Merge pull request #573 from ungrim97/feature/non_inc_range_quantifier

Add support for 1^..^10 non inclusive range quantifiers in regexs
rakudo · Nov 5, 2015 · 55d55f3 · 55d55f3
2 parents 183d699 + c698e20
commit 55d55f3
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -8543,11 +8543,22 @@ class Perl6::RegexActions is QRegex::P6Regex::Actions does STDActions {
             );
         }
         else {
-            my $min := $<min>.ast;
+            my $min := 0;
+            if $<min> { $min := $<min>.ast; }
+
             my $max := -1;
-            if ! $<max> { $max := $min }
+            my $upto := $<upto>;
+
+            if $<from> eq '^' { $min++ }
+
+            if ! $<max> {
+                $max := $min
+            }
             elsif $<max> ne '*' {
                 $max := $<max>.ast;
+                if $<upto> eq '^' {
+                    $max--;
+                }
                 $/.CURSOR.panic("Empty range") if $min > $max;
             }
             $qast := QAST::Regex.new( :rxtype<quant>, :min($min), :max($max), :node($/) );