small bugs in error report

This commit is contained in:
Roberto Ierusalimschy 1997-12-22 15:52:20 -02:00
parent 22439a7511
commit fae0b52825
2 changed files with 7 additions and 5 deletions

6
lapi.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lapi.c,v 1.14 1997/12/15 16:17:20 roberto Exp roberto $ ** $Id: lapi.c,v 1.15 1997/12/18 18:32:39 roberto Exp roberto $
** Lua API ** Lua API
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -60,7 +60,7 @@ static void set_normalized (TObject *d, TObject *s)
static TObject *luaA_protovalue (TObject *o) static TObject *luaA_protovalue (TObject *o)
{ {
return (ttype(o) == LUA_T_CLOSURE) ? protovalue(o) : o; return (normalized_type(o) == LUA_T_CLOSURE) ? protovalue(o) : o;
} }
@ -509,7 +509,7 @@ void lua_funcinfo (lua_Object func, char **filename, int *linedefined)
lua_error("API - `funcinfo' called with a non-function value"); lua_error("API - `funcinfo' called with a non-function value");
else { else {
TObject *f = luaA_protovalue(Address(func)); TObject *f = luaA_protovalue(Address(func));
if (ttype(f) == LUA_T_PROTO) { if (normalized_type(f) == LUA_T_PROTO) {
*filename = tfvalue(f)->fileName->str; *filename = tfvalue(f)->fileName->str;
*linedefined = tfvalue(f)->lineDefined; *linedefined = tfvalue(f)->lineDefined;
} }

6
llex.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: llex.c,v 1.10 1997/12/09 13:35:19 roberto Exp roberto $ ** $Id: llex.c,v 1.11 1997/12/17 20:48:58 roberto Exp roberto $
** Lexical Analizer ** Lexical Analizer
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -50,8 +50,10 @@ void luaX_init (void)
static void firstline (LexState *LS) static void firstline (LexState *LS)
{ {
int c = zgetc(LS->lex_z); int c = zgetc(LS->lex_z);
if (c == '#') if (c == '#') {
LS->linenumber++;
while ((c=zgetc(LS->lex_z)) != '\n' && c != EOZ) /* skip first line */; while ((c=zgetc(LS->lex_z)) != '\n' && c != EOZ) /* skip first line */;
}
zungetc(LS->lex_z); zungetc(LS->lex_z);
} }