1 files changed, 7 insertions, 31 deletions

diff --git a/src/auxiliar.c b/src/auxiliar.c
index fe21d08..b1f9203 100644
--- a/src/auxiliar.c
+++ b/src/auxiliar.c
@@ -14,27 +14,6 @@
 * Exported functions
 \*=========================================================================*/
 /*-------------------------------------------------------------------------*\
-* Prints the value of a class in a nice way
-\*-------------------------------------------------------------------------*/
-int aux_meth_tostring(lua_State *L)
-{
-    char buf[32];
-    if (!lua_getmetatable(L, 1)) goto error;
-    lua_pushstring(L, "__index");
-    lua_gettable(L, -2);
-    if (!lua_istable(L, -1)) goto error;
-    lua_pushstring(L, "class");
-    lua_gettable(L, -2);
-    if (!lua_isstring(L, -1)) goto error;
-    sprintf(buf, "%p", lua_touserdata(L, 1));
-    lua_pushfstring(L, "socket: %s: %s", lua_tostring(L, -1), buf);
-    return 1;
-error:
-    lua_pushnil(L);
-    return 1;
-}
-
-/*-------------------------------------------------------------------------*\
 * Initializes the module
 \*-------------------------------------------------------------------------*/
 int aux_open(lua_State *L)
@@ -48,23 +27,20 @@ int aux_open(lua_State *L)
 void aux_newclass(lua_State *L, const char *classname, luaL_reg *func)
 {
     luaL_newmetatable(L, classname); /* mt */
-    /* set __tostring metamethod */
-    lua_pushstring(L, "__tostring"); 
-    lua_pushcfunction(L, aux_meth_tostring);
-    lua_rawset(L, -3);      
     /* create __index table to place methods */
     lua_pushstring(L, "__index");    /* mt,"__index" */
     lua_newtable(L);                 /* mt,"__index",it */ 
-    luaL_openlib(L, NULL, func, 0);
     /* put class name into class metatable */
     lua_pushstring(L, "class");      /* mt,"__index",it,"class" */
     lua_pushstring(L, classname);    /* mt,"__index",it,"class",classname */
     lua_rawset(L, -3);               /* mt,"__index",it */
-    /* get __gc method from class and use it for garbage collection */
-    lua_pushstring(L, "__gc");       /* mt,"__index",it,"__gc" */
-    lua_pushstring(L, "__gc");       /* mt,"__index",it,"__gc","__gc" */
-    lua_rawget(L, -3);               /* mt,"__index",it,"__gc",fn */
-    lua_rawset(L, -5);               /* mt,"__index",it */
+    /* pass all methods that start with _ to the metatable, and all others
+     * to the index table */
+    for (; func->name; func++) {     /* mt,"__index",it */
+        lua_pushstring(L, func->name);
+        lua_pushcfunction(L, func->func);
+        lua_rawset(L, func->name[0] == '_' ? -5: -3);
+    }
     lua_rawset(L, -3);               /* mt */
     lua_pop(L, 1);
 }