Fix for coroutines issue (#31).

gamesys · Dec 23, 2015 · 2f3d088 · 2f3d088
1 parent 1a3f5f2
commit 2f3d088
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/test/distil-tests b/test/distil-tests
@@ -1,2 +1,6 @@
 #!/usr/bin/env bash
-../bin/moonshine distil ./scripts -o ./test-package.json -pm ./scripts/test-runner.lua
+COMPILER='luac'
+if [ $1 ]; then
+  COMPILER=$1
+fi
+../bin/moonshine distil ./scripts -o ./test-package.json -pm ./scripts/test-runner.lua -c $COMPILER
diff --git a/test/scripts/lib-coroutine.lua b/test/scripts/lib-coroutine.lua
@@ -96,3 +96,17 @@ assertTrue (arguments == 'OaMaIaIIaanilnillooptrueIIaanilIb123nilnilMbObMaIaIIaa
 
 
 
+order = ''
+local c = coroutine.create(function() order = order..'1' coroutine.yield(2) order = order..'3' return 4 end)
+local res, retval = coroutine.resume(c)
+
+assertTrue (res, 'coroutine should yeild successfully')
+assertEqual (retval, 2, 'coroutine should yeild correct value')
+assertEqual (order, '1', 'coroutine should yeild at correct point.')
+
+res, retval = coroutine.resume(c)
+
+assertTrue (res, 'coroutine should yeild successfully when function returns at end')
+assertEqual (retval, 4, 'coroutine should yeild value that is returned from function')
+assertEqual (order, '13', 'coroutine should resume at correct point.')
+assertEqual (coroutine.status(c), 'dead', 'coroutine should be dead after function returns')
diff --git a/test/test-package.json b/test/test-package.json
diff --git a/vm/moonshine.js b/vm/moonshine.js
@@ -1653,7 +1653,7 @@ shine.Coroutine._add = function (co) {
  */
 shine.Coroutine._remove = function () {
 	var vm = shine.getCurrentVM();
-	vm._coroutineRunning = vm._coroutineStack.pop();
+	if (vm) vm._coroutineRunning = vm._coroutineStack.pop();
 };
 
 
@@ -5090,7 +5090,7 @@ if (typeof module != 'undefined') module.exports = shine.jit;
 			switch (co.status) {
 				case shine.RUNNING: return (co === getVM()._coroutineRunning)? 'running' : 'normal';
 				case shine.SUSPENDED: return 'suspended';
-				case shine.DEAD: return 'dead';
+				default: return 'dead';
 			}
 		},
 

diff --git a/vm/src/Coroutine.js b/vm/src/Coroutine.js
@@ -102,7 +102,7 @@ shine.Coroutine._add = function (co) {
  */
 shine.Coroutine._remove = function () {
 	var vm = shine.getCurrentVM();
-	vm._coroutineRunning = vm._coroutineStack.pop();
+	if (vm) vm._coroutineRunning = vm._coroutineStack.pop();
 };
 
 

diff --git a/vm/src/lib.js b/vm/src/lib.js
@@ -789,7 +789,7 @@
 			switch (co.status) {
 				case shine.RUNNING: return (co === getVM()._coroutineRunning)? 'running' : 'normal';
 				case shine.SUSPENDED: return 'suspended';
-				case shine.DEAD: return 'dead';
+				default: return 'dead';
 			}
 		},