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

small bug: error message in 'io.lines' is not the error number

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2011-11-09 12:10:43 -02:00
parent 6d8d282e0f
commit ea382b0be1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
liolib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: liolib.c,v 2.103 2011/08/02 18:00:01 roberto Exp roberto $ ** $Id: liolib.c,v 2.104 2011/09/13 21:09:04 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
*/ */
@@ -488,9 +488,10 @@ static int io_readline (lua_State *L) {
if (!lua_isnil(L, -n)) /* read at least one value? */ if (!lua_isnil(L, -n)) /* read at least one value? */
return n; /* return them */ return n; /* return them */
else { /* first result is nil: EOF or error */ else { /* first result is nil: EOF or error */
if (!lua_isnil(L, -1)) /* is there error information? */ if (n > 1) { /* is there error information? */
return luaL_error(L, "%s", lua_tostring(L, -1)); /* error */ /* 2nd result is error message */
/* else EOF */ return luaL_error(L, "%s", lua_tostring(L, -n + 1));
}
if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */ if (lua_toboolean(L, lua_upvalueindex(3))) { /* generator created file? */
lua_settop(L, 0); lua_settop(L, 0);
lua_pushvalue(L, lua_upvalueindex(1)); lua_pushvalue(L, lua_upvalueindex(1));