From 2c8945d3e734bb42faa60ef0b97a6115a2b099f7 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 2 Feb 2011 02:38:59 +0100
Subject: [PATCH] Use names defined in lualib.h for library registration.

---
 src/lib_base.c   | 4 ++--
 src/lib_bit.c    | 2 +-
 src/lib_debug.c  | 2 +-
 src/lib_ffi.c    | 6 +++---
 src/lib_io.c     | 4 ++--
 src/lib_jit.c    | 6 +++---
 src/lib_math.c   | 2 +-
 src/lib_os.c     | 2 +-
 src/lib_string.c | 2 +-
 src/lib_table.c  | 2 +-
 src/lj_lib.h     | 4 +---
 11 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/lib_base.c b/src/lib_base.c
index 47530f93..1a9a6df2 100644
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -614,8 +614,8 @@ LUALIB_API int luaopen_base(lua_State *L)
   settabV(L, lj_tab_setstr(L, env, lj_str_newlit(L, "_G")), env);
   lua_pushliteral(L, LUA_VERSION);  /* top-3. */
   newproxy_weaktable(L);  /* top-2. */
-  LJ_LIB_REG_(L, "_G", base);
-  LJ_LIB_REG(L, coroutine);
+  LJ_LIB_REG(L, "_G", base);
+  LJ_LIB_REG(L, LUA_COLIBNAME, coroutine);
   return 2;
 }
 
diff --git a/src/lib_bit.c b/src/lib_bit.c
index 77fd9f9a..c200404b 100644
--- a/src/lib_bit.c
+++ b/src/lib_bit.c
@@ -68,7 +68,7 @@ LJLIB_CF(bit_tohex)
 
 LUALIB_API int luaopen_bit(lua_State *L)
 {
-  LJ_LIB_REG(L, bit);
+  LJ_LIB_REG(L, LUA_BITLIBNAME, bit);
   return 1;
 }
 
diff --git a/src/lib_debug.c b/src/lib_debug.c
index 95420222..3f1cb8c6 100644
--- a/src/lib_debug.c
+++ b/src/lib_debug.c
@@ -360,7 +360,7 @@ LJLIB_CF(debug_traceback)
 
 LUALIB_API int luaopen_debug(lua_State *L)
 {
-  LJ_LIB_REG(L, debug);
+  LJ_LIB_REG(L, LUA_DBLIBNAME, debug);
   return 1;
 }
 
diff --git a/src/lib_ffi.c b/src/lib_ffi.c
index ef5de029..85a4e9c1 100644
--- a/src/lib_ffi.c
+++ b/src/lib_ffi.c
@@ -524,14 +524,14 @@ LJLIB_PUSH(top-2) LJLIB_SET(arch)
 LUALIB_API int luaopen_ffi(lua_State *L)
 {
   lj_ctype_init(L);
-  LJ_LIB_REG_(L, NULL, ffi_meta);
+  LJ_LIB_REG(L, NULL, ffi_meta);
   /* NOBARRIER: basemt is a GC root. */
   setgcref(basemt_it(G(L), LJ_TCDATA), obj2gco(tabV(L->top-1)));
-  LJ_LIB_REG_(L, NULL, ffi_clib);
+  LJ_LIB_REG(L, NULL, ffi_clib);
   lj_clib_default(L, tabV(L->top-1));  /* Create ffi.C default namespace. */
   lua_pushliteral(L, LJ_OS_NAME);
   lua_pushliteral(L, LJ_ARCH_NAME);
-  LJ_LIB_REG_(L, NULL, ffi);  /* Note: no global "ffi" created! */
+  LJ_LIB_REG(L, NULL, ffi);  /* Note: no global "ffi" created! */
   return 1;
 }
 
