Changeset 22013 for src/perl6

Timestamp:

08/22/08 20:14:34 (3 months ago)

Author:

lwall

Message:

[Cursor] more speed tweaks

Files:

• src/perl6/Cursor.pmc (modified) (3 diffs)

src/perl6/Cursor.pmc

@@ -618 +618 @@
                     sub {
                         my \$C = shift;
-                        pos(\$\$buf) = \$C->{_pos};
+                        my \$P = \$C->{_pos};
+                        pos(\$\$buf) = \$P;
 
                         my \$result;
@@ -645 +646 @@
                             my $tried = "";
                             vec($tried,$last-1,1) = 1;
-                            $_[0] = [$tried, $+[0] - $-[0], []];
+                            $_[0] = [$tried, pos($$buf) - $P, []];
                         }
                         $result;
@@ -852 +853 @@
     
     my $fate = $self->{_fate};
-    if ($fate and $fate->[0] eq $name) {
-        $self->deb("Fate passed to $name: $$fate[3]") if $DEBUG & DEBUG::fates;
-        ($tag, $try, $fate) = @$fate;
+    if ($fate) {
+        if ($fate->[0] eq $name) {
+            $self->deb("Fate passed to $name: $$fate[3]") if $DEBUG & DEBUG::fates;
+            ($tag, $try, $fate) = @$fate;
+            $r{_fate} = $fate;
+            return (CORE::bless \%r, ref $self), $tag, $try, $relex;
+        }
+        elsif ($fate->[0] . ':*' eq $name) {
+            $self->deb("Fate passed to $name: $$fate[3]") if $DEBUG & DEBUG::fates;
+            ($tag, $try, $fate) = @$fate;
+            $r{_fate} = $fate;
+            return (CORE::bless \%r, ref $self), $tag, $try, $relex;
+        }
+    }
+
+    $relex = $self->_AUTOLEXnow($name,$retree);
+    $fate = $relex->($self,$_[0]);
+    if ($fate) {
+        $self->deb("FATE OF ${pkg}::$name: $$fate[3]") if $DEBUG & DEBUG::fates;
+        ($tag, $try, $fate) = @$fate;
         $r{_fate} = $fate;
     }
-    elsif ($fate and $fate->[0] . ':*' eq $name) {
-        $self->deb("Fate passed to $name: $$fate[3]") if $DEBUG & DEBUG::fates;
-        ($tag, $try, $fate) = @$fate;
-        $r{_fate} = $fate;
-    }
-    else {
-        $relex = $self->_AUTOLEXnow($name,$retree);
-        $fate = $relex->($self,$_[0]);
-        if ($fate) {
-            $self->deb("FATE OF ${pkg}::$name: $$fate[3]") if $DEBUG & DEBUG::fates;
-            ($tag, $try, $fate) = @$fate;
-            $r{_fate} = $fate;
-        }
-        else {
-            $self->deb("NO FATE FOR ${pkg}::$name (will probe)") if $DEBUG & DEBUG::fates;
-            $tag = '';
-        }
+    else {
+        $self->deb("NO FATE FOR ${pkg}::$name (will probe)") if $DEBUG & DEBUG::fates;
+        $tag = '';
     }
     return (CORE::bless \%r, ref $self), $tag, $try, $relex;