summaryrefslogtreecommitdiff
path: root/clients/lib/mathlib.c
diff options
context:
space:
mode:
Diffstat (limited to 'clients/lib/mathlib.c')
-rw-r--r--clients/lib/mathlib.c182
1 files changed, 131 insertions, 51 deletions
diff --git a/clients/lib/mathlib.c b/clients/lib/mathlib.c
index c84af8cb..ca5ab780 100644
--- a/clients/lib/mathlib.c
+++ b/clients/lib/mathlib.c
@@ -3,24 +3,26 @@
** Mathematics library to LUA
*/
-char *rcs_mathlib="$Id: mathlib.c,v 1.1 1993/12/17 18:41:19 celes Exp $";
+char *rcs_mathlib="$Id: mathlib.c,v 1.9 1995/02/06 19:36:43 roberto Exp $";
#include <stdio.h> /* NULL */
#include <math.h>
+#include "lualib.h"
#include "lua.h"
-#define TODEGREE(a) ((a)*180.0/3.14159)
-#define TORAD(a) ((a)*3.14159/180.0)
+#define PI 3.14159265358979323846
+#define TODEGREE(a) ((a)*180.0/PI)
+#define TORAD(a) ((a)*PI/180.0)
static void math_abs (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `abs'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `abs'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `abs'"); return; }
+ lua_error ("incorrect arguments to function `abs'");
d = lua_getnumber(o);
if (d < 0) d = -d;
lua_pushnumber (d);
@@ -31,10 +33,10 @@ static void math_sin (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `sin'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `sin'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `sin'"); return; }
+ lua_error ("incorrect arguments to function `sin'");
d = lua_getnumber(o);
lua_pushnumber (sin(TORAD(d)));
}
@@ -45,10 +47,10 @@ static void math_cos (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `cos'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `cos'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `cos'"); return; }
+ lua_error ("incorrect arguments to function `cos'");
d = lua_getnumber(o);
lua_pushnumber (cos(TORAD(d)));
}
@@ -59,10 +61,10 @@ static void math_tan (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `tan'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `tan'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `tan'"); return; }
+ lua_error ("incorrect arguments to function `tan'");
d = lua_getnumber(o);
lua_pushnumber (tan(TORAD(d)));
}
@@ -72,10 +74,10 @@ static void math_asin (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `asin'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `asin'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `asin'"); return; }
+ lua_error ("incorrect arguments to function `asin'");
d = lua_getnumber(o);
lua_pushnumber (TODEGREE(asin(d)));
}
@@ -85,10 +87,10 @@ static void math_acos (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `acos'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `acos'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `acos'"); return; }
+ lua_error ("incorrect arguments to function `acos'");
d = lua_getnumber(o);
lua_pushnumber (TODEGREE(acos(d)));
}
@@ -99,10 +101,10 @@ static void math_atan (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `atan'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `atan'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `atan'"); return; }
+ lua_error ("incorrect arguments to function `atan'");
d = lua_getnumber(o);
lua_pushnumber (TODEGREE(atan(d)));
}
@@ -112,10 +114,10 @@ static void math_ceil (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `ceil'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `ceil'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `ceil'"); return; }
+ lua_error ("incorrect arguments to function `ceil'");
d = lua_getnumber(o);
lua_pushnumber (ceil(d));
}
@@ -125,10 +127,10 @@ static void math_floor (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `floor'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `floor'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `floor'"); return; }
+ lua_error ("incorrect arguments to function `floor'");
d = lua_getnumber(o);
lua_pushnumber (floor(d));
}
@@ -139,7 +141,7 @@ static void math_mod (void)
lua_Object o1 = lua_getparam (1);
lua_Object o2 = lua_getparam (2);
if (!lua_isnumber(o1) || !lua_isnumber(o2))
- { lua_error ("incorrect arguments to function `mod'"); return; }
+ lua_error ("incorrect arguments to function `mod'");
d1 = (int) lua_getnumber(o1);
d2 = (int) lua_getnumber(o2);
lua_pushnumber (d1%d2);
@@ -150,24 +152,36 @@ static void math_sqrt (void)
{
double d;
lua_Object o = lua_getparam (1);
- if (o == NULL)
- { lua_error ("too few arguments to function `sqrt'"); return; }
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `sqrt'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `sqrt'"); return; }
+ lua_error ("incorrect arguments to function `sqrt'");
d = lua_getnumber(o);
lua_pushnumber (sqrt(d));
}
+static int old_pow;
+
static void math_pow (void)
{
- double d1, d2;
lua_Object o1 = lua_getparam (1);
lua_Object o2 = lua_getparam (2);
- if (!lua_isnumber(o1) || !lua_isnumber(o2))
- { lua_error ("incorrect arguments to function `pow'"); return; }
- d1 = lua_getnumber(o1);
- d2 = lua_getnumber(o2);
- lua_pushnumber (pow(d1,d2));
+ lua_Object op = lua_getparam(3);
+ if (!lua_isnumber(o1) || !lua_isnumber(o2) || *(lua_getstring(op)) != 'p')
+ {
+ lua_Object old = lua_getlocked(old_pow);
+ lua_pushobject(o1);
+ lua_pushobject(o2);
+ lua_pushobject(op);
+ if (lua_callfunction(old) != 0)
+ lua_error(NULL);
+ }
+ else
+ {
+ double d1 = lua_getnumber(o1);
+ double d2 = lua_getnumber(o2);
+ lua_pushnumber (pow(d1,d2));
+ }
}
static void math_min (void)
@@ -175,15 +189,15 @@ static void math_min (void)
int i=1;
double d, dmin;
lua_Object o;
- if ((o = lua_getparam(i++)) == NULL)
- { lua_error ("too few arguments to function `min'"); return; }
+ if ((o = lua_getparam(i++)) == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `min'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `min'"); return; }
+ lua_error ("incorrect arguments to function `min'");
dmin = lua_getnumber (o);
- while ((o = lua_getparam(i++)) != NULL)
+ while ((o = lua_getparam(i++)) != LUA_NOOBJECT)
{
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `min'"); return; }
+ lua_error ("incorrect arguments to function `min'");
d = lua_getnumber (o);
if (d < dmin) dmin = d;
}
@@ -196,15 +210,15 @@ static void math_max (void)
int i=1;
double d, dmax;
lua_Object o;
- if ((o = lua_getparam(i++)) == NULL)
- { lua_error ("too few arguments to function `max'"); return; }
+ if ((o = lua_getparam(i++)) == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `max'");
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `max'"); return; }
+ lua_error ("incorrect arguments to function `max'");
dmax = lua_getnumber (o);
- while ((o = lua_getparam(i++)) != NULL)
+ while ((o = lua_getparam(i++)) != LUA_NOOBJECT)
{
if (!lua_isnumber(o))
- { lua_error ("incorrect arguments to function `max'"); return; }
+ lua_error ("incorrect arguments to function `max'");
d = lua_getnumber (o);
if (d > dmax) dmax = d;
}
@@ -212,6 +226,67 @@ static void math_max (void)
}
+static void math_log (void)
+{
+ double d;
+ lua_Object o = lua_getparam (1);
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `log'");
+ if (!lua_isnumber(o))
+ lua_error ("incorrect arguments to function `log'");
+ d = lua_getnumber(o);
+ lua_pushnumber (log(d));
+}
+
+
+static void math_log10 (void)
+{
+ double d;
+ lua_Object o = lua_getparam (1);
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `log10'");
+ if (!lua_isnumber(o))
+ lua_error ("incorrect arguments to function `log10'");
+ d = lua_getnumber(o);
+ lua_pushnumber (log10(d));
+}
+
+
+static void math_exp (void)
+{
+ double d;
+ lua_Object o = lua_getparam (1);
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `exp'");
+ if (!lua_isnumber(o))
+ lua_error ("incorrect arguments to function `exp'");
+ d = lua_getnumber(o);
+ lua_pushnumber (exp(d));
+}
+
+static void math_deg (void)
+{
+ float d;
+ lua_Object o = lua_getparam (1);
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `deg'");
+ if (!lua_isnumber(o))
+ lua_error ("incorrect arguments to function `deg'");
+ d = lua_getnumber(o);
+ lua_pushnumber (d*180./PI);
+}
+
+static void math_rad (void)
+{
+ float d;
+ lua_Object o = lua_getparam (1);
+ if (o == LUA_NOOBJECT)
+ lua_error ("too few arguments to function `rad'");
+ if (!lua_isnumber(o))
+ lua_error ("incorrect arguments to function `rad'");
+ d = lua_getnumber(o);
+ lua_pushnumber (d/180.*PI);
+}
/*
** Open math library
@@ -229,7 +304,12 @@ void mathlib_open (void)
lua_register ("floor", math_floor);
lua_register ("mod", math_mod);
lua_register ("sqrt", math_sqrt);
- lua_register ("pow", math_pow);
lua_register ("min", math_min);
lua_register ("max", math_max);
+ lua_register ("log", math_log);
+ lua_register ("log10", math_log10);
+ lua_register ("exp", math_exp);
+ lua_register ("deg", math_deg);
+ lua_register ("rad", math_rad);
+ old_pow = lua_lockobject(lua_setfallback("arith", math_pow));
}