nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comments

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2003-11-11 14:34:17 -02:00
parent fa198197a0
commit 921b1723e2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lbaselib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lbaselib.c,v 1.136 2003/10/23 18:06:22 roberto Exp roberto $ ** $Id: lbaselib.c,v 1.137 2003/11/05 11:59:14 roberto Exp roberto $
** Basic library ** Basic library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -484,14 +484,14 @@ static void pushcomposename (lua_State *L) {
const char *wild; const char *wild;
int n = 1; int n = 1;
while ((wild = strchr(path, LUA_PATH_MARK)) != NULL) { while ((wild = strchr(path, LUA_PATH_MARK)) != NULL) {
/* is there stack space for prefix, name, and eventual last sufix? */ /* is there stack space for prefix, name, and eventual last suffix? */
luaL_checkstack(L, 3, "too many marks in a path component"); luaL_checkstack(L, 3, "too many marks in a path component");
lua_pushlstring(L, path, wild - path); /* push prefix */ lua_pushlstring(L, path, wild - path); /* push prefix */
lua_pushvalue(L, 1); /* push package name (in place of MARK) */ lua_pushvalue(L, 1); /* push package name (in place of MARK) */
path = wild + 1; /* continue after MARK */ path = wild + 1; /* continue after MARK */
n += 2; n += 2;
} }
lua_pushstring(L, path); /* push last sufix (`n' already includes this) */ lua_pushstring(L, path); /* push last suffix (`n' already includes this) */
lua_concat(L, n); lua_concat(L, n);
} }

4
ldo.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: ldo.c,v 1.227 2003/10/20 12:24:26 roberto Exp roberto $ ** $Id: ldo.c,v 1.228 2003/10/20 17:42:41 roberto Exp roberto $
** Stack and Call structure of Lua ** Stack and Call structure of Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -334,7 +334,7 @@ static void resume (lua_State *L, void *ud) {
lua_assert(ci == L->base_ci && nargs < L->top - L->base); lua_assert(ci == L->base_ci && nargs < L->top - L->base);
luaD_precall(L, L->top - (nargs + 1)); /* start coroutine */ luaD_precall(L, L->top - (nargs + 1)); /* start coroutine */
} }
else { /* resumming from previous yield */ else { /* resuming from previous yield */
if (!f_isLua(ci)) { /* `common' yield? */ if (!f_isLua(ci)) { /* `common' yield? */
/* finish interrupted execution of `OP_CALL' */ /* finish interrupted execution of `OP_CALL' */
int nresults; int nresults;