From 9fdf73bc9a6b4c6afbfff1d8181fface6b1c6761 Mon Sep 17 00:00:00 2001 From: Roberto Ierusalimschy Date: Mon, 28 Aug 2000 14:57:04 -0300 Subject: first version for new API --- lmathlib.c | 122 ++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 77 insertions(+), 45 deletions(-) (limited to 'lmathlib.c') diff --git a/lmathlib.c b/lmathlib.c index 86850cc9..d6957e76 100644 --- a/lmathlib.c +++ b/lmathlib.c @@ -1,5 +1,5 @@ /* -** $Id: lmathlib.c,v 1.25 2000/06/12 13:52:05 roberto Exp roberto $ +** $Id: lmathlib.c,v 1.26 2000/08/09 19:16:57 roberto Exp roberto $ ** Standard mathematical library ** See Copyright Notice in lua.h */ @@ -33,138 +33,169 @@ #endif -static void math_abs (lua_State *L) { +static int math_abs (lua_State *L) { lua_pushnumber(L, fabs(luaL_check_number(L, 1))); + return 1; } -static void math_sin (lua_State *L) { +static int math_sin (lua_State *L) { lua_pushnumber(L, sin(TORAD(luaL_check_number(L, 1)))); + return 1; } -static void math_cos (lua_State *L) { +static int math_cos (lua_State *L) { lua_pushnumber(L, cos(TORAD(luaL_check_number(L, 1)))); + return 1; } -static void math_tan (lua_State *L) { +static int math_tan (lua_State *L) { lua_pushnumber(L, tan(TORAD(luaL_check_number(L, 1)))); + return 1; } -static void math_asin (lua_State *L) { +static int math_asin (lua_State *L) { lua_pushnumber(L, FROMRAD(asin(luaL_check_number(L, 1)))); + return 1; } -static void math_acos (lua_State *L) { +static int math_acos (lua_State *L) { lua_pushnumber(L, FROMRAD(acos(luaL_check_number(L, 1)))); + return 1; } -static void math_atan (lua_State *L) { +static int math_atan (lua_State *L) { lua_pushnumber(L, FROMRAD(atan(luaL_check_number(L, 1)))); + return 1; } -static void math_atan2 (lua_State *L) { +static int math_atan2 (lua_State *L) { lua_pushnumber(L, FROMRAD(atan2(luaL_check_number(L, 1), luaL_check_number(L, 2)))); + return 1; } -static void math_ceil (lua_State *L) { +static int math_ceil (lua_State *L) { lua_pushnumber(L, ceil(luaL_check_number(L, 1))); + return 1; } -static void math_floor (lua_State *L) { +static int math_floor (lua_State *L) { lua_pushnumber(L, floor(luaL_check_number(L, 1))); + return 1; } -static void math_mod (lua_State *L) { +static int math_mod (lua_State *L) { lua_pushnumber(L, fmod(luaL_check_number(L, 1), luaL_check_number(L, 2))); + return 1; } -static void math_sqrt (lua_State *L) { +static int math_sqrt (lua_State *L) { lua_pushnumber(L, sqrt(luaL_check_number(L, 1))); + return 1; } -static void math_pow (lua_State *L) { +static int math_pow (lua_State *L) { lua_pushnumber(L, pow(luaL_check_number(L, 1), luaL_check_number(L, 2))); + return 1; } -static void math_log (lua_State *L) { +static int math_log (lua_State *L) { lua_pushnumber(L, log(luaL_check_number(L, 1))); + return 1; } -static void math_log10 (lua_State *L) { +static int math_log10 (lua_State *L) { lua_pushnumber(L, log10(luaL_check_number(L, 1))); + return 1; } -static void math_exp (lua_State *L) { +static int math_exp (lua_State *L) { lua_pushnumber(L, exp(luaL_check_number(L, 1))); + return 1; } -static void math_deg (lua_State *L) { +static int math_deg (lua_State *L) { lua_pushnumber(L, luaL_check_number(L, 1)/RADIANS_PER_DEGREE); + return 1; } -static void math_rad (lua_State *L) { +static int math_rad (lua_State *L) { lua_pushnumber(L, luaL_check_number(L, 1)*RADIANS_PER_DEGREE); + return 1; } -static void math_frexp (lua_State *L) { +static int math_frexp (lua_State *L) { int e; lua_pushnumber(L, frexp(luaL_check_number(L, 1), &e)); lua_pushnumber(L, e); + return 2; } -static void math_ldexp (lua_State *L) { +static int math_ldexp (lua_State *L) { lua_pushnumber(L, ldexp(luaL_check_number(L, 1), luaL_check_int(L, 2))); + return 1; } -static void math_min (lua_State *L) { - int i = 1; - double dmin = luaL_check_number(L, i); - while (lua_getparam(L, ++i) != LUA_NOOBJECT) { +static int math_min (lua_State *L) { + int n = lua_gettop(L); /* number of arguments */ + double dmin = luaL_check_number(L, 1); + int i; + for (i=2; i<=n; i++) { double d = luaL_check_number(L, i); if (d < dmin) dmin = d; } lua_pushnumber(L, dmin); + return 1; } -static void math_max (lua_State *L) { - int i = 1; - double dmax = luaL_check_number(L, i); - while (lua_getparam(L, ++i) != LUA_NOOBJECT) { +static int math_max (lua_State *L) { + int n = lua_gettop(L); /* number of arguments */ + double dmax = luaL_check_number(L, 1); + int i; + for (i=2; i<=n; i++) { double d = luaL_check_number(L, i); if (d > dmax) dmax = d; } lua_pushnumber(L, dmax); + return 1; } -static void math_random (lua_State *L) { +static int math_random (lua_State *L) { /* the '%' avoids the (rare) case of r==1, and is needed also because on some systems (SunOS!) "rand()" may return a value larger than RAND_MAX */ double r = (double)(rand()%RAND_MAX) / (double)RAND_MAX; - if (lua_getparam(L, 1) == LUA_NOOBJECT) /* no arguments? */ - lua_pushnumber(L, r); /* Number between 0 and 1 */ - else { - int l, u; /* lower & upper limits */ - if (lua_getparam(L, 2) == LUA_NOOBJECT) { /* only one argument? */ - l = 1; - u = luaL_check_int(L, 1); + switch (lua_gettop(L)) { /* check number of arguments */ + case 0: { /* no arguments */ + lua_pushnumber(L, r); /* Number between 0 and 1 */ + break; } - else { /* two arguments */ - l = luaL_check_int(L, 1); - u = luaL_check_int(L, 2); + case 1: { /* only upper limit */ + int u = luaL_check_int(L, 1); + luaL_arg_check(L, 1<=u, 1, "interval is empty"); + lua_pushnumber(L, (int)(r*u)+1); /* integer between 1 and `u' */ + break; } - luaL_arg_check(L, l<=u, 1, "interval is empty"); - lua_pushnumber(L, (int)(r*(u-l+1))+l); /* integer between `l' and `u' */ + case 2: { /* lower and upper limits */ + int l = luaL_check_int(L, 1); + int u = luaL_check_int(L, 2); + luaL_arg_check(L, l<=u, 2, "interval is empty"); + lua_pushnumber(L, (int)(r*(u-l+1))+l); /* integer between `l' and `u' */ + break; + } + default: lua_error(L, "wrong number of arguments"); } + return 1; } -static void math_randomseed (lua_State *L) { +static int math_randomseed (lua_State *L) { srand(luaL_check_int(L, 1)); + return 0; } @@ -199,9 +230,10 @@ static const struct luaL_reg mathlib[] = { */ void lua_mathlibopen (lua_State *L) { luaL_openl(L, mathlib); - lua_pushcfunction(L, math_pow); lua_pushnumber(L, 0); /* to get its tag */ - lua_settagmethod(L, lua_tag(L, lua_pop(L)), "pow"); + lua_pushcfunction(L, math_pow); + lua_settagmethod(L, lua_tag(L, -2), "pow"); + lua_settop(L, -1); /* remove number */ lua_pushnumber(L, PI); lua_setglobal(L, "PI"); } -- cgit v1.2.3-55-g6feb