Bugfix for string.dump() and converted instruction data.

gamesys · May 15, 2014 · adff2ed · adff2ed
1 parent ca6d7a5
commit adff2ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/test/scripts/lib.lua b/test/scripts/lib.lua
@@ -160,6 +160,11 @@ assertTrue (type(f) == 'function', 'loadstring() should return a function when p
 local result = f()
 assertTrue (result == 'hello', 'The function returned from loadstring() should return the value from the script')
 
+local s = string.dump(function () return 'bar' end)
+f = loadstring(s)
+result = f()
+
+assertTrue (result == 'bar', 'loadstring() should be able to create a function from the output of string.dump()')
 
 
 

diff --git a/test/test-package.json b/test/test-package.json
diff --git a/vm/src/lib.js b/vm/src/lib.js
@@ -1453,7 +1453,16 @@ var shine = shine || {};
 
 
 		dump: function (func) {
-			return JSON.stringify(func._data);
+			var data = func._data,
+				result = shine.gc.createObject(),
+				i;
+
+			for (i in data) {
+				if (data.hasOwnProperty(i)) result[i] = data[i];
+			}
+
+			result.instructions = Array.apply(shine.gc.createArray(), result.instructions);
+			return JSON.stringify(result);
 		},