Changeset 24144

Timestamp:

12/03/08 04:37:51 (6 hours ago)

Author:

putter

Message:

[elfish/rx_on_re] Additional prep for changing emitter output.

Files:

• misc/elfish/rx_on_re/emit5.pm (modified) (7 diffs)

misc/elfish/rx_on_re/emit5.pm

@@ -554 +554 @@
 
   sub RMARE_aregex_create {
-    my($o,$f)=@_;
-    my $nparenx = $o->{flags}{p5} ? $o->{nparen} : $o->{nparen6};
+    my($o,$f,$nparenx)=@_;
     $nparenx = 0 if !defined $nparenx; #XXX arguments to subrules.  aregex not seeing an init.
     subname "<aregex ".($sub_id++).">" => sub {
@@ -575 +574 @@
 
   sub RMARE_do_match {
-    my($o,$f,$s,$beginat,$minlen)=@_;
-    my $nparen = $o->{nparen};
+    my($o,$f,$s,$beginat,$minlen,$nparen)=@_;
     my $len = length($s);
     $beginat = 0 if !defined($beginat);
@@ -842 +840 @@
 
   sub RMARE_aregex {
-    my($o,$pkg,$name,$f)=@_;
+    my($o,$pkg,$name,$f,$nparen)=@_;
     # Why the extra sub?  60+% shorter re_text runtime.  sigh.
     my $matchergen = subname "even with subname used?" => sub {
@@ -848 +846 @@
         my($pkg9,$name1,$s,$beginat,$minlen)=@_;
         local $Regexp::ModuleA::ReentrantEngine::Env::pkg = $pkg9;
-        my $m = $o->RMARE_do_match($f,$s,$beginat,$minlen);
+        my $m = $o->RMARE_do_match($f,$s,$beginat,$minlen,$nparen);
         $m->_match_enable_overload2;
         $$m->{RULE} = $name1;
@@ -1417 +1415 @@
       my $pkg = self.<pkg>; #if self.<pkg> {'"'~quotemeta(self.<pkg>)~'"'} else {'undef'};
       my $name = self.<name>; #if self.<name> {'"'~quotemeta(self.<name>)~'"'} else {'undef'};
-      #XXX TODO: RMARE_aregex_create is accessing the node.  Refactor.
-      my $f = $.RMARE_aregex_create(self.<expr>.RMARE_emit2);
-      $.RMARE_aregex($pkg,$name,$f);
+      my $nparenx = {if self.<flags><p5> { self.<nparen> } else { self.<nparen6> }};
+      my $nparen = self.<nparen>; #||'undef';
+      my $expr = self.<expr>.RMARE_emit2;
+      #$.RMARE_aregex($pkg,$name,$.RMARE_aregex_create($expr,$nparenx),$nparen);
+      _inline_p5('IRx1::RxBaseClass->RMARE_aregex($pkg,$name,IRx1::RxBaseClass->RMARE_aregex_create($expr,$nparenx),$nparen)');
     }
   }
@@ -1432 +1432 @@
       my $name = self.<name>; #if self.<name> {'"'~quotemeta(self.<name>)~'"'} else {'undef'};
       my $fr = self.<expr>.RMARE_emit2;
-      #XXX TODO
       $.RMARE_biind($pkg,$name,$fr);
+      #_inline_p5('IRx1::RxBaseClass->RMARE_biind($pkg,$name,$fr)')
     }
   }
@@ -1443 +1443 @@
     }
     method RMARE_emit2 {
-      my $pkg = self.<pkg>; #if self.<pkg> {'"'~quotemeta(self.<pkg>)~'"'} else {'undef'};
-      #XXX TODO
-      $.RMARE_namespace($pkg);
-      self.<bindings>.map(sub($o){$o.RMARE_emit2}).flatten;
+      my $pkg = self.<pkg>;
+      #$.RMARE_namespace($pkg);
+      eval_perl5('IRx1::RxBaseClass->RMARE_namespace("'~quotemeta($pkg)~'");'); #~
+      self.<bindings>.map(sub($o){$o.RMARE_emit2}).flatten; #join
     }
   }