diff options
author | daurnimator <quae@daurnimator.com> | 2017-05-05 15:53:14 +1000 |
---|---|---|
committer | daurnimator <quae@daurnimator.com> | 2017-05-05 15:58:55 +1000 |
commit | 1dc893efcd664df86606b571d4b6bbee5b5868ca (patch) | |
tree | faac1dcfacdad1de1cc8fa71123fc994c4bc2c94 | |
parent | 4c8de564f08e122e011c5f5ecaa96bea595603ed (diff) | |
download | fengari-1dc893efcd664df86606b571d4b6bbee5b5868ca.tar.gz fengari-1dc893efcd664df86606b571d4b6bbee5b5868ca.tar.bz2 fengari-1dc893efcd664df86606b571d4b6bbee5b5868ca.zip |
Need to copy to the stack if not coming from a stack
-rw-r--r-- | src/ldo.js | 2 | ||||
-rw-r--r-- | src/ltm.js | 6 | ||||
-rw-r--r-- | src/lvm.js | 3 |
3 files changed, 6 insertions, 5 deletions
@@ -233,7 +233,7 @@ const tryfuncTM = function(L, off, func) { for (let p = L.top; p > off; p--) L.stack[p] = L.stack[p-1]; L.top++; /* slot ensured by caller */ - L.stack[off] = tm; /* tag method is the new function to be called */ + L.stack[off] = new lobject.TValue(tm.type, tm.value); /* tag method is the new function to be called */ }; /* @@ -83,9 +83,9 @@ const luaT_callTM = function(L, f, p1, p2, p3, hasres) { let result = p3; let func = L.top; - L.stack[L.top] = f; /* push function (assume EXTRA_STACK) */ - L.stack[L.top + 1] = p1; /* 1st argument */ - L.stack[L.top + 2] = p2; /* 2nd argument */ + L.stack[L.top] = new lobject.TValue(f.type, f.value); /* push function (assume EXTRA_STACK) */ + L.stack[L.top + 1] = new lobject.TValue(p1.type, p1.value); /* 1st argument */ + L.stack[L.top + 2] = new lobject.TValue(p2.type, p2.value); /* 2nd argument */ L.top += 3; if (!hasres) /* no result? 'p3' is third argument */ @@ -161,7 +161,8 @@ const luaV_execute = function(L) { break; } case OCi.OP_GETUPVAL: { - L.stack[ra] = cl.upvals[i.B].val(L); + let o = cl.upvals[i.B].val(L); + L.stack[ra] = new lobject.TValue(o.type, o.value); break; } case OCi.OP_SETUPVAL: { |