X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ftarget-format.lisp;h=3406f9b9bd41ac9bf64803bfd1941156f5b97ca4;hb=3e3cd66f482339be3b2eab942e00147c3e343434;hp=399feb05b94052a391b31957ba5a0175131ed663;hpb=6f4c867e670a3c538b4072b824fa8026e9f2cbfe;p=sbcl.git

diff --git a/src/code/target-format.lisp b/src/code/target-format.lisp
index 399feb0..3406f9b 100644
--- a/src/code/target-format.lisp
+++ b/src/code/target-format.lisp
@@ -332,7 +332,8 @@
        (commainterval 3))
       params
     (let ((arg (next-arg)))
-      (unless (integerp arg)
+      (unless (or base
+                  (integerp arg))
         (error 'format-error
                :complaint "~s is not of type INTEGER."
                :args (list arg)))
@@ -1099,7 +1100,7 @@
   (multiple-value-bind (segments first-semi close remaining)
       (parse-format-justification directives)
     (setf args
-          (if (format-directive-colonp close)
+          (if (format-directive-colonp close) ; logical block vs. justification
               (multiple-value-bind (prefix per-line-p insides suffix)
                   (parse-format-logical-block segments colonp first-semi
                                               close params string end)
@@ -1114,6 +1115,16 @@
                          :complaint "~D illegal directive~:P found inside justification block"
                          :args (list count)
                          :references (list '(:ansi-cl :section (22 3 5 2)))))
+                ;; ANSI does not explicitly say that an error should
+                ;; be signalled, but the @ modifier is not explicitly
+                ;; allowed for ~> either.
+                (when (format-directive-atsignp close)
+                  (error 'format-error
+                         :complaint "@ modifier not allowed in close ~
+                         directive of justification ~
+                         block (i.e. ~~<...~~@>."
+                         :offset (1- (format-directive-end close))
+                         :references (list '(:ansi-cl :section (22 3 6 2)))))
                 (interpret-format-justification stream orig-args args
                                                 segments colonp atsignp
                                                 first-semi params))))