Refactor named assertions slightly for better argument handling later.

perl6 · Oct 15, 2009 · bbbca64 · bbbca64
1 parent 3b052a5
commit bbbca64
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Regex/P6Regex/Actions.pm b/src/Regex/P6Regex/Actions.pm
@@ -292,18 +292,16 @@ method assertion:sym<method>($/) {
 method assertion:sym<name>($/) {
     my $name := ~$<longname>;
     my $past;
-    if $<nibbler> {
-        my $subpast := buildsub($<nibbler>[0].ast);
-        $past := PAST::Regex.new( $name, $subpast, :name($name),
-                                  :pasttype('subrule'), :subtype('capture') );
-    }
-    elsif $<assertion> {
+    if $<assertion> {
         $past := $<assertion>[0].ast;
         $past.name($name);
     }
     else {
-        $past := PAST::Regex.new( $name, :name($name) , :pasttype('subrule'),
-                                  :subtype('capture') );
+        $past := PAST::Regex.new( $name, :name($name),
+                                  :pasttype('subrule'), :subtype('capture') );
+        if $<nibbler> {
+            $past.push( buildsub($<nibbler>[0].ast) );
+        }
     }
     make $past;
 }