gh-mirror/mikepaul-LuaJIT
1
0
Fork 1
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-13 01:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backport math.tointeger from 5.3

Browse Source
This commit is contained in:
Francois Perrad 2017-03-25 12:07:16 +01:00
parent 636aaed7cc
commit 4427dda116
3 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib_math.c
View File

@ -94,6 +94,19 @@ LJLIB_ASM(math_min) LJLIB_REC(math_minmax IR_MIN)
} }
LJLIB_ASM_(math_max) LJLIB_REC(math_minmax IR_MAX) LJLIB_ASM_(math_max) LJLIB_REC(math_minmax IR_MAX)
LJLIB_CF(math_tointeger)
{
int valid;
lua_Integer n = lua_tointegerx(L, 1, &valid);
if (valid)
lua_pushinteger(L, n);
else {
luaL_checkany(L, 1);
lua_pushnil(L); /* value is not convertible to integer */
}
return 1;
}
LJLIB_CF(math_type) LJLIB_CF(math_type)
{ {
if (lua_type(L, 1) == LUA_TNUMBER) { if (lua_type(L, 1) == LUA_TNUMBER) {

40
src/lj_api.c
View File

@ -319,16 +319,25 @@ LUA_API int lua_lessthan(lua_State *L, int idx1, int idx2)
} }
} }
LUA_API lua_Number lua_tonumber(lua_State *L, int idx) LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *pisnum)
{ {
cTValue *o = index2adr(L, idx); cTValue *o = index2adr(L, idx);
TValue tmp; TValue tmp;
if (LJ_LIKELY(tvisnumber(o))) if (LJ_LIKELY(tvisnumber(o))) {
if (pisnum) *pisnum = 1;
return numberVnum(o); return numberVnum(o);
else if (tvisstr(o) && lj_strscan_num(strV(o), &tmp)) } else if (tvisstr(o) && lj_strscan_num(strV(o), &tmp)) {
if (pisnum) *pisnum = 1;
return numV(&tmp); return numV(&tmp);
else } else {
if (pisnum) *pisnum = 0;
return 0; return 0;
}
}
LUA_API lua_Number lua_tonumber(lua_State *L, int idx)
{
return lua_tonumberx(L, idx, NULL);
} }
LUALIB_API lua_Number luaL_checknumber(lua_State *L, int idx) LUALIB_API lua_Number luaL_checknumber(lua_State *L, int idx)
@ -355,22 +364,34 @@ LUALIB_API lua_Number luaL_optnumber(lua_State *L, int idx, lua_Number def)
return numV(&tmp); return numV(&tmp);
} }
LUA_API lua_Integer lua_tointeger(lua_State *L, int idx) LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *pisnum)
{ {
cTValue *o = index2adr(L, idx); cTValue *o = index2adr(L, idx);
TValue tmp; TValue tmp;
lua_Number n; lua_Number n;
if (LJ_LIKELY(tvisint(o))) { if (LJ_LIKELY(tvisint(o))) {
if (pisnum) *pisnum = 1;
return intV(o); return intV(o);
} else if (LJ_LIKELY(tvisnum(o))) { } else if (LJ_LIKELY(tvisnum(o))) {
n = numV(o); n = numV(o);
} else { } else {
if (!(tvisstr(o) && lj_strscan_number(strV(o), &tmp))) if (!(tvisstr(o) && lj_strscan_number(strV(o), &tmp))) {
if (pisnum) *pisnum = 0;
return 0; return 0;
if (tvisint(&tmp)) }
if (tvisint(&tmp)) {
if (pisnum) *pisnum = 1;
return (lua_Integer)intV(&tmp); return (lua_Integer)intV(&tmp);
}
n = numV(&tmp); n = numV(&tmp);
} }
#if LJ52
if ((lua_Number)(lua_Integer)n != n) {
if (pisnum) *pisnum = 0;
return 0;
}
#endif
if (pisnum) *pisnum = 1;
#if LJ_64 #if LJ_64
return (lua_Integer)n; return (lua_Integer)n;
#else #else
@ -378,6 +399,11 @@ LUA_API lua_Integer lua_tointeger(lua_State *L, int idx)
#endif #endif
} }
LUA_API lua_Integer lua_tointeger(lua_State *L, int idx)
{
return lua_tointegerx(L, idx, NULL);
}
LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int idx) LUALIB_API lua_Integer luaL_checkinteger(lua_State *L, int idx)
{ {
cTValue *o = index2adr(L, idx); cTValue *o = index2adr(L, idx);

2
src/lua.h
View File

@ -347,6 +347,8 @@ LUA_API void *lua_upvalueid (lua_State *L, int idx, int n);
LUA_API void lua_upvaluejoin (lua_State *L, int idx1, int n1, int idx2, int n2); LUA_API void lua_upvaluejoin (lua_State *L, int idx1, int n1, int idx2, int n2);
LUA_API int lua_loadx (lua_State *L, lua_Reader reader, void *dt, LUA_API int lua_loadx (lua_State *L, lua_Reader reader, void *dt,
const char *chunkname, const char *mode); const char *chunkname, const char *mode);
LUA_API lua_Number lua_tonumberx (lua_State *L, int idx, int *isnum);
LUA_API lua_Integer lua_tointegerx (lua_State *L, int idx, int *isnum);
/* From Lua 5.3. */ /* From Lua 5.3. */
LUA_API int lua_isinteger (lua_State *L, int idx); LUA_API int lua_isinteger (lua_State *L, int idx);