First stab and % and %%.

Raku · Nov 18, 2011 · 879321b · 879321b
1 parent f599448
commit 879321b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/QRegex/P6Regex/Actions.nqp b/src/QRegex/P6Regex/Actions.nqp
@@ -69,9 +69,24 @@ class QRegex::P6Regex::Actions is HLL::Actions {
             $ast.unshift($qast);
             $qast := $ast;
         }
+        if $<separator> {
+            unless $qast.rxtype eq 'quant' {
+                $/.CURSOR.panic("'" ~ $<separator>[0]<septype> ~
+                    "' many only be used immediately following a quantifier")
+            }
+            $qast.push($<separator>[0].ast);
+            if $<separator>[0]<septype> eq '%%' {
+                $qast := QAST::Regex.new( :rxtype<concat>, $qast,
+                    QAST::Regex.new( :rxtype<quant>, :min(0), :max(1), $<separator>[0].ast ));
+            }
+        }
         $qast.backtrack('r') if $qast && !$qast.backtrack && %*RX<r>;
         make $qast;
     }
+
+    method separator($/) {
+        make $<quantified_atom>.ast;
+    }
 
     method atom($/) {
         make $<metachar>

diff --git a/src/QRegex/P6Regex/Grammar.nqp b/src/QRegex/P6Regex/Grammar.nqp
@@ -61,9 +61,17 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
     }
 
     token quantified_atom {
-        <atom> [ <.ws> [ <quantifier> | <?before ':'> <backmod> <!alpha> ] ]?
+        <atom>
+        [
+            <.ws> [ <quantifier> | <?before ':'> <backmod> <!alpha> ]
+            [ <.ws> <separator> ]?
+        ]?
     }
 
+    token separator {
+        $<septype>=['%''%'?] <normspace>? <quantified_atom>
+    }
+
     token atom {
         # :dba('regex atom')
         [