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

merge of common parts from 'limittointeger' and 'luaV_tointeger_'

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2014-04-29 17:06:05 -03:00
parent ffa43df3cd
commit b123a88673
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lvm.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lvm.c,v 2.200 2014/04/29 18:11:57 roberto Exp roberto $ ** $Id: lvm.c,v 2.201 2014/04/29 18:14:16 roberto Exp roberto $
** Lua virtual machine ** Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -97,19 +97,28 @@ int luaV_numtointeger (lua_Number n, lua_Integer *p) {
/* /*
** try to convert a non-integer value to an integer ** try to convert a non-integer value to an integer, rounding up if
** 'up' is true
*/ */
int luaV_tointeger_ (const TValue *obj, lua_Integer *p) { static int tointeger_aux (const TValue *obj, lua_Integer *p, int up) {
lua_Number n; lua_Number n;
lua_assert(!ttisinteger(obj)); lua_assert(!ttisinteger(obj));
if (tonumber(obj, &n)) { if (tonumber(obj, &n)) {
n = l_floor(n); n = (up ? -l_floor(-n) : l_floor(n));
return luaV_numtointeger(n, p); return luaV_numtointeger(n, p);
} }
else return 0; else return 0;
} }
/*
** try to convert a non-integer value to an integer, rounding down
*/
int luaV_tointeger_ (const TValue *obj, lua_Integer *p) {
return tointeger_aux(obj, p, 0);
}
/* /*
** Check whether the limit of a 'for' loop can be safely converted ** Check whether the limit of a 'for' loop can be safely converted
** to an integer (rounding down or up depending on the signal of 'step') ** to an integer (rounding down or up depending on the signal of 'step')
@@ -119,12 +128,8 @@ static int limittointeger (const TValue *n, lua_Integer *p, lua_Integer step) {
*p = ivalue(n); *p = ivalue(n);
return 1; return 1;
} }
else if (!ttisfloat(n)) return 0; else
else { return tointeger_aux(n, p, (step < 0));
lua_Number f = fltvalue(n);
f = (step >= 0) ? l_floor(f) : -l_floor(-f);
return luaV_numtointeger(f, p);
}
} }