Parse a couple more types of regex quoting constructs. We now get to …

…pass another 3 tests from S05.
rakudo · Feb 9, 2010 · f456c24 · f456c24
1 parent fcb9e3c
commit f456c24
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -1734,6 +1734,14 @@ method quote:sym</ />($/) {
     my $past := Regex::P6Regex::Actions::buildsub($<p6regex>.ast);
     make create_code_object($past, 'Regex', 0, '');
 }
+method quote:sym<rx>($/) {
+    my $past := Regex::P6Regex::Actions::buildsub($<p6regex>.ast);
+    make create_code_object($past, 'Regex', 0, '');
+}
+method quote:sym<m>($/) {
+    my $past := Regex::P6Regex::Actions::buildsub($<p6regex>.ast);
+    make create_code_object($past, 'Regex', 0, '');
+}
 
 method quote_escape:sym<$>($/) { make $<variable>.ast; }
 method quote_escape:sym<{ }>($/) {

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -865,6 +865,15 @@ token quote:sym<Q>     { 'Q'   <![(]> <.ws> <quote_EXPR> }
 token quote:sym<Q:PIR> { 'Q:PIR'      <.ws> <quote_EXPR> }
 token quote:sym</null/> { '/' \s* '/' <.panic: "Null regex not allowed"> }
 token quote:sym</ />  { '/'<p6regex=.LANG('Regex','nibbler')>'/' }
+token quote:sym<rx>   { <sym> >> '/'<p6regex=.LANG('Regex','nibbler')>'/' }
+token quote:sym<m> {
+    <sym> >>
+    [
+    | '/'<p6regex=.LANG('Regex','nibbler')>'/'
+    | '{'<p6regex=.LANG('Regex','nibbler')>'}'
+    ]
+}
+
 
 token quote_escape:sym<$>   { <?[$]> <?quotemod_check('s')> <variable> }
 token quote_escape:sym<{ }> { <?[{]> <?quotemod_check('c')> <block> }

diff --git a/t/spectest.data b/t/spectest.data
@@ -237,17 +237,17 @@ S04-statements/until.t
 # S05-match/non-capturing.t
 # S05-match/perl.t
 # S05-match/positions.t
-# S05-metachars/line-anchors.t
-# S05-metachars/newline.t
+S05-metachars/line-anchors.t
+S05-metachars/newline.t
 # S05-metachars/tilde.t
 # S05-metasyntax/angle-brackets.t
 S05-metasyntax/changed.t
 # S05-metasyntax/charset.t
 # S05-metasyntax/lookaround.t
-# S05-metasyntax/null.t
+S05-metasyntax/null.t
 # S05-metasyntax/regex.t
 # S05-metasyntax/repeat.t
-# S05-metasyntax/single-quotes.t
+S05-metasyntax/single-quotes.t
 # S05-metasyntax/unknown.t
 # S05-modifier/ignorecase.t
 # S05-modifier/perl5_1.t