[svn:parrot] r39631 - in trunk: compilers/nqp/src/Grammar compilers/pct/src/PAST compilers/pge/PGE runtime/parrot/library runtime/parrot/library/CGI runtime/parrot/library/Getopt runtime/parrot/library/MIME runtime/parrot/library/PGE runtime/parrot/library/Test/Builder tools/dev

NotFound at svn.parrot.org NotFound at svn.parrot.org
Wed Jun 17 20:30:32 UTC 2009


Author: NotFound
Date: Wed Jun 17 20:30:30 2009
New Revision: 39631
URL: https://trac.parrot.org/parrot/changeset/39631

Log:
[cage] remove a lot of duplicate pir local symbols, see TT #767

Modified:
   trunk/compilers/nqp/src/Grammar/Actions.pir
   trunk/compilers/pct/src/PAST/Compiler.pir
   trunk/compilers/pge/PGE/Match.pir
   trunk/compilers/pge/PGE/Perl6Regex.pir
   trunk/runtime/parrot/library/CGI/QueryHash.pir
   trunk/runtime/parrot/library/Getopt/Obj.pir
   trunk/runtime/parrot/library/MIME/Base64.pir
   trunk/runtime/parrot/library/P6object.pir
   trunk/runtime/parrot/library/PGE/Util.pir
   trunk/runtime/parrot/library/Range.pir
   trunk/runtime/parrot/library/Test/Builder/Output.pir
   trunk/tools/dev/pbc_to_exe.pir

Modified: trunk/compilers/nqp/src/Grammar/Actions.pir
==============================================================================
--- trunk/compilers/nqp/src/Grammar/Actions.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/compilers/nqp/src/Grammar/Actions.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -715,7 +715,6 @@
     $S0 = expr.'name'()
     if $S0 != 'infix:,' goto one_arg
   comma_arg:
-    .local pmc iter
     iter = expr.'iterator'()
   iter_loop:
     unless iter goto end

Modified: trunk/compilers/pct/src/PAST/Compiler.pir
==============================================================================
--- trunk/compilers/pct/src/PAST/Compiler.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/compilers/pct/src/PAST/Compiler.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -406,7 +406,6 @@
 
     .local pmc iter
     .local string rtype
-    .local int sigidx
     iter = node.'iterator'()
     sigidx = 1
     rtype = substr signature, sigidx, 1
@@ -1423,7 +1422,7 @@
     collpast = node[0]
     bodypast = node[1]
 
-    .local pmc collpost, testpost
+    .local pmc collpost
     collpost = self.'as_post'(collpast, 'rtype'=>'P')
     ops.'push'(collpost)
 

Modified: trunk/compilers/pge/PGE/Match.pir
==============================================================================
--- trunk/compilers/pge/PGE/Match.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/compilers/pge/PGE/Match.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -64,7 +64,6 @@
     .local pmc target, grammar_class
     issrcmatch = isa src, ['PGE';'Match']
     if issrcmatch goto target_from_src
-    .local pmc target
     target = new 'CodeString'
     assign target, src
     pos = 0

Modified: trunk/compilers/pge/PGE/Perl6Regex.pir
==============================================================================
--- trunk/compilers/pge/PGE/Perl6Regex.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/compilers/pge/PGE/Perl6Regex.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -107,7 +107,7 @@
     .return ($P0)
 
   analyze:
-    .local pmc exp, pad
+    .local pmc pad
     exp = match['expr']
     pad = clone adverbs
     $P0 = new 'Hash'

Modified: trunk/runtime/parrot/library/CGI/QueryHash.pir
==============================================================================
--- trunk/runtime/parrot/library/CGI/QueryHash.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/runtime/parrot/library/CGI/QueryHash.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -93,7 +93,7 @@
     unless query goto END
 
     .local pmc query_hash, items, items_tmp_1, items_tmp_2
-    .local string query, kv, k, v, item_tmp_1, item_tmp_2, last_chars_of_k
+    .local string kv, k, v, item_tmp_1, item_tmp_2, last_chars_of_k
     .local int i, j, n, o, len_of_k
 
     query_hash      = new 'Hash'

