mirror of https://github.com/rusefi/lua.git
'lua_numtointeger' -> 'lua_numbertointeger'
This commit is contained in:
parent
88ff582fd8
commit
463edee2fd
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
** $Id: lmathlib.c,v 1.109 2014/10/01 11:54:56 roberto Exp $
|
** $Id: lmathlib.c,v 1.110 2014/10/08 19:57:31 roberto Exp roberto $
|
||||||
** Standard mathematical library
|
** Standard mathematical library
|
||||||
** See Copyright Notice in lua.h
|
** See Copyright Notice in lua.h
|
||||||
*/
|
*/
|
||||||
|
@ -91,7 +91,7 @@ static int math_toint (lua_State *L) {
|
||||||
|
|
||||||
static void pushnumint (lua_State *L, lua_Number d) {
|
static void pushnumint (lua_State *L, lua_Number d) {
|
||||||
lua_Integer n;
|
lua_Integer n;
|
||||||
if (lua_numtointeger(d, &n)) /* does 'd' fit in an integer? */
|
if (lua_numbertointeger(d, &n)) /* does 'd' fit in an integer? */
|
||||||
lua_pushinteger(L, n); /* result is integer */
|
lua_pushinteger(L, n); /* result is integer */
|
||||||
else
|
else
|
||||||
lua_pushnumber(L, d); /* result is float */
|
lua_pushnumber(L, d); /* result is float */
|
||||||
|
|
4
ltable.c
4
ltable.c
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
** $Id: ltable.c,v 2.95 2014/09/04 18:15:29 roberto Exp roberto $
|
** $Id: ltable.c,v 2.96 2014/10/17 16:28:21 roberto Exp roberto $
|
||||||
** Lua tables (hash)
|
** Lua tables (hash)
|
||||||
** See Copyright Notice in lua.h
|
** See Copyright Notice in lua.h
|
||||||
*/
|
*/
|
||||||
|
@ -88,7 +88,7 @@ static const Node dummynode_ = {
|
||||||
*/
|
*/
|
||||||
static int numisinteger (lua_Number x, lua_Integer *p) {
|
static int numisinteger (lua_Number x, lua_Integer *p) {
|
||||||
if ((x) == l_floor(x)) /* integral value? */
|
if ((x) == l_floor(x)) /* integral value? */
|
||||||
return lua_numtointeger(x, p); /* try as an integer */
|
return lua_numbertointeger(x, p); /* try as an integer */
|
||||||
else return 0;
|
else return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
4
lvm.c
4
lvm.c
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
** $Id: lvm.c,v 2.223 2014/09/04 18:15:29 roberto Exp roberto $
|
** $Id: lvm.c,v 2.224 2014/10/17 16:28:21 roberto Exp roberto $
|
||||||
** Lua virtual machine
|
** Lua virtual machine
|
||||||
** See Copyright Notice in lua.h
|
** See Copyright Notice in lua.h
|
||||||
*/
|
*/
|
||||||
|
@ -92,7 +92,7 @@ static int tointeger_aux (const TValue *obj, lua_Integer *p, int mode) {
|
||||||
else if (mode > 0) /* needs ceil? */
|
else if (mode > 0) /* needs ceil? */
|
||||||
f += 1; /* convert floor to ceil (remember: n != f) */
|
f += 1; /* convert floor to ceil (remember: n != f) */
|
||||||
}
|
}
|
||||||
return lua_numtointeger(f, p);
|
return lua_numbertointeger(f, p);
|
||||||
}
|
}
|
||||||
else if (ttisinteger(obj)) {
|
else if (ttisinteger(obj)) {
|
||||||
*p = ivalue(obj);
|
*p = ivalue(obj);
|
||||||
|
|
Loading…
Reference in New Issue