Merge remote-tracking branch 'jtothebell/pico8' into pico8

Author: samhocevar

lbaselib.c

@@ -195,8 +195,17 @@ static int luaB_type (lua_State *L) {
 }
 
 
+static int _empty(lua_State *L) { return 0; }
+
+
 static int pairsmeta (lua_State *L, const char *method, int iszero,
                       lua_CFunction iter) {
+  // PICO-8 0.2.0 changelog: pairs(nil) returns an empty function
+  if (lua_isnil(L, 1)) {
+    lua_pushcfunction(L, _empty);
+    return 1;
+  }
+
   if (!luaL_getmetafield(L, 1, method)) {  /* no metamethod? */
     luaL_checktype(L, 1, LUA_TTABLE);  /* argument must be a table */
     lua_pushcfunction(L, iter);  /* will return generator, */

lpico8lib.c

@@ -140,7 +140,15 @@ static int pico8_rotr(lua_State *l) {
 static int pico8_tostr(lua_State *l) {
     char buffer[20];
     char const *s = buffer;
-    auto hex = lua_toboolean(l, 2);
+
+    uint16_t flags = 0;
+    if (lua_isboolean(l, 2)) {
+        flags = lua_toboolean(l, 2) ? 1 : 0;
+    }
+    else if (lua_isnumber(l, 2)) {
+        flags = lua_tointeger(l, 2);
+    }
+
     switch (lua_type(l, 1))
     {
         case LUA_TNONE:
@@ -149,9 +157,17 @@ static int pico8_tostr(lua_State *l) {
             break;
         case LUA_TNUMBER: {
             lua_Number x = lua_tonumber(l, 1);
-            if (hex) {
+            if (flags) {
                 uint32_t b = (uint32_t)x.bits();
-                sprintf(buffer, "0x%04x.%04x", (b >> 16) & 0xffff, b & 0xffff);
+                if ((flags & 0x3) == 0x3) {
+                    sprintf(buffer, "0x%04x%04x", (b >> 16) & 0xffff, b & 0xffff);
+                }
+                else if ((flags & 0x2) == 0x2) {
+                    sprintf(buffer, "%d", b);
+                }
+                else {
+                    sprintf(buffer, "0x%04x.%04x", (b >> 16) & 0xffff, b & 0xffff);
+                }
             } else {
                 lua_number2str(buffer, x);
             }
@@ -172,7 +188,7 @@ static int pico8_tostr(lua_State *l) {
         case LUA_TFUNCTION:
             // PICO-8 0.1.12d changelog: “tostr(x,true) can also be used to view
             // the hex value of functions and tables (uses Lua's tostring)”
-            if (hex) {
+            if (flags) {
                 luaL_tolstring(l, 1, NULL);
                 return 1;
             }
@@ -189,6 +205,25 @@ static int pico8_tonum(lua_State *l) {
     {
         case LUA_TSTRING: {
             char const *s = lua_tostring(l, 1);
+            uint16_t flags = lua_gettop(l) >= 2 ? lua_tointeger(l, 2) : 0;
+            if (flags & 0x1) {
+                char buffer[9];
+                size_t i = 0;
+                while (s[i] != '\0') {
+                    buffer[i] = isxdigit(s[i]) ? s[i] : '0';
+                    i++;
+                }
+                uint32_t bits = strtol(buffer, NULL, 16);
+                if (flags & 0x2) bits >>= 16;
+                lua_pushnumber(l, (lua_Number)bits);
+                return 1;
+            }
+            else if (flags & 0x2) {
+                uint32_t bits = strtol(s, NULL, 10);
+                bits >>= 16;
+                lua_pushnumber(l, (lua_Number)bits);
+                return 1;
+            }
             // If parsing failed, PICO-8 returns nothing
             if (!luaO_str2d(s, strlen(s), &ret)) return 0;
             break;
@@ -203,14 +238,20 @@ static int pico8_tonum(lua_State *l) {
 }
 
 static int pico8_chr(lua_State *l) {
-    char s[2] = { (char)(uint8_t)lua_tonumber(l, 1), '\0' };
-    lua_pushlstring(l, s, 1);
+    // PICO-8 seems to top out at allowing 248 arguments
+    char s[248];
+    size_t numargs = lua_gettop(l) < sizeof(s) ? lua_gettop(l) : sizeof(s);
+    for (size_t i = 0; i < numargs; i++) {
+        s[i] = (char)(uint8_t)lua_tonumber(l, i + 1);
+    }
+    lua_pushlstring(l, s, numargs);
     return 1;
 }
 
 static int pico8_ord(lua_State *l) {
     size_t len;
-    int n = 0, count = 1;
+    int n = 0;
+    int count = 1;
     char const *s = luaL_checklstring(l, 1, &len);
     if (!lua_isnone(l, 3)) {
         if (!lua_isnumber(l, 3)) return 0;
@@ -230,6 +271,10 @@ static int pico8_ord(lua_State *l) {
 }
 
 static int pico8_split(lua_State *l) {
+    if (lua_isnil(l, 1)) {
+        return 0;
+    }
+
     size_t count = 0, hlen;
     char const *haystack = luaL_checklstring(l, 1, &hlen);
     if (!haystack)

lstrlib.c

@@ -54,7 +54,9 @@ static int str_sub (lua_State *L) {
   size_t l;
   const char *s = luaL_checklstring(L, 1, &l);
   size_t start = posrelat(luaL_checkinteger(L, 2), l);
-  size_t end = posrelat(luaL_optinteger(L, 3, -1), l);
+  size_t end = lua_gettop(L) > 2 ? start : l;
+  if (lua_isnumber(L, 3))
+    end = posrelat(lua_tonumber(L, 3), l);
   if (start < 1) start = 1;
   if (end > l) end = l;
   if (start <= end)