Changeset 22498

Timestamp:

10/03/08 14:27:37 (7 weeks ago)

Author:

lwall

Message:

[STD] EXPR didn't _MATCHIFY
[viv] starting on a gimme5 replacement using STD

Location:

src/perl6

Files:

• Cursor.pmc (modified) (1 diff)
• STD.pm (modified) (2 diffs)
• gimme5 (modified) (1 diff)
• viv (added)

src/perl6/Cursor.pmc

@@ -1947 +1947 @@
     $self->{_reduced} = $tag;
     if ($::ACTIONS) {
-        eval { $::ACTIONS->$tag($self) }
+        eval { $::ACTIONS->$tag($self) };
+        warn $@ if $@ and not $@ =~ /locate/;
     }
     $self->deb("REDUCE $tag from $F to $P") if $DEBUG & DEBUG::matchers;

src/perl6/STD.pm

@@ -3188 +3188 @@
     :my $i;
     $i = <identifier> <args( $¢.is_type($i.text) )>
-    {{ %ROUTINES{$i.text} ~= $¢.lineof($¢.pos) ~ ' ' }}
+    {{ $<identifier> = $i; %ROUTINES{$i.text} ~= $¢.lineof($¢.pos) ~ ' ' }}
 }
 
@@ -3526 +3526 @@
         @termstack[0]<_to> = $here.pos;
     }
-    @termstack;
+    self._MATCHIFYr("EXPR", @termstack);
 }
 

src/perl6/gimme5

@@ -352 +352 @@
             push \@gather, \$C->\$try(\@_);
         }
-        \$self->_MATCHIFY("$NAME", \@gather);
+        \$self->_MATCHIFY("$name", \@gather);
     };
     if (\$@) {