diff --git a/code/format.lisp b/code/format.lisp index ffb0c06643aad2bc043e2e1c17997af23e5c741c..270caa00e5a33a26ea23e784343400bc75adf8cf 100644 --- a/code/format.lisp +++ b/code/format.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.62 2005/03/22 16:12:43 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/format.lisp,v 1.63 2005/04/18 21:56:17 rtoy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -1773,9 +1773,10 @@ (error 'format-error :complaint "Must specify exactly two sections.")) - (expand-bind-defaults ((index (expand-next-arg))) params + (expand-bind-defaults ((index nil)) params (setf *only-simple-args* nil) - (let ((clauses nil)) + (let ((clauses nil) + (case `(or ,index ,(expand-next-arg)))) (when last-semi-with-colon-p (push `(t ,@(expand-directive-list (pop sublists))) clauses)) @@ -1784,7 +1785,7 @@ (push `(,(decf count) ,@(expand-directive-list sublist)) clauses))) - `(case ,index ,@clauses))))) + `(case ,case ,@clauses))))) remaining))) (defun expand-maybe-conditional (sublist)