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

"-"-trick in C packages now accept name-v13...

This commit is contained in:
Roberto Ierusalimschy 2010-01-11 14:10:47 -02:00
parent 55d3138397
commit a541ada194
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
loadlib.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: loadlib.c,v 1.72 2010/01/04 16:36:39 roberto Exp roberto $ ** $Id: loadlib.c,v 1.73 2010/01/06 14:35:17 roberto Exp roberto $
** Dynamic library loader for Lua ** Dynamic library loader for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
** **
@ -449,13 +449,20 @@ static int loader_Lua (lua_State *L) {
} }
static int loadfunc(lua_State *L, const char *filename, const char *modname) { static int loadfunc (lua_State *L, const char *filename, const char *modname) {
const char *funcname; const char *funcname;
const char *mark = strchr(modname, *LUA_IGMARK); const char *mark;
if (mark) modname = mark + 1; modname = luaL_gsub(L, modname, ".", LUA_OFSEP);
funcname = luaL_gsub(L, modname, ".", LUA_OFSEP); mark = strchr(modname, *LUA_IGMARK);
funcname = lua_pushfstring(L, POF"%s", funcname); if (mark) {
lua_remove(L, -2); /* remove 'gsub' result */ int stat;
funcname = lua_pushlstring(L, modname, mark - modname);
funcname = lua_pushfstring(L, POF"%s", funcname);
stat = ll_loadfunc(L, filename, funcname);
if (stat != ERRFUNC) return stat;
modname = mark + 1; /* else go ahead and try old-style name */
}
funcname = lua_pushfstring(L, POF"%s", modname);
return ll_loadfunc(L, filename, funcname); return ll_loadfunc(L, filename, funcname);
} }