Changeset 21836 for src/perl6

Timestamp:

08/07/08 22:23:40 (4 months ago)

Author:

lwall

Message:

[STD] distinguish &infix:<x> inside declaration from outside

Files:

• src/perl6/STD.pm (modified) (7 diffs)

src/perl6/STD.pm

@@ -7 +7 @@
 my $GOAL is context = "(eof)";
 my $PARSER is context<rw>;
+my $IN_DECL is context<rw>;
 
 # random rule for debugging, please ignore
@@ -1062 +1063 @@
 
 token variable_declarator {
+    :my $IN_DECL is context<rw> = 1;
     <variable> { $<sigil> = $<variable><sigil> }
+    { $IN_DECL = 0; }
     [   # Is it a shaped array or hash declaration?
       #  <?{ $<sigil> eq '@' | '%' }>
@@ -1516 +1519 @@
     <name>
     # XXX too soon
-    [ <colonpair>+ { $¢.add_macro($<name>); } ]?
+    [ <colonpair>+ { $¢.add_macro($<name>) if $+IN_DECL; } ]?
 }
 
@@ -1543 +1546 @@
     [
     | <category>
-        [ <colonpair>+ { $¢.add_macro($<category>); } ]?
+        [ <colonpair>+ { $¢.add_macro($<category>) if $+IN_DECL; } ]?
     | <desigilname>
     ]
@@ -2347 +2350 @@
 
 rule routine_def {
+    :my $IN_DECL is context<rw> = 1;
     [ '&'<deflongname>? | <deflongname> ]? [ <multisig> | <trait> ]*
     <!!{ bless $¢, ref $PARSER; }>
+    { $IN_DECL = 0; }
     <block>
 }
@@ -2421 +2426 @@
 
 token signature {
+    # XXX incorrectly scopes &infix:<x> parameters to outside following block
+    :my $IN_DECL is context<rw> = 1;
     :my $zone is context<rw> = 'posreq';
     <.ws>
@@ -2429 +2436 @@
     <.ws>
     [ '-->' <.ws> <fulltypename> ]?
+    { $IN_DECL = 0; }
 }