Changeset 21852

Timestamp:

08/08/08 18:51:11 (5 months ago)

Author:

lwall

Message:

[STD] allow ' and - in ident (but only before a letter)

Location:

src/perl6

Files:

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

src/perl6/Cursor.pmc

@@ -157 +157 @@
     for (;;) {
         my $retval = eval {
-            $self->deb("Calling $class" . '::multitweak');
+            $self->deb("Calling $class" . '::multitweak') if $DEBUG & DEBUG::mixins;
             &{$class . '::multitweak'}($self,@_);
         }; 
@@ -609 +609 @@
                     # Try Real Hard to prevent TRE from recompiling $pat
                     state $matcher = eval(do { my $prog = <<"END" .
-                    \$self->deb("GENERATING");
                     sub {
                         my \$C = shift;
@@ -620 +619 @@
                             my $max = @+ - 1;
                             my $last = @- - 1;  # ignore '$0'
-                            $C->deb("LAST: $last\n");
+                            $C->deb("LAST: $last\n") if $DEBUG & DEBUG::lexer;
                             $result = $fates->[$last-1];
                             for my $x (1 .. $max) {
@@ -652 +651 @@
                     }
                     else {
-                        $self->deb("NO LEXER MATCH");
+                        $self->deb("NO LEXER MATCH") if $DEBUG & DEBUG::lexer;
                         return;
                     }

src/perl6/STD.pm

@@ -441 +441 @@
 }
 
+token identish {
+    <.alpha> \w*
+}
+
 token ident {
-    <.alpha> \w*
+    <.identish> [<[ ' \- ]><identish>]*
 }
 
@@ -3842 +3846 @@
     return 1 unless defined $p;
     my $posprops = self.<_>;
-    my $line = $posprops.[$p]<line>;
+    my $line = $posprops.[$p]<L>;
     return $line if $line;
     $line = 1;
     my $pos = 0;
     my $orig = self.orig;
-    my $text = $$orig;
-    while $text ne '' { # XXX needs to recognize #line?
-        $posprops.[$pos++]<line> = $line;
-        $line++ if substr($text,0,1,'') eq "\n";
-    }
-    return $posprops.[$p]<line> // 0;
+    my @text = split(/^/,$$orig);
+    for @text {
+        $posprops.[$pos++]<L> = $line
+            for 1 .. length($_);
+        $line++;
+    }
+    return $posprops.[$p]<L> // 0;
 }