tisp

commit 71a51439b0f4ad759c6c8312fb3ad5554e1a7a08
parent 368faf2c46732d2297f06dc4aeecc53864a92e5a
Author: Ed van Bruggen <edvb@uw.edu>
Date:   Thu, 30 May 2019 13:31:58 -0700

Add all number support to compares

Diffstat:
tibs/math.c
 | 
26
++++++++++++++------------

1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/tibs/math.c b/tibs/math.c
@@ -186,18 +186,20 @@ prim_pow(Env env, Val args)
 	return mk_pair(mk_sym(env, "^"), mk_pair(b, mk_pair(p, env->nil)));
 }
 
-#define PRIM_COMPARE(NAME, OP)                                        \
-static Val                                                            \
-prim_##NAME(Env env, Val args)                                        \
-{                                                                     \
-	Val v;                                                        \
-	if (!(v = tisp_eval_list(env, args)))                         \
-		return NULL;                                          \
-	if (list_len(v) != 2)                                         \
-		return env->t;                                        \
-	tsp_arg_type(car(v), #OP, INTEGER);                           \
-	tsp_arg_type(car(cdr(v)), #OP, INTEGER);                      \
-	return (num(car(v)) OP num(car(cdr(v)))) ? env->t : env->nil; \
+#define PRIM_COMPARE(NAME, OP)                    \
+static Val                                        \
+prim_##NAME(Env env, Val args)                    \
+{                                                 \
+	Val v;                                    \
+	if (!(v = tisp_eval_list(env, args)))     \
+		return NULL;                      \
+	if (list_len(v) != 2)                     \
+		return env->t;                    \
+	tsp_arg_type(car(v), #OP, NUMBER);        \
+	tsp_arg_type(car(cdr(v)), #OP, NUMBER);   \
+	return ((num(car(v))*den(car(cdr(v)))) OP \
+		(num(car(cdr(v)))*den(car(v)))) ? \
+		env->t : env->nil;                \
 }
 
 PRIM_COMPARE(lt,  <)