Changeset 12939

Timestamp:

10/02/10 19:04:00 (11 years ago)

Author:

ehuelsmann

Message:

Fix COERCE on a COMPLEX, being coerced to (COMPLEX <anything>);
this is excercised by Maxima.

File:

• trunk/abcl/src/org/armedbear/lisp/coerce.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/coerce.lisp

@@ -106 +106 @@
         ((and (consp result-type)
               (eq (%car result-type) 'complex))
+         (when (complexp object)
+           (return-from coerce
+             (complex (coerce (realpart object) (cadr result-type))
+                      (coerce (imagpart object) (cadr result-type)))))
          (if (memq (%cadr result-type)
                    '(float single-float double-float short-float long-float))
-             (complex object 0.0)
+             (complex (coerce object (cadr result-type))
+                      (coerce 0.0 (cadr result-type)))
              object))
         ((and (consp result-type)