Changeset 22080 for src/perl6

Timestamp:

09/01/08 09:48:28 (3 months ago)

Author:

lwall

Message:

[STD] fix enum parsing (again)
[Cursor] minor speedups

Location:

src/perl6

Files:

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

src/perl6/Cursor.pmc

@@ -428 +428 @@
         $self->_AUTOLEXpeek($key,$retree);
     };
-    $self->highwater($lexer->{NAME});
+    $self->highwater($lexer->{NAME}) if $self->{_pos} >= $::HIGHWATER;
     my $buf = $self->{_orig};
     my $P = $self->{_pos};
@@ -434 +434 @@
         return sub { return };
     }
-    my $ch2 = substr($$buf,$P,5);
-    # wish I could persuade p5 to parse this directly out of $$buf...
-    $ch2 =~ s/^(\[[\\<>«»]*..|[<>][<>]..|[ -~].|.).*$/$1/s;
-
+    pos($$buf) = $P;
+    $$buf =~ m/\G(\[[\\<>«»]*..|[<>][<>]..|[ -~].|.)/smgc;
+    my $ch2 = $1;
 
     $lexer->{$ch2} //= do {
@@ -462 +461 @@
 #               print join "\n", @pats, '';
 #           }
+            # XXX this could be greatly compactified by just storing offsets into @pats
+            # and just appending a single line to a single digraph cache file.
             if (open PATS, '>', $file) {
                 binmode(PATS, ":utf8");
@@ -672 +673 @@
 sub highwater {
     my $self = shift;
-    if ($self->{_pos} >= $::HIGHWATER) {
-        if ($self->{_pos} > $::HIGHWATER) {
-            %$::HIGHEXPECT = ();
-            $::HIGHMESS = '';
-        }
-        for (@_) {
-            my $name = $_;
-            $name =~ s/_0[01]$//;
-            $name =~ s/_(\d\d)$/ (alt $1)/;
-            $name =~ s/:\*$//;
-            $::HIGHEXPECT->{$name}++;
-        }
-        $::HIGHWATER = $self->{_pos};
-    }
+    if ($self->{_pos} > $::HIGHWATER) {
+        %$::HIGHEXPECT = ();
+        $::HIGHMESS = '';
+    }
+    for (@_) {
+        my $name = $_;
+        $name =~ s/_0[01]$//;
+        $name =~ s/_(\d\d)$/ (alt $1)/;
+        $name =~ s/:\*$//;
+        $::HIGHEXPECT->{$name}++;
+    }
+    $::HIGHWATER = $self->{_pos};
 }
 

src/perl6/STD.pm

@@ -2572 +2572 @@
     :my $l;
     <sym> <.ws>
-    [ $l = <longname> { $¢.add_type($l); } <.ws> ]?
+    [ $l = <longname> :: { $¢.add_type($l); } <.ws> ]?
     <EXPR> <.ws>
 }