Changeset 22562

Timestamp:

10/10/08 09:57:02 (6 weeks ago)

Author:

lwall

Message:

[gimme5,STD] switch exists and delete to new form

Location:

src/perl6

Files:

• STD.pm (modified) (5 diffs)
• gimme5 (modified) (1 diff)

src/perl6/STD.pm

@@ -107 +107 @@
 method is_type ($name) {
     return True if %typenames{$name};
-    #return True if GLOBAL::{$name}.:exists;
+    #return True if GLOBAL::{$name} :exists;
     return False;
 }
@@ -180 +180 @@
     return True if %routinenames{$name};
     return True if %typenames{$name};
-    #return True if GLOBAL::{$name}.:exists;
+    #return True if GLOBAL::{$name} :exists;
     return False;
 }
@@ -451 +451 @@
 
 token ws {
-    :my @stub = return self if self.<_>[self.pos].:exists<ws>;
+    :my @stub = return self if self.<_>[self.pos]<ws> :exists;
     :my $startpos = self.pos;
 
@@ -1951 +1951 @@
         push @nibbles, $text; $<nibbles> = [@nibbles];
         $<lastpos> = $¢.pos;
-        $/.:delete<nibbler>;
-        $/.:delete<escape>;
+        $<nibbler> :delete;
+        $<escape> :delete;
         $COMPILING::LAST_NIBBLE = $¢;
         $COMPILING::LAST_NIBBLE_MULTILINE = $¢ if $multiline;
@@ -3357 +3357 @@
 # hopefully we can include these tokens in any outer LTM matcher
 regex stdstopper {
-    :my @stub = return self if self.<_>[self.pos].:exists<endstmt>;
+    :my @stub = return self if self.<_>[self.pos]<endstmt> :exists;
     :dba('standard stopper')
     [

src/perl6/gimme5

@@ -81 +81 @@
     $f =~ s/\\x([0-9a-fA-F]{3,4})/\\x{$1}/g;
     $f =~ s!\$([0-9]+)!\$\$C{$1}!g;
-    $f =~ s/(\S+\.):(exists|delete)/$2 $1/g if $f =~ /\.:(exists|delete)/;
+    $f =~ s/(\S+)\s*:(exists|delete)/$2 $1/g if $f =~ /:(exists|delete)/;
     while ($f ne "") {
         #print "$f\n" if $trace;