From ebbcbf8484d74cfccd0b39abf661dbc14fd2dc5d Mon Sep 17 00:00:00 2001
From: Benoit Giannangeli <benoit.giannangeli@boursorama.fr>
Date: Thu, 16 Feb 2017 07:51:01 +0100
Subject: lua_pushnumber

---
 src/ldo.js               |  3 +--
 src/lvm.js               | 15 ++++++---------
 tests/C/Makefile         |  8 ++++++++
 tests/C/lua_pushnumber.c | 21 +++++++++++++++++++++
 tests/lapi.js            | 27 +++++++++++++++++++++++++++
 5 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 tests/C/Makefile
 create mode 100644 tests/C/lua_pushnumber.c

diff --git a/src/ldo.js b/src/ldo.js
index 86a06e6..aa52b76 100644
--- a/src/ldo.js
+++ b/src/ldo.js
@@ -11,7 +11,6 @@ const CT             = lua.constant_types;
 const TS             = lua.thread_status;
 const LUA_MULTRET    = lua.LUA_MULTRET;
 const TValue         = lobject.TValue;
-const CallInfo       = lstate.CallInfo;
 const TMS            = ltm.TMS;
 
 const nil            = new TValue(CT.LUA_TNIL, null);
@@ -44,7 +43,7 @@ const luaD_precall = function(L, off, nresults) {
                 L.ci = L.ci.next;
                 ci = L.ci;
             } else {
-                ci = new CallInfo(off);
+                ci = new lstate.CallInfo(off);
                 L.ci.next = ci;
                 ci.previous = L.ci;
                 ci.next = null;
diff --git a/src/lvm.js b/src/lvm.js
index 5ba568d..f62e8f5 100644
--- a/src/lvm.js
+++ b/src/lvm.js
@@ -535,19 +535,19 @@ const luaV_execute = function(L) {
                         throw new Error("'for' limit must be a number");
 
                     plimit.type = CT.LUA_TNUMFLT;
-                    plimit.value = nlimit.value;
+                    plimit.value = nlimit
 
                     if (nstep === false)
                         throw new Error("'for' step must be a number");
 
                     pstep.type = CT.LUA_TNUMFLT;
-                    pstep.value = nstep.value;
+                    pstep.value = nstep
 
                     if (ninit === false)
                         throw new Error("'for' initial value must be a number");
 
                     init.type = CT.LUA_TNUMFLT;
-                    init.value = ninit.value - nstep.value;
+                    init.value = ninit - nstep;
                 }
 
                 ci.pcOff += i.sBx;
@@ -787,14 +787,11 @@ const luaV_tointeger = function(obj, mode) {
 };
 
 const tonumber = function(v) {
-    if (v.type === CT.LUA_TNUMFLT)
-        return new TValue(v.type, v.value);
-
-    if (v.type === CT.LUA_TNUMINT)
-        return new TValue(CT.LUA_TNUMFLT, v.value);
+    if (v.type === CT.LUA_TNUMFLT || v.type === CT.LUA_TNUMINT)
+        return v.value;
 
     if (v.type === CT.LUA_TSHRSTR || v.type === CT.LUA_TLNGSTR)
-        return new TValue(CT.LUA_TNUMFLT, parseFloat(v.value)); // TODO: luaO_str2num
+        return parseFloat(v.value); // TODO: luaO_str2num
 
     return false;
 };
diff --git a/tests/C/Makefile b/tests/C/Makefile
new file mode 100644
index 0000000..28ff1c2
--- /dev/null
+++ b/tests/C/Makefile
@@ -0,0 +1,8 @@
+CC= gcc-6 -std=gnu99
+CFLAGS= -g -Wall -Wextra
+
+LIBS= -lm -llua
+
+all:
+	$(CC) $(CFLAGS) $(LIBS) lua_pushnil.c -o lua_pushnil.out
+	$(CC) $(CFLAGS) $(LIBS) lua_pushnumber.c -o lua_pushnumber.out
\ No newline at end of file
diff --git a/tests/C/lua_pushnumber.c b/tests/C/lua_pushnumber.c
new file mode 100644
index 0000000..eca2564
--- /dev/null
+++ b/tests/C/lua_pushnumber.c
@@ -0,0 +1,21 @@
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+int main(void) {
+
+    lua_State *L = luaL_newstate();
+
+    luaL_openlibs(L);
+
+    lua_pushnumber(L, 10);
+
+    printf("L->top(%d): %s\n", lua_gettop(L), luaL_typename(L, lua_gettop(L)));
+
+    lua_close(L);
+
+    return 0;
+
+}
\ No newline at end of file
diff --git a/tests/lapi.js b/tests/lapi.js
index 39477b2..251c5a8 100644
--- a/tests/lapi.js
+++ b/tests/lapi.js
@@ -36,4 +36,31 @@ test('luaL_newstate, lua_pushnil, lua_gettop, luaL_typename', function (t) {
         "nil",
         "Correct element(s) on the stack"
     );
+});
+
+
+test('lua_pushnumber', function (t) {
+    let L;
+    
+    t.plan(3);
+
+    t.doesNotThrow(function () {
+
+        L = lauxlib.luaL_newstate();
+
+        lapi.lua_pushnumber(L, 10);
+
+    }, "JS Lua program ran without error");
+
+    t.strictEqual(
+        lapi.lua_gettop(L),
+        1,
+        "top is correct"
+    );
+
+    t.strictEqual(
+        lauxlib.luaL_typename(L, lapi.lua_gettop(L)),
+        "number",
+        "Correct element(s) on the stack"
+    );
 });
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2