Changeset 22934 for src

Timestamp:

11/09/08 03:09:36 (2 months ago)

Author:

lwall

Message:

[Cursor] random fiddling
[STD] add type on ::T

Location:

src/perl6

Files:

• Cursor.pmc (modified) (2 diffs)
• STD.pm (modified) (6 diffs)

src/perl6/Cursor.pmc

@@ -611 +611 @@
     my $P = $self->{_pos};
     if ($P >= @::ORIG) {
-        return '', 0, sub {};
+        return sub {};
     }
     pos($::ORIG) = $P;
-    $::ORIG =~ m/\G(\[[\\<>«»]*..|[<>][<>]..|[ -~].|.)/smgc;
+    $::ORIG =~ m/\G(\[[\\<>«»]*..|[<>][<>]..|[$@%]?\w+|['"]|[ -~].|.)/smgc;
     my $ch2 = $1;
 
-    return $lexer->{$ch2} //= do {
+    return $lexer->{X}{$ch2} //= do {
         my @pats;
         my $file = $lexer->{FILE} . '__' . ::mangle($ch2);
@@ -1570 +1570 @@
 }
 
+my $alpha;
+BEGIN {
+    $alpha = "";
+    for my $ch (0..255) {
+        my $char = chr($ch);
+        vec($alpha,$ch,1) = 1 if $char =~ /\w/ and $char !~ /\d/;
+    }
+}
 sub alpha { my $self = shift;
     local $CTX = $self->callm if $DEBUG & DEBUG::trace_call;
     my $P = $self->{_pos};
-    my $char = substr($::ORIG, $P, 1);
-    if ($char =~ /^[_[:alpha:]\pL]$/) {
+#    my $char = substr($::ORIG, $P, 1);
+    my $ch = $::ORIG[$P];
+    if (vec($alpha,$ch,1) or ($ch > 255 and chr($ch) =~ /\pL/)) {
+#    if ($char =~ /^[_[:alpha:]\pL]$/) {
         my $r = $self->cursor($P+1);
         return $r->retm();

src/perl6/STD.pm

@@ -121 +121 @@
 }
 
-method add_type ($longname) {
-    my $shortname = $longname.<name>.text;
-    my $typename = main::mangle($shortname);
+method add_type ($name) {
+    my $typename = main::mangle($name);
     my $qualname = ($+PKG // 'GLOBAL') ~ '::' ~ $typename;
     %typenames{$typename} = $qualname;
     %typenames{$qualname} = $qualname;
-    %typenames{$shortname} = $qualname;
+    %typenames{$name} = $qualname;
 }
 
@@ -747 +746 @@
         {{
             my $longname = $<module_name><longname>;
-            $¢.add_type($longname);
+            $¢.add_type($longname.text);
         }}
     ]
@@ -1299 +1298 @@
         <module_name>{
             $longname = $<module_name>[0]<longname>;
-            $¢.add_type($longname);
+            $¢.add_type($longname.text);
         }
     ]?
@@ -1742 +1741 @@
     | '::?'<identifier>                 # parse ::?CLASS as special case
     | <longname>
-      <?{
+      <?{{
         my $longname = $<longname>.text;
-        substr($longname, 0, 2) eq '::' or $¢.is_type($longname)
-      }>
+        if substr($longname, 0, 2) eq '::' {
+            $¢.add_type(substr($longname, 2));
+        }
+        else {
+            $¢.is_type($longname)
+        }
+      }}>
     ]
     # parametric type?
@@ -2616 +2620 @@
 token type_declarator:subset {
     <sym> :s
-    <longname> { $¢.add_type($<longname>); }
+    <longname> { $¢.add_type($<longname>.text); }
     [ of <fulltypename> ]?
     [where <EXPR(item %chaining)> ]?    # (EXPR can parse multiple where clauses)
@@ -2624 +2628 @@
     :my $l;
     <sym> <.ws>
-    [ $l = <longname> :: { $¢.add_type($l); } <.ws> ]?
+    [ $l = <longname> :: { $¢.add_type($l.text); } <.ws> ]?
     <EXPR> <.ws>
 }