Refactor <?{...}> and <!{...}> code assertions to prepare for <{...}>.

perl6 · May 25, 2010 · 43b5e39 · 43b5e39
1 parent aa182b0
commit 43b5e39
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -829,6 +829,12 @@ class NQP::RegexActions is Regex::P6Regex::Actions {
                               :pasttype<pastnode>, :node($/) );
     }
 
+    method assertion:sym<?{ }>($/) { 
+        make PAST::Regex.new( $<codeblock>.ast, 
+                              :subtype<zerowidth>, :negate( $<zw> eq '!' ),
+                              :pasttype<pastnode>, :node($/) );
+    }
+
     method assertion:sym<var>($/) {
         make PAST::Regex.new( '!INTERPOLATE_REGEX', $<var>.ast, 
                               :pasttype<subrule>, :subtype<method>, :node($/));

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -558,8 +558,12 @@ grammar NQP::Regex is Regex::P6Regex::Grammar {
         <?[$@]> <var=.LANG('MAIN', 'variable')>
     }
 
-    token assertion:sym<{ }> {
-        <?[{]> <codeblock>
+    # token assertion:sym<{ }> {
+    #     <?[{]> <codeblock>
+    # }
+
+    token assertion:sym<?{ }> {
+        $<zw>=[ <[?!]> <?before '{'> ] <codeblock>
     }
 
     token assertion:sym<name> {