Changeset 5667

Timestamp:

07/18/05 17:53:32 (3 years ago)

Author:

iblech

svk:copy_cache_prev:

7648

Message:

* Pugs.Compile -- loop foo; ; bar {baz} should be compiled as loop foo;

bool::true; bar {baz}.

* PIL2JS: jspugs.pl -- Empty lines don't cause a compile now.
* PIL2JS: PIL::Nodes, PIL::Parser -- Support for VBool.

Files:

• perl5/PIL2JS/jspugs.pl (modified) (1 diff)
• perl5/PIL2JS/lib/PIL/Nodes.pm (modified) (2 diffs)
• perl5/PIL2JS/lib/PIL/Parser.pm (modified) (1 diff)
• src/Pugs/Compile.hs (modified) (1 diff)

perl5/PIL2JS/jspugs.pl

@@ -40 +40 @@
 
 while(defined($_ = $term->readline($prompt))) {
-  $term->addhistory($_) if /\S/;
+  next unless /\S/;
+  $term->addhistory($_);
   s/\s*$//;
 

perl5/PIL2JS/lib/PIL/Nodes.pm

@@ -151 +151 @@
   sub as_js {
     my $self = shift;
-
     die unless @$self == 0;
-    return "";
+
+    return "" unless $IN_SUBLIKE;
+    return "return(new PIL2JS.Box.Constant(undefined));";
   }
 }
@@ -338 +339 @@
     die if     ref $self->[0];
     return sprintf "new PIL2JS.Box.Constant(%s)", PIL::Nodes::doublequote $self->[0];
+  }
+}
+
+{
+  package PIL::VBool;
+  our @ISA = qw<PIL::PVal>;
+
+  sub as_js {
+    my $self = shift;
+    die unless @$self == 1;
+
+    return sprintf "new PIL2JS.Box.Constant(%s)",
+      $self->[0]->isa("PIL::True")  ? "true"  :
+      $self->[0]->isa("PIL::False") ? "false" : die;
   }
 }

perl5/PIL2JS/lib/PIL/Parser.pm

@@ -184 +184 @@
 
         VInt    => 1, VRat   => 1,
-        VStr    => 1, VUndef => 0,
+        VStr    => 1, VUndef => 0, VBool => 1,
         SubPrim => 0, SubRoutine => 0, SubBlock => 0, SubPointy => 0, SubMethod => 0,
         True    => 0, False => 0,

src/Pugs/Compile.hs

@@ -261 +261 @@
     compile (Syn "loop" [pre, cond, post, (Syn "block" [body])]) = do
         preC    <- compile pre
-        condC   <- compile cond
+        -- loop ...; ; ... {...} ->
+        -- loop ...; bool::true; ... {...}
+        let cond' | unwrap cond == Noop
+                  = return $ PStmts (PStmt . PLit . PVal $ VBool True) PNil
+                  | otherwise
+                  = compile cond
+        condC   <- cond'
         bodyC   <- compile body
         postC   <- compile post