Changeset 22575

Timestamp:

10/11/08 07:18:59 (6 weeks ago)

Author:

lwall

Message:

[viv] straighten out chain operators

Location:

src/perl6

Files:

• STD.pm (modified) (1 diff)
• viv (modified) (2 diffs)

src/perl6/STD.pm

@@ -3403 +3403 @@
                 push @chain, pop(@termstack).cleanup;
                 @chain = reverse @chain if @chain > 1;
-                $op<O><chain> = [@chain];
-                $op<_arity> = 'CHAIN';
-                push @termstack, $op._REDUCE('EXPR');
+                my $nop = $op.cursor_fresh();
+                $nop<chain> = [@chain];
+                $nop<_arity> = 'CHAIN';
+                push @termstack, $nop._REDUCE('EXPR');
             }
             when 'list' {

src/perl6/viv

@@ -122 +122 @@
                     }
                     $r{$k} = $zyg;
-                    $r{zygs}{$k} = $SEQ++ if @$zyg;
+                    $r{zygs}{$k} = $SEQ++ if @$zyg and $k ne 'sym';
                 }
                 elsif (ref $v) {
@@ -196 +196 @@
                 }
             }
+            elsif ($arity eq 'CHAIN') {
+                $text .= join('', @zyg);
+            }
             else {
                 $text .= join('', reverse @zyg);