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

math.abs, math.max, and math.min work for integers, too.

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2014-03-31 16:00:52 -03:00
parent 8ef9117924
commit 66b7b9b582
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lmathlib.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lmathlib.c,v 1.91 2013/07/10 20:57:05 roberto Exp roberto $ ** $Id: lmathlib.c,v 1.92 2013/07/22 16:05:53 roberto Exp roberto $
** Standard mathematical library ** Standard mathematical library
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -23,6 +23,12 @@
static int math_abs (lua_State *L) { static int math_abs (lua_State *L) {
if (lua_isinteger(L, 1)) {
lua_Integer n = lua_tointeger(L, 1);
if (n < 0) n = (lua_Integer)(0u - n);
lua_pushinteger(L, n);
}
else
lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1))); lua_pushnumber(L, l_mathop(fabs)(luaL_checknumber(L, 1)));
return 1; return 1;
} }
@@ -185,31 +191,30 @@ static int math_ldexp (lua_State *L) {
} }
static int math_min (lua_State *L) { static int math_min (lua_State *L) {
int n = lua_gettop(L); /* number of arguments */ int n = lua_gettop(L); /* number of arguments */
lua_Number dmin = luaL_checknumber(L, 1); int imax = 1;
int i; int i;
luaL_argcheck(L, n >= 1, 1, "value expected");
for (i = 2; i <= n; i++) { for (i = 2; i <= n; i++) {
lua_Number d = luaL_checknumber(L, i); if (lua_compare(L, i, imax, LUA_OPLT))
if (d < dmin) imax = i;
dmin = d;
} }
lua_pushnumber(L, dmin); lua_pushvalue(L, imax);
return 1; return 1;
} }
static int math_max (lua_State *L) { static int math_max (lua_State *L) {
int n = lua_gettop(L); /* number of arguments */ int n = lua_gettop(L); /* number of arguments */
lua_Number dmax = luaL_checknumber(L, 1); int imax = 1;
int i; int i;
luaL_argcheck(L, n >= 1, 1, "value expected");
for (i = 2; i <= n; i++) { for (i = 2; i <= n; i++) {
lua_Number d = luaL_checknumber(L, i); if (lua_compare(L, imax, i, LUA_OPLT))
if (d > dmax) imax = i;
dmax = d;
} }
lua_pushnumber(L, dmax); lua_pushvalue(L, imax);
return 1; return 1;
} }