Add *, +, and ? quantifiers.

partcl · Nov 29, 2009 · ccab549 · ccab549
1 parent 8add5bf
commit ccab549
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/ARE/Actions.pm b/src/ARE/Actions.pm
@@ -40,14 +40,30 @@ method termish($/) {
 }
 
 method quantified_atom($/) {
-    make $<atom>.ast;
+    my $past := $<atom>.ast;
+    if $<quantifier> {
+        my $qast := $<quantifier>[0].ast;
+        $qast.unshift($past);
+        $past := $qast;
+    }
+    make $past;
 }
 
 method atom($/) {
     my $past := PAST::Regex.new( ~$/, :pasttype<literal>, :node($/) );
     make $past;
 }
 
+method quantifier:sym<*>($/) {
+    make PAST::Regex.new( :pasttype<quant>, :node($/) );
+}
+method quantifier:sym<+>($/) {
+    make PAST::Regex.new( :pasttype<quant>, :min(1), :node($/) );
+}
+method quantifier:sym<?>($/) {
+    make PAST::Regex.new( :pasttype<quant>, :min(0), :max(1), :node($/) );
+}
+
 
 sub buildsub($rpast, $block = PAST::Block.new() ) {
     $rpast := PAST::Regex.new(

diff --git a/src/ARE/Grammar.pm b/src/ARE/Grammar.pm
@@ -14,7 +14,7 @@ token termish {
 }
 
 token quantified_atom {
-    <atom>
+    <atom> <quantifier>?
 }
 
 token atom {
@@ -24,4 +24,9 @@ token atom {
     ]
 }
 
+proto token quantifier { <...> }
+token quantifier:sym<*> { <sym> }
+token quantifier:sym<+> { <sym> }
+token quantifier:sym<?> { <sym> }
+