enhance Lua std library

common/luajit.cc

@@ -426,6 +426,12 @@ void PushImmEnv(lua_State* L) noexcept {
     lua_setmetatable(L, -2);
   }
 }
+void PushImmTable(lua_State* L) noexcept {
+  if (luaL_newmetatable(L, "nf7::luajit::ImmTable")) {
+    lua_pushcfunction(L, [](auto L) { return luaL_error(L, "table is immutable"); });
+    lua_setfield(L, -2, "__newindex");
+  }
+}
 
 
 template <typename T>

common/luajit.hh

@@ -143,5 +143,6 @@ int PushAll(lua_State* L, T v, Args&&... args) noexcept {
 // ---- global table
 void PushGlobalTable(lua_State*) noexcept;
 void PushImmEnv(lua_State*) noexcept;
+void PushImmTable(lua_State*) noexcept;
 
 }  // namespace nf7

common/luajit_std.hh

@@ -6,92 +6,12 @@
 namespace nf7::luajit {
 
 inline void PushStdTable(lua_State* L) noexcept {
+  luaL_openlibs(L);
+
   lua_newuserdata(L, 0);
   lua_createtable(L, 0, 0);
   lua_createtable(L, 0, 0);
   {
-    // ---- lua lib ----
-
-    // assert(expr[, msg])
-    lua_pushcfunction(L, [](auto L) {
-      if (lua_toboolean(L, 1)) {
-        return 0;
-      }
-      if (lua_gettop(L) >= 2) {
-        return luaL_error(L, lua_tostring(L, 2));
-      } else {
-        return luaL_error(L, "assertion failure");
-      }
-    });
-    lua_setfield(L, -2, "assert");
-
-    // error(msg)
-    lua_pushcfunction(L, [](auto L) {
-      return luaL_error(L, luaL_checkstring(L, 1));
-    });
-    lua_setfield(L, -2, "error");
-
-    // load(str)
-    lua_pushcfunction(L, [](auto L) {
-      if (0 != luaL_loadstring(L, luaL_checkstring(L, 1))) {
-        return luaL_error(L, "lua.load error: %s", lua_tostring(L, -1));
-      }
-      return 1;
-    });
-    lua_setfield(L, -2, "load");
-
-    // pcall(func, args...) -> success, result
-    lua_pushcfunction(L, [](auto L) {
-      if (0 == lua_pcall(L, lua_gettop(L)-1, LUA_MULTRET, 0)) {
-        lua_pushboolean(L, true);
-        lua_insert(L, 1);
-        return lua_gettop(L);
-      } else {
-        lua_pushboolean(L, false);
-        lua_insert(L, 1);
-        return 2;
-      }
-    });
-    lua_setfield(L, -2, "pcall");
-
-
-    // ---- math lib ----
-
-    // sin(theta)
-    lua_pushcfunction(L, [](auto L) {
-      lua_pushnumber(L, std::sin(luaL_checknumber(L, 1)));
-      return 1;
-    });
-    lua_setfield(L, -2, "sin");
-
-    // cos(theta)
-    lua_pushcfunction(L, [](auto L) {
-      lua_pushnumber(L, std::cos(luaL_checknumber(L, 1)));
-      return 1;
-    });
-    lua_setfield(L, -2, "cos");
-
-    // tan(theta)
-    lua_pushcfunction(L, [](auto L) {
-      lua_pushnumber(L, std::tan(luaL_checknumber(L, 1)));
-      return 1;
-    });
-    lua_setfield(L, -2, "tan");
-
-
-    // ---- table lib ----
-
-    // meta(table, meta_table)
-    lua_pushcfunction(L, [](auto L) {
-      luaL_checktype(L, 1, LUA_TTABLE);
-      luaL_checktype(L, 2, LUA_TTABLE);
-      lua_settop(L, 2);
-      lua_setmetatable(L, 1);
-      return 1;
-    });
-    lua_setfield(L, -2, "meta");
-
-
     // ---- time lib ----
 
     // now()
@@ -142,17 +62,41 @@ inline void PushStdTable(lua_State* L) noexcept {
     lua_setfield(L, -2, "mvector");
 
 
-    // ---- bit manip ----
+    // ---- lua std libs ----
-    luaL_openlibs(L);
+    const auto Copy =
-    luaL_loadstring(L, "return require(\"bit\")");
+        [L](const char* name, const char* expr, bool imm) {
-    lua_call(L, 0, 1);
+          luaL_loadstring(L, expr);
-    lua_setfield(L, -2, "bit");
+          lua_call(L, 0, 1);
+          if (imm) {
+            PushImmTable(L);
+            lua_setmetatable(L, -2);
+          }
+          lua_setfield(L, -2, name);
+        };
+    Copy("assert",       "return assert",       false);
+    Copy("error",        "return error",        false);
+    Copy("ipairs",       "return ipairs",       false);
+    Copy("loadstring",   "return loadstring",   false);
+    Copy("next",         "return next",         false);
+    Copy("pairs",        "return pairs",        false);
+    Copy("pcall",        "return pcall",        false);
+    Copy("rawequal",     "return rawequal",     false);
+    Copy("rawget",       "return rawget",       false);
+    Copy("select",       "return select",       false);
+    Copy("setfenv",      "return setfenv",      false);
+    Copy("setmetatable", "return setmetatable", false);
+    Copy("tonumber",     "return tonumber",     false);
+    Copy("tostring",     "return tostring",     false);
+    Copy("type",         "return type",         false);
+    Copy("unpack",       "return unpack",       false);
+    Copy("_VERSION",     "return _VERSION",     false);
+    Copy("xpcall",       "return xpcall",       false);
 
-    // ---- str manip ----
+    Copy("bit",       "return require(\"bit\")", true);
-    luaL_openlibs(L);
+    Copy("coroutine", "return coroutine",        true);
-    luaL_loadstring(L, "return string");
+    Copy("math",      "return math",             true);
-    lua_call(L, 0, 1);
+    Copy("string",    "return string",           true);
-    lua_setfield(L, -2, "str");
+    Copy("table",     "return table",            true);
   }
   lua_setfield(L, -2, "__index");
   lua_setmetatable(L, -2);