Changeset 23025 for src

Timestamp:

11/15/08 19:05:27 (8 weeks ago)

Author:

lwall

Message:

[Cursor] reorder fate elements

Location:

src/perl6

Files:

• Cursor.pmc (modified) (5 diffs)
• gimme5 (modified) (4 diffs)

src/perl6/Cursor.pmc

@@ -44 +44 @@
     my $text = '';
     while ($f) {
-        $text .= $f->[0] . " " . $f->[1];
-        $text .= ' ' if $f = $f->[2];
+        $text .= $f->[1] . " " . $f->[2];
+        $text .= ' ' if $f = $f->[0];
     }
     $text;
@@ -331 +331 @@
                 $FATECACHE{$fstr} = $fate = $fates->[$i] = [0,0,0];
                 while ($fstr =~ s/(\S+)\s+(\S+)\s*//) {
-                    $fate->[0] = $1;
-                    $fate->[1] = $2;
-                    if ($fate->[2] = $FATECACHE{$fstr}) {
+                    $fate->[1] = $1;
+                    $fate->[2] = $2;
+                    if ($fate->[0] = $FATECACHE{$fstr}) {
                         last;
                     }
-                    $fate = $fate->[2] //= [0,0,0] if $fstr ne '';
+                    $fate = $fate->[0] //= [0,0,0] if $fstr ne '';
                 }
             }
@@ -365 +365 @@
             my $fate = $fates->[$i] = [0,0,0];
             while ($fstr =~ s/(\S+)\s+(\S+)\s*//) {
-                $fate->[0] = $1;
-                $fate->[1] = $2;
-                $fate = $fate->[2] = [0,0,0] if $fstr ne '';
+                $fate->[1] = $1;
+                $fate->[2] = $2;
+                $fate = $fate->[0] = [0,0,0] if $fstr ne '';
             }
             $i++;
@@ -439 +439 @@
                 $FATECACHE{$fstr} = $fate = $fates->[$i] = [0,0,0];
                 while ($fstr =~ s/(\S+)\s+(\S+)\s*//) {
-                    $fate->[0] = $1;
-                    $fate->[1] = $2;
-                    if ($fate->[2] = $FATECACHE{$fstr}) {
+                    $fate->[1] = $1;
+                    $fate->[2] = $2;
+                    if ($fate->[0] = $FATECACHE{$fstr}) {
                         last;
                     }
-                    $fate = $fate->[2] //= [0,0,0] if $fstr ne '';
+                    $fate = $fate->[0] //= [0,0,0] if $fstr ne '';
                 }
             }
@@ -911 +911 @@
 
                 for my $i (0..@$fates-1) {
-                    $self->deb("\t", $i, ': ', $fates->[$i][3]);
+                    $self->deb("\t", $i, ': ', fatestr($fates->[$i]));
                 }
             }

src/perl6/gimme5

@@ -335 +335 @@
         my \$relex;
         if (my \$fate = \$C->{_fate}) {
-            if (\$fate->[0] eq '$name') {
+            if (\$fate->[1] eq '$name') {
                 \$C->deb("Fate passed to $name: ", ::fatestr(\$fate)) if \$DEBUG & DEBUG::fates;
-                (\$tag, \$try, \$fate) = \@\$fate;
-                \$C->{_fate} = \$fate;
+                (\$C->{_fate}, \$tag, \$try) = \@\$fate;
                 \@try = (\$try);
             }
@@ -353 +352 @@
     
             if (ref \$try eq 'ARRAY') {
-                (\$tag, \$try, \$C->{_fate}) = \@\$try; # next candidate fate
+                (\$C->{_fate}, \$tag, \$try) = \@\$try; # next candidate fate
             }
     
@@ -2485 +2484 @@
 
     my \$fate;
-    if (\$fate = \$C->{_fate} and \$fate->[0] eq '$altname') {
+    if (\$fate = \$C->{_fate} and \$fate->[1] eq '$altname') {
         \$C->deb("Fate passed to $altname: ", ::fatestr(\$fate)) if \$DEBUG & DEBUG::fates;
-        (\$tag, \$try, \$fate) = \@\$fate;
-        \$C->{_fate} = \$fate;
+        (\$C->{_fate}, \$tag, \$try) = \@\$fate;
         \@try = (\$try);
     }
@@ -2502 +2500 @@
 
         if (ref \$try eq 'ARRAY') {
-            (\$tag, \$try, \$C->{_fate}) = \@\$try;     # next candidate fate
+            (\$C->{_fate}, \$tag, \$try) = \@\$try;     # next candidate fate
         }