[Sbcl-commits] CVS: sbcl/src/code coerce.lisp,1.16,1.17 filesys.lisp,1.48,1.49

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28111/src/code

Modified Files:
	coerce.lisp filesys.lisp 
Log Message:
0.8.18.9:
	Merge a couple of patches
	... a bug in 'filesys.lisp' (Artem V. Andreev);
	... (coerce #c(1 2) '(complex float)) => error (Vincent Arkesteijn)


Index: coerce.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/coerce.lisp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- coerce.lisp	20 Oct 2003 13:31:07 -0000	1.16
+++ coerce.lisp	1 Jan 2005 21:01:29 -0000	1.17
@@ -179,6 +179,9 @@
 		     ((csubtypep type (specifier-type '(complex long-float)))
 		      (complex (%long-float (realpart object))
 			       (%long-float (imagpart object))))
+                     ((csubtypep type (specifier-type '(complex float)))
+                      (complex (%single-float (realpart object))
+                               (%single-float (imagpart object))))
 		     ((and (typep object 'rational)
 			   (csubtypep type (specifier-type '(complex float))))
 		      ;; Perhaps somewhat surprisingly, ANSI specifies

Index: filesys.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/filesys.lisp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- filesys.lisp	30 Oct 2004 14:36:06 -0000	1.48
+++ filesys.lisp	1 Jan 2005 21:01:29 -0000	1.49
@@ -318,7 +318,7 @@
 	   (error ":BACK cannot be represented in namestrings."))
 	  ((member :wild-inferiors)
 	   (pieces "**/"))
-	  ((or simple-string pattern)
+	  ((or simple-string pattern (member :wild))
 	   (pieces (unparse-unix-piece dir))
 	   (pieces "/"))
 	  (t