Add \d, \s, \w, \D, \S, \W backslash escapes to ARE.

partcl · Nov 29, 2009 · 2bff6f8 · 2bff6f8
1 parent c61dca5
commit 2bff6f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/ARE/Actions.pm b/src/ARE/Actions.pm
@@ -70,6 +70,11 @@ method metachar:sym<.>($/) {
     make PAST::Regex.new( :pasttype<charclass>, :subtype<.>, :node($/) );
 }
 
+method metachar:sym<back>($/) { make $<backslash>.ast; }
+
+method backslash:sym<w>($/) {
+    make PAST::Regex.new( :pasttype<charclass>, :subtype(~$<sym>), :node($/));
+}
 
 sub buildsub($rpast, $block = PAST::Block.new() ) {
     $rpast := PAST::Regex.new(

diff --git a/src/ARE/Grammar.pm b/src/ARE/Grammar.pm
@@ -34,5 +34,5 @@ token metachar:sym<.> { <sym> }
 token metachar:sym<back> { \\ <backslash> }
 
 proto token backslash { <...> }
-token backslash:sym<w> { $<sym>=[<[dswnDSWN]>] }
+token backslash:sym<w> { $<sym>=[<[dswDSW]>] }
 
diff --git a/src/PmTcl/Commands.pm b/src/PmTcl/Commands.pm
@@ -272,6 +272,8 @@ our sub puts(*@args) {
 }
 
 our sub regexp($exp, $string) {
+    ## my &dumper := Q:PIR { %r = get_root_global ['parrot'], '_dumper' };
+    ## &dumper(ARE::Compiler.compile($exp, :target<parse>));
     my $regex := ARE::Compiler.compile($exp);
     ?Regex::Cursor.parse($string, :rule($regex), :c(0));
 }