Add parsing for &&.

perl6 · Aug 20, 2010 · 8788740 · 8788740
1 parent a56f707
commit 8788740
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/Regex/P6Regex/Actions.pm b/src/Regex/P6Regex/Actions.pm
@@ -37,8 +37,22 @@ method nibbler($/, $key?) {
 
     @MODIFIERS.shift;
     my $past;
-    if +$<termish> > 1 {
+    if +$<termconj> > 1 {
         $past := PAST::Regex.new( :pasttype('alt'), :node($/) );
+        for $<termconj> {
+            $past.push($_.ast);
+        }
+    }
+    else {
+        $past := $<termconj>[0].ast;
+    }
+    make $past;
+}
+
+method termconj($/) {
+    my $past;
+    if +$<termish> > 1 {
+        $past := PAST::Regex.new( :pasttype('conj'), :node($/) );
         for $<termish> {
             $past.push($_.ast);
         }

diff --git a/src/Regex/P6Regex/Grammar.pm b/src/Regex/P6Regex/Grammar.pm
@@ -29,8 +29,15 @@ grammar Regex::P6Regex::Grammar is HLL::Grammar;
     token nibbler {
         {*} #= open
         [ <.ws> ['||'|'|'|'&&'|'&'] ]?
-        <termish>
+        <termconj>
         [ ['||'|'|']
+          [ <termconj> || <.panic: 'Null pattern not allowed'> ]
+        ]*
+    }
+
+    token termconj {
+        <termish>
+        [ ['&&'|'&']
           [ <termish> || <.panic: 'Null pattern not allowed'> ]
         ]*
     }