Improve redbean

- Improve serialization
- Add Benchmark() API to redbean
- Refactor UNIX API to be assert() friendly
- Make the redbean Lua REPL print data structures
- Fix recent regressions in linenoise reverse search
- Add -i flag so redbean can be a language interpreter

third_party/lua/luaencodeluadata.c

@@ -16,51 +16,97 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/bits/bits.h"
+#include "libc/fmt/itoa.h"
 #include "libc/math.h"
 #include "libc/stdio/append.internal.h"
 #include "third_party/lua/cosmo.h"
 #include "third_party/lua/lauxlib.h"
 #include "third_party/lua/lua.h"
 
-int LuaEncodeLuaData(lua_State *L, char **buf, int level, char *numformat) {
-  size_t idx = -1;
-  size_t tbllen, buflen, slen;
+int LuaEncodeLuaData(lua_State *L, char **buf, int level, char *numformat,
+                     int idx) {
   char *s;
   int ktype;
-  int t = lua_type(L, idx);
-  if (level < 0) return luaL_argerror(L, 1, "too many nested tables");
-  if (LUA_TSTRING == t) {
-    s = lua_tolstring(L, idx, &slen);
-    EscapeLuaString(s, slen, buf);
-  } else if (LUA_TNUMBER == t) {
-    appendf(buf, numformat, lua_tonumber(L, idx));
-  } else if (LUA_TBOOLEAN == t) {
-    appends(buf, lua_toboolean(L, idx) ? "true" : "false");
-  } else if (LUA_TTABLE == t) {
-    appendw(buf, '{');
-    int i = 0;
-    lua_pushnil(L);  // push the first key
-    while (lua_next(L, -2) != 0) {
-      ktype = lua_type(L, -2);
-      if (ktype == LUA_TTABLE)
-        return luaL_argerror(L, 1, "can't serialize key of this type");
-      if (i++ > 0) appendd(buf, ",", 1);
-      if (ktype != LUA_TNUMBER || floor(lua_tonumber(L, -2)) != i) {
-        appendw(buf, '[');
-        lua_pushvalue(L, -2);  // table/-4, key/-3, value/-2, key/-1
-        LuaEncodeLuaData(L, buf, level, numformat);
-        lua_remove(L, -1);  // remove copied key: table/-3, key/-2, value/-1
-        appendw(buf, ']' | '=' << 010);
-      }
-      LuaEncodeLuaData(L, buf, level - 1, numformat);
-      lua_pop(L, 1);  // table/-2, key/-1
+  lua_Integer i;
+  size_t tbllen, buflen, slen;
+  char ibuf[21], fmt[] = "%.14g";
+  if (level > 0) {
+    switch (lua_type(L, idx)) {
+      case LUA_TNIL:
+        appendw(buf, READ32LE("nil"));
+        return 0;
+      case LUA_TSTRING:
+        s = lua_tolstring(L, idx, &slen);
+        EscapeLuaString(s, slen, buf);
+        return 0;
+      case LUA_TFUNCTION:
+        appendf(buf, "\"func@%p\"", lua_touserdata(L, idx));
+        return 0;
+      case LUA_TUSERDATA:
+        appendf(buf, "\"udata@%p\"", lua_touserdata(L, idx));
+        return 0;
+      case LUA_TLIGHTUSERDATA:
+        appendf(buf, "\"light@%p\"", lua_touserdata(L, idx));
+        return 0;
+      case LUA_TTHREAD:
+        appendf(buf, "\"thread@%p\"", lua_touserdata(L, idx));
+        return 0;
+      case LUA_TNUMBER:
+        if (lua_isinteger(L, idx)) {
+          appendd(buf, ibuf,
+                  FormatInt64(ibuf, luaL_checkinteger(L, idx)) - ibuf);
+        } else {
+          // TODO(jart): replace this api
+          while (*numformat == '%' || *numformat == '.' ||
+                 isdigit(*numformat)) {
+            ++numformat;
+          }
+          switch (*numformat) {
+            case 'a':
+            case 'g':
+            case 'f':
+              fmt[4] = *numformat;
+              break;
+            default:
+              return luaL_error(L, "numformat string not allowed");
+          }
+          appendf(buf, fmt, lua_tonumber(L, idx));
+        }
+        return 0;
+      case LUA_TBOOLEAN:
+        if (lua_toboolean(L, idx)) {
+          appendw(buf, READ32LE("true"));
+        } else {
+          appendw(buf, READ64LE("false\0\0"));
+        }
+        return 0;
+      case LUA_TTABLE:
+        i = 0;
+        appendw(buf, '{');
+        lua_pushnil(L);  // push the first key
+        while (lua_next(L, -2) != 0) {
+          ktype = lua_type(L, -2);
+          if (i++ > 0) appendw(buf, ',');
+          if (ktype != LUA_TNUMBER || lua_tointeger(L, -2) != i) {
+            appendw(buf, '[');
+            lua_pushvalue(L, -2);  // table/-4, key/-3, value/-2, key/-1
+            LuaEncodeLuaData(L, buf, level - 1, numformat, -1);
+            lua_remove(L, -1);  // remove copied key: table/-3, key/-2, value/-1
+            appendw(buf, ']' | '=' << 010);
+          }
+          LuaEncodeLuaData(L, buf, level - 1, numformat, -1);
+          lua_pop(L, 1);  // table/-2, key/-1
+        }
+        // stack: table/-1, as the key was popped by lua_next
+        appendw(buf, '}');
+        return 0;
+      default:
+        luaL_error(L, "can't serialize value of this type");
+        unreachable;
     }
-    // stack: table/-1, as the key was popped by lua_next
-    appendw(buf, '}');
-  } else if (LUA_TNIL == t) {
-    appendd(buf, "nil", 3);
   } else {
-    return luaL_argerror(L, 1, "can't serialize value of this type");
+    luaL_error(L, "too many nested tables");
+    unreachable;
   }
-  return 0;
 }