lua_pushnumber, lua_pushinteger, lua_pushstring, lua_pushboolean

2 files changed, 37 insertions, 35 deletions

diff --git a/src/lapi.js b/src/lapi.js
index 0cb0a4b..71cf3f6 100644
--- a/src/lapi.js
+++ b/src/lapi.js
@@ -94,7 +94,7 @@ const lua_pushinteger = function(L, n) {
     assert(L.top <= L.ci.top, "stack overflow");
 };
 
-const lua_pushlstring = function(L, s, len) {
+const lua_pushlstring = function(L, s, len) { // TODO: embedded \0
     assert(typeof s === "string");
     assert(typeof n === "number");
 
@@ -113,6 +113,7 @@ const lua_pushstring = function (L, s) {
         L.stack[L.top] = nil;
     else {
         let ts = new TValue(CT.LUA_TLNGSTR, s);
+        L.stack[L.top] = ts;
         s = ts.value;
     }
 
@@ -243,6 +244,7 @@ module.exports.lua_pushnumber  = lua_pushnumber;
 module.exports.lua_pushinteger = lua_pushinteger;
 module.exports.lua_pushlstring = lua_pushlstring;
 module.exports.lua_pushstring  = lua_pushstring;
+module.exports.lua_pushboolean = lua_pushboolean;
 module.exports.lua_version     = lua_version;
 module.exports.lua_atpanic     = lua_atpanic;
 module.exports.lua_gettop      = lua_gettop;
diff --git a/src/lundump.js b/src/lundump.js
index 67867bb..0ff3143 100644
--- a/src/lundump.js
+++ b/src/lundump.js
@@ -134,7 +134,7 @@ class BytecodeParser {
                 sBx:    ((ins >> o.POS_Bx) & p.MASK1(o.SIZE_Bx, 0)) - o.MAXARG_sBx
             };
 
-            console.log(`   [${i}]    Op: ${o.OpCodes[f.code[i].opcode]}  A: ${f.code[i].A}  B: ${f.code[i].B}  C: ${f.code[i].C}  Ax: ${f.code[i].Ax}  Bx: ${f.code[i].Bx}  sBx: ${f.code[i].sBx}`);
+            // console.log(`   [${i}]    Op: ${o.OpCodes[f.code[i].opcode]}  A: ${f.code[i].A}  B: ${f.code[i].B}  C: ${f.code[i].C}  Ax: ${f.code[i].Ax}  Bx: ${f.code[i].Bx}  sBx: ${f.code[i].sBx}`);
         }
     }
 
@@ -148,11 +148,11 @@ class BytecodeParser {
                 idx:     this.readByte()
             };
 
-            console.log(`
-                f.upvalues[${i}].name    = ${f.upvalues[i].name}
-                f.upvalues[${i}].instack = ${f.upvalues[i].instack}
-                f.upvalues[${i}].idx     = ${f.upvalues[i].idx}
-            `);
+            // console.log(`
+            //     f.upvalues[${i}].name    = ${f.upvalues[i].name}
+            //     f.upvalues[${i}].instack = ${f.upvalues[i].instack}
+            //     f.upvalues[${i}].idx     = ${f.upvalues[i].idx}
+            // `);
         }
     }
 
