summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/lua/linit.c
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-06-06 10:11:31 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-06-06 10:11:31 +0000
commit991212c069ea15fbdd5e3330f681aa60148fd7b0 (patch)
treeb4600fee55b25a9e3f51d26a277681bd4915da3b /src/lib/lua/linit.c
parent08dc361f462ee7e58ece9f6b43a577a1dea02e46 (diff)
-Created machine_manager as singleton class that contains (for now) one running machine [Miodrag Milanovic]
-Updated LUA engine to run in machine_manager instead of being initialized per machine -Added "-console" option so emulator can be started with LUA enabled console -Update LUA to version 5.2.3 -Enabled SQLite3 to be compiled and added LUA module for it
Diffstat (limited to 'src/lib/lua/linit.c')
-rw-r--r--src/lib/lua/linit.c53
1 files changed, 27 insertions, 26 deletions
diff --git a/src/lib/lua/linit.c b/src/lib/lua/linit.c
index cf9bbd1e403..c1a38304711 100644
--- a/src/lib/lua/linit.c
+++ b/src/lib/lua/linit.c
@@ -1,5 +1,5 @@
/*
-** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $
+** $Id: linit.c,v 1.32.1.1 2013/04/12 18:48:47 roberto Exp $
** Initialization of libraries for lua.c and other clients
** See Copyright Notice in lua.h
*/
@@ -27,17 +27,17 @@
** program
*/
static const luaL_Reg loadedlibs[] = {
- {"_G", luaopen_base},
- {LUA_LOADLIBNAME, luaopen_package},
- {LUA_COLIBNAME, luaopen_coroutine},
- {LUA_TABLIBNAME, luaopen_table},
- {LUA_IOLIBNAME, luaopen_io},
- {LUA_OSLIBNAME, luaopen_os},
- {LUA_STRLIBNAME, luaopen_string},
- {LUA_BITLIBNAME, luaopen_bit32},
- {LUA_MATHLIBNAME, luaopen_math},
- {LUA_DBLIBNAME, luaopen_debug},
- {NULL, NULL}
+ {"_G", luaopen_base},
+ {LUA_LOADLIBNAME, luaopen_package},
+ {LUA_COLIBNAME, luaopen_coroutine},
+ {LUA_TABLIBNAME, luaopen_table},
+ {LUA_IOLIBNAME, luaopen_io},
+ {LUA_OSLIBNAME, luaopen_os},
+ {LUA_STRLIBNAME, luaopen_string},
+ {LUA_BITLIBNAME, luaopen_bit32},
+ {LUA_MATHLIBNAME, luaopen_math},
+ {LUA_DBLIBNAME, luaopen_debug},
+ {NULL, NULL}
};
@@ -45,22 +45,23 @@ static const luaL_Reg loadedlibs[] = {
** these libs are preloaded and must be required before used
*/
static const luaL_Reg preloadedlibs[] = {
- {NULL, NULL}
+ {NULL, NULL}
};
LUALIB_API void luaL_openlibs (lua_State *L) {
- const luaL_Reg *lib;
- /* call open functions from 'loadedlibs' and set results to global table */
- for (lib = loadedlibs; lib->func; lib++) {
- luaL_requiref(L, lib->name, lib->func, 1);
- lua_pop(L, 1); /* remove lib */
- }
- /* add open functions from 'preloadedlibs' into 'package.preload' table */
- luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
- for (lib = preloadedlibs; lib->func; lib++) {
- lua_pushcfunction(L, lib->func);
- lua_setfield(L, -2, lib->name);
- }
- lua_pop(L, 1); /* remove _PRELOAD table */
+ const luaL_Reg *lib;
+ /* call open functions from 'loadedlibs' and set results to global table */
+ for (lib = loadedlibs; lib->func; lib++) {
+ luaL_requiref(L, lib->name, lib->func, 1);
+ lua_pop(L, 1); /* remove lib */
+ }
+ /* add open functions from 'preloadedlibs' into 'package.preload' table */
+ luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+ for (lib = preloadedlibs; lib->func; lib++) {
+ lua_pushcfunction(L, lib->func);
+ lua_setfield(L, -2, lib->name);
+ }
+ lua_pop(L, 1); /* remove _PRELOAD table */
}
+