diff options
-rw-r--r-- | lauxlib.c | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lauxlib.c,v 1.250 2013/06/04 19:36:42 roberto Exp roberto $ | 2 | ** $Id: lauxlib.c,v 1.251 2013/06/14 18:12:53 roberto Exp roberto $ |
3 | ** Auxiliary functions for building Lua libraries | 3 | ** Auxiliary functions for building Lua libraries |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -386,11 +386,22 @@ LUALIB_API lua_Number luaL_optnumber (lua_State *L, int narg, lua_Number def) { | |||
386 | } | 386 | } |
387 | 387 | ||
388 | 388 | ||
389 | static void interror (lua_State *L, int narg) { | ||
390 | if (lua_type(L, narg) == LUA_TNUMBER) { | ||
391 | assert(!lua_isinteger(L, narg)); | ||
392 | luaL_argerror(L, narg, "float value out of range"); | ||
393 | } | ||
394 | else | ||
395 | tag_error(L, narg, LUA_TNUMBER); | ||
396 | } | ||
397 | |||
398 | |||
389 | LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) { | 399 | LUALIB_API lua_Integer luaL_checkinteger (lua_State *L, int narg) { |
390 | int isnum; | 400 | int isnum; |
391 | lua_Integer d = lua_tointegerx(L, narg, &isnum); | 401 | lua_Integer d = lua_tointegerx(L, narg, &isnum); |
392 | if (!isnum) | 402 | if (!isnum) { |
393 | tag_error(L, narg, LUA_TNUMBER); | 403 | interror(L, narg); |
404 | } | ||
394 | return d; | 405 | return d; |
395 | } | 406 | } |
396 | 407 | ||
@@ -399,7 +410,7 @@ LUALIB_API lua_Unsigned luaL_checkunsigned (lua_State *L, int narg) { | |||
399 | int isnum; | 410 | int isnum; |
400 | lua_Unsigned d = lua_tounsignedx(L, narg, &isnum); | 411 | lua_Unsigned d = lua_tounsignedx(L, narg, &isnum); |
401 | if (!isnum) | 412 | if (!isnum) |
402 | tag_error(L, narg, LUA_TNUMBER); | 413 | interror(L, narg); |
403 | return d; | 414 | return d; |
404 | } | 415 | } |
405 | 416 | ||