Changeset 21838 for src/perl6

Timestamp:

08/07/08 22:53:55 (4 months ago)

Author:

lwall

Message:

[STD] more opdef tuneups

Location:

src/perl6

Files:

• Cursor.pmc (modified) (1 diff)
• STD.pm (modified) (1 diff)

src/perl6/Cursor.pmc

@@ -924 +924 @@
     my $name = $lang->text;
     my $WHAT = ref $lang;
-    if ($name =~ s/:/:sym/) {
+    if ($name =~ s/:(?=[«<({[])/:sym/) {
         my ($sym) = $name =~ /:sym(.*)/;
         if ($sym =~ s/^«(.*)»$/$1/) {

src/perl6/STD.pm

@@ -2373 +2373 @@
 
 rule regex_def {
-    <longname>?
+    :my $IN_DECL is context<rw> = 1;
+    [ '&'<deflongname>? | <deflongname> ]?
     [ [ ':'?'(' <signature> ')'] | <trait> ]*
+    { $IN_DECL = 0; }
     <regex_block>
 }
 
 rule macro_def {
+    :my $IN_DECL is context<rw> = 1;
     [ '&'<deflongname>? | <deflongname> ]? [ <multisig> | <trait> ]*
+    <!!{ bless $¢, ref $PARSER; }>
+    { $IN_DECL = 0; }
     <block>
 }