Changeset 22508

Timestamp:

10/05/08 05:33:15 (7 weeks ago)

Author:

lwall

Message:

[STD] clean up nibbler output
[viv] now successfully produces transforms STD.pm to ast(ish)

Location:

src/perl6

Files:

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

src/perl6/STD.pm

@@ -1901 +1901 @@
     :my $buf = self.orig;
     :my $multiline = 0;
+    :my $nibble;
     { $<firstpos> = self.pos; }
     [ <!before <stopper> >
@@ -1913 +1914 @@
                         }
         || <escape>   {
-                            push @nibbles, $text, $<escape>;
+                            push @nibbles, $text, $<escape>[*-1];
                             $text = '';
                         }
@@ -1930 +1931 @@
         push @nibbles, $text; $<nibbles> = [@nibbles];
         $<lastpos> = $¢.pos;
+        $/.:delete<nibbler>;
+        $/.:delete<escape>;
         $COMPILING::LAST_NIBBLE = $¢;
         $COMPILING::LAST_NIBBLE_MULTILINE = $¢ if $multiline;
@@ -2359 +2362 @@
 
         # in single quotes, keep backslash on random character by default
-        token backslash:misc { {} (.) { $<text> = "\\" ~ $0; } }
+        token backslash:misc { {} (.) { $<text> = "\\" ~ $0.text; } }
 
         # begin tweaks (DO NOT ERASE)

src/perl6/viv

@@ -46 +46 @@
                 my $zyg = [];
                 for my $z (@$v) {
-                    if (ref $z eq 'HASH' and exists $z->{''}) {
-                        push @$zyg, $z->{''};
+                    if (ref $z) {
+                        if (ref $z eq 'ARRAY') {
+                            warn "ARRAY";
+                            push @$zyg, $z;
+                        }
+                        elsif (exists $z->{''}) {
+                            push @$zyg, $z->{''};
+                        }
                     }
                     else {
                         push @$zyg, $z;
                     }
-                    push @$zyg, $z;
                 }
                 $r{$k} = $zyg;