Changeset 21830 for src/perl6

Timestamp:

08/07/08 19:46:35 (4 months ago)

Author:

lwall

Message:

[STD] refine nibbler to avoid LTM for now
avoid feeding canmatch() multiple large unicode characters at once

since that tends to make way too many digraph cache files

[t] whack illegal adverbials

Location:

src/perl6

Files:

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

src/perl6/Cursor.pmc

@@ -434 +434 @@
     }
     my $ch2 = substr($$buf,$P,5);
-#    $ch2 .= substr($$buf,$P+1,3) if $ch2 eq '[';
-    $ch2 =~ s/^(\[[\\<>«»]*..|[<>][<>]..|..).*$/$1/s;
+    # wish I could persuade p5 to parse this directly out of $$buf...
+    $ch2 =~ s/^(\[[\\<>«»]*..|[<>][<>]..|[ -~].|.).*$/$1/s;
 
 

src/perl6/STD.pm

@@ -1786 +1786 @@
     :my $multiline = 0;
     { $<firstpos> = self.pos; }
-    [
+    [ <!before <stopper> >
         [
-        | <?before <stopper> > :: <fail>
-        | <starter> :: <nibbler> <stopper>
+        || <starter> :: <nibbler> <stopper>
                         {
                             my $n = $<nibbler>[*-1]<nibbles>;
@@ -1797 +1796 @@
                             push @nibbles, @n;
                         }
-        | <escape>   :: {
+        || <escape>   :: {
                             push @nibbles, $text, $<escape>;
                             $text = '';
                         }
-        |            :: .
+        ||            :: .
                         {{
                             my $ch = substr($$buf, $¢.pos-1, 1);
@@ -2538 +2537 @@
                 given $+zone {
                     when 'posopt' {
-$¢.panic("Can't use required parameter in optional zone");
+$¢.panic("Can't put required parameter after optional parameters");
                     }
                     when 'var' {
-$¢.panic("Can't use required parameter in variadic zone");
+$¢.panic("Can't put required parameter after variadic parameters");
                     }
                 }
@@ -2549 +2548 @@
                     when 'posreq' { $+zone = 'posopt' }
                     when 'var' {
-$¢.panic("Can't use optional positional parameter in variadic zone");
+$¢.panic("Can't put optional positional parameter after slurpy parameters");
                     }
                 }