From cdf8cf1806ca793c47095b69382b2dd733899af7 Mon Sep 17 00:00:00 2001
From: Benoit Giannangeli <benoit.giannangeli@boursorama.fr>
Date: Fri, 17 Feb 2017 12:25:28 +0100
Subject: lua can read globals set by js

---
 src/lapi.js | 33 ++++++++++++++++++++++++++++++---
 src/lvm.js  |  3 ++-
 2 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lapi.js b/src/lapi.js
index 6cc95b2..6a88f6f 100644
--- a/src/lapi.js
+++ b/src/lapi.js
@@ -50,7 +50,6 @@ const index2addr = function(L, idx) {
             return idx <= ci.func.nupvalues ? ci.func.upvalue[idx - 1] : ldo.nil;
         }
     }
-
 };
 
 /*
@@ -190,6 +189,33 @@ const lua_pushlightuserdata = function(L, p) {
     assert(L.top <= L.ci.top, "stack overflow");
 };
 
+/*
+** set functions (stack -> Lua)
+*/
+
+/*
+** t[k] = value at the top of the stack (where 'k' is a string)
+*/
+const auxsetstr = function(L, t, k) {
+    let str = new TValue(CT.LUA_TLNGSTR, k);
+
+    assert(1 < L.top - L.ci.funcOff, "not enough elements in the stack");
+
+    if (t.ttistable() && !t.__index(t, k).ttisnil()) {
+        t.__newindex(t, k, L.stack[L.top - 1]);
+        L.top--; /* pop value */
+    } else {
+        L.stack[L.top] = str;
+        L.top++;
+        lvm.luaV_finishset(L, t, L.stack[L.top - 1], L.stack[L.top - 2], t.__index(t, k), 0);
+        L.top -= 2; /* pop value and key */
+    }
+};
+
+const lua_setglobal = function(L, name) {
+    auxsetstr(L, L.l_G.l_registry.value.array[lua.LUA_RIDX_GLOBALS], name);
+};
+
 
 /*
 ** access functions (stack -> JS)
@@ -251,7 +277,7 @@ const lua_load = function(L, data, chunckname) {
             let reg = L.l_G.l_registry;
             let gt = reg.value.array[lua.LUA_RIDX_GLOBALS];
             /* set global table as 1st upvalue of 'f' (may be LUA_ENV) */
-            f.upvals[0].v = gt; // TODO: is gt on the stack ? is that upvalue opened or closed ?
+            f.upvals[0].u.value = gt;
         }
     }
 
@@ -354,4 +380,5 @@ module.exports.lua_tostring       = lua_tostring;
 module.exports.lua_load           = lua_load;
 module.exports.lua_callk          = lua_callk;
 module.exports.lua_call           = lua_call;
-module.exports.lua_pop            = lua_pop;
\ No newline at end of file
+module.exports.lua_pop            = lua_pop;
+module.exports.lua_setglobal      = lua_setglobal;
\ No newline at end of file
diff --git a/src/lvm.js b/src/lvm.js
index 931b7a5..4f52678 100644
--- a/src/lvm.js
+++ b/src/lvm.js
@@ -1033,4 +1033,5 @@ module.exports.LEnum          = LEnum;
 module.exports.LEintfloat     = LEintfloat;
 module.exports.LTintfloat     = LTintfloat;
 module.exports.l_strcmp       = l_strcmp;
-module.exports.luaV_objlen    = luaV_objlen;
\ No newline at end of file
+module.exports.luaV_objlen    = luaV_objlen;
+module.exports.luaV_finishset = luaV_finishset;
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf