0.9.15.22: check for error, do not aver, do not collect $200

 * Reported by Antonio Martinez.

diff --git a/NEWS b/NEWS
index cff3727..06c3a5c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,9 @@ changes in sbcl-0.9.16 relative to sbcl-0.9.15:
     (reported by Richard Kreuter)
   * bug fix: compiled calls to TYPEP were mishandling obsolete
     instances.  (reported by James Bielman and Attila Lendvai)
+  * bug fix: format strings with ~> without matching ~< no longer
+    trigger an AVER, but signal an understandable error instead.
+    (reported by Antonio Martinez)
 
 changes in sbcl-0.9.15 relative to sbcl-0.9.14:
   * added support for the ucs-2 external format.  (contributed by Ivan

diff --git a/src/code/late-format.lisp b/src/code/late-format.lisp
index 4e262c0..6369024 100644 (file)
--- a/src/code/late-format.lisp
+++ b/src/code/late-format.lisp
@@ -78,7 +78,11 @@
             ((and block (char= char #\;) (format-directive-colonp directive))
              (setf semicolon directive))
             ((char= char #\>)
-             (aver block)
+             (unless block
+               (error 'format-error
+                      :complaint "~~> without a matching ~~<"
+                      :control-string string
+                      :offset next-directive))
              (cond
                ((format-directive-colonp directive)
                 (unless pprint

diff --git a/version.lisp-expr b/version.lisp-expr
index 88dfe28..6640afe 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.15.21"
+"0.9.15.22"