X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fmacros.lisp;h=feb191ca859a9034d56499803d62c9a00fdab8b2;hb=dca55270cf662763243dfc8ee207370473da2a6f;hp=9f5a4861a7ecbd8c95781b67637da9796b63d292;hpb=670010e3f3dcd62efaf23f61abdc73950edb88c6;p=sbcl.git

diff --git a/src/code/macros.lisp b/src/code/macros.lisp
index 9f5a486..feb191c 100644
--- a/src/code/macros.lisp
+++ b/src/code/macros.lisp
@@ -133,8 +133,7 @@
 			:environment environment)
       (let ((def `(lambda (,whole ,environment)
 		    ,@local-decs
-		    (block ,(fun-name-block-name name)
-		      ,body)))
+		    ,body))
 	    (debug-name (debug-namify "DEFINE-COMPILER-MACRO ~S" name)))
 	`(eval-when (:compile-toplevel :load-toplevel :execute)
 	  (sb!c::%define-compiler-macro ',name
@@ -169,18 +168,17 @@
                              lambda-list
 			     (%simple-fun-name (%closure-fun definition))
 			     debug-name))
-                      ((#.sb!vm:simple-fun-header-widetag
-                        #.sb!vm:closure-fun-header-widetag)
+                      (#.sb!vm:simple-fun-header-widetag
                        (setf (%simple-fun-arglist definition) lambda-list
 			     (%simple-fun-name definition) debug-name))))
 	     name))))
   (progn
     (def (:load-toplevel :execute) #-sb-xc-host t #+sb-xc-host nil)
-    (def (:compile-toplevel) nil)))
+    #-sb-xc (def (:compile-toplevel) nil)))
 
 ;;;; CASE, TYPECASE, and friends
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
+(eval-when (#-sb-xc :compile-toplevel :load-toplevel :execute)
 
 ;;; CASE-BODY returns code for all the standard "case" macros. NAME is
 ;;; the macro name, and KEYFORM is the thing to case on. MULTI-P
@@ -320,7 +318,8 @@
 ;;;; WITH-FOO i/o-related macros
 
 (defmacro-mundanely with-open-stream ((var stream) &body forms-decls)
-  (multiple-value-bind (forms decls) (parse-body forms-decls nil)
+  (multiple-value-bind (forms decls)
+      (parse-body forms-decls :doc-string-allowed nil)
     (let ((abortp (gensym)))
       `(let ((,var ,stream)
 	     (,abortp t))
@@ -339,7 +338,8 @@
 
 (defmacro-mundanely with-input-from-string ((var string &key index start end)
 					    &body forms-decls)
-  (multiple-value-bind (forms decls) (parse-body forms-decls nil)
+  (multiple-value-bind (forms decls)
+      (parse-body forms-decls :doc-string-allowed nil)
     ;; The ONCE-ONLY inhibits compiler note for unreachable code when
     ;; END is true.
     (once-only ((string string))
@@ -364,16 +364,18 @@
 	   ,@(when index
 	       `((setf ,index (string-input-stream-current ,var)))))))))
 
-(defmacro-mundanely with-output-to-string ((var &optional string)
-					   &body forms-decls)
-  (multiple-value-bind (forms decls) (parse-body forms-decls nil)
+(defmacro-mundanely with-output-to-string 
+    ((var &optional string &key (element-type ''character))
+     &body forms-decls)
+  (multiple-value-bind (forms decls)
+      (parse-body forms-decls :doc-string-allowed nil)
     (if string
       `(let ((,var (make-fill-pointer-output-stream ,string)))
   	 ,@decls
   	 (unwind-protect
 	     (progn ,@forms)
   	   (close ,var)))
-      `(let ((,var (make-string-output-stream)))
+      `(let ((,var (make-string-output-stream :element-type ,element-type)))
   	 ,@decls
   	 (unwind-protect
 	     (progn ,@forms)