Add special handling of <sym>.

perl6 · Oct 23, 2009 · fbaf420 · fbaf420
1 parent d6f5066
commit fbaf420
Show file tree

Hide file tree

Showing 4 changed files with 2,859 additions and 2,766 deletions.
diff --git a/src/Regex/P6Grammar/Actions.pm b/src/Regex/P6Grammar/Actions.pm
@@ -31,14 +31,18 @@ method regex_stmt($/, $key?) {
     my @MODIFIERS := Q:PIR { 
         %r = get_hll_global ['Regex';'P6Regex';'Actions'], '@MODIFIERS'
     };
+    my $name := ~$<longname>;
     if $key eq 'open' {
         my %h;
         if $<sym> eq 'token' { %h<r> := 1; }
         if $<sym> eq 'rule'  { %h<r> := 1;  %h<s> := 1; }
         @MODIFIERS.unshift(%h);
+        Q:PIR { 
+            $P0 = find_lex '$name'
+            set_hll_global ['Regex';'P6Regex';'Actions'], '$REGEXNAME', $P0
+        };
         return 0;
     }
-    my $name := ~$<longname>;
     my $past;
     if $<proto> {
         $past := 

diff --git a/src/Regex/P6Regex/Actions.pm b/src/Regex/P6Regex/Actions.pm
@@ -322,6 +322,21 @@ method assertion:sym<name>($/) {
         $past := $<assertion>[0].ast;
         subrule_alias($past, $name);
     }
+    elsif $name eq 'sym' {
+        my $regexsym := Q:PIR {
+            $P0 = get_global '$REGEXNAME'
+            $S0 = $P0
+            $I0 = index $S0, ':sym<'
+            add $I0, 5
+            $S0 = substr $S0, $I0
+            chopn $S0, 1
+            %r = box $S0
+        };
+        $past := PAST::Regex.new( 
+            PAST::Regex.new( $regexsym, :pasttype('literal') ),
+            :name($name), :pasttype('subcapture'), :node($/) 
+        );
+    }
     else {
         $past := PAST::Regex.new( $name, :name($name),
                                   :pasttype('subrule'), :subtype('capture'), :node($/) );