Changeset 32544 in project

Timestamp:

07/05/15 13:00:12 (6 years ago)

Author:

sjamaan

Message:

numbers: Fix error reporting when supplied non-numeric arguments

File:

• release/4/numbers/trunk/numbers.scm (modified) (5 diffs)

release/4/numbers/trunk/numbers.scm

@@ -323 +323 @@
                (%/ numerator d)
                (%make-ratnum numerator d))))
-        (else (bad-number '+ y)) ) )
+        (else (if (not (number? x))
+                  (bad-number '+ x)
+                  (bad-number '+ y))) ) )
 
 (define (- arg1 . args)
@@ -367 +369 @@
                (%/ numerator d)
                (%make-ratnum numerator d))))
-        (else (bad-number '- y)) ) )
+        (else (if (not (number? x))
+                  (bad-number '- x)
+                  (bad-number '- y))) ) )
 
 (define (* . args)
@@ -375 +379 @@
             (args (##sys#slot args 1)))
         (if (null? args)
-            (if (number? x) x (bad-number '+ x))
+            (if (number? x) x (bad-number '* x))
             (let loop ((args (##sys#slot args 1))
                        (x (%* x (##sys#slot args 0))))
@@ -416 +420 @@
              (nonrat*rat y x)))
         ((ratnum? y) (nonrat*rat x y))
-        (else (bad-number '* x))))
+        (else (if (not (number? x))
+                  (bad-number '* x)
+                  (bad-number '* y)))))
 
 (define-inline (bignum-digit-count b) (##core#inline "C_u_i_bignum_size" b))
@@ -513 +519 @@
                (%ratnum num denom))))
         ((not (number? x)) (bad-number '/ x))
-        (else (bad-number '/ y))) )
+        (else (if (not (number? x))
+                  (bad-number '/ x)
+                  (bad-number '/ y)))) )
 
 ;; Burnikel-Ziegler recursive division: Split high number (x) in three