[src/trunk]: src/sys/modules/luacore using Lua auxlib in luacore module

[lneto <lneto%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9ebec27651f2
branches:  trunk
changeset: 325054:9ebec27651f2
user:      lneto <lneto%NetBSD.org@localhost>
date:      Mon Dec 02 05:06:32 2013 +0000

description:
using Lua auxlib in luacore module

diffstat:

 sys/modules/luacore/luacore.c |  55 +++++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 32 deletions(-)

diffs (90 lines):

diff -r 0511561e0fe5 -r 9ebec27651f2 sys/modules/luacore/luacore.c
--- a/sys/modules/luacore/luacore.c     Mon Dec 02 04:57:41 2013 +0000
+++ b/sys/modules/luacore/luacore.c     Mon Dec 02 05:06:32 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: luacore.c,v 1.4 2013/10/23 18:57:40 mbalmer Exp $ */
+/*     $NetBSD: luacore.c,v 1.5 2013/12/02 05:06:32 lneto Exp $ */
 
 /*
  * Copyright (c) 2011, 2013 Marc Balmer <mbalmer%NetBSD.org@localhost>.
@@ -39,6 +39,7 @@
 #include <sys/systm.h>
 
 #include <lua.h>
+#include <lauxlib.h>
 
 #ifdef _MODULE
 MODULE(MODULE_CLASS_MISC, luacore, "lua");
@@ -156,43 +157,34 @@
 
 /* mutexes */
 
-struct core_reg {
-       const char *n;
-       int (*f)(lua_State *);
+static const luaL_Reg core_lib[ ] = {
+       { "print",                      print },
+       { "print_nolog",                print_nolog },
+       { "uprint",                     uprint },
+       { "aprint_normal",              core_aprint_normal },
+       { "aprint_naive",               core_aprint_naive },
+       { "aprint_verbose",             core_aprint_verbose },
+       { "aprint_debug",               core_aprint_debug },
+       { "aprint_error",               core_aprint_error },
+       { "aprint_get_error_count",     core_aprint_get_error_count },
+
+       /* panicing */
+       { "panic",                      core_panic },
+
+       /* callouts */
+
+       /* mutexes */
+
+       {NULL, NULL}
 };
 
+
 static int
 luaopen_core(void *ls)
 {
        lua_State *L = (lua_State *)ls;
-       int n, nfunc;
-       struct core_reg core[] = {
-               /* printing functions */
-               { "print",                      print },
-               { "print_nolog",                print_nolog },
-               { "uprint",                     uprint },
-               { "aprint_normal",              core_aprint_normal },
-               { "aprint_naive",               core_aprint_naive },
-               { "aprint_verbose",             core_aprint_verbose },
-               { "aprint_debug",               core_aprint_debug },
-               { "aprint_error",               core_aprint_error },
-               { "aprint_get_error_count",     core_aprint_get_error_count },
 
-               /* panicing */
-               { "panic",                      core_panic },
-
-               /* callouts */
-
-               /* mutexes */
-       };
-
-       nfunc = sizeof(core)/sizeof(core[1]);
-
-       lua_createtable(L, nfunc, 0);
-       for (n = 0; n < nfunc; n++) {
-               lua_pushcfunction(L, core[n].f);
-               lua_setfield(L, -2, core[n].n);
-       }
+       luaL_register(L, "core", core_lib);
 
        /* some string values */
        lua_pushstring(L, copyright);
@@ -216,7 +208,6 @@
        lua_pushinteger(L, ncpu);
        lua_setfield(L, -2, "ncpu");
 
-       lua_setglobal(L, "core");
        return 1;
 }