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

using `require' to implement `-l'

This commit is contained in:
Roberto Ierusalimschy 2005-03-29 13:47:48 -03:00
parent e6e543a534
commit 092dc95b06
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lua.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.137 2005/03/22 16:55:35 roberto Exp roberto $ ** $Id: lua.c,v 1.138 2005/03/23 17:50:49 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -46,8 +46,9 @@ static void print_usage (void) {
" - execute stdin as a file\n" " - execute stdin as a file\n"
" -e stat execute string `stat'\n" " -e stat execute string `stat'\n"
" -i enter interactive mode after executing `script'\n" " -i enter interactive mode after executing `script'\n"
" -l name load and run library `name'\n" " -l name require library `name'\n"
" -v show version information\n" " -v show version information\n"
" -w control access to undefined globals\n"
" -- stop handling options\n" , " -- stop handling options\n" ,
progname); progname);
} }
@ -130,14 +131,9 @@ 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) {
luaL_getfield(L, LUA_GLOBALSINDEX, "package.path"); lua_getglobal(L, "require");
if (!lua_isstring(L, -1)) { lua_pushstring(L, name);
l_message(progname, "`package.path' must be a string"); return report(L, lua_pcall(L, 1, 0, 0));
return 1;
}
name = luaL_searchpath(L, name, lua_tostring(L, -1));
if (name == NULL) return report(L, 1);
else return dofile(L, name);
} }