Modified: trunk/runtime/parrot/library/Getopt/Obj.pir
==============================================================================
--- trunk/runtime/parrot/library/Getopt/Obj.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/runtime/parrot/library/Getopt/Obj.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -202,7 +202,6 @@
 
     key = name
 
-    .local string type
     type = spec."type"()
     $I2 = length val
 
@@ -220,7 +219,6 @@
 
     (name, spec) = self."getNameForKey"(key)
     if null name goto redofor
-    .local string type
     type = spec."type"()
     unless type == 'Boolean' goto error_2
 
@@ -263,7 +261,6 @@
 
 beginstore_1:
     # Store the value...
-    .local string type
     type = spec."type"()
     if_null val, undef
     if type == 'String' goto str
@@ -286,7 +283,6 @@
 array:
     $P0 = return[name]
     if null $P0 goto not_set
-    .local string type
     type = typeof $P0
     unless type != 'ResizableStringArray' goto endif_5
 not_set:
@@ -297,7 +293,6 @@
 hash:
     $P0 = return[name]
     if null $P0 goto not_set_hash
-    .local string type
     type = typeof $P0
     unless type != 'Hash' goto endif_7
 not_set_hash:

Modified: trunk/runtime/parrot/library/MIME/Base64.pir
==============================================================================
--- trunk/runtime/parrot/library/MIME/Base64.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/runtime/parrot/library/MIME/Base64.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -200,7 +200,7 @@
     goto START_5
     END_5:
 
-    .local int len, len_mod_4
+    .local int len_mod_4
     len = length base64_cleaned
     len_mod_4 = len % 4
 

Modified: trunk/runtime/parrot/library/P6object.pir
==============================================================================
--- trunk/runtime/parrot/library/P6object.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/runtime/parrot/library/P6object.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -453,7 +453,7 @@
     setattribute how, 'parrotclass', parrotclass
 
     ##  create an anonymous class for the protoobject
-    .local pmc protoclass, protoobject, iter
+    .local pmc protoclass, protoobject
     protoclass = new 'Class'
     $P0 = get_class 'P6protoobject'
     ##  P6protoobject methods override parrotclass methods...

Modified: trunk/runtime/parrot/library/PGE/Util.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Util.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/runtime/parrot/library/PGE/Util.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -160,7 +160,7 @@
   have_pos:
 
     # count newlines to the current position of the parse
-    .local int pos, npos, lines
+    .local int npos, lines
     .local string target
     $P99 = getattribute match, '$.target'
     target = $P99

Modified: trunk/runtime/parrot/library/Range.pir
==============================================================================
--- trunk/runtime/parrot/library/Range.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/runtime/parrot/library/Range.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -16,9 +16,9 @@
 =cut
 
 .macro exhausted_check()
-  .local pmc exhausted
-  exhausted = getattribute self, 'exhausted'
-  unless exhausted goto .$more
+  .local pmc exhausted_check
+  exhausted_check = getattribute self, 'exhausted'
+  unless exhausted_check goto .$more
   .local pmc exception
   exception = new 'Exception'
   exception[0] = 'Exhausted Range'
@@ -155,7 +155,7 @@
 .sub 'shift' :vtable('shift_pmc') :method
   .exhausted_check()
 
-  .local pmc exhausted, from, to, by
+  .local pmc from, to, by
   from = getattribute self, 'from'
   to   = getattribute self, 'to'
   by   = getattribute self, 'by'

Modified: trunk/runtime/parrot/library/Test/Builder/Output.pir
==============================================================================
--- trunk/runtime/parrot/library/Test/Builder/Output.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/runtime/parrot/library/Test/Builder/Output.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -138,7 +138,6 @@
 	i = 0
 
 	.local string first_char
-	.local string line
 
   LOOP:
     if i == 0 goto LINE_OK

Modified: trunk/tools/dev/pbc_to_exe.pir
==============================================================================
--- trunk/tools/dev/pbc_to_exe.pir	Wed Jun 17 18:59:08 2009	(r39630)
+++ trunk/tools/dev/pbc_to_exe.pir	Wed Jun 17 20:30:30 2009	(r39631)
@@ -168,7 +168,6 @@
     .return(infile, cfile, objfile, exefile)
 
   proper_args:
-    .local string infile, cfile, objfile, exefile
 
     $P0    = shift args
     infile = shift args


More information about the parrot-commits mailing list