Changeset 23048

Timestamp:

11/20/08 19:58:42 (7 weeks ago)

Author:

lwall

Message:

[gimme5] switch back to YAML::Syck till YAML::XS is fixed
[viv] allow input from stdin
[STD] always report worries for now

Location:

src/perl6

Files:

• Cursor.pmc (modified) (1 diff)
• STD.pm (modified) (1 diff)
• gimme5 (modified) (3 diffs)
• viv (modified) (1 diff)

src/perl6/Cursor.pmc

@@ -220 +220 @@
 sub _PARAMS {}  # overridden in parametric role packages
 
-use YAML::XS;
+use YAML::Syck;
 use Storable;
 

src/perl6/STD.pm

@@ -593 +593 @@
     # "CHECK" time...
     {{
+        if @COMPILING::WORRIES {
+            warn "Potential difficulties:\n  " ~ join( "\n  ", @COMPILING::WORRIES) ~ "\n";
+        }
+
         my %UNKNOWN;
         for keys(%ROUTINES) {

src/perl6/gimme5

@@ -18 +18 @@
 }
 
-use YAML::XS;
+use YAML::Syck;
 
 our $SEQ = 0;
@@ -283 +283 @@
 }
 
-use YAML::XS;
-#{
-#    local $/;
-#    my $yaml = <DATA>;
-#    *::RE = Load($yaml);
-#}
+use YAML::Syck;
 
 END
@@ -924 +919 @@
 sub dumpretree {
     if (%$RETREE) {
-        $out .= "BEGIN {\n    \$retree = YAML::XS::Load(<<'RETREE_END');\n";
+        $out .= "BEGIN {\n    \$retree = YAML::Syck::Load(<<'RETREE_END');\n";
         $out .= Encode::decode("utf8", Dump($RETREE));
         $out .= "RETREE_END\n}\n";

src/perl6/viv

@@ -62 +62 @@
         }
     }
-    USAGE() unless -r $_[0];
-    my $r = STD->parsefile($_[0])->item;
+#    USAGE() unless -r $_[0];
+    my $r;
+    if (@_ and -f $_[0]) {
+        $r = STD->parsefile($_[0])->item;
+    }
+    else {
+        my $prog;
+        {
+            local $/;
+            $prog = <>;
+        }
+        $r = STD->parse($prog)->item;
+    }
     if ($output eq 'ast') {
         print Dump($r);