Refactor p6regex's handling of argument lists.

perl6 · Nov 2, 2009 · c65b0dd · c65b0dd
1 parent 81afeca
commit c65b0dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Regex/P6Regex/Actions.pm b/src/Regex/P6Regex/Actions.pm
@@ -15,6 +15,12 @@ method arg($/) {
     make $<quote> ?? ~$<quote><val> !! +$<val>;
 }
 
+method arglist($/) {
+    my $past := PAST::Op.new( :pasttype('list') );
+    for $<arg> { $past.push( $_.ast ); }
+    make $past;
+}
+
 method TOP($/) {
     my $past := buildsub( $<nibbler>.ast );
     $past.node($/);
@@ -374,9 +380,7 @@ method assertion:sym<name>($/) {
             $past.push( buildsub($<nibbler>[0].ast) );
         }
         elsif $<arglist> {
-            for $<arglist>[0]<arg> {
-                $past.push( $_.ast );
-            }
+            for $<arglist>[0].ast.list { $past.push( $_ ); }
         }
     }
     make $past;

diff --git a/src/Regex/P6Regex/Grammar.pm b/src/Regex/P6Regex/Grammar.pm
@@ -18,7 +18,7 @@ grammar Regex::P6Regex::Grammar is HLL::Grammar;
         ]
     }
 
-    rule arglist { <arg> [ ',' <arg> ]* }
+    rule arglist { <arg> [ ',' <arg>]* }
 
     token TOP {
         <nibbler>