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

correct error message for floating-point values out of (integer) range

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2013-06-14 15:34:49 -03:00
parent 53210d7e5b
commit 138e69cc55
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lauxlib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lauxlib.c,v 1.250 2013/06/04 19:36:42 roberto Exp roberto $ ** $Id: lauxlib.c,v 1.251 2013/06/14 18:12:53 roberto Exp roberto $
** Auxiliary functions for building Lua libraries ** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -386,11 +386,22 @@ LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) {
} }
static void interror (lua_State *L, int narg) {
if (lua_type(L, narg) == LUA_TNUMBER) {
assert(!lua_isinteger(L, narg));
luaL_argerror(L, narg, "float value out of range");
}
else
tag_error(L, narg, LUA_TNUMBER);
}
LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) { LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) {
int isnum; int isnum;
lua_Integer d = lua_tointegerx(L, narg, &isnum); lua_Integer d = lua_tointegerx(L, narg, &isnum);
if (!isnum) if (!isnum) {
tag_error(L, narg, LUA_TNUMBER); interror(L, narg);
}
return d; return d;
} }
@@ -399,7 +410,7 @@ LUALIB_API lua_Unsigned luaL_checkunsigned (lua_State *L, int narg) {
int isnum; int isnum;
lua_Unsigned d = lua_tounsignedx(L, narg, &isnum); lua_Unsigned d = lua_tounsignedx(L, narg, &isnum);
if (!isnum) if (!isnum)
tag_error(L, narg, LUA_TNUMBER); interror(L, narg);
return d; return d;
} }