Changeset 6376 for perl5/PIL2JS/lib/PIL.pm

Timestamp:

08/20/05 15:47:35 (3 years ago)

Author:

iblech

svk:copy_cache_prev:

8581

Message:

* Usual svn props.
* PIL2JS: &?CALLER_CONTINUATION.

• t/unspecced/cont.t: Added some type annotations and a new test. PIL2JS passes 14/14 with 6 unexpected succeedings. :)
• PIL, PIL2JS.js: PIL2JS.cps2normal now works correctly with functions which reach the end of the program (this can happen, for example, with continuations :)). Previously, the program flow was restarted after the call to PIL2JS.cps2normal, resulting in certain regions running twice.
• PIL, PIL::PVar, PIL::Subs: sub foo { {return}() } didn't compile, because PIL2JS only kept track of the current subtype, not of all subs it's currently in. Fixed.

* PIL2JS: PIL, PIL2JS.js, README: Context objects are now unboxed -- boxing was

never needed. Should give a small speedup.

Files:

• perl5/PIL2JS/lib/PIL.pm (modified) (4 diffs)

perl5/PIL2JS/lib/PIL.pm

@@ -18 +18 @@
 # Are we in a sublike thing? If yes, what sublevel does that thing have?
 our $IN_SUBLIKE = undef;
+our @IN_SUBLIKES;
 
 # What's the name of the sub we're currently in?
@@ -23 +24 @@
 
 # Our current pos?
-our $CUR_POS  = bless [ "<unknown>", (0) x 4 ] => "PIL::MkPos";
+our $CUR_POS  = bless {
+  posName => "<unknown>",
+  posBeginLine   => 0,
+  posBeginColumn => 0,
+  posEndLine     => 0,
+  posEndColumn   => 0,
+} => "PIL::MkPos";
 
 # Are we in pilGlob?
@@ -181 +188 @@
     "\n// End of initialization of global vars and exportation of subs.\n";
 
-  return sprintf <<EOF, $decl_js, add_indent(2, join "\n", @glob_js, $init_js, $main_js);
+  return sprintf <<EOF, $decl_js, add_indent(3, join "\n", @glob_js, $init_js, $main_js);
 %s
 PIL2JS.catch_all_exceptions(function () {
-  PIL2JS.runloop(function () {
-    var PIL2JS = AlsoPIL2JS_SpeedupHack;
-    var pad = {}; PIL2JS_subpads.push(pad);
-    pad['\$?POSITION'] = _24main_3a_3a_3fPOSITION;
-    pad['\$_']         = _24main_3a_3a_;
+  PIL2JS.catch_end_exception(function() {
+    PIL2JS.runloop(function () {
+      var PIL2JS = AlsoPIL2JS_SpeedupHack;
+      var pad = {}; PIL2JS_subpads.push(pad);
+      pad['\$?POSITION'] = _24main_3a_3a_3fPOSITION;
+      pad['\$_']         = _24main_3a_3a_;
 
 %s
+    });
   });
 });
@@ -207 +216 @@
 
   sub as_js {
-    return sprintf "new PIL2JS.Box.Constant(new PIL2JS.Context({ main: %s, type: %s }))",
+    return sprintf "new PIL2JS.Context({ main: %s, type: %s })",
       PIL::doublequote($_[0]->main),
       defined $_[0]->type