replace some number predicates with c imples

piclib/built-in.scm

@@ -347,15 +347,6 @@
 (export make-parameter
         parameterize)
 
-(define (any pred list)
-  (if (null? list)
-      #f
-      ((lambda (it)
-	 (if it
-	     it
-	     (any pred (cdr list))))
-       (pred (car list)))))
-
 (define (every pred list)
   (if (null? list)
       #t
@@ -370,21 +361,6 @@
 
 ;;; 6.2. Numbers
 
-(define (zero? n)
-  (= n 0))
-
-(define (positive? x)
-  (> x 0))
-
-(define (negative? x)
-  (< x 0))
-
-(define (odd? n)
-  (= 0 (floor-remainder n 2)))
-
-(define (even? n)
-  (= 1 (floor-remainder n 2)))
-
 (define (min x . args)
   (let loop ((pivot x) (rest args))
     (if (null? rest)
@@ -429,8 +405,7 @@
 (define (lcm n m)
   (/ (* n m) (gcd n m)))
 
-(export zero? positive? negative?
+(export min max
-        odd? even? min max
         floor/ truncate/
         exact-integer-sqrt
         gcd lcm)

src/number.c

@@ -133,6 +133,56 @@ DEFINE_ARITH_CMP(>, gt)
 DEFINE_ARITH_CMP(<=, le)
 DEFINE_ARITH_CMP(>=, ge)
 
+static pic_value
+pic_number_zero_p(pic_state *pic)
+{
+  double f;
+
+  pic_get_args(pic, "f", &f);
+
+  return pic_bool_value(f == 0);
+}
+
+static pic_value
+pic_number_positive_p(pic_state *pic)
+{
+  double f;
+
+  pic_get_args(pic, "f", &f);
+
+  return pic_bool_value(f > 0);
+}
+
+static pic_value
+pic_number_negative_p(pic_state *pic)
+{
+  double f;
+
+  pic_get_args(pic, "f", &f);
+
+  return pic_bool_value(f < 0);
+}
+
+static pic_value
+pic_number_odd_p(pic_state *pic)
+{
+  int i;
+
+  pic_get_args(pic, "i", &i);
+
+  return pic_bool_value(i % 2 != 0);
+}
+
+static pic_value
+pic_number_even_p(pic_state *pic)
+{
+  int i;
+
+  pic_get_args(pic, "i", &i);
+
+  return pic_bool_value(i % 2 == 0);
+}
+
 #define DEFINE_ARITH_OP(op, name, unit)                         \
   static pic_value                                              \
   pic_number_##name(pic_state *pic)                             \
@@ -526,6 +576,12 @@ pic_init_number(pic_state *pic)
   pic_defun(pic, ">=", pic_number_ge);
   pic_gc_arena_restore(pic, ai);
 
+  pic_defun(pic, "zero?", pic_number_zero_p);
+  pic_defun(pic, "positive?", pic_number_positive_p);
+  pic_defun(pic, "negative?", pic_number_negative_p);
+  pic_defun(pic, "odd?", pic_number_odd_p);
+  pic_defun(pic, "even?", pic_number_even_p);
+
   pic_defun(pic, "+", pic_number_add);
   pic_defun(pic, "-", pic_number_sub);
   pic_defun(pic, "*", pic_number_mul);