Changeset 6177

Timestamp:

Apr 7, 2007, 7:56:15 PM (18 years ago)

Author:

Gary Byers

Message:

When trying to infer result type of MAKE-ARRAY call, unquote quoted
type specifier.

Strength-reduce FLOAT when second argument is of known type.

File:

• trunk/ccl/compiler/optimizers.lisp (modified) (4 diffs)

trunk/ccl/compiler/optimizers.lisp

@@ -616 +616 @@
           (setf (array-ctype-dimensions ctype)
                 '*))))
-    (let* ((element-type (specifier-type (if element-type-p element-type t))))
+    (let* ((element-type (specifier-type (if element-type-p (nx-unquote element-type) t))))
       (setf (array-ctype-element-type ctype) element-type)
       (if (typep element-type 'unknown-ctype)
@@ -1526 +1526 @@
     `(eql (lisptag ,arg) ,fixnum-tag)))
 
-(define-compiler-macro float (&whole w number &optional other)
-  (declare (ignore number other))
-  w)
+
 
 (define-compiler-macro double-float-p (n)
@@ -1788 +1786 @@
       call)))
 
-(define-compiler-macro float (&whole call number &optional other &environment env)
+(define-compiler-macro float (&whole call number &optional (other 0.0f0 other-p) &environment env)
+  
   (cond ((and (typep other 'single-float)
               (nx-form-typep number 'double-float env))
@@ -1795 +1794 @@
               (nx-form-typep number 'single-float env))
          `(the double-float (%single-to-double ,number)))
+        ((or (typep other 'single-float)
+             (null other-p))
+         `(the single-float (%short-float ,number)))
+        ((typep other 'double-float)
+         `(the double-float (%double-float ,number)))
         (t call)))