fixed #259 - bumped version to 0.10.17 and recompiled

Sage · Feb 24, 2015 · 702c37a · 702c37a
1 parent 5760010
commit 702c37a
Show file tree

Hide file tree

Showing 23 changed files with 57 additions and 27 deletions.
diff --git a/lib/callbacks/builtins.js b/lib/callbacks/builtins.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (callbacks) - DO NOT EDIT ***/ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {
+/*** Generated by streamline 0.10.17 (callbacks) - DO NOT EDIT ***/ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {
 
 
 

diff --git a/lib/callbacks/compile.js b/lib/callbacks/compile.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (callbacks) - DO NOT EDIT ***/ "use strict"; var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb,__catch=__rt.__catch,__tryCatch=__rt.__tryCatch; var fs = require("fs");
+/*** Generated by streamline 0.10.17 (callbacks) - DO NOT EDIT ***/ "use strict"; var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb,__catch=__rt.__catch,__tryCatch=__rt.__tryCatch; var fs = require("fs");
 
 
 

diff --git a/lib/callbacks/flows.js b/lib/callbacks/flows.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (callbacks) - DO NOT EDIT ***/ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {
+/*** Generated by streamline 0.10.17 (callbacks) - DO NOT EDIT ***/ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {
 
 
 

diff --git a/lib/fibers-fast/builtins.js b/lib/fibers-fast/builtins.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (fibers-fast) --aggressive - DO NOT EDIT ***/var fstreamline__ = require("../fibers-fast/runtime");(function(){})(); fstreamline__.create((function(_) { /**
+/*** Generated by streamline 0.10.17 (fibers-fast) --aggressive - DO NOT EDIT ***/var fstreamline__ = require("../fibers-fast/runtime");(function(){})(); fstreamline__.create((function(_) { /**
  * Copyright (c) 2012 Bruno Jouhier <bruno.jouhier@sage.com>
  * MIT License
  */

diff --git a/lib/fibers-fast/flows.js b/lib/fibers-fast/flows.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (fibers-fast) --aggressive - DO NOT EDIT ***/var fstreamline__ = require("../fibers-fast/runtime");(function(){})(); fstreamline__.create((function(_) { /**
+/*** Generated by streamline 0.10.17 (fibers-fast) --aggressive - DO NOT EDIT ***/var fstreamline__ = require("../fibers-fast/runtime");(function(){})(); fstreamline__.create((function(_) { /**
  * Copyright (c) 2011 Bruno Jouhier <bruno.jouhier@sage.com>
  *
  * Permission is hereby granted, free of charge, to any person

diff --git a/lib/fibers/builtins.js b/lib/fibers/builtins.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (fibers) - DO NOT EDIT ***/var fstreamline__ = require("../fibers/runtime"); (function(){})();(fstreamline__.create(function(_) { /**
+/*** Generated by streamline 0.10.17 (fibers) - DO NOT EDIT ***/var fstreamline__ = require("../fibers/runtime"); (function(){})();(fstreamline__.create(function(_) { /**
  * Copyright (c) 2012 Bruno Jouhier <bruno.jouhier@sage.com>
  * MIT License
  */

diff --git a/lib/fibers/flows.js b/lib/fibers/flows.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (fibers) - DO NOT EDIT ***/var fstreamline__ = require("../fibers/runtime"); (function(){})();(fstreamline__.create(function(_) { /**
+/*** Generated by streamline 0.10.17 (fibers) - DO NOT EDIT ***/var fstreamline__ = require("../fibers/runtime"); (function(){})();(fstreamline__.create(function(_) { /**
  * Copyright (c) 2011 Bruno Jouhier <bruno.jouhier@sage.com>
  *
  * Permission is hereby granted, free of charge, to any person

diff --git a/lib/generators-fast/builtins.js b/lib/generators-fast/builtins.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators-fast) - DO NOT EDIT ***/var galaxy = require("../generators-fast/runtime");(function(){})();galaxy.unstar((function*(_) { /**
+/*** Generated by streamline 0.10.17 (generators-fast) - DO NOT EDIT ***/var galaxy = require("../generators-fast/runtime");(function(){})();galaxy.unstar((function*(_) { /**
  * Copyright (c) 2012 Bruno Jouhier <bruno.jouhier@sage.com>
  * MIT License
  */

diff --git a/lib/generators-fast/flows.js b/lib/generators-fast/flows.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators-fast) - DO NOT EDIT ***/var galaxy = require("../generators-fast/runtime");(function(){})();galaxy.unstar((function*(_) { /**
+/*** Generated by streamline 0.10.17 (generators-fast) - DO NOT EDIT ***/var galaxy = require("../generators-fast/runtime");(function(){})();galaxy.unstar((function*(_) { /**
  * Copyright (c) 2011 Bruno Jouhier <bruno.jouhier@sage.com>
  *
  * Permission is hereby granted, free of charge, to any person

diff --git a/lib/generators/builtins.js b/lib/generators/builtins.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators) - DO NOT EDIT ***/var galaxy = require("../generators/runtime");(function(){})();(galaxy.unstar(function*(_) { /**
+/*** Generated by streamline 0.10.17 (generators) - DO NOT EDIT ***/var galaxy = require("../generators/runtime");(function(){})();(galaxy.unstar(function*(_) { /**
  * Copyright (c) 2012 Bruno Jouhier <bruno.jouhier@sage.com>
  * MIT License
  */

diff --git a/lib/generators/flows.js b/lib/generators/flows.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators) - DO NOT EDIT ***/var galaxy = require("../generators/runtime");(function(){})();(galaxy.unstar(function*(_) { /**
+/*** Generated by streamline 0.10.17 (generators) - DO NOT EDIT ***/var galaxy = require("../generators/runtime");(function(){})();(galaxy.unstar(function*(_) { /**
  * Copyright (c) 2011 Bruno Jouhier <bruno.jouhier@sage.com>
  *
  * Permission is hereby granted, free of charge, to any person

diff --git a/lib/streams/client/streams.js b/lib/streams/client/streams.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (callbacks) - DO NOT EDIT ***/ "use strict"; var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; function DataBuffer(options) {
+/*** Generated by streamline 0.10.17 (callbacks) - DO NOT EDIT ***/ "use strict"; var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; function DataBuffer(options) {
 
 
 

diff --git a/lib/transform-all.js b/lib/transform-all.js
@@ -2869,7 +2869,7 @@ Narcissus.decompiler = (function() {
 }());
 "use strict";
 (function(exports) {
-	exports.version = "0.10.15";
+	exports.version = "0.10.17";
 })(typeof exports !== 'undefined' ? exports : (Streamline.version = Streamline.version || {}));
 "use strict";
 (function() {
@@ -5495,11 +5495,13 @@ if (typeof exports !== 'undefined') {
 				q.push(fn);
 			},
 			flush: function() {
+				var oldContext = __g.context;
 				__g.depth++;
 				try {
 					var fn;
 					while (fn = q.shift()) fn();
 				} finally {
+					__g.context = oldContext;
 					__g.depth--;
 				}
 			}
@@ -5595,8 +5597,8 @@ if (typeof exports !== 'undefined') {
 				// We emit this before resetting the frame so that the 'exit' handler has access to the current frame.
 				if (emitter) emitter.emit("exit", frame);
 				__g.frame = oldFrame;
-				if (--__g.depth === 0 && __g.trampoline) __g.trampoline.flush();
 				__g.context = oldContext;
+				if (--__g.depth === 0 && __g.trampoline) __g.trampoline.flush();
 			}
 		};
 		if (emitter && !ret.dispatched) emitter.emit('yield', frame);
@@ -5742,7 +5744,7 @@ if (typeof exports !== 'undefined') {
 	exports.stackTraceEnabled = true;
 })(typeof exports !== 'undefined' ? exports : (Streamline.runtime = Streamline.runtime || {}));
 require && require("../callbacks/builtins");
-/*** Generated by streamline 0.10.15 (callbacks) - DO NOT EDIT ***/ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {
+/*** Generated by streamline 0.10.17 (callbacks) - DO NOT EDIT ***/ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {
 
 
 

diff --git a/lib/version.js b/lib/version.js
@@ -1,4 +1,4 @@
 "use strict";
 (function(exports) {
-	exports.version = "0.10.15";
+	exports.version = "0.10.17";
 })(typeof exports !== 'undefined' ? exports : (Streamline.version = Streamline.version || {}));
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "streamline",
   "description": "Asynchronous Javascript for dummies",
-  "version": "0.10.16",
+  "version": "0.10.17",
   "homepage": "http://github.com/Sage/streamlinejs",
   "repository": {
     "type": "git",

diff --git a/test/common/callbacks/eval-test.js b/test/common/callbacks/eval-test.js
diff --git a/test/common/callbacks/flows-test.js b/test/common/callbacks/flows-test.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (callbacks) - DO NOT EDIT ***/ var __rt=require('streamline/lib/callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; QUnit.module(module.id);
+/*** Generated by streamline 0.10.17 (callbacks) - DO NOT EDIT ***/ var __rt=require('streamline/lib/callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; QUnit.module(module.id);
 var flows = require("streamline/lib/util/flows");
 
 function delay(_, val) { var __frame = { name: "delay", line: 4 }; return __func(_, this, arguments, delay, 0, __frame, function __$delay() {

diff --git a/test/common/callbacks/futures-test.js b/test/common/callbacks/futures-test.js
diff --git a/test/common/callbacks/stack-test.js b/test/common/callbacks/stack-test.js
diff --git a/test/common/generators/eval-test.js b/test/common/generators/eval-test.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var delay_ = galaxy.unstar(delay, 0), delayFail_ = galaxy.unstar(delayFail, 0); QUnit.module(module.id);
+/*** Generated by streamline 0.10.17 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var delay_ = galaxy.unstar(delay, 0), delayFail_ = galaxy.unstar(delayFail, 0); QUnit.module(module.id);
 
 function evalTest(f, val) {
 	f(  function(err, result) {
@@ -886,6 +886,20 @@ if (typeof require !== "undefined") { // skip this one in browser
 	}, 0));
 }
 
+asyncTest("IIFE bug in fibers mode", 1, galaxy.unstar(function*(_) {
+	var api = (yield (function*() {var foo_ = galaxy.unstar(foo, 0);
+		function* foo(_) {
+			return 1;
+		}
+		return {
+			foo: foo_,
+		};
+	})());
+	strictEqual((yield galaxy.invoke(api, "foo", [_], 0)), 1);
+	start();
+}, 0));
+
+
 // enable later
 false && asyncTest("futures on non-streamline APIs", 1, galaxy.unstar(function*(_) {
 	function nat(cb) {

diff --git a/test/common/generators/flows-test.js b/test/common/generators/flows-test.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var delay_ = galaxy.unstar(delay, 0), delayFail_ = galaxy.unstar(delayFail, 0); QUnit.module(module.id);
+/*** Generated by streamline 0.10.17 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var delay_ = galaxy.unstar(delay, 0), delayFail_ = galaxy.unstar(delayFail, 0); QUnit.module(module.id);
 var flows = require("streamline/lib/util/flows");
 
 function* delay(_, val) {

diff --git a/test/common/generators/futures-test.js b/test/common/generators/futures-test.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var delay_ = galaxy.unstar(delay, 2); QUnit.module(module.id);
+/*** Generated by streamline 0.10.17 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var delay_ = galaxy.unstar(delay, 2); QUnit.module(module.id);
 
 function* delay(millis, val, _) {
 	(yield galaxy.invoke(null, setTimeout, [_, millis], 0));

diff --git a/test/common/generators/stack-test.js b/test/common/generators/stack-test.js
@@ -1,4 +1,4 @@
-/*** Generated by streamline 0.10.15 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var failAsync_ = galaxy.unstar(failAsync, 0), failSync_ = galaxy.unstar(failSync, 0), A_ = galaxy.unstar(A, 0), B_ = galaxy.unstar(B, 0), C_ = galaxy.unstar(C, 0), D_ = galaxy.unstar(D, 0), E_ = galaxy.unstar(E, 0), F_ = galaxy.unstar(F, 0), G_ = galaxy.unstar(G, 0), H_ = galaxy.unstar(H, 0), I_ = galaxy.unstar(I, 0), issue233_ = galaxy.unstar(issue233, 0), T_ = galaxy.unstar(T, 0); // WARNING: DO NOT INSERT COMMENTS OR ANYTHING
+/*** Generated by streamline 0.10.17 (generators) - DO NOT EDIT ***/var galaxy = require("streamline/lib/generators/runtime");(function(){})();(galaxy.unstar(function*(_) {var failAsync_ = galaxy.unstar(failAsync, 0), failSync_ = galaxy.unstar(failSync, 0), A_ = galaxy.unstar(A, 0), B_ = galaxy.unstar(B, 0), C_ = galaxy.unstar(C, 0), D_ = galaxy.unstar(D, 0), E_ = galaxy.unstar(E, 0), F_ = galaxy.unstar(F, 0), G_ = galaxy.unstar(G, 0), H_ = galaxy.unstar(H, 0), I_ = galaxy.unstar(I, 0), issue233_ = galaxy.unstar(issue233, 0), T_ = galaxy.unstar(T, 0); // WARNING: DO NOT INSERT COMMENTS OR ANYTHING
 // Line numbers matter to this test!
 
 QUnit.module(module.id);
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		/* Generated by streamline 0.10.15 (callbacks) - DO NOT EDIT */ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {
		/* Generated by streamline 0.10.17 (callbacks) - DO NOT EDIT */ var __rt=require('../callbacks/runtime').runtime(__filename, false),__func=__rt.__func,__cb=__rt.__cb; (function(exports) {



Expand Down