diff options
author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2000-09-12 10:47:39 -0300 |
---|---|---|
committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2000-09-12 10:47:39 -0300 |
commit | 0f59e3d7a70ea8c15792450496974d95dbae8d5b (patch) | |
tree | 9fb65d7b00ffd90f545ae80490b9ed031aeaaacf | |
parent | 55c3bc2bcba70bceb6ec80ae46f8249dc4026c60 (diff) | |
download | lua-0f59e3d7a70ea8c15792450496974d95dbae8d5b.tar.gz lua-0f59e3d7a70ea8c15792450496974d95dbae8d5b.tar.bz2 lua-0f59e3d7a70ea8c15792450496974d95dbae8d5b.zip |
details
-rw-r--r-- | ldo.c | 6 | ||||
-rw-r--r-- | lobject.c | 3 |
2 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ldo.c,v 1.94 2000/09/11 17:38:42 roberto Exp roberto $ | 2 | ** $Id: ldo.c,v 1.95 2000/09/11 20:29:27 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 | */ |
@@ -218,7 +218,7 @@ void luaD_breakrun (lua_State *L, int errcode) { | |||
218 | else { | 218 | else { |
219 | if (errcode != LUA_ERRMEM) | 219 | if (errcode != LUA_ERRMEM) |
220 | message(L, "unable to recover; exiting\n"); | 220 | message(L, "unable to recover; exiting\n"); |
221 | exit(1); | 221 | exit(EXIT_FAILURE); |
222 | } | 222 | } |
223 | } | 223 | } |
224 | 224 | ||
@@ -271,7 +271,7 @@ static int protectedparser (lua_State *L, ZIO *z, int bin) { | |||
271 | old_blocks = L->nblocks; | 271 | old_blocks = L->nblocks; |
272 | chain_longjmp(L, &myErrorJmp); | 272 | chain_longjmp(L, &myErrorJmp); |
273 | if (setjmp(myErrorJmp.b) == 0) { | 273 | if (setjmp(myErrorJmp.b) == 0) { |
274 | Proto *tf = bin ? luaU_undump1(L, z) : luaY_parser(L, z); | 274 | Proto *tf = bin ? luaU_undump(L, z) : luaY_parser(L, z); |
275 | luaV_Lclosure(L, tf, 0); | 275 | luaV_Lclosure(L, tf, 0); |
276 | } | 276 | } |
277 | else { /* an error occurred: correct error code */ | 277 | else { /* an error occurred: correct error code */ |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lobject.c,v 1.46 2000/09/11 17:38:42 roberto Exp roberto $ | 2 | ** $Id: lobject.c,v 1.47 2000/09/11 20:29:27 roberto Exp roberto $ |
3 | ** Some generic functions over Lua objects | 3 | ** Some generic functions over Lua objects |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -127,6 +127,7 @@ int luaO_str2d (const char *s, Number *result) { /* LUA_NUMBER */ | |||
127 | } | 127 | } |
128 | 128 | ||
129 | 129 | ||
130 | /* this function needs to handle only '%d' and '%.XXXs' formats */ | ||
130 | void luaO_verror (lua_State *L, const char *fmt, ...) { | 131 | void luaO_verror (lua_State *L, const char *fmt, ...) { |
131 | char buff[500]; | 132 | char buff[500]; |
132 | va_list argp; | 133 | va_list argp; |