mirror of
https://github.com/lua/lua
synced 2025-01-19 15:49:17 +03:00
towards new package system
This commit is contained in:
Roberto Ierusalimschy
parent
cf2a194edc
commit
36541dec9b
49
lauxlib.c
49
lauxlib.c
@ -1,5 +1,5 @@
|
||||
/*
|
||||
** $Id: lauxlib.c,v 1.124 2004/09/03 13:17:14 roberto Exp roberto $
|
||||
** $Id: lauxlib.c,v 1.125 2004/09/21 16:54:32 roberto Exp roberto $
|
||||
** Auxiliary functions for building Lua libraries
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@ -239,16 +239,22 @@ LUALIB_API void luaL_openlib (lua_State *L, const char *libname,
|
||||
const luaL_reg *l, int nup) {
|
||||
if (libname) {
|
||||
/* check whether lib already exists */
|
||||
lua_getglobal(L, libname);
|
||||
if (lua_isnil(L, -1)) { /* no? */
|
||||
lua_pop(L, 1);
|
||||
luaL_getfield(L, LUA_GLOBALSINDEX, libname);
|
||||
if (lua_isnil(L, -1)) { /* not found? */
|
||||
lua_pop(L, 1); /* remove previous result */
|
||||
lua_newtable(L); /* create it */
|
||||
if (lua_getmetatable(L, LUA_GLOBALSINDEX))
|
||||
lua_setmetatable(L, -2); /* share metatable with global table */
|
||||
lua_pushvalue(L, -1);
|
||||
/* register it with given name */
|
||||
lua_setglobal(L, libname);
|
||||
lua_pushvalue(L, -1);
|
||||
luaL_setfield(L, LUA_GLOBALSINDEX, libname);
|
||||
}
|
||||
else if (!lua_istable(L, -1))
|
||||
luaL_error(L, "name conflict for library `%s'", libname);
|
||||
lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
|
||||
lua_pushvalue(L, -2);
|
||||
lua_setfield(L, -2, libname); /* _LOADED[modname] = new table */
|
||||
lua_pop(L, 1); /* remove _LOADED table */
|
||||
lua_insert(L, -(nup+1)); /* move library table to below upvalues */
|
||||
}
|
||||
for (; l->name; l++) {
|
||||
@ -381,37 +387,45 @@ LUALIB_API const char *luaL_searchpath (lua_State *L, const char *name,
|
||||
}
|
||||
fname = luaL_gsub(L, lua_tostring(L, -1), LUA_PATH_MARK, name);
|
||||
lua_remove(L, -2); /* remove path template */
|
||||
f = fopen(fname, "r"); /* try to read it */
|
||||
f = fopen(fname, "r"); /* try to open it */
|
||||
if (f) {
|
||||
int err;
|
||||
getc(f); /* try to read file */
|
||||
err = ferror(f);
|
||||
fclose(f);
|
||||
return fname;
|
||||
if (err == 0) /* open and read sucessful? */
|
||||
return fname; /* return that file name */
|
||||
}
|
||||
lua_pop(L, 1); /* remove file name */
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
LUALIB_API const char *luaL_getfield (lua_State *L, const char *fname) {
|
||||
LUALIB_API const char *luaL_getfield (lua_State *L, int idx,
|
||||
const char *fname) {
|
||||
const char *e;
|
||||
lua_pushvalue(L, idx);
|
||||
while ((e = strchr(fname, '.')) != NULL) {
|
||||
lua_pushlstring(L, fname, e - fname);
|
||||
lua_gettable(L, -2);
|
||||
lua_rawget(L, -2);
|
||||
lua_remove(L, -2); /* remove previous table */
|
||||
fname = e + 1;
|
||||
if (!lua_istable(L, -1)) return fname;
|
||||
}
|
||||
lua_getfield(L, -1, fname); /* get last field */
|
||||
lua_pushstring(L, fname);
|
||||
lua_rawget(L, -2); /* get last field */
|
||||
lua_remove(L, -2); /* remove previous table */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
LUALIB_API const char *luaL_setfield (lua_State *L, const char *fname) {
|
||||
LUALIB_API const char *luaL_setfield (lua_State *L, int idx,
|
||||
const char *fname) {
|
||||
const char *e;
|
||||
lua_insert(L, -2); /* move value to below table */
|
||||
lua_pushvalue(L, idx);
|
||||
while ((e = strchr(fname, '.')) != NULL) {
|
||||
lua_pushlstring(L, fname, e - fname);
|
||||
lua_gettable(L, -2);
|
||||
lua_rawget(L, -2);
|
||||
if (lua_isnil(L, -1)) { /* no such field? */
|
||||
lua_pop(L, 1); /* remove this nil */
|
||||
lua_newtable(L); /* create a new table for field */
|
||||
@ -426,9 +440,10 @@ LUALIB_API const char *luaL_setfield (lua_State *L, const char *fname) {
|
||||
return fname;
|
||||
}
|
||||
}
|
||||
lua_insert(L, -2); /* move table to below value */
|
||||
lua_setfield(L, -2, fname); /* set last field */
|
||||
lua_remove(L, -2); /* remove table */
|
||||
lua_pushstring(L, fname);
|
||||
lua_pushvalue(L, -3); /* move value to the top */
|
||||
lua_rawset(L, -3); /* set last field */
|
||||
lua_pop(L, 2); /* remove value and table */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
72
lbaselib.c
72
lbaselib.c
@ -1,5 +1,5 @@
|
||||
/*
|
||||
** $Id: lbaselib.c,v 1.157 2004/09/03 13:16:48 roberto Exp roberto $
|
||||
** $Id: lbaselib.c,v 1.158 2004/09/15 20:39:42 roberto Exp roberto $
|
||||
** Basic library
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
@ -463,24 +463,79 @@ static const char *getpath (lua_State *L) {
|
||||
static int luaB_require (lua_State *L) {
|
||||
const char *name = luaL_checkstring(L, 1);
|
||||
const char *fname;
|
||||
lua_getfield(L, lua_upvalueindex(1), name);
|
||||
lua_settop(L, 1);
|
||||
lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
|
||||
lua_getfield(L, 2, name);
|
||||
if (lua_toboolean(L, -1)) /* is it there? */
|
||||
return 1; /* package is already loaded; return its result */
|
||||
/* else must load it; first mark it as loaded */
|
||||
lua_pushboolean(L, 1);
|
||||
lua_setfield(L, lua_upvalueindex(1), name); /* _LOADED[name] = true */
|
||||
fname = luaL_searchpath(L, name, getpath(L));
|
||||
lua_setfield(L, 2, name); /* _LOADED[name] = true */
|
||||
fname = luaL_gsub(L, name, ".", LUA_DIRSEP);
|
||||
fname = luaL_searchpath(L, fname, getpath(L));
|
||||
if (fname == NULL || luaL_loadfile(L, fname) != 0)
|
||||
return luaL_error(L, "error loading package `%s' (%s)", name,
|
||||
lua_tostring(L, -1));
|
||||
lua_pushvalue(L, 1); /* pass name as argument to module */
|
||||
lua_call(L, 1, 1); /* run loaded module */
|
||||
if (!lua_isnil(L, -1)) /* nil return? */
|
||||
lua_setfield(L, lua_upvalueindex(1), name);
|
||||
lua_getfield(L, lua_upvalueindex(1), name); /* return _LOADED[name] */
|
||||
lua_setfield(L, 2, name);
|
||||
lua_getfield(L, 2, name); /* return _LOADED[name] */
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static void setfenv (lua_State *L) {
|
||||
lua_Debug ar;
|
||||
lua_getstack(L, 1, &ar);
|
||||
lua_getinfo(L, "f", &ar);
|
||||
lua_pushvalue(L, -2);
|
||||
lua_setfenv(L, -2);
|
||||
}
|
||||
|
||||
|
||||
static int luaB_module (lua_State *L) {
|
||||
const char *modname = luaL_checkstring(L, 1);
|
||||
const char *dot;
|
||||
lua_settop(L, 1);
|
||||
lua_getfield(L, LUA_REGISTRYINDEX, "_LOADED");
|
||||
/* try to find given table */
|
||||
luaL_getfield(L, LUA_GLOBALSINDEX, modname);
|
||||
if (lua_isnil(L, -1)) { /* not found? */
|
||||
lua_pop(L, 1); /* remove previous result */
|
||||
lua_newtable(L); /* create it */
|
||||
/* register it with given name */
|
||||
lua_pushvalue(L, -1);
|
||||
luaL_setfield(L, LUA_GLOBALSINDEX, modname);
|
||||
}
|
||||
else if (!lua_istable(L, -1))
|
||||
return luaL_error(L, "name conflict for module `%s'", modname);
|
||||
/* check whether table already has a _NAME field */
|
||||
lua_getfield(L, -1, "_NAME");
|
||||
if (!lua_isnil(L, -1)) /* is table an initialized module? */
|
||||
lua_pop(L, 1);
|
||||
else { /* no; initialize it */
|
||||
lua_pop(L, 1);
|
||||
lua_newtable(L); /* create new metatable */
|
||||
lua_pushvalue(L, LUA_GLOBALSINDEX);
|
||||
lua_setfield(L, -2, "__index"); /* mt.__index = _G */
|
||||
lua_setmetatable(L, -2);
|
||||
lua_pushstring(L, modname);
|
||||
lua_setfield(L, -2, "_NAME");
|
||||
dot = strrchr(modname, '.'); /* look for last dot in module name */
|
||||
if (dot == NULL) dot = modname;
|
||||
else dot++;
|
||||
/* set _PACK as package name (full module name minus last part) */
|
||||
lua_pushlstring(L, modname, dot - modname);
|
||||
lua_setfield(L, -2, "_PACK");
|
||||
}
|
||||
lua_pushvalue(L, -1);
|
||||
lua_setfield(L, 2, modname); /* _LOADED[modname] = new table */
|
||||
setfenv(L);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* }====================================================== */
|
||||
|
||||
|
||||
@ -509,6 +564,8 @@ static const luaL_reg base_funcs[] = {
|
||||
{"dofile", luaB_dofile},
|
||||
{"loadstring", luaB_loadstring},
|
||||
{"load", luaB_load},
|
||||
{"require", luaB_require},
|
||||
{"module", luaB_module},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
@ -676,8 +733,7 @@ static void base_open (lua_State *L) {
|
||||
lua_newtable(L);
|
||||
lua_pushvalue(L, -1);
|
||||
lua_setglobal(L, "_LOADED");
|
||||
lua_pushcclosure(L, luaB_require, 1);
|
||||
lua_setfield(L, LUA_GLOBALSINDEX, "require");
|
||||
lua_setfield(L, LUA_REGISTRYINDEX, "_LOADED");
|
||||
/* set global _G */
|
||||
lua_pushvalue(L, LUA_GLOBALSINDEX);
|
||||
lua_setfield(L, LUA_GLOBALSINDEX, "_G");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user