diff -r a8c6460d612b -r 63f06a23c235 lm_types.c --- a/lm_types.c Sun Mar 08 00:48:19 2009 +0200 +++ b/lm_types.c Sat Mar 14 02:41:26 2009 +0200 @@ -14,15 +14,15 @@ luaL_free (cb->L, cb); } -#define LLM_CHECK(WHAT, TYPE) \ +#define LLM_CHECK(WHAT, LWHAT, TYPE) \ llm_##WHAT##_t *luaL_checklm_##WHAT (lua_State *L, int index) \ { \ - llm_##WHAT##_t *object = luaL_checkudata (L, index, "loudmouth." #WHAT); \ + llm_##WHAT##_t *object = luaL_checkudata (L, index, "loudmouth." #LWHAT); \ luaL_argcheck (L, object != NULL, index, "loudmouth " #WHAT " expected"); \ return object; \ } -#define LLM_BLESS(WHAT, LWHAT, TYPE) \ +#define LLM_BLESS(WHAT, LWHAT, TYPE) \ llm_##WHAT##_t *bless_lm_##WHAT (lua_State *L, TYPE *WHAT) \ { \ llm_##WHAT##_t *object; /* top of stack */ \ @@ -33,26 +33,26 @@ if (!lua_isnil (L, -1)) { /* 2 object */ \ lua_remove (L, -2); /* 1 object */ \ object = lua_touserdata (L, -1); \ - D ("Existing " #LWHAT " object %X requested", (int) object); \ + D ("Existing " #LWHAT " object %X requested", (int) object); \ return object; \ } \ /* 2 nil */ \ lua_remove (L, -1); /* 1 registry table */ \ object = lua_newuserdata (L, sizeof (llm_##WHAT##_t)); /* 2 userdata */ \ - luaL_getmetatable (L, "loudmouth." #LWHAT); /* 3 metatable */ \ + luaL_getmetatable (L, "loudmouth." #LWHAT); /* 3 metatable */ \ lua_setmetatable (L, -2); /* 2 object */ \ lua_pushlightuserdata (L, WHAT); /* 3 light userdata */ \ lua_pushvalue (L, -2); /* 4 object */ \ lua_rawset (L, -4); /* 2 object */ \ lua_remove (L, -2); /* 1 object */ \ object->WHAT = WHAT; \ - lm_##LWHAT##_ref (WHAT); \ - D ("New " #LWHAT " object %X blessed", (int) object); \ + lm_##LWHAT##_ref (WHAT); \ + D ("New " #LWHAT " object %X blessed", (int) object); \ return object; \ } #define LLM_DEFINE(WHAT, LWHAT, TYPE) \ -LLM_CHECK (WHAT, TYPE) \ +LLM_CHECK (WHAT, LWHAT, TYPE) \ LLM_BLESS (WHAT, LWHAT, TYPE) LLM_DEFINE (connection, connection, LmConnection)