Fix number casting in z8lua, revert rnd() to previous implementation (which works now as intended)

Author: mupfdev

src/api.c

@@ -549,7 +549,7 @@ static int pico8_pget(lua_State* L)
     int x = (int)fix32_to_int32(luaL_checknumber(L, 1));
     int y = (int)fix32_to_int32(luaL_checknumber(L, 2));
 
-    lua_pushinteger(L, fix32_from_int32(pget(x, y)));
+    lua_pushinteger(L, pget(x, y));
     return 1;
 }
 
@@ -612,7 +612,7 @@ static int pico8_print(lua_State* L)
 
     pico8_ram[0x5f26] = cursor_x;
     pico8_ram[0x5f27] = cursor_y;
-    lua_pushnumber(L, fix32_from_uint8(cursor_x));
+    lua_pushnumber(L, cursor_x);
 
     return 1;
 }
@@ -793,16 +793,10 @@ static int pico8_rnd(lua_State* L)
 {
     if (lua_istable(L, 1))
     {
-        lua_Integer len = lua_rawlen(L, 1);
-        if (len == 0)
-        {
-            return 0;
-        }
-
-        fix32_t rnd_value = pico8_random(len << 8);
-        lua_Integer index = (rnd_value >> 8) + 1;
 
-        lua_rawgeti(L, 1, index);
+        const fix32_t value = pico8_random(lua_rawlen(L, 1) << 8);
+        lua_pushnumber(L, ((value >> 8) + 1) * fix32_value(1, 0));
+        lua_gettable(L, -2);
     }
     else
     {

src/z8lua/llimits.h

@@ -93,7 +93,7 @@ typedef LUAI_UACNUMBER l_uacNumber;
 #define cast(t, exp)	((t)(exp))
 
 #define cast_byte(i)	cast(lu_byte, (i))
-#define cast_num(i)	cast(lua_Number, (i))
+#define cast_num(i)	fix32_from_double(i)
 #define cast_int(i)	cast(int, (i))
 #define cast_uchar(i)	cast(unsigned char, (i))
 

src/z8lua/lvm.c

@@ -380,11 +380,11 @@ void luaV_objlen (lua_State *L, StkId ra, const TValue *rb) {
       Table *h = hvalue(rb);
       tm = fasttm(L, h->metatable, TM_LEN);
       if (tm) break;  /* metamethod? break switch to call it */
-      setnvalue(ra, cast_num(fix32_from_uint32(luaH_getn(h))));  /* else primitive len */
+      setnvalue(ra, cast_num(luaH_getn(h)));  /* else primitive len */
       return;
     }
     case LUA_TSTRING: {
-      setnvalue(ra, cast_num(fix32_from_uint32(tsvalue(rb)->len)));
+      setnvalue(ra, cast_num(tsvalue(rb)->len));
       return;
     }
     default: {  /* try metamethod */

tests/tests.lua

@@ -104,7 +104,9 @@ end
 function test_tables()
     local tbl = {0, 1, 1, 2, 3, 5, 8, 13}
     log("tbl = {0, 1, 1, 2, 3, 5, 8, 13}")
-    --assert_equal(tbl[1], 0 "tbl[1]")
+    assert_equal(tbl[5], 3, "tbl[5]")
+    assert_equal(tbl[6], 5, "tbl[6]")
+    assert_equal(tbl[7], 8, "tbl[7]")
 end
 
 -- PICO-8 API.
@@ -299,8 +301,8 @@ function run_tests()
     test_relational_operations()
     test_logical_operations()
     test_control_flow()
-    test_tables()
     test_pico8_api()
+    test_tables()
 end
 
 run_tests()