[svn:parrot] r37767 - branches/pge1/compilers/pge/PGE

[pmichaud at svn.parrot.org]

Author: pmichaud
Date: Fri Mar 27 21:39:59 2009
New Revision: 37767
URL: https://trac.parrot.org/parrot/changeset/37767

Log:
[pge]:  Convert obsolete calls to 'result_object' to '!make'.

Modified:
   branches/pge1/compilers/pge/PGE/Exp.pir
   branches/pge1/compilers/pge/PGE/OPTable.pir
   branches/pge1/compilers/pge/PGE/P5Regex.pir
   branches/pge1/compilers/pge/PGE/Perl6Regex.pir

Modified: branches/pge1/compilers/pge/PGE/Exp.pir
==============================================================================
--- branches/pge1/compilers/pge/PGE/Exp.pir	Fri Mar 27 20:37:49 2009	(r37766)
+++ branches/pge1/compilers/pge/PGE/Exp.pir	Fri Mar 27 21:39:59 2009	(r37767)
@@ -417,7 +417,7 @@
     $S0 = exp0.'ast'()
     $S1 = exp1.'ast'()
     concat $S0, $S1
-    exp0.'result_object'($S0)
+    exp0.'!make'($S0)
     goto concat_lit_loop
   concat_lit_shift:
     inc j
@@ -1455,12 +1455,12 @@
           mpos = pos
           ($P0 :optional, $I0 :opt_flag) = $P1(mob)
           if $I0 == 0 goto %0
-          mob.'result_object'($P0)
+          mob.'!make'($P0)
           push ustack, pos
           local_branch cstack, succeed
           pos = pop ustack
           null $P0
-          mob.'result_object'($P0)
+          mob.'!make'($P0)
           goto fail
         CODE
     .return ()

Modified: branches/pge1/compilers/pge/PGE/OPTable.pir
==============================================================================
--- branches/pge1/compilers/pge/PGE/OPTable.pir	Fri Mar 27 20:37:49 2009	(r37766)
+++ branches/pge1/compilers/pge/PGE/OPTable.pir	Fri Mar 27 21:39:59 2009	(r37767)
@@ -526,7 +526,7 @@
     unless rulename goto reduce_saveterm_1
     ($P0 :optional, $I0 :opt_flag) = action.rulename($P1, 'reduce')
     unless $I0 goto reduce_saveterm_1
-    $P1.'result_object'($P0)
+    $P1.'!make'($P0)
   reduce_saveterm_1:
     push termstack, $P1
   reduce_end:
@@ -608,7 +608,7 @@
     unless rulename goto end_all
     ($P0 :optional, $I0 :opt_flag) = action.rulename(mob, 'end')
     unless $I0 goto end_all
-    mob.'result_object'($P0)
+    mob.'!make'($P0)
   end_all:
     .return (mob)
 

Modified: branches/pge1/compilers/pge/PGE/P5Regex.pir
==============================================================================
--- branches/pge1/compilers/pge/PGE/P5Regex.pir	Fri Mar 27 20:37:49 2009	(r37766)
+++ branches/pge1/compilers/pge/PGE/P5Regex.pir	Fri Mar 27 21:39:59 2009	(r37767)
@@ -200,7 +200,7 @@
     $I0 = pos - litstart
     $S0 = substr target, litstart, $I0
     $S0 = concat initchar, $S0
-    mob.'result_object'($S0)
+    mob.'!make'($S0)
     goto end
   end:
     mob.'to'(pos)
@@ -344,7 +344,7 @@
     mob["isnegated"] = 1
   end:
     mob.'to'(pos)
-    mob.'result_object'(charlist)
+    mob.'!make'(charlist)
     .return (mob)
 
   err_close:

Modified: branches/pge1/compilers/pge/PGE/Perl6Regex.pir
==============================================================================
--- branches/pge1/compilers/pge/PGE/Perl6Regex.pir	Fri Mar 27 20:37:49 2009	(r37766)
+++ branches/pge1/compilers/pge/PGE/Perl6Regex.pir	Fri Mar 27 21:39:59 2009	(r37767)
@@ -407,7 +407,7 @@
 
   term_charlist:
     mob = mob.'new'(mob, 'grammar'=>'PGE::Exp::EnumCharList')
-    mob.'result_object'(charlist)
+    mob.'!make'(charlist)
     mob['isnegated'] = isnegated
     mob.'to'(pos)
     .return (mob)
@@ -921,7 +921,7 @@
     ##   create a node for the charlist
     term = mob.'new'(mob, 'grammar'=>'PGE::Exp::EnumCharList')
     term.'to'(pos)
-    term.'result_object'(charlist)
+    term.'!make'(charlist)
     goto combine
 
   subrule:
@@ -948,7 +948,7 @@
     ##   token is '<-', we need to match a char by concat dot
     $P0 = mob.'new'(mob, 'grammar'=>'PGE::Exp::CCShortcut')
     $P0.'to'(pos)
-    $P0.'result_object'('.')
+    $P0.'!make'('.')
     mob = mob.'new'(mob, 'grammar'=>'PGE::Exp::Concat')
     mob.'to'(pos)
     mob[0] = term
@@ -1118,14 +1118,14 @@
     if $I1 == 0 goto fail
     $S0 = substr target, $I0, $I1
     mob['key'] = $S0
-    mob.'result_object'(value)
+    mob.'!make'(value)
     $S0 = substr target, pos, 1
     if $S0 != '(' goto end
     $I0 = pos + 1
     pos = index target, ')', pos
     $I1 = pos - $I0
     $S0 = substr target, $I0, $I1
-    mob.'result_object'($S0)
+    mob.'!make'($S0)
     inc pos
   end:
     ### XXX pos = find_not_cclass .CCLASS_WHITESPACE, target, pos, lastpos
@@ -1167,7 +1167,7 @@
     if $I0 < pos goto err_noclose
     $I1 = $I0 - pos
     $S1 = substr target, pos, $I1
-    mob.'result_object'($S1)
+    mob.'!make'($S1)
     pos = $I0 + len
     mob.'to'(pos)
     .return (mob)
@@ -1636,7 +1636,7 @@
     closure_fn = closure_pp[lang]
     $S1 = self.'ast'()
     $S1 = closure_fn($S1)
-    self.'result_object'($S1)
+    self.'!make'($S1)
   end:
     .return (self)
 .end