diff options
| -rw-r--r-- | lbaselib.c | 6 | ||||
| -rw-r--r-- | ldo.c | 4 |
2 files changed, 5 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lbaselib.c,v 1.136 2003/10/23 18:06:22 roberto Exp roberto $ | 2 | ** $Id: lbaselib.c,v 1.137 2003/11/05 11:59:14 roberto Exp roberto $ |
| 3 | ** Basic library | 3 | ** Basic library |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -484,14 +484,14 @@ static void pushcomposename (lua_State *L) { | |||
| 484 | const char *wild; | 484 | const char *wild; |
| 485 | int n = 1; | 485 | int n = 1; |
| 486 | while ((wild = strchr(path, LUA_PATH_MARK)) != NULL) { | 486 | while ((wild = strchr(path, LUA_PATH_MARK)) != NULL) { |
| 487 | /* is there stack space for prefix, name, and eventual last sufix? */ | 487 | /* is there stack space for prefix, name, and eventual last suffix? */ |
| 488 | luaL_checkstack(L, 3, "too many marks in a path component"); | 488 | luaL_checkstack(L, 3, "too many marks in a path component"); |
| 489 | lua_pushlstring(L, path, wild - path); /* push prefix */ | 489 | lua_pushlstring(L, path, wild - path); /* push prefix */ |
| 490 | lua_pushvalue(L, 1); /* push package name (in place of MARK) */ | 490 | lua_pushvalue(L, 1); /* push package name (in place of MARK) */ |
| 491 | path = wild + 1; /* continue after MARK */ | 491 | path = wild + 1; /* continue after MARK */ |
| 492 | n += 2; | 492 | n += 2; |
| 493 | } | 493 | } |
| 494 | lua_pushstring(L, path); /* push last sufix (`n' already includes this) */ | 494 | lua_pushstring(L, path); /* push last suffix (`n' already includes this) */ |
| 495 | lua_concat(L, n); | 495 | lua_concat(L, n); |
| 496 | } | 496 | } |
| 497 | 497 | ||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: ldo.c,v 1.227 2003/10/20 12:24:26 roberto Exp roberto $ | 2 | ** $Id: ldo.c,v 1.228 2003/10/20 17:42:41 roberto Exp roberto $ |
| 3 | ** Stack and Call structure of Lua | 3 | ** Stack and Call structure of Lua |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -334,7 +334,7 @@ static void resume (lua_State *L, void *ud) { | |||
| 334 | lua_assert(ci == L->base_ci && nargs < L->top - L->base); | 334 | lua_assert(ci == L->base_ci && nargs < L->top - L->base); |
| 335 | luaD_precall(L, L->top - (nargs + 1)); /* start coroutine */ | 335 | luaD_precall(L, L->top - (nargs + 1)); /* start coroutine */ |
| 336 | } | 336 | } |
| 337 | else { /* resumming from previous yield */ | 337 | else { /* resuming from previous yield */ |
| 338 | if (!f_isLua(ci)) { /* `common' yield? */ | 338 | if (!f_isLua(ci)) { /* `common' yield? */ |
| 339 | /* finish interrupted execution of `OP_CALL' */ | 339 | /* finish interrupted execution of `OP_CALL' */ |
| 340 | int nresults; | 340 | int nresults; |
