Parse _ in ** quantifier values.

Also sneak in a decent NYI error for the ** {...} case.
Raku · Sep 25, 2013 · a47a76b · a47a76b
1 parent 3898d17
commit a47a76b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/QRegex/P6Regex/Actions.nqp b/src/QRegex/P6Regex/Actions.nqp
@@ -129,7 +129,7 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         my $qast;
         $qast := QAST::Regex.new( :rxtype<quant>, :min(+$<min>), :max(-1), :node($/) );
         if ! $<max> { $qast.max(+$<min>) }
-        elsif $<max>[0] ne '*' { $qast.max(+$<max>[0]); }
+        elsif $<max> ne '*' { $qast.max(+$<max>); }
         make backmod($qast, $<backmod>);
     }
 

diff --git a/src/QRegex/P6Regex/Grammar.nqp b/src/QRegex/P6Regex/Grammar.nqp
@@ -170,16 +170,20 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
     token quantifier:sym<**> {
         <sym> <normspace>**0..1 <backmod> <normspace>**0..1
         [
-        ||  $<min>=[\d+] 
-            [   '..' 
-                $<max>=[ 
-                       || \d+ 
-                       || '*' 
-                       || \-\d+ <.panic: "Negative numbers are not allowed as range quantifier endpoint">
-                       || <.panic: "Only integers or '*' allowed as range quantifier endpoint"> 
-                       ] 
-            ]**0..1
-        || \-\d+ <.panic: "Negative numbers are not allowed as quantifiers">
+        | <.decint> \s+ '..' <.panic: "Spaces not allowed in bare range">
+        | <min=.decint>
+          [ '..'
+            [
+            | <max=.decint> {
+                $/.CURSOR.panic("Negative numbers are not allowed as quantifiers") if $<max>.Str < 0;
+                $/.CURSOR.panic("Empty range") if $<min>.Str > $<max>.Str;
+              }
+            | $<max>=['*']
+            | <.panic: "Malformed range">
+            ]
+          ]?
+          { $/.CURSOR.panic("Negative numbers are not allowed as quantifiers") if $<min>.Str < 0 }
+        | <?[{]> { $/.CURSOR.panic("Block case of ** quantifier not yet implemented") }
         ]
     }