- (let ((char (get-char)))
- (cond ((or (char<= #\0 char #\9) (char= char #\+) (char= char #\-))
- (check-ordering)
- (multiple-value-bind (param new-posn)
- (parse-integer string :start posn :junk-allowed t)
- (push (cons posn param) params)
- (setf posn new-posn)
- (case (get-char)
- (#\,)
- ((#\: #\@)
- (decf posn))
- (t
- (return)))))
- ((or (char= char #\v)
- (char= char #\V))
- (check-ordering)
- (push (cons posn :arg) params)
- (incf posn)
- (case (get-char)
- (#\,)
- ((#\: #\@)
- (decf posn))
- (t
- (return))))
- ((char= char #\#)
- (check-ordering)
- (push (cons posn :remaining) params)
- (incf posn)
- (case (get-char)
- (#\,)
- ((#\: #\@)
- (decf posn))
- (t
- (return))))
- ((char= char #\')
- (check-ordering)
- (incf posn)
- (push (cons posn (get-char)) params)
- (incf posn)
- (unless (char= (get-char) #\,)
- (decf posn)))
- ((char= char #\,)
- (check-ordering)
- (push (cons posn nil) params))
- ((char= char #\:)
- (if colonp
- (error 'format-error
- :complaint "too many colons supplied"
- :control-string string
- :offset posn
+ (let ((char (get-char)))
+ (cond ((or (char<= #\0 char #\9) (char= char #\+) (char= char #\-))
+ (check-ordering)
+ (multiple-value-bind (param new-posn)
+ (parse-integer string :start posn :junk-allowed t)
+ (push (cons posn param) params)
+ (setf posn new-posn)
+ (case (get-char)
+ (#\,)
+ ((#\: #\@)
+ (decf posn))
+ (t
+ (return)))))
+ ((or (char= char #\v)
+ (char= char #\V))
+ (check-ordering)
+ (push (cons posn :arg) params)
+ (incf posn)
+ (case (get-char)
+ (#\,)
+ ((#\: #\@)
+ (decf posn))
+ (t
+ (return))))
+ ((char= char #\#)
+ (check-ordering)
+ (push (cons posn :remaining) params)
+ (incf posn)
+ (case (get-char)
+ (#\,)
+ ((#\: #\@)
+ (decf posn))
+ (t
+ (return))))
+ ((char= char #\')
+ (check-ordering)
+ (incf posn)
+ (push (cons posn (get-char)) params)
+ (incf posn)
+ (unless (char= (get-char) #\,)
+ (decf posn)))
+ ((char= char #\,)
+ (check-ordering)
+ (push (cons posn nil) params))
+ ((char= char #\:)
+ (if colonp
+ (error 'format-error
+ :complaint "too many colons supplied"
+ :control-string string
+ :offset posn
- (when (char= char #\/)
- (let ((closing-slash (position #\/ string :start (1+ posn))))
- (if closing-slash
- (setf posn closing-slash)
- (error 'format-error
- :complaint "no matching closing slash"
- :control-string string
- :offset posn))))
- (make-format-directive
- :string string :start start :end (1+ posn)
- :character (char-upcase char)
- :colonp colonp :atsignp atsignp
- :params (nreverse params))))))
+ (when (char= char #\/)
+ (let ((closing-slash (position #\/ string :start (1+ posn))))
+ (if closing-slash
+ (setf posn closing-slash)
+ (error 'format-error
+ :complaint "no matching closing slash"
+ :control-string string
+ :offset posn))))
+ (make-format-directive
+ :string string :start start :end (1+ posn)
+ :character (char-upcase char)
+ :colonp colonp :atsignp atsignp
+ :params (nreverse params))))))
- (*only-simple-args* t)
- (guts (expand-control-string control-string))
- (args nil))
- (dolist (arg *simple-args*)
- (push `(,(car arg)
- (error
- 'format-error
- :complaint "required argument missing"
- :control-string ,control-string
- :offset ,(cdr arg)))
- args))
- (return `(lambda (stream &optional ,@args &rest args)
- ,guts
- args))))
+ (*only-simple-args* t)
+ (guts (expand-control-string control-string))
+ (args nil))
+ (dolist (arg *simple-args*)
+ (push `(,(car arg)
+ (error
+ 'format-error
+ :complaint "required argument missing"
+ :control-string ,control-string
+ :offset ,(cdr arg)))
+ args))
+ (return `(lambda (stream &optional ,@args &rest args)
+ (declare (ignorable stream))
+ ,guts
+ args))))
- (collect ((expander-bindings) (runtime-bindings))
- (dolist (spec specs)
- (destructuring-bind (var default) spec
- (let ((symbol (gensym)))
- (expander-bindings
- `(,var ',symbol))
- (runtime-bindings
- `(list ',symbol
- (let* ((param-and-offset (pop ,params))
- (offset (car param-and-offset))
- (param (cdr param-and-offset)))
- (case param
- (:arg `(or ,(expand-next-arg offset)
- ,,default))
- (:remaining
- (setf *only-simple-args* nil)
- '(length args))
- ((nil) ,default)
- (t param))))))))
- `(let ,(expander-bindings)
- `(let ,(list ,@(runtime-bindings))
- ,@(if ,params
- (error
- 'format-error
- :complaint
- "too many parameters, expected no more than ~W"
- :args (list ,(length specs))
- :offset (caar ,params)))
- ,,@body)))
- `(progn
- (when ,params
- (error 'format-error
- :complaint "too many parameters, expected none"
- :offset (caar ,params)))
- ,@body))))
+ (collect ((expander-bindings) (runtime-bindings))
+ (dolist (spec specs)
+ (destructuring-bind (var default) spec
+ (let ((symbol (gensym)))
+ (expander-bindings
+ `(,var ',symbol))
+ (runtime-bindings
+ `(list ',symbol
+ (let* ((param-and-offset (pop ,params))
+ (offset (car param-and-offset))
+ (param (cdr param-and-offset)))
+ (case param
+ (:arg `(or ,(expand-next-arg offset)
+ ,,default))
+ (:remaining
+ (setf *only-simple-args* nil)
+ '(length args))
+ ((nil) ,default)
+ (t param))))))))
+ `(let ,(expander-bindings)
+ `(let ,(list ,@(runtime-bindings))
+ ,@(if ,params
+ (error
+ 'format-error
+ :complaint
+ "too many parameters, expected no more than ~W"
+ :args (list ,(length specs))
+ :offset (caar ,params)))
+ ,,@body)))
+ `(progn
+ (when ,params
+ (error 'format-error
+ :complaint "too many parameters, expected none"
+ :offset (caar ,params)))
+ ,@body))))
- (if (format-directive-p next)
- (let ((char (format-directive-character next)))
- (if (or (char= kind char)
- (and stop-at-semi (char= char #\;)))
- (car directives)
- (find-directive
- (cdr (flet ((after (char)
- (member (find-directive (cdr directives)
- char
- nil)
- directives)))
- (case char
- (#\( (after #\)))
- (#\< (after #\>))
- (#\[ (after #\]))
- (#\{ (after #\}))
- (t directives))))
- kind stop-at-semi)))
- (find-directive (cdr directives) kind stop-at-semi)))))
+ (if (format-directive-p next)
+ (let ((char (format-directive-character next)))
+ (if (or (char= kind char)
+ (and stop-at-semi (char= char #\;)))
+ (car directives)
+ (find-directive
+ (cdr (flet ((after (char)
+ (member (find-directive (cdr directives)
+ char
+ nil)
+ directives)))
+ (case char
+ (#\( (after #\)))
+ (#\< (after #\>))
+ (#\[ (after #\]))
+ (#\{ (after #\}))
+ (t directives))))
+ kind stop-at-semi)))
+ (find-directive (cdr directives) kind stop-at-semi)))))
- (expand-bind-defaults ((mincol 0) (colinc 1) (minpad 0)
- (padchar #\space))
- params
- `(format-prin1 stream ,(expand-next-arg) ,colonp ,atsignp
- ,mincol ,colinc ,minpad ,padchar)))
- (colonp
- `(let ((arg ,(expand-next-arg)))
- (if arg
- (prin1 arg stream)
- (princ "()" stream))))
- (t
- `(prin1 ,(expand-next-arg) stream))))
+ (expand-bind-defaults ((mincol 0) (colinc 1) (minpad 0)
+ (padchar #\space))
+ params
+ `(format-prin1 stream ,(expand-next-arg) ,colonp ,atsignp
+ ,mincol ,colinc ,minpad ,padchar)))
+ (colonp
+ `(let ((arg ,(expand-next-arg)))
+ (if arg
+ (prin1 arg stream)
+ (princ "()" stream))))
+ (t
+ `(prin1 ,(expand-next-arg) stream))))
- ((mincol 0) (padchar #\space) (commachar #\,) (commainterval 3))
- params
- `(format-print-integer stream ,(expand-next-arg) ,colonp ,atsignp
- ,base ,mincol ,padchar ,commachar
- ,commainterval))
- `(write ,(expand-next-arg) :stream stream :base ,base :radix nil
- :escape nil)))
+ ((mincol 0) (padchar #\space) (commachar #\,) (commainterval 3))
+ params
+ `(format-print-integer stream ,(expand-next-arg) ,colonp ,atsignp
+ ,base ,mincol ,padchar ,commachar
+ ,commainterval))
+ `(let ((*print-base* ,base)
+ (*print-radix* nil)
+ (*print-escape* nil))
+ (output-object ,(expand-next-arg) stream))))
- ((not colonp)
- (expand-next-arg))
- (*orig-args-available*
- `(if (eq orig-args args)
- (error 'format-error
- :complaint "no previous argument"
- :offset ,(1- end))
- (do ((arg-ptr orig-args (cdr arg-ptr)))
- ((eq (cdr arg-ptr) args)
- (car arg-ptr)))))
- (*only-simple-args*
- (unless *simple-args*
- (error 'format-error
- :complaint "no previous argument"))
- (caar *simple-args*))
- (t
- (/show0 "THROWing NEED-ORIG-ARGS from tilde-P")
- (throw 'need-orig-args nil)))))
+ ((not colonp)
+ (expand-next-arg))
+ (*orig-args-available*
+ `(if (eq orig-args args)
+ (error 'format-error
+ :complaint "no previous argument"
+ :offset ,(1- end))
+ (do ((arg-ptr orig-args (cdr arg-ptr)))
+ ((eq (cdr arg-ptr) args)
+ (car arg-ptr)))))
+ (*only-simple-args*
+ (unless *simple-args*
+ (error 'format-error
+ :complaint "no previous argument"))
+ (caar *simple-args*))
+ (t
+ (/show0 "THROWing NEED-ORIG-ARGS from tilde-P")
+ (throw 'need-orig-args nil)))))
(expand-bind-defaults ((w nil) (d nil) (k nil) (ovf nil) (pad #\space)) params
`(format-fixed stream ,(expand-next-arg) ,w ,d ,k ,ovf ,pad ,atsignp)))
(def-format-directive #\E (colonp atsignp params)
(when colonp
(error 'format-error
(expand-bind-defaults ((w nil) (d nil) (k nil) (ovf nil) (pad #\space)) params
`(format-fixed stream ,(expand-next-arg) ,w ,d ,k ,ovf ,pad ,atsignp)))
(def-format-directive #\E (colonp atsignp params)
(when colonp
(error 'format-error
(def-format-directive #\$ (colonp atsignp params)
(expand-bind-defaults ((d 2) (n 1) (w 0) (pad #\space)) params
`(format-dollars stream ,(expand-next-arg) ,d ,n ,w ,pad ,colonp
(def-format-directive #\$ (colonp atsignp params)
(expand-bind-defaults ((d 2) (n 1) (w 0) (pad #\space)) params
`(format-dollars stream ,(expand-next-arg) ,d ,n ,w ,pad ,colonp
- (expand-bind-defaults ((colrel 1) (colinc 1)) params
- `(format-relative-tab stream ,colrel ,colinc))
- (expand-bind-defaults ((colnum 1) (colinc 1)) params
- `(format-absolute-tab stream ,colnum ,colinc)))))
+ (expand-bind-defaults ((colrel 1) (colinc 1)) params
+ `(format-relative-tab stream ,colrel ,colinc))
+ (expand-bind-defaults ((colnum 1) (colinc 1)) params
+ `(format-absolute-tab stream ,colnum ,colinc)))))
- (error 'format-error
- :complaint
- "both colon and atsign modifiers used simultaneously")
- (expand-bind-defaults ((posn 0)) params
- (unless *orig-args-available*
- (/show0 "THROWing NEED-ORIG-ARGS from tilde-@*")
- (throw 'need-orig-args nil))
- `(if (<= 0 ,posn (length orig-args))
- (setf args (nthcdr ,posn orig-args))
- (error 'format-error
- :complaint "Index ~W out of bounds. Should have been ~
+ (error 'format-error
+ :complaint
+ "both colon and atsign modifiers used simultaneously")
+ (expand-bind-defaults ((posn 0)) params
+ (unless *orig-args-available*
+ (/show0 "THROWing NEED-ORIG-ARGS from tilde-@*")
+ (throw 'need-orig-args nil))
+ `(if (<= 0 ,posn (length orig-args))
+ (setf args (nthcdr ,posn orig-args))
+ (error 'format-error
+ :complaint "Index ~W out of bounds. Should have been ~
- (expand-bind-defaults ((n 1)) params
- (unless *orig-args-available*
- (/show0 "THROWing NEED-ORIG-ARGS from tilde-:*")
- (throw 'need-orig-args nil))
- `(do ((cur-posn 0 (1+ cur-posn))
- (arg-ptr orig-args (cdr arg-ptr)))
- ((eq arg-ptr args)
- (let ((new-posn (- cur-posn ,n)))
- (if (<= 0 new-posn (length orig-args))
- (setf args (nthcdr new-posn orig-args))
- (error 'format-error
- :complaint
- "Index ~W is out of bounds; should have been ~
+ (expand-bind-defaults ((n 1)) params
+ (unless *orig-args-available*
+ (/show0 "THROWing NEED-ORIG-ARGS from tilde-:*")
+ (throw 'need-orig-args nil))
+ `(do ((cur-posn 0 (1+ cur-posn))
+ (arg-ptr orig-args (cdr arg-ptr)))
+ ((eq arg-ptr args)
+ (let ((new-posn (- cur-posn ,n)))
+ (if (<= 0 new-posn (length orig-args))
+ (setf args (nthcdr new-posn orig-args))
+ (error 'format-error
+ :complaint
+ "Index ~W is out of bounds; should have been ~
- (if colonp
- (error 'format-error
- :complaint
- "both colon and atsign modifiers used simultaneously")
- (if (cdr sublists)
- (error 'format-error
- :complaint
- "Can only specify one section")
- (expand-bind-defaults () params
- (expand-maybe-conditional (car sublists)))))
- (if colonp
- (if (= (length sublists) 2)
- (expand-bind-defaults () params
- (expand-true-false-conditional (car sublists)
- (cadr sublists)))
- (error 'format-error
- :complaint
- "must specify exactly two sections"))
- (expand-bind-defaults ((index (expand-next-arg))) params
- (setf *only-simple-args* nil)
- (let ((clauses nil))
- (when last-semi-with-colon-p
- (push `(t ,@(expand-directive-list (pop sublists)))
- clauses))
- (let ((count (length sublists)))
- (dolist (sublist sublists)
- (push `(,(decf count)
- ,@(expand-directive-list sublist))
- clauses)))
- `(case ,index ,@clauses)))))
+ (if colonp
+ (error 'format-error
+ :complaint
+ "both colon and atsign modifiers used simultaneously")
+ (if (cdr sublists)
+ (error 'format-error
+ :complaint
+ "Can only specify one section")
+ (expand-bind-defaults () params
+ (expand-maybe-conditional (car sublists)))))
+ (if colonp
+ (if (= (length sublists) 2)
+ (expand-bind-defaults () params
+ (expand-true-false-conditional (car sublists)
+ (cadr sublists)))
+ (error 'format-error
+ :complaint
+ "must specify exactly two sections"))
+ (expand-bind-defaults ((index nil)) params
+ (setf *only-simple-args* nil)
+ (let ((clauses nil)
+ (case `(or ,index ,(expand-next-arg))))
+ (when last-semi-with-colon-p
+ (push `(t ,@(expand-directive-list (pop sublists)))
+ clauses))
+ (let ((count (length sublists)))
+ (dolist (sublist sublists)
+ (push `(,(decf count)
+ ,@(expand-directive-list sublist))
+ clauses)))
+ `(case ,case ,@clauses)))))
- (unless close-or-semi
- (error 'format-error
- :complaint "no corresponding close bracket"))
- (let ((posn (position close-or-semi remaining)))
- (push (subseq remaining 0 posn) sublists)
- (setf remaining (nthcdr (1+ posn) remaining))
- (when (char= (format-directive-character close-or-semi) #\])
- (return))
- (setf last-semi-with-colon-p
- (format-directive-colonp close-or-semi)))))
+ (unless close-or-semi
+ (error 'format-error
+ :complaint "no corresponding close bracket"))
+ (let ((posn (position close-or-semi remaining)))
+ (push (subseq remaining 0 posn) sublists)
+ (setf remaining (nthcdr (1+ posn) remaining))
+ (when (char= (format-directive-character close-or-semi) #\])
+ (return))
+ (setf last-semi-with-colon-p
+ (format-directive-colonp close-or-semi)))))
- (multiple-value-bind (guts new-args)
- (let ((*simple-args* *simple-args*))
- (values (expand-directive-list sublist)
- *simple-args*))
- (cond ((eq *simple-args* (cdr new-args))
- (setf *simple-args* new-args)
- `(when ,(caar new-args)
- ,@guts))
- (t
- (setf *only-simple-args* nil)
- (hairy))))
- (hairy))))
+ (multiple-value-bind (guts new-args)
+ (let ((*simple-args* *simple-args*))
+ (values (expand-directive-list sublist)
+ *simple-args*))
+ (cond ((and new-args (eq *simple-args* (cdr new-args)))
+ (setf *simple-args* new-args)
+ `(when ,(caar new-args)
+ ,@guts))
+ (t
+ (setf *only-simple-args* nil)
+ (hairy))))
+ (hairy))))
- (multiple-value-bind (true-guts true-args true-simple)
- (let ((*simple-args* *simple-args*)
- (*only-simple-args* t))
- (values (expand-directive-list true)
- *simple-args*
- *only-simple-args*))
- (multiple-value-bind (false-guts false-args false-simple)
- (let ((*simple-args* *simple-args*)
- (*only-simple-args* t))
- (values (expand-directive-list false)
- *simple-args*
- *only-simple-args*))
- (if (= (length true-args) (length false-args))
- `(if ,arg
- (progn
- ,@true-guts)
- ,(do ((false false-args (cdr false))
- (true true-args (cdr true))
- (bindings nil (cons `(,(caar false) ,(caar true))
- bindings)))
- ((eq true *simple-args*)
- (setf *simple-args* true-args)
- (setf *only-simple-args*
- (and true-simple false-simple))
- (if bindings
- `(let ,bindings
- ,@false-guts)
- `(progn
- ,@false-guts)))))
- (progn
- (setf *only-simple-args* nil)
- (hairy)))))
- (hairy)))))
+ (multiple-value-bind (true-guts true-args true-simple)
+ (let ((*simple-args* *simple-args*)
+ (*only-simple-args* t))
+ (values (expand-directive-list true)
+ *simple-args*
+ *only-simple-args*))
+ (multiple-value-bind (false-guts false-args false-simple)
+ (let ((*simple-args* *simple-args*)
+ (*only-simple-args* t))
+ (values (expand-directive-list false)
+ *simple-args*
+ *only-simple-args*))
+ (if (= (length true-args) (length false-args))
+ `(if ,arg
+ (progn
+ ,@true-guts)
+ ,(do ((false false-args (cdr false))
+ (true true-args (cdr true))
+ (bindings nil (cons `(,(caar false) ,(caar true))
+ bindings)))
+ ((eq true *simple-args*)
+ (setf *simple-args* true-args)
+ (setf *only-simple-args*
+ (and true-simple false-simple))
+ (if bindings
+ `(let ,bindings
+ ,@false-guts)
+ `(progn
+ ,@false-guts)))))
+ (progn
+ (setf *only-simple-args* nil)
+ (hairy)))))
+ (hairy)))))
`(when ,(expand-bind-defaults ((arg1 nil) (arg2 nil) (arg3 nil)) params
`(cond (,arg3 (<= ,arg1 ,arg2 ,arg3))
(,arg2 (eql ,arg1 ,arg2))
`(when ,(expand-bind-defaults ((arg1 nil) (arg2 nil) (arg3 nil)) params
`(cond (,arg3 (<= ,arg1 ,arg2 ,arg3))
(,arg2 (eql ,arg1 ,arg2))
- ((compute-insides ()
- (if (zerop posn)
- (if *orig-args-available*
- `((handler-bind
- ((format-error
- (lambda (condition)
- (error 'format-error
- :complaint
- "~A~%while processing indirect format string:"
- :args (list condition)
- :print-banner nil
- :control-string ,string
- :offset ,(1- end)))))
- (setf args
- (%format stream inside-string orig-args args))))
- (throw 'need-orig-args nil))
- (let ((*up-up-and-out-allowed* colonp))
- (expand-directive-list (subseq directives 0 posn)))))
- (compute-loop (count)
- (when atsignp
- (setf *only-simple-args* nil))
- `(loop
- ,@(unless closed-with-colon
- '((when (null args)
- (return))))
- ,@(when count
- `((when (and ,count (minusp (decf ,count)))
- (return))))
- ,@(if colonp
- (let ((*expander-next-arg-macro* 'expander-next-arg)
- (*only-simple-args* nil)
- (*orig-args-available* t))
- `((let* ((orig-args ,(expand-next-arg))
- (outside-args args)
- (args orig-args))
- (declare (ignorable orig-args outside-args args))
- (block nil
- ,@(compute-insides)))))
- (compute-insides))
- ,@(when closed-with-colon
- '((when (null args)
- (return))))))
- (compute-block (count)
- (if colonp
- `(block outside-loop
- ,(compute-loop count))
- (compute-loop count)))
- (compute-bindings (count)
- (if atsignp
+ ((compute-insides ()
+ (if (zerop posn)
+ (if *orig-args-available*
+ `((handler-bind
+ ((format-error
+ (lambda (condition)
+ (error 'format-error
+ :complaint
+ "~A~%while processing indirect format string:"
+ :args (list condition)
+ :print-banner nil
+ :control-string ,string
+ :offset ,(1- end)))))
+ (setf args
+ (%format stream inside-string orig-args args))))
+ (throw 'need-orig-args nil))
+ (let ((*up-up-and-out-allowed* colonp))
+ (expand-directive-list (subseq directives 0 posn)))))
+ (compute-loop (count)
+ (when atsignp
+ (setf *only-simple-args* nil))
+ `(loop
+ ,@(unless closed-with-colon
+ '((when (null args)
+ (return))))
+ ,@(when count
+ `((when (and ,count (minusp (decf ,count)))
+ (return))))
+ ,@(if colonp
+ (let ((*expander-next-arg-macro* 'expander-next-arg)
+ (*only-simple-args* nil)
+ (*orig-args-available* t))
+ `((let* ((orig-args ,(expand-next-arg))
+ (outside-args args)
+ (args orig-args))
+ (declare (ignorable orig-args outside-args args))
+ (block nil
+ ,@(compute-insides)))))
+ (compute-insides))
+ ,@(when closed-with-colon
+ '((when (null args)
+ (return))))))
+ (compute-block (count)
+ (if colonp
+ `(block outside-loop
+ ,(compute-loop count))
+ (compute-loop count)))
+ (compute-bindings (count)
+ (if atsignp
- (multiple-value-bind (prefix per-line-p insides suffix)
- (parse-format-logical-block segments colonp first-semi
- close params string end)
- (expand-format-logical-block prefix per-line-p insides
- suffix atsignp))
- (let ((count (reduce #'+ (mapcar (lambda (x) (count-if #'illegal-inside-justification-p x)) segments))))
- (when (> count 0)
- ;; ANSI specifies that "an error is signalled" in this
- ;; situation.
- (error 'format-error
- :complaint "~D illegal directive~:P found inside justification block"
- :args (list count)
+ (multiple-value-bind (prefix per-line-p insides suffix)
+ (parse-format-logical-block segments colonp first-semi
+ close params string end)
+ (expand-format-logical-block prefix per-line-p insides
+ suffix atsignp))
+ (let ((count (reduce #'+ (mapcar (lambda (x) (count-if #'illegal-inside-justification-p x)) segments))))
+ (when (> count 0)
+ ;; ANSI specifies that "an error is signalled" in this
+ ;; situation.
+ (error 'format-error
+ :complaint "~D illegal directive~:P found inside justification block"
+ :args (list count)
- (apply #'concatenate 'string list)))))
- (case (length segments)
- (0 (values prefix-default nil suffix-default))
- (1 (values prefix-default (car segments) suffix-default))
- (2 (values (extract-string (car segments) t)
- (cadr segments) suffix-default))
- (3 (values (extract-string (car segments) t)
- (cadr segments)
- (extract-string (caddr segments) nil)))
- (t
- (error 'format-error
- :complaint "too many segments for ~~<...~~:>")))))
+ (apply #'concatenate 'string list)))))
+ (case (length segments)
+ (0 (values prefix-default nil suffix-default))
+ (1 (values prefix-default (car segments) suffix-default))
+ (2 (values (extract-string (car segments) t)
+ (cadr segments) suffix-default))
+ (3 (values (extract-string (car segments) t)
+ (cadr segments)
+ (extract-string (caddr segments) nil)))
+ (t
+ (error 'format-error
+ :complaint "too many segments for ~~<...~~:>")))))
- ((simple-string-p directive)
- (let* ((non-space (position #\Space directive :test #'char/=))
- (newlinep (and last-directive
- (char=
- (format-directive-character last-directive)
- #\Newline))))
- (cond
- ((and newlinep non-space)
- (nconc
- (list (subseq directive 0 non-space))
- (add-fill-style-newlines-aux
- (subseq directive non-space) string (+ offset non-space))
- (add-fill-style-newlines
- (cdr list) string (+ offset (length directive)))))
- (newlinep
- (cons directive
- (add-fill-style-newlines
- (cdr list) string (+ offset (length directive)))))
- (t
- (nconc (add-fill-style-newlines-aux directive string offset)
- (add-fill-style-newlines
- (cdr list) string (+ offset (length directive))))))))
- (t
- (cons directive
- (add-fill-style-newlines
- (cdr list) string
- (format-directive-end directive) directive))))))
+ ((simple-string-p directive)
+ (let* ((non-space (position #\Space directive :test #'char/=))
+ (newlinep (and last-directive
+ (char=
+ (format-directive-character last-directive)
+ #\Newline))))
+ (cond
+ ((and newlinep non-space)
+ (nconc
+ (list (subseq directive 0 non-space))
+ (add-fill-style-newlines-aux
+ (subseq directive non-space) string (+ offset non-space))
+ (add-fill-style-newlines
+ (cdr list) string (+ offset (length directive)))))
+ (newlinep
+ (cons directive
+ (add-fill-style-newlines
+ (cdr list) string (+ offset (length directive)))))
+ (t
+ (nconc (add-fill-style-newlines-aux directive string offset)
+ (add-fill-style-newlines
+ (cdr list) string (+ offset (length directive))))))))
+ (t
+ (cons directive
+ (add-fill-style-newlines
+ (cdr list) string
+ (format-directive-end directive) directive))))))
- (let ((blank (position #\space literal :start posn)))
- (when (null blank)
- (results (subseq literal posn))
- (return))
- (let ((non-blank (or (position #\space literal :start blank
- :test #'char/=)
- end)))
- (results (subseq literal posn non-blank))
- (results (make-format-directive
- :string string :character #\_
- :start (+ offset non-blank) :end (+ offset non-blank)
- :colonp t :atsignp nil :params nil))
- (setf posn non-blank))
- (when (= posn end)
- (return))))
+ (let ((blank (position #\space literal :start posn)))
+ (when (null blank)
+ (results (subseq literal posn))
+ (return))
+ (let ((non-blank (or (position #\space literal :start blank
+ :test #'char/=)
+ end)))
+ (results (subseq literal posn non-blank))
+ (results (make-format-directive
+ :string string :character #\_
+ :start (+ offset non-blank) :end (+ offset non-blank)
+ :colonp t :atsignp nil :params nil))
+ (setf posn non-blank))
+ (when (= posn end)
+ (return))))
- (let ((close-or-semi (find-directive remaining #\> t)))
- (unless close-or-semi
- (error 'format-error
- :complaint "no corresponding close bracket"))
- (let ((posn (position close-or-semi remaining)))
- (segments (subseq remaining 0 posn))
- (setf remaining (nthcdr (1+ posn) remaining)))
- (when (char= (format-directive-character close-or-semi)
- #\>)
- (setf close close-or-semi)
- (return))
- (unless first-semi
- (setf first-semi close-or-semi))))
+ (let ((close-or-semi (find-directive remaining #\> t)))
+ (unless close-or-semi
+ (error 'format-error
+ :complaint "no corresponding close bracket"))
+ (let ((posn (position close-or-semi remaining)))
+ (segments (subseq remaining 0 posn))
+ (setf remaining (nthcdr (1+ posn) remaining)))
+ (when (char= (format-directive-character close-or-semi)
+ #\>)
+ (setf close close-or-semi)
+ (return))
+ (unless first-semi
+ (setf first-semi close-or-semi))))
- ,@(unless atsignp
- `((orig-args arg))))
- (declare (ignorable args ,@(unless atsignp '(orig-args))))
- (block nil
- ,@(let ((*expander-next-arg-macro* 'expander-pprint-next-arg)
- (*only-simple-args* nil)
- (*orig-args-available*
- (if atsignp *orig-args-available* t)))
- (expand-directive-list insides)))))))
+ ,@(unless atsignp
+ `((orig-args arg))))
+ (declare (ignorable args ,@(unless atsignp '(orig-args))))
+ (block nil
+ ,@(let ((*expander-next-arg-macro* 'expander-pprint-next-arg)
+ (*only-simple-args* nil)
+ (*orig-args-available*
+ (if atsignp *orig-args-available* t)))
+ (expand-directive-list insides)))))))
- ,@(when newline-segment-p
- '((newline-segment nil)
- (extra-space 0)
- (line-len 72))))
- (block nil
- ,@(when newline-segment-p
- `((setf newline-segment
- (with-output-to-string (stream)
- ,@(expand-directive-list (pop segments))))
- ,(expand-bind-defaults
- ((extra 0)
- (line-len '(or (sb!impl::line-length stream) 72)))
- (format-directive-params first-semi)
- `(setf extra-space ,extra line-len ,line-len))))
- ,@(mapcar (lambda (segment)
- `(push (with-output-to-string (stream)
- ,@(expand-directive-list segment))
- segments))
- segments))
- (format-justification stream
- ,@(if newline-segment-p
- '(newline-segment extra-space line-len)
- '(nil 0 0))
- segments ,colonp ,atsignp
- ,mincol ,colinc ,minpad ,padchar)))))
+ ,@(when newline-segment-p
+ '((newline-segment nil)
+ (extra-space 0)
+ (line-len 72))))
+ (block nil
+ ,@(when newline-segment-p
+ `((setf newline-segment
+ (with-output-to-string (stream)
+ ,@(expand-directive-list (pop segments))))
+ ,(expand-bind-defaults
+ ((extra 0)
+ (line-len '(or (sb!impl::line-length stream) 72)))
+ (format-directive-params first-semi)
+ `(setf extra-space ,extra line-len ,line-len))))
+ ,@(mapcar (lambda (segment)
+ `(push (with-output-to-string (stream)
+ ,@(expand-directive-list segment))
+ segments))
+ segments))
+ (format-justification stream
+ ,@(if newline-segment-p
+ '(newline-segment extra-space line-len)
+ '(nil 0 0))
+ segments ,colonp ,atsignp
+ ,mincol ,colinc ,minpad ,padchar)))))
- (let ((param (cdr param-and-offset)))
- (let ((param-name (gensym)))
- (param-names param-name)
- (bindings `(,param-name
- ,(case param
- (:arg (expand-next-arg))
- (:remaining '(length args))
- (t param)))))))
+ (let ((param (cdr param-and-offset)))
+ (let ((param-name (gensym)))
+ (param-names param-name)
+ (bindings `(,param-name
+ ,(case param
+ (:arg (expand-next-arg))
+ (:remaining '(length args))
+ (t param)))))))
- ;; Hack alert: This is to keep the compiler
- ;; quiet about deleting code inside the
- ;; subseq expansion.
- (subseq foo (1+ slash) (1- end)))))
- (first-colon (position #\: name))
- (second-colon (if first-colon (position #\: name :start (1+ first-colon))))
- (package-name (if first-colon
- (subseq name 0 first-colon)
- "COMMON-LISP-USER"))
- (package (find-package package-name)))
+ ;; Hack alert: This is to keep the compiler
+ ;; quiet about deleting code inside the
+ ;; subseq expansion.
+ (subseq foo (1+ slash) (1- end)))))
+ (first-colon (position #\: name))
+ (second-colon (if first-colon (position #\: name :start (1+ first-colon))))
+ (package-name (if first-colon
+ (subseq name 0 first-colon)
+ "COMMON-LISP-USER"))
+ (package (find-package package-name)))
- `(progn
- (incf min ,increment)
- (incf max ,increment)))
- (walk-complex-directive (function)
- `(multiple-value-bind (min-inc max-inc remaining)
- (,function directive directives args)
- (incf min min-inc)
- (incf max max-inc)
- (setq directives remaining))))
+ `(progn
+ (incf min ,increment)
+ (incf max ,increment)))
+ (walk-complex-directive (function)
+ `(multiple-value-bind (min-inc max-inc remaining)
+ (,function directive directives args)
+ (incf min min-inc)
+ (incf max max-inc)
+ (setq directives remaining))))
- ((walk-justification (justification directives args)
- (declare (ignore args))
- (let ((*default-format-error-offset*
- (1- (format-directive-end justification))))
- (multiple-value-bind (segments first-semi close remaining)
- (parse-format-justification directives)
- (declare (ignore segments first-semi))
- (cond
- ((not (format-directive-colonp close))
- (values 0 0 directives))
- ((format-directive-atsignp justification)
- (values 0 sb!xc:call-arguments-limit directives))
- ;; FIXME: here we could assert that the
- ;; corresponding argument was a list.
- (t (values 1 1 remaining))))))
- (walk-conditional (conditional directives args)
- (let ((*default-format-error-offset*
- (1- (format-directive-end conditional))))
- (multiple-value-bind (sublists last-semi-with-colon-p remaining)
- (parse-conditional-directive directives)
- (declare (ignore last-semi-with-colon-p))
- (let ((sub-max
- (loop for s in sublists
- maximize (nth-value
- 1 (walk-directive-list s args)))))
- (cond
- ((format-directive-atsignp conditional)
- (values 1 (max 1 sub-max) remaining))
- ((loop for p in (format-directive-params conditional)
- thereis (or (integerp (cdr p))
- (memq (cdr p) '(:remaining :arg))))
- (values 0 sub-max remaining))
- ;; FIXME: if not COLONP, then the next argument
- ;; must be a number.
- (t (values 1 (1+ sub-max) remaining)))))))
- (walk-iteration (iteration directives args)
- (declare (ignore args))
- (let ((*default-format-error-offset*
- (1- (format-directive-end iteration))))
- (let* ((close (find-directive directives #\} nil))
- (posn (or (position close directives)
+ ((walk-justification (justification directives args)
+ (declare (ignore args))
+ (let ((*default-format-error-offset*
+ (1- (format-directive-end justification))))
+ (multiple-value-bind (segments first-semi close remaining)
+ (parse-format-justification directives)
+ (declare (ignore segments first-semi))
+ (cond
+ ((not (format-directive-colonp close))
+ (values 0 0 directives))
+ ((format-directive-atsignp justification)
+ (values 0 sb!xc:call-arguments-limit directives))
+ ;; FIXME: here we could assert that the
+ ;; corresponding argument was a list.
+ (t (values 1 1 remaining))))))
+ (walk-conditional (conditional directives args)
+ (let ((*default-format-error-offset*
+ (1- (format-directive-end conditional))))
+ (multiple-value-bind (sublists last-semi-with-colon-p remaining)
+ (parse-conditional-directive directives)
+ (declare (ignore last-semi-with-colon-p))
+ (let ((sub-max
+ (loop for s in sublists
+ maximize (nth-value
+ 1 (walk-directive-list s args)))))
+ (cond
+ ((format-directive-atsignp conditional)
+ (values 1 (max 1 sub-max) remaining))
+ ((loop for p in (format-directive-params conditional)
+ thereis (or (integerp (cdr p))
+ (memq (cdr p) '(:remaining :arg))))
+ (values 0 sub-max remaining))
+ ;; FIXME: if not COLONP, then the next argument
+ ;; must be a number.
+ (t (values 1 (1+ sub-max) remaining)))))))
+ (walk-iteration (iteration directives args)
+ (declare (ignore args))
+ (let ((*default-format-error-offset*
+ (1- (format-directive-end iteration))))
+ (let* ((close (find-directive directives #\} nil))
+ (posn (or (position close directives)
- (remaining (nthcdr (1+ posn) directives)))
- ;; FIXME: if POSN is zero, the next argument must be
- ;; a format control (either a function or a string).
- (if (format-directive-atsignp iteration)
- (values (if (zerop posn) 1 0)
- sb!xc:call-arguments-limit
- remaining)
- ;; FIXME: the argument corresponding to this
- ;; directive must be a list.
- (let ((nreq (if (zerop posn) 2 1)))
- (values nreq nreq remaining))))))
- (walk-directive-list (directives args)
- (let ((min 0) (max 0))
- (loop
- (let ((directive (pop directives)))
- (when (null directive)
- (return (values min (min max sb!xc:call-arguments-limit))))
- (when (format-directive-p directive)
- (incf-both (count :arg (format-directive-params directive)
- :key #'cdr))
- (let ((c (format-directive-character directive)))
- (cond
- ((find c "ABCDEFGORSWX$/")
- (incf-both))
- ((char= c #\P)
- (unless (format-directive-colonp directive)
- (incf-both)))
- ((or (find c "IT%&|_();>~") (char= c #\Newline)))
+ (remaining (nthcdr (1+ posn) directives)))
+ ;; FIXME: if POSN is zero, the next argument must be
+ ;; a format control (either a function or a string).
+ (if (format-directive-atsignp iteration)
+ (values (if (zerop posn) 1 0)
+ sb!xc:call-arguments-limit
+ remaining)
+ ;; FIXME: the argument corresponding to this
+ ;; directive must be a list.
+ (let ((nreq (if (zerop posn) 2 1)))
+ (values nreq nreq remaining))))))
+ (walk-directive-list (directives args)
+ (let ((min 0) (max 0))
+ (loop
+ (let ((directive (pop directives)))
+ (when (null directive)
+ (return (values min (min max sb!xc:call-arguments-limit))))
+ (when (format-directive-p directive)
+ (incf-both (count :arg (format-directive-params directive)
+ :key #'cdr))
+ (let ((c (format-directive-character directive)))
+ (cond
+ ((find c "ABCDEFGORSWX$/")
+ (incf-both))
+ ((char= c #\P)
+ (unless (format-directive-colonp directive)
+ (incf-both)))
+ ((or (find c "IT%&|_();>~") (char= c #\Newline)))
- ((char= c #\<)
- (walk-complex-directive walk-justification))
- ((char= c #\[)
- (walk-complex-directive walk-conditional))
- ((char= c #\{)
- (walk-complex-directive walk-iteration))
- ((char= c #\?)
- ;; FIXME: the argument corresponding to this
- ;; directive must be a format control.
- (cond
- ((format-directive-atsignp directive)
- (incf min)
- (setq max sb!xc:call-arguments-limit))
- (t (incf-both 2))))
- (t (throw 'give-up-format-string-walk nil))))))))))
- (catch 'give-up-format-string-walk
- (let ((directives (tokenize-control-string string)))
- (walk-directive-list directives args)))))))
+ ((char= c #\<)
+ (walk-complex-directive walk-justification))
+ ((char= c #\[)
+ (walk-complex-directive walk-conditional))
+ ((char= c #\{)
+ (walk-complex-directive walk-iteration))
+ ((char= c #\?)
+ ;; FIXME: the argument corresponding to this
+ ;; directive must be a format control.
+ (cond
+ ((format-directive-atsignp directive)
+ (incf min)
+ (setq max sb!xc:call-arguments-limit))
+ (t (incf-both 2))))
+ (t (throw 'give-up-format-string-walk nil))))))))))
+ (catch 'give-up-format-string-walk
+ (let ((directives (tokenize-control-string string)))
+ (walk-directive-list directives args)))))))