Changeset 22486 for src/perl6

Timestamp:

10/02/08 19:20:32 (2 months ago)

Author:

lwall

Message:

[STD] more ACTIONS infrastructure, can now set $ACTIONS to a class in which
methods are called according to reduction tag.

Location:

src/perl6

Files:

• Cursor.pmc (modified) (1 diff)
• STD.pm (modified) (5 diffs)
• gimme5 (modified) (1 diff)

src/perl6/Cursor.pmc

@@ -1946 +1946 @@
     my $F = $self->{_from};
     $self->{_reduced} = $tag;
+    if ($::ACTIONS) {
+        eval { $::ACTIONS->$tag($self) }
+    }
     $self->deb("REDUCE $tag from $F to $P") if $DEBUG & DEBUG::matchers;
 #    $self->whats;

src/perl6/STD.pm

@@ -1 +1 @@
 grammar STD:ver<6.0.0.alpha>:auth<http://perl.org>;
 
+# should some of these be parser instance attributes?
 my $LANG is context;
 my $PKGDECL is context = "";
@@ -7 +8 @@
 my $GOAL is context = "(eof)";
 my $PARSER is context<rw>;
+my $ACTIONS is context<rw>;
 my $IN_DECL is context<rw>;
 my %ROUTINES;
@@ -14 +16 @@
    'foo' <.ws> 'bar' <.ws> 'baz'
 }
-
-=begin things todo
-
-    add more suppositions and figure out exact error continuation semantics
-    think about longest-token-defeating {*} that maybe should be <?{ {*}; 1}>
-    add parsing this file to sanity tests :)
-    evaluate "is context<rw>" for reentrancy brokenness
-
-=end things todo
 
 =begin comment overview
@@ -48 +41 @@
 symbol will be used by default.
 
-Note that rules with only one action need no #= comment, so the identifier
-of the following stub is just "TOP".
+Note that rules automatically get an implicit {*} at their return, so
+for the TOP rule the implicit action name is also simply "TOP".
 
 Another nod toward preprocessing is that blocks that contain nested braces
@@ -55 +48 @@
 understand Perl 6 code.
 
-This grammar also assumes transitive longest-token semantics, though
-we make a feeble attempt to order rules so a procedural interpretation
-of alternation can usually produce a correct parse.  (This will tend
-to become less true over time.)
+This grammar relies on transitive longest-token semantics, though
+initially we made a feeble attempt to order rules so a procedural
+interpretation of alternation could usually produce a correct parse.
+(This is becoming less true over time.)
 
 =end comment overview

src/perl6/gimme5

@@ -1175 +1175 @@
             $key .= " $2";
         }
+        $key =~ s/ +/_/g;
         ws();
         $key =~ s/(['\\])/\\$1/g;