[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2013-02-10-g0ecc7f4

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  0ecc7f4cbf55f877f2d2fa65c31f2e6665cc68ba (commit)
      from  3e1b21d485864fb5f783153170c8a8365815b326 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ecc7f4cbf55f877f2d2fa65c31f2e6665cc68ba
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Thu Feb 21 20:28:37 2013 -0800

    Remove :conservative-float-type from *features* and update code
    accordingly.

diff --git a/src/compiler/srctran.lisp b/src/compiler/srctran.lisp
index 4b6f0ff..8f5c134 100644
--- a/src/compiler/srctran.lisp
+++ b/src/compiler/srctran.lisp
@@ -21,9 +21,6 @@
 (in-package "C")
 (intl:textdomain "cmucl")
 
-#+conservative-float-type
-(sys:register-lisp-feature :conservative-float-type)
-
 ;;; Source transform for Not, Null  --  Internal
 ;;;
 ;;;    Convert into an IF so that IF optimizations will eliminate redundant
@@ -1253,15 +1250,12 @@
 ;;;
 (defun two-arg-derive-type (arg1 arg2 derive-fcn fcn
 				 &optional (convert-type t))
-  #-conservative-float-type
-  (declare (ignore fcn))
   (labels ((maybe-convert-numeric-type (type)
 	     (if convert-type (convert-numeric-type type) type))
 	   (maybe-convert-back-type-list (type)
 	     (if convert-type (convert-back-numeric-type-list type) type))
 	   (deriver (x y same-arg)
-	     (cond #+conservative-float-type
-		   ((and (member-type-p x) (member-type-p y))
+	     (cond ((and (member-type-p x) (member-type-p y))
 		    (let* ((x (first (member-type-members x)))
 			   (y (first (member-type-members y)))
 			   (result (with-float-traps-masked
@@ -1275,12 +1269,6 @@
 						:complexp :real))
 			    (t
 			     (specifier-type `(eql ,result))))))
-		   #-conservative-float-type
-		   ((and (member-type-p x) (member-type-p y))
-		    (let* ((x (convert-member-type x))
-			   (y (convert-member-type y))
-			   (result (funcall derive-fcn x y same-arg)))
-		      (maybe-convert-back-type-list result)))
 		   ((and (member-type-p x) (numeric-type-p y))
 		    (let* ((x (convert-member-type x))
 			   (y (maybe-convert-numeric-type y))

-----------------------------------------------------------------------

Summary of changes:
 src/compiler/srctran.lisp |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp