Add more numeric types

Author: Aethaeryn

scheme-types.lisp

@@ -28,22 +28,37 @@
 
 ;;;; Type definitions
 
+(define-scheme-type* (number?) numberp
+  'number)
+
+(define-scheme-type* (complex?) numberp
+  'number)
+
+(define-scheme-type* (real?) realp
+  'real)
+
+(define-scheme-type (rational?)
+  '(or rational float))
+
+;;; TODO: integer?
+
 (define-scheme-type (exact?)
   "An exact number might be real or complex, but is not a float."
   `(or rational (complex rational)))
 
-(define-scheme-type (exact-integer?)
-  "An exact integer in Scheme is just a CL integer."
-  `integer)
-
 (define-scheme-type (inexact?)
   "An inexact number is just a float, real or complex."
   `(or float (complex float)))
 
 (define-scheme-type (flonum?)
-  "A Scheme flonum is just a double-float."
   'double-float)
 
+(define-scheme-type (exact-integer?)
+  `integer)
+
+(define-scheme-type* (zero?) zerop
+  '(or (real 0 0) (complex (real 0 0))))
+
 (define-scheme-type (boolean?)
   "
 The two symbols that represent a Scheme Boolean, which externally are

standard-procedures.lisp

@@ -39,16 +39,16 @@
 ;;; Numerical predicates
 
 (define-scheme-predicate (number? obj)
-  (numberp obj))
+  (number? obj))
 
 (define-scheme-predicate (complex? obj)
-  (numberp obj))
+  (complex? obj))
 
 (define-scheme-predicate (real? obj)
-  (realp obj))
+  (real? obj))
 
 (define-scheme-predicate (rational? obj)
-  (or (rationalp obj) (floatp obj)))
+  (rational? obj))
 
 (define-scheme-predicate (integer? obj)
   (or (integerp obj)
@@ -90,7 +90,7 @@
   (apply #'>= x more-numbers))
 
 (define-scheme-predicate (zero? z)
-  (zerop z))
+  (zero? z))
 
 (define-scheme-predicate (positive? x)
   (plusp x))