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

ERRORMESSAGE uses auxlib's buffer to build message string

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2000-09-12 10:48:34 -03:00
parent 4ef14ba280
commit d1c351857d
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
liolib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: liolib.c,v 1.78 2000/09/11 17:38:42 roberto Exp roberto $ ** $Id: liolib.c,v 1.79 2000/09/11 20:29:27 roberto Exp roberto $
** Standard I/O (and system) library ** Standard I/O (and system) library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -590,30 +590,27 @@ static int errorfb (lua_State *L) {
int level = 1; /* skip level 0 (it's this function) */ int level = 1; /* skip level 0 (it's this function) */
int firstpart = 1; /* still before eventual `...' */ int firstpart = 1; /* still before eventual `...' */
lua_Debug ar; lua_Debug ar;
lua_settop(L, 1); luaL_Buffer b;
luaL_checktype(L, 1, "string"); luaL_buffinit(L, &b);
lua_pushstring(L, "error: "); luaL_addstring(&b, "error: ");
lua_insert(L, 1); luaL_addstring(&b, luaL_check_string(L, 1));
lua_pushstring(L, "\nstack traceback:\n"); luaL_addstring(&b, "\nstack traceback:\n");
lua_concat(L, 3);
while (lua_getstack(L, level++, &ar)) { while (lua_getstack(L, level++, &ar)) {
char buff[120]; /* enough to fit following `sprintf's */ char buff[120]; /* enough to fit following `sprintf's */
int toconcat = 1; /* number of strings in the stack to concat */
if (level > LEVELS1 && firstpart) { if (level > LEVELS1 && firstpart) {
/* no more than `LEVELS2' more levels? */ /* no more than `LEVELS2' more levels? */
if (!lua_getstack(L, level+LEVELS2, &ar)) if (!lua_getstack(L, level+LEVELS2, &ar))
level--; /* keep going */ level--; /* keep going */
else { else {
lua_pushstring(L, " ...\n"); /* too many levels */ luaL_addstring(&b, " ...\n"); /* too many levels */
lua_concat(L, 2);
while (lua_getstack(L, level+LEVELS2, &ar)) /* find last levels */ while (lua_getstack(L, level+LEVELS2, &ar)) /* find last levels */
level++; level++;
} }
firstpart = 0; firstpart = 0;
continue; continue;
} }
sprintf(buff, "%4d: ", level-1); sprintf(buff, "%4d: ", level-1);
lua_pushstring(L, buff); toconcat++; luaL_addstring(&b, buff);
lua_getinfo(L, "Snl", &ar); lua_getinfo(L, "Snl", &ar);
switch (*ar.namewhat) { switch (*ar.namewhat) {
case 'g': case 'l': /* global, local */ case 'g': case 'l': /* global, local */
@@ -632,21 +629,21 @@ static int errorfb (lua_State *L) {
sprintf(buff, "%.70s", ar.source_id); sprintf(buff, "%.70s", ar.source_id);
else else
sprintf(buff, "function <%d:%.70s>", ar.linedefined, ar.source_id); sprintf(buff, "function <%d:%.70s>", ar.linedefined, ar.source_id);
ar.source = NULL; ar.source = NULL; /* do not print source again */
} }
} }
lua_pushstring(L, buff); toconcat++; luaL_addstring(&b, buff);
if (ar.currentline > 0) { if (ar.currentline > 0) {
sprintf(buff, " at line %d", ar.currentline); sprintf(buff, " at line %d", ar.currentline);
lua_pushstring(L, buff); toconcat++; luaL_addstring(&b, buff);
} }
if (ar.source) { if (ar.source) {
sprintf(buff, " [%.70s]", ar.source_id); sprintf(buff, " [%.70s]", ar.source_id);
lua_pushstring(L, buff); toconcat++; luaL_addstring(&b, buff);
} }
lua_pushstring(L, "\n"); toconcat++; luaL_addstring(&b, "\n");
lua_concat(L, toconcat);
} }
luaL_pushresult(&b);
lua_getglobals(L); lua_getglobals(L);
lua_pushstring(L, LUA_ALERT); lua_pushstring(L, LUA_ALERT);
lua_rawget(L, -2); lua_rawget(L, -2);