Changeset 11852

Timestamp:

05/10/09 11:47:29 (14 years ago)

Author:

vvoutilainen

Message:

Combine derive-type flets into a helper function.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp (modified) (6 diffs)

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -6166 +6166 @@
             (and high1 high2 (- high1 high2))))
 
+(defun derive-compiler-types (args op)
+  (flet ((combine (x y)
+      (derive-type-numeric-op op x y)))
+    (reduce #'combine (cdr args) :key #'derive-compiler-type
+      :initial-value (derive-compiler-type (car args)))))
+
 (defknown derive-type-minus (t) t)
 (defun derive-type-minus (form)
@@ -6174 +6180 @@
                                  zero-integer-type
                                  (derive-compiler-type (%car args))))
-      (2 (flet ((combine (x y)
-                  (derive-type-numeric-op op x y)))
-           (reduce #'combine (cdr args) :key #'derive-compiler-type
-                   :initial-value (derive-compiler-type (car args))))))))
-
+      (2 (derive-compiler-types args op)))))
 
 (define-int-bounds-derivation + (low1 high1 low2 high2)
@@ -6190 +6192 @@
     (if (null args)
         zero-integer-type
-        (flet ((combine (x y)
-                 (derive-type-numeric-op op x y)))
-          (reduce #'combine (cdr args) :key #'derive-compiler-type
-                  :initial-value (derive-compiler-type (car args)))))))
+      (derive-compiler-types args op))))
 
 (define-int-bounds-derivation * (low1 high1 low2 high2)
@@ -6219 +6218 @@
     (if (null args)
         one-integer-type
-        (flet ((combine (x y)
-                 (derive-type-numeric-op op x y)))
-          (reduce #'combine (cdr args) :key #'derive-compiler-type
-                  :initial-value (derive-compiler-type (car args)))))))
+      (derive-compiler-types args op))))
 
 (define-int-bounds-derivation max (low1 low2 high1 high2)
@@ -6232 +6228 @@
   (let ((op (car form))
         (args (cdr form)))
-    (flet ((combine (x y)
-             (derive-type-numeric-op op x y)))
-      (reduce #'combine (cdr args) :key #'derive-compiler-type
-              :initial-value (derive-compiler-type (car args))))))
+    (derive-compiler-types args op)))
 
 (define-int-bounds-derivation min (low1 high1 low2 high2)
@@ -6245 +6238 @@
   (let ((op (car form))
         (args (cdr form)))
-    (flet ((combine (x y)
-             (derive-type-numeric-op op x y)))
-      (reduce #'combine (cdr args) :key #'derive-compiler-type
-              :initial-value (derive-compiler-type (car args))))))
+    (derive-compiler-types args op)))
 
 ;; read-char &optional input-stream eof-error-p eof-value recursive-p => char