Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1:/tmp/cvs-serv28596/src/code

Modified Files:
	cold-init-helper-macros.lisp late-type.lisp 
Log Message:
0.8.1.24:
        * SB-BSD-SOCKETS: test of local sockets tries both stream and
          datagram kinds;
        * COMPLEX-= type method: if the second type is unknown, try to
          reparse it.


Index: cold-init-helper-macros.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/cold-init-helper-macros.lisp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cold-init-helper-macros.lisp	26 Jun 2003 19:36:02 -0000	1.5
+++ cold-init-helper-macros.lisp	4 Jul 2003 05:18:25 -0000	1.6
@@ -20,11 +20,11 @@
   (defvar *cold-init-forms*))
 
 (defmacro !begin-collecting-cold-init-forms ()
-  #-sb-xc-host '(eval-when (:compile-toplevel :execute)
-		  (when (boundp '*cold-init-forms*)
-		    (warn "discarding old *COLD-INIT-FORMS* value"))
-		  (setf *cold-init-forms* nil))
-  #+sb-xc-host nil)
+  #+sb-xc '(eval-when (:compile-toplevel :execute)
+             (when (boundp '*cold-init-forms*)
+               (warn "discarding old *COLD-INIT-FORMS* value"))
+             (setf *cold-init-forms* nil))
+  #-sb-xc nil)
 
 ;;; Note: Unlike the analogous COLD-INIT macro in CMU CL, this macro
 ;;; makes no attempt to simulate a top level situation by treating
@@ -33,24 +33,24 @@
   ;; In the target Lisp, stuff the forms into a named function which
   ;; will presumably be executed at the appropriate stage of cold load
   ;; (i.e. basically as soon as possible).
-  #-sb-xc-host (progn
-		 (setf *cold-init-forms*
-		       (nconc *cold-init-forms* (copy-list forms)))
-		 nil)
+  #+sb-xc (progn
+            (setf *cold-init-forms*
+                  (nconc *cold-init-forms* (copy-list forms)))
+            nil)
   ;; In the cross-compilation host Lisp, cold load might not be a
   ;; meaningful concept and in any case would have happened long ago,
   ;; so just execute the forms at load time (i.e. basically as soon as
   ;; possible).
-  #+sb-xc-host `(progn ,@forms))
+  #-sb-xc `(progn ,@forms))
 
 (defmacro !defun-from-collected-cold-init-forms (name)
-  #-sb-xc-host `(progn
-		  (defun ,name ()
-		    ,@*cold-init-forms*
-		    (values))
-		  (eval-when (:compile-toplevel :execute)
-		    (makunbound '*cold-init-forms*)))
-  #+sb-xc-host (declare (ignore name)))
+  #+sb-xc `(progn
+             (defun ,name ()
+               ,@*cold-init-forms*
+               (values))
+             (eval-when (:compile-toplevel :execute)
+               (makunbound '*cold-init-forms*)))
+  #-sb-xc (declare (ignore name)))
 
 ;;; FIXME: Consider renaming this file asap.lisp,
 ;;; and the renaming the various things

Index: late-type.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/late-type.lisp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- late-type.lisp	30 Jun 2003 04:24:14 -0000	1.89
+++ late-type.lisp	4 Jul 2003 05:18:25 -0000	1.90
@@ -1148,8 +1148,12 @@
   (values nil nil))
 
 (!define-type-method (hairy :complex-=) (type1 type2)
-  (declare (ignore type1 type2))
-  (values nil nil))
+  (if (unknown-type-p type2)
+      (let ((type2 (specifier-type (unknown-type-specifier type2))))
+        (if (unknown-type-p type2)
+            (values nil nil)
+            (type= type1 type2)))
+  (values nil nil)))
 
 (!define-type-method (hairy :simple-intersection2 :complex-intersection2) 
 		     (type1 type2)