Changeset 21792 for src/perl6

Timestamp:

08/05/08 21:14:18 (4 months ago)

Author:

lwall

Message:

[STD] let EXPR parse term after infix with a rule specified by the infix op

(considered other kludges but this preserves 1-pass parsing)
switch , parsing to using this mechanism plus <nulltermish>
fix .= parsing by forcing <dottyop> as next term

[pre_post.t] can't leave the space out between "is Foo" and the class block

or it is interpreted as an arg to the Foo pseudo-adverb

Location:

src/perl6

Files:

• LazyMap.pm (modified) (1 diff)
• STD.pm (modified) (6 diffs)

src/perl6/LazyMap.pm

@@ -47 +47 @@
 
 sub iter {
+    no warnings 'recursion';
     my $self = shift;
     my $lazies = $self->{L};

src/perl6/STD.pm

@@ -123 +123 @@
 constant %item_assignment = (:prec<i=>, :assoc<right>);
 constant %loose_unary     = (:prec<h=>);
-constant %comma           = (:prec<g=>, :assoc<list>, :nullok);
+constant %comma           = (:prec<g=>, :assoc<list>, :nextterm<nulltermish>);
 constant %list_infix      = (:prec<f=>, :assoc<list>,  :assign);
 constant %list_assignment = (:prec<i=>, :sub<e=>, :assoc<right>);
@@ -737 +737 @@
 }
 
+token nulltermish {
+    [
+    | <?stdstopper>
+    | <termish>?
+    ]
+}
+
 token termish {
     [
@@ -2932 +2939 @@
 # XXX need to do something to turn subcall into method call here...
 token infix:sym<.=> ( --> Item_assignment)
-    { <sym> }
+    { <sym> <.ws> { $<O><nextterm> = 'dottyop' } }
 
 token infix:sym« => » ( --> Item_assignment)
@@ -3159 +3166 @@
     my @termstack;
     my @opstack;
-    my $nullok = 0;
+    my $termish = 'termish';
 
     push @opstack, { 'O' => item %terminator, 'sym' => '' };         # (just a sentinel value)
@@ -3244 +3251 @@
         self.deb("In loop, at ", $here.pos) if $*DEBUG +& DEBUG::EXPR;
         my $oldpos = $here.pos;
-        my @t = $here.termish();       # eats ws too
-
-        if not @t or not $here = @t[0] or $here.pos == $oldpos {
-            last if $nullok;
+        my @t = $here.$termish;       # presumed to eat trailing ws too
+
+        if not @t or not $here = @t[0] or ($here.pos == $oldpos and $termish eq 'termish') {
             return ();
             # $here.panic("Failed to parse a required term");
         }
+        $termish = 'termish';
 
         # interleave prefix and postfix, pretend they're infixish
@@ -3328 +3335 @@
             }
         }
-        $nullok = 1 if $inO<nullok>;
+        $termish = $inO<nextterm> if $inO<nextterm>;
         push @opstack, $infix;
     }