@@ -165,24 +165,24 @@ class BytecodeParser {
             switch (t) {
             case constant_types.LUA_TNIL:
                 f.k.push(new TValue(constant_types.LUA_TNIL, null));
-                console.log(`   LUA_TNIL     = ${f.k[f.k.length - 1].value}`);
+                // console.log(`   LUA_TNIL     = ${f.k[f.k.length - 1].value}`);
                 break;
             case constant_types.LUA_TBOOLEAN:
                 f.k.push(new TValue(constant_types.LUA_TBOOLEAN, this.readByte()));
-                console.log(`   LUA_TBOOLEAN = ${f.k[f.k.length - 1].value}`);
+                // console.log(`   LUA_TBOOLEAN = ${f.k[f.k.length - 1].value}`);
                 break;
             case constant_types.LUA_TNUMFLT:
                 f.k.push(new TValue(constant_types.LUA_TNUMFLT, this.readNumber()));
-                console.log(`   LUA_TNUMFLT  = ${f.k[f.k.length - 1].value}`);
+                // console.log(`   LUA_TNUMFLT  = ${f.k[f.k.length - 1].value}`);
                 break;
             case constant_types.LUA_TNUMINT:
                 f.k.push(new TValue(constant_types.LUA_TNUMINT, this.readInteger()));
-                console.log(`   LUA_TNUMINT  = ${f.k[f.k.length - 1].value}`);
+                // console.log(`   LUA_TNUMINT  = ${f.k[f.k.length - 1].value}`);
                 break;
             case constant_types.LUA_TSHRSTR:
             case constant_types.LUA_TLNGSTR:
                 f.k.push(new TValue(constant_types.LUA_TLNGSTR, this.readString()));
-                console.log(`   LUA_TLNGSTR  = ${f.k[f.k.length - 1].value}`);
+                // console.log(`   LUA_TLNGSTR  = ${f.k[f.k.length - 1].value}`);
                 break;
             default:
                 throw new Error(`unrecognized constant '${t}'`);
@@ -212,20 +212,20 @@ class BytecodeParser {
                 endpc:   this.readInt()
             };
 
-            console.log(`
-                f.locvars[${i}].varname = ${f.locvars[i].varname}
-                f.locvars[${i}].startpc = ${f.locvars[i].startpc}
-                f.locvars[${i}].endpc   = ${f.locvars[i].endpc}
-            `);
+            // console.log(`
+            //     f.locvars[${i}].varname = ${f.locvars[i].varname}
+            //     f.locvars[${i}].startpc = ${f.locvars[i].startpc}
+            //     f.locvars[${i}].endpc   = ${f.locvars[i].endpc}
+            // `);
         }
 
         n = this.readInt();
         for (let i = 0; i < n; i++) {
             f.upvalues[i].name = this.readString();
 
-            console.log(`
-                f.upvalues[${i}].name = ${f.upvalues[i].name}
-            `);
+            // console.log(`
+            //     f.upvalues[${i}].name = ${f.upvalues[i].name}
+            // `);
         }
     }
 
@@ -239,14 +239,14 @@ class BytecodeParser {
         f.is_vararg = this.readByte();
         f.maxstacksize = this.readByte();
 
-        console.log(`
-            f.source          = ${f.source}
-            f.linedefined     = ${f.linedefined}
-            f.lastlinedefined = ${f.lastlinedefined}
-            f.numparams       = ${f.numparams}
-            f.is_vararg       = ${f.is_vararg}
-            f.maxstacksize    = ${f.maxstacksize}
-        `);
+        // console.log(`
+        //     f.source          = ${f.source}
+        //     f.linedefined     = ${f.linedefined}
+        //     f.lastlinedefined = ${f.lastlinedefined}
+        //     f.numparams       = ${f.numparams}
+        //     f.is_vararg       = ${f.is_vararg}
+        //     f.maxstacksize    = ${f.maxstacksize}
+        // `);
 
         this.readCode(f);
         this.readConstants(f);
@@ -274,13 +274,13 @@ class BytecodeParser {
         this.integerSize     = this.readByte();
         this.numberSize      = this.readByte();
 
-        console.log(`
-            intSize         = ${this.intSize}
-            size_tSize      = ${this.size_tSize}
-            instructionSize = ${this.instructionSize}
-            integerSize     = ${this.integerSize}
-            numberSize      = ${this.numberSize}
-        `)
+        // console.log(`
+        //     intSize         = ${this.intSize}
+        //     size_tSize      = ${this.size_tSize}
+        //     instructionSize = ${this.instructionSize}
+        //     integerSize     = ${this.integerSize}
+        //     numberSize      = ${this.numberSize}
+        // `)
 
         if (this.readInteger() !== 0x5678)
             throw new Error("endianness mismatch");