diff --git a/src/lib_io.c b/src/lib_io.c
index 19528bb1..307d005c 100644
--- a/src/lib_io.c
+++ b/src/lib_io.c
@@ -504,10 +504,10 @@ static GCobj *io_std_new(lua_State *L, FILE *fp, const char *name)
 LUALIB_API int luaopen_io(lua_State *L)
 {
   lj_lib_pushcf(L, lj_cf_io_lines_iter, FF_io_lines_iter);
-  LJ_LIB_REG_(L, NULL, io_method);
+  LJ_LIB_REG(L, NULL, io_method);
   copyTV(L, L->top, L->top-1); L->top++;
   lua_setfield(L, LUA_REGISTRYINDEX, LUA_FILEHANDLE);
-  LJ_LIB_REG(L, io);
+  LJ_LIB_REG(L, LUA_IOLIBNAME, io);
   setgcref(G(L)->gcroot[GCROOT_IO_INPUT], io_std_new(L, stdin, "stdin"));
   setgcref(G(L)->gcroot[GCROOT_IO_OUTPUT], io_std_new(L, stdout, "stdout"));
   io_std_new(L, stderr, "stderr");
diff --git a/src/lib_jit.c b/src/lib_jit.c
index f99418cc..66a00523 100644
--- a/src/lib_jit.c
+++ b/src/lib_jit.c
@@ -592,11 +592,11 @@ LUALIB_API int luaopen_jit(lua_State *L)
   lua_pushliteral(L, LJ_ARCH_NAME);
   lua_pushinteger(L, LUAJIT_VERSION_NUM);
   lua_pushliteral(L, LUAJIT_VERSION);
-  LJ_LIB_REG(L, jit);
+  LJ_LIB_REG(L, LUA_JITLIBNAME, jit);
 #ifndef LUAJIT_DISABLE_JITUTIL
-  LJ_LIB_REG_(L, "jit.util", jit_util);
+  LJ_LIB_REG(L, "jit.util", jit_util);
 #endif
-  LJ_LIB_REG_(L, "jit.opt", jit_opt);
+  LJ_LIB_REG(L, "jit.opt", jit_opt);
   L->top -= 2;
   jit_init(L);
   return 1;
diff --git a/src/lib_math.c b/src/lib_math.c
index 3573fe47..79d91e73 100644
--- a/src/lib_math.c
+++ b/src/lib_math.c
@@ -167,7 +167,7 @@ LUALIB_API int luaopen_math(lua_State *L)
   RandomState *rs;
   rs = (RandomState *)lua_newuserdata(L, sizeof(RandomState));
   rs->valid = 0;  /* Use lazy initialization to save some time on startup. */
-  LJ_LIB_REG(L, math);
+  LJ_LIB_REG(L, LUA_MATHLIBNAME, math);
 #if defined(LUA_COMPAT_MOD)
   lua_getfield(L, -1, "fmod");
   lua_setfield(L, -2, "mod");
diff --git a/src/lib_os.c b/src/lib_os.c
index 81c96e15..72929408 100644
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -250,7 +250,7 @@ LJLIB_CF(os_setlocale)
 
 LUALIB_API int luaopen_os(lua_State *L)
 {
-  LJ_LIB_REG(L, os);
+  LJ_LIB_REG(L, LUA_OSLIBNAME, os);
   return 1;
 }
 
diff --git a/src/lib_string.c b/src/lib_string.c
index 27eae557..0b1c98a9 100644
--- a/src/lib_string.c
+++ b/src/lib_string.c
@@ -791,7 +791,7 @@ LUALIB_API int luaopen_string(lua_State *L)
 {
   GCtab *mt;
   global_State *g;
-  LJ_LIB_REG(L, string);
+  LJ_LIB_REG(L, LUA_STRLIBNAME, string);
 #if defined(LUA_COMPAT_GFIND)
   lua_getfield(L, -1, "gmatch");
   lua_setfield(L, -2, "gfind");
diff --git a/src/lib_table.c b/src/lib_table.c
index 66947a45..8ae54167 100644
--- a/src/lib_table.c
+++ b/src/lib_table.c
@@ -270,7 +270,7 @@ LJLIB_CF(table_sort)
 
 LUALIB_API int luaopen_table(lua_State *L)
 {
-  LJ_LIB_REG(L, table);
+  LJ_LIB_REG(L, LUA_TABLIBNAME, table);
   return 1;
 }
 
diff --git a/src/lj_lib.h b/src/lj_lib.h
index ef73218e..b9bd4c2d 100644
--- a/src/lj_lib.h
+++ b/src/lj_lib.h
@@ -81,9 +81,7 @@ static LJ_AINLINE void lj_lib_pushcc(lua_State *L, lua_CFunction f,
 #define LJLIB_NOREGUV
 #define LJLIB_NOREG
 
-#define LJ_LIB_REG(L, name) \
-  lj_lib_register(L, #name, lj_lib_init_##name, lj_lib_cf_##name)
-#define LJ_LIB_REG_(L, regname, name) \
+#define LJ_LIB_REG(L, regname, name) \
   lj_lib_register(L, regname, lj_lib_init_##name, lj_lib_cf_##name)
 
 LJ_FUNC void lj_lib_register(lua_State *L, const char *libname,