Refactor regex creation a bit.

perl6 · Nov 22, 2009 · da4d6f4 · da4d6f4
1 parent 9f7db2e
commit da4d6f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -440,19 +440,9 @@ method regex_declarator($/, $key?) {
             );
     }
     else {
-        my $rpast := $<p6regex>.ast;
-        my %capnames := Regex::P6Regex::Actions::capnames($rpast, 0);
-        %capnames{''} := 0;
-        $rpast := PAST::Regex.new(
-                     $rpast,
-                     PAST::Regex.new( :pasttype('pass') ),
-                     :pasttype('concat'),
-                     :capnames(%capnames)
-        );
-        $past := @BLOCK.shift;
-        $past.blocktype('method');
+        $past := 
+             Regex::P6Regex::Actions::buildsub($<p6regex>.ast, @BLOCK.shift);
         $past.name($name);
-        $past.push($rpast);
         @MODIFIERS.shift;
     }
     make $past;

diff --git a/src/Regex/P6Regex/Actions.pm b/src/Regex/P6Regex/Actions.pm
@@ -472,7 +472,7 @@ method mod_internal($/) {
     make 0;
 }
 
-sub buildsub($rpast) {
+sub buildsub($rpast, $block = PAST::Block.new() ) {
     my %capnames := capnames($rpast, 0);
     %capnames{''} := 0;
     $rpast := PAST::Regex.new(
@@ -482,7 +482,9 @@ sub buildsub($rpast) {
         :pasttype('concat'),
         :capnames(%capnames)
     );
-    PAST::Block.new( $rpast, :blocktype('method'));
+    $block.push($rpast);
+    $block.blocktype('method');
+    $block;
 }
 
 sub capnames($ast, $count) {