0.7.1.18:

[sbcl.git] / src / code / numbers.lisp

diff --git a/src/code/numbers.lisp b/src/code/numbers.lisp
index fac1b02..9eb5d54 100644 (file)
--- a/src/code/numbers.lisp
+++ b/src/code/numbers.lisp
@@ -679,18 +679,18 @@
        (+ rem divisor)
        rem)))
 
        (+ rem divisor)
        rem)))
 

-(macrolet ((def-frob (name op doc)
+(macrolet ((def (name op doc)

             `(defun ,name (number &optional (divisor 1))
                ,doc
                (multiple-value-bind (res rem) (,op number divisor)
                  (values (float res (if (floatp rem) rem 1.0)) rem)))))
             `(defun ,name (number &optional (divisor 1))
                ,doc
                (multiple-value-bind (res rem) (,op number divisor)
                  (values (float res (if (floatp rem) rem 1.0)) rem)))))

-  (def-frob ffloor floor
+  (def ffloor floor

     "Same as FLOOR, but returns first value as a float.")
     "Same as FLOOR, but returns first value as a float.")

-  (def-frob fceiling ceiling
+  (def fceiling ceiling

     "Same as CEILING, but returns first value as a float." )
     "Same as CEILING, but returns first value as a float." )

-  (def-frob ftruncate truncate
+  (def ftruncate truncate

     "Same as TRUNCATE, but returns first value as a float.")
     "Same as TRUNCATE, but returns first value as a float.")

-  (def-frob fround round
+  (def fround round

     "Same as ROUND, but returns first value as a float."))
 \f
 ;;;; comparisons
     "Same as ROUND, but returns first value as a float."))
 \f
 ;;;; comparisons

@@ -978,13 +978,13 @@
     (fixnum (lognot (truly-the fixnum number)))
     (bignum (bignum-logical-not number))))
 
     (fixnum (lognot (truly-the fixnum number)))
     (bignum (bignum-logical-not number))))
 

-(macrolet ((def-frob (name op big-op)
+(macrolet ((def (name op big-op)

             `(defun ,name (x y)
               (number-dispatch ((x integer) (y integer))
                 (bignum-cross-fixnum ,op ,big-op)))))
             `(defun ,name (x y)
               (number-dispatch ((x integer) (y integer))
                 (bignum-cross-fixnum ,op ,big-op)))))

-  (def-frob two-arg-and logand bignum-logical-and)
-  (def-frob two-arg-ior logior bignum-logical-ior)
-  (def-frob two-arg-xor logxor bignum-logical-xor))
+  (def two-arg-and logand bignum-logical-and)
+  (def two-arg-ior logior bignum-logical-ior)
+  (def two-arg-xor logxor bignum-logical-xor))

 
 (defun logcount (integer)
   #!+sb-doc
 
 (defun logcount (integer)
   #!+sb-doc

@@ -1214,7 +1214,7 @@
     (13 (boole 13 integer1 integer2))
     (14 (boole 14 integer1 integer2))
     (15 (boole 15 integer1 integer2))
     (13 (boole 13 integer1 integer2))
     (14 (boole 14 integer1 integer2))
     (15 (boole 15 integer1 integer2))

-    (t (error "~S is not of type (mod 16)." op))))
+    (t (error 'type-error :datum op :expected-type '(mod 16)))))

 \f
 ;;;; GCD and LCM
 
 \f
 ;;;; GCD and LCM
 

@@ -1315,10 +1315,10 @@
 \f
 ;;;; miscellaneous number predicates
 
 \f
 ;;;; miscellaneous number predicates
 

-(macrolet ((def-frob (name doc)
+(macrolet ((def (name doc)

             `(defun ,name (number) ,doc (,name number))))
             `(defun ,name (number) ,doc (,name number))))

-  (def-frob zerop "Is this number zero?")
-  (def-frob plusp "Is this real number strictly positive?")
-  (def-frob minusp "Is this real number strictly negative?")
-  (def-frob oddp "Is this integer odd?")
-  (def-frob evenp "Is this integer even?"))
+  (def zerop "Is this number zero?")
+  (def plusp "Is this real number strictly positive?")
+  (def minusp "Is this real number strictly negative?")
+  (def oddp "Is this integer odd?")
+  (def evenp "Is this integer even?"))