rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better definitions for lua_[gs]etglobal + less uses of ENVIRONINDEX

This commit is contained in:
Roberto Ierusalimschy 2010-03-13 00:57:46 -03:00
parent 25c557ec63
commit 489253d753
4 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lbaselib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.235 2009/12/28 16:30:31 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.236 2010/03/12 19:14:06 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -23,7 +23,7 @@
static int luaB_print (lua_State *L) { static int luaB_print (lua_State *L) {
int n = lua_gettop(L); /* number of arguments */ int n = lua_gettop(L); /* number of arguments */
int i; int i;
lua_getfield(L, LUA_ENVIRONINDEX, "tostring"); lua_getglobal(L, "tostring");
for (i=1; i<=n; i++) { for (i=1; i<=n; i++) {
const char *s; const char *s;
size_t l; size_t l;
@ -679,11 +679,12 @@ static void auxopen (lua_State *L, const char *name,
static void base_open (lua_State *L) { static void base_open (lua_State *L) {
/* set global _G */ /* set global _G */
lua_pushglobaltable(L); lua_pushglobaltable(L);
lua_setfield(L, LUA_ENVIRONINDEX, "_G"); lua_pushglobaltable(L);
lua_setfield(L, -2, "_G");
/* open lib into global table */ /* open lib into global table */
luaL_register(L, "_G", base_funcs); luaL_register(L, "_G", base_funcs);
lua_pushliteral(L, LUA_VERSION); lua_pushliteral(L, LUA_VERSION);
lua_setfield(L, LUA_ENVIRONINDEX, "_VERSION"); /* set global _VERSION */ lua_setfield(L, -2, "_VERSION"); /* set global _VERSION */
/* `ipairs' and `pairs' need auxiliary functions as upvalues */ /* `ipairs' and `pairs' need auxiliary functions as upvalues */
auxopen(L, "ipairs", luaB_ipairs, ipairsaux); auxopen(L, "ipairs", luaB_ipairs, ipairsaux);
auxopen(L, "pairs", luaB_pairs, luaB_next); auxopen(L, "pairs", luaB_pairs, luaB_next);
@ -694,7 +695,7 @@ static void base_open (lua_State *L) {
lua_pushliteral(L, "kv"); lua_pushliteral(L, "kv");
lua_setfield(L, -2, "__mode"); /* metatable(w).__mode = "kv" */ lua_setfield(L, -2, "__mode"); /* metatable(w).__mode = "kv" */
lua_pushcclosure(L, luaB_newproxy, 1); lua_pushcclosure(L, luaB_newproxy, 1);
lua_setfield(L, LUA_ENVIRONINDEX, "newproxy"); /* set global `newproxy' */ lua_setfield(L, -2, "newproxy"); /* set global `newproxy' */
} }

20
ltablib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: ltablib.c,v 1.53 2009/12/28 16:30:31 roberto Exp roberto $ ** $Id: ltablib.c,v 1.54 2010/01/13 19:59:10 roberto Exp roberto $
** Library for Table Manipulation ** Library for Table Manipulation
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -171,15 +171,15 @@ static int tconcat (lua_State *L) {
static int pack (lua_State *L) { static int pack (lua_State *L) {
int top = lua_gettop(L); int top = lua_gettop(L);
lua_createtable(L, top, 1); /* create result table */ lua_createtable(L, top, 1); /* create result table */
/* use function environment as a temporary place to keep new table */
lua_replace(L, LUA_ENVIRONINDEX);
lua_pushinteger(L, top); /* number of elements */ lua_pushinteger(L, top); /* number of elements */
lua_setfield(L, LUA_ENVIRONINDEX, "n"); /* t.n = number of elements */ lua_setfield(L, -2, "n"); /* t.n = number of elements */
for (; top >= 1; top--) /* assign elements */ if (top > 0) { /* at least one element? */
lua_rawseti(L, LUA_ENVIRONINDEX, top); lua_pushvalue(L, 1);
lua_pushvalue(L, LUA_ENVIRONINDEX); /* return new table */ lua_rawseti(L, -2, 1); /* insert first element */
/* remove new table from environment to allow its later collection */ lua_replace(L, 1); /* move table into its position (index 1) */
lua_copy(L, LUA_REGISTRYINDEX, LUA_ENVIRONINDEX); for (; top >= 2; top--) /* assign other elements */
lua_rawseti(L, 1, top);
}
return 1; return 1;
} }
@ -328,7 +328,7 @@ LUAMOD_API int luaopen_table (lua_State *L) {
#if defined(LUA_COMPAT_UNPACK) #if defined(LUA_COMPAT_UNPACK)
/* _G.unpack = table.unpack */ /* _G.unpack = table.unpack */
lua_getfield(L, -1, "unpack"); lua_getfield(L, -1, "unpack");
lua_setfield(L, LUA_ENVIRONINDEX, "unpack"); lua_setglobal(L, "unpack");
#endif #endif
return 1; return 1;
} }

10
lua.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.187 2010/02/18 19:18:41 roberto Exp roberto $ ** $Id: lua.c,v 1.188 2010/02/27 21:15:36 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -219,7 +219,7 @@ static int dostring (lua_State *L, const char *s, const char *name) {
static int dolibrary (lua_State *L, const char *name) { static int dolibrary (lua_State *L, const char *name) {
lua_getfield(L, LUA_ENVIRONINDEX, "require"); lua_getglobal(L, "require");
lua_pushstring(L, name); lua_pushstring(L, name);
return report(L, docall(L, 1, 1)); return report(L, docall(L, 1, 1));
} }
@ -227,7 +227,7 @@ static int dolibrary (lua_State *L, const char *name) {
static const char *get_prompt (lua_State *L, int firstline) { static const char *get_prompt (lua_State *L, int firstline) {
const char *p; const char *p;
lua_getfield(L, LUA_ENVIRONINDEX, firstline ? "_PROMPT" : "_PROMPT2"); lua_getglobal(L, firstline ? "_PROMPT" : "_PROMPT2");
p = lua_tostring(L, -1); p = lua_tostring(L, -1);
if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2); if (p == NULL) p = (firstline ? LUA_PROMPT : LUA_PROMPT2);
lua_pop(L, 1); /* remove global */ lua_pop(L, 1); /* remove global */
@ -301,7 +301,7 @@ static void dotty (lua_State *L) {
report(L, status); report(L, status);
if (status == LUA_OK && lua_gettop(L) > 0) { /* any result to print? */ if (status == LUA_OK && lua_gettop(L) > 0) { /* any result to print? */
luaL_checkstack(L, LUA_MINSTACK, "too many results to print"); luaL_checkstack(L, LUA_MINSTACK, "too many results to print");
lua_getfield(L, LUA_ENVIRONINDEX, "print"); lua_getglobal(L, "print");
lua_insert(L, 1); lua_insert(L, 1);
if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK) if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != LUA_OK)
l_message(progname, lua_pushfstring(L, l_message(progname, lua_pushfstring(L,
@ -319,7 +319,7 @@ static int handle_script (lua_State *L, char **argv, int n) {
int status; int status;
const char *fname; const char *fname;
int narg = getargs(L, argv, n); /* collect arguments */ int narg = getargs(L, argv, n); /* collect arguments */
lua_setfield(L, LUA_ENVIRONINDEX, "arg"); lua_setglobal(L, "arg");
fname = argv[n]; fname = argv[n];
if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0) if (strcmp(fname, "-") == 0 && strcmp(argv[n-1], "--") != 0)
fname = NULL; /* stdin */ fname = NULL; /* stdin */

10
lua.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.h,v 1.260 2010/01/06 15:08:00 roberto Exp roberto $ ** $Id: lua.h,v 1.261 2010/01/11 17:15:11 roberto Exp roberto $
** Lua - A Scripting Language ** Lua - A Scripting Language
** Lua.org, PUC-Rio, Brazil (http://www.lua.org) ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
** See Copyright Notice at the end of this file ** See Copyright Notice at the end of this file
@ -297,8 +297,12 @@ LUA_API void (lua_setallocf) (lua_State *L, lua_Alloc f, void *ud);
#define lua_newtable(L) lua_createtable(L, 0, 0) #define lua_newtable(L) lua_createtable(L, 0, 0)
#define lua_setglobal(L,s) lua_setfield(L, LUA_ENVIRONINDEX, (s)) #define lua_setglobal(L,s) \
#define lua_getglobal(L,s) lua_getfield(L, LUA_ENVIRONINDEX, (s)) (lua_pushglobaltable(L), lua_pushvalue(L, -2), \
lua_setfield(L, -2, (s)), lua_pop(L, 2))
#define lua_getglobal(L,s) \
(lua_pushglobaltable(L), lua_getfield(L, -1, (s)), lua_remove(L, -2))
#define lua_register(L,n,f) \ #define lua_register(L,n,f) \
(lua_pushcfunction(L, (f)), lua_setfield(L, LUA_ENVIRONINDEX, (n))) (lua_pushcfunction(L, (f)), lua_setfield(L, LUA_ENVIRONINDEX, (n)))