[cmucl-cvs] CMUCL commit: src/code (format.lisp)

[Raymond Toy]

    Date: Tuesday, November 16, 2010 @ 14:15:38
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/code

Modified: format.lisp

Signal a warning if ~:[ directive includes ~:;.  From a message by
Didier Verna, cmucl-imp, 2010-11-11.


-------------+
 format.lisp |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


Index: src/code/format.lisp
diff -u src/code/format.lisp:1.96 src/code/format.lisp:1.97
--- src/code/format.lisp:1.96	Tue Apr 20 13:57:44 2010
+++ src/code/format.lisp	Tue Nov 16 14:15:38 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/format.lisp,v 1.96 2010-04-20 17:57:44 rtoy Rel $")
+  "$Header: /project/cmucl/cvsroot/src/code/format.lisp,v 1.97 2010-11-16 19:15:38 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -2384,9 +2384,13 @@
 		   (expand-maybe-conditional (car sublists)))))
 	 (if colonp
 	     (if (= (length sublists) 2)
-		 (expand-bind-defaults () params
-		   (expand-true-false-conditional (car sublists)
-						  (cadr sublists)))
+		 (progn
+		   (when last-semi-with-colon-p
+		     (error 'format-error
+			    :complaint (intl:gettext "~~:; directive not effective in ~~:[")))
+		   (expand-bind-defaults () params
+		     (expand-true-false-conditional (car sublists)
+						    (cadr sublists))))
 		 (error 'format-error
 			:complaint
 			(intl:gettext "Must specify exactly two sections.")))