`newproxy' uses its own weaktable

3 files changed, 24 insertions, 35 deletions

diff --git a/lauxlib.c b/lauxlib.c
index 26a81287..d66250b3 100644
--- a/lauxlib.c
+++ b/lauxlib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.c,v 1.76 2002/06/25 19:15:21 roberto Exp roberto $
+** $Id: lauxlib.c,v 1.77 2002/06/26 19:28:44 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -302,24 +302,6 @@ LUALIB_API void luaL_unref (lua_State *L, int t, int ref) {
 }
 
 
-LUALIB_API void luaL_weakregistry (lua_State *L) {
-  static const char dummy = '\0';  /* index for a weak table in registry */
-  lua_pushudataval(L, (void *)&dummy);  /* push index */
-  lua_rawget(L, LUA_REGISTRYINDEX);  /* get value */
-  if (!lua_isnil(L, -1)) return;  /* weak table already created? */
-  /* else must create a weak table */
-  lua_pop(L, 1);  /* remove previous nil */
-  lua_newtable(L);  /* new table `w' */
-  lua_pushvalue(L, -1);
-  lua_setmetatable(L, -2);  /* setmetatable(w, w) */
-  lua_pushliteral(L, "__mode");
-  lua_pushliteral(L, "kv");
-  lua_rawset(L, -3);  /* metatable(w).__mode = "kv" */
-  lua_pushudataval(L, (void *)&dummy);  /* push index */
-  lua_pushvalue(L, -2);  /* push value */
-  lua_rawset(L, LUA_REGISTRYINDEX);  /* store new weak table into registry */
-}
-
 
 /*
 ** {======================================================
diff --git a/lauxlib.h b/lauxlib.h
index 438e6c20..e61e509a 100644
--- a/lauxlib.h
+++ b/lauxlib.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.h,v 1.49 2002/06/18 15:19:27 roberto Exp roberto $
+** $Id: lauxlib.h,v 1.50 2002/06/25 19:15:21 roberto Exp roberto $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */
@@ -49,8 +49,6 @@ LUALIB_API int luaL_error (lua_State *L, const char *fmt, ...);
 LUALIB_API int luaL_findstring (const char *name, 
                                 const char *const list[]);
 
-LUALIB_API void luaL_weakregistry (lua_State *L);
-
 LUALIB_API int luaL_ref (lua_State *L, int t);
 LUALIB_API void luaL_unref (lua_State *L, int t, int ref);
 
diff --git a/lbaselib.c b/lbaselib.c
index 48544e2b..b166c59c 100644
--- a/lbaselib.c
+++ b/lbaselib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lbaselib.c,v 1.87 2002/06/26 19:28:44 roberto Exp roberto $
+** $Id: lbaselib.c,v 1.88 2002/06/26 20:36:17 roberto Exp roberto $
 ** Basic library
 ** See Copyright Notice in lua.h
 */
@@ -323,27 +323,27 @@ static int luaB_tostring (lua_State *L) {
 
 
 static int luaB_newproxy (lua_State *L) {
-  static const char dummy = '\0';
   lua_settop(L, 1);
-  luaL_weakregistry(L);  /* get weak registry */
   lua_newuserdata(L, 0);  /* create proxy */
   if (lua_toboolean(L, 1) == 0)
     return 1;  /* no metatable */
   else if (lua_isboolean(L, 1)) {
     lua_newtable(L);  /* create a new metatable `m' ... */
     lua_pushvalue(L, -1);  /* ... and mark `m' as a valid metatable */
-    lua_pushudataval(L, (void *)&dummy);
-    lua_rawset(L, 2);  /* weakregistry[m] = &dummy */
+    lua_pushboolean(L, 1);
+    lua_rawset(L, lua_upvalueindex(1));  /* weaktable[m] = true */
   }
   else {
-    if (lua_getmetatable(L, 1))  /* check whether registry[m] == &dummy */
-      lua_rawget(L, 2);
-    luaL_arg_check(L, (char *)lua_touserdata(L, -1) == &dummy, 1,
-                      "boolean/proxy expected");
-    lua_getmetatable(L, 1);  /* metatable is valid */
+    int validproxy = 0;  /* to check if weaktable[metatable(u)] == true */
+    if (lua_getmetatable(L, 1)) {
+      lua_rawget(L, lua_upvalueindex(1));
+      validproxy = lua_toboolean(L, -1);
+      lua_pop(L, 1);  /* remove value */
+    }
+    luaL_arg_check(L, validproxy, 1, "boolean/proxy expected");
+    lua_getmetatable(L, 1);  /* metatable is valid; get it */
   }
-  lua_setmetatable(L, 3);
-  lua_pushvalue(L, 3);
+  lua_setmetatable(L, 2);
   return 1;
 }
 
@@ -461,7 +461,6 @@ static const luaL_reg base_funcs[] = {
   {"tostring", luaB_tostring},
   {"type", luaB_type},
   {"assert", luaB_assert},
-  {"newproxy", luaB_newproxy},
   {"unpack", luaB_unpack},
   {"rawequal", luaB_rawequal},
   {"rawget", luaB_rawget},
@@ -569,6 +568,16 @@ static void base_open (lua_State *L) {
   lua_pushliteral(L, "_VERSION");
   lua_pushliteral(L, LUA_VERSION);
   lua_rawset(L, -3);  /* set global _VERSION */
+  /* `newproxy' needs a weaktable as upvalue */
+  lua_pushliteral(L, "newproxy");
+  lua_newtable(L);  /* new table `w' */
+  lua_newtable(L);  /* create `w's metatable */
+  lua_pushliteral(L, "__mode");
+  lua_pushliteral(L, "k");
+  lua_rawset(L, -3);  /* metatable(w).__mode = "k" */
+  lua_setmetatable(L, -2);
+  lua_pushcclosure(L, luaB_newproxy, 1);
+  lua_rawset(L, -3);  /* set global `newproxy' */
   lua_rawset(L, -1);  /* set global _G */
 }