projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.1.37:
[sbcl.git]
/
src
/
code
/
late-format.lisp
diff --git
a/src/code/late-format.lisp
b/src/code/late-format.lisp
index
3aefd3d
..
9063fa4
100644
(file)
--- a/
src/code/late-format.lisp
+++ b/
src/code/late-format.lisp
@@
-73,10
+73,17
@@
:complaint "String ended before directive was found."
:control-string string
:offset start)
:complaint "String ended before directive was found."
:control-string string
:offset start)
- (schar string posn))))
+ (schar string posn)))
+ (check-ordering ()
+ (when (or colonp atsignp)
+ (error 'format-error
+ :complaint "parameters found after #\\: or #\\@ modifier"
+ :control-string string
+ :offset posn))))
(loop
(let ((char (get-char)))
(cond ((or (char<= #\0 char #\9) (char= char #\+) (char= char #\-))
(loop
(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)
(multiple-value-bind (param new-posn)
(parse-integer string :start posn :junk-allowed t)
(push (cons posn param) params)
@@
-87,7
+94,9
@@
(decf posn))
(t
(return)))))
(decf posn))
(t
(return)))))
- ((or (char= char #\v) (char= char #\V))
+ ((or (char= char #\v)
+ (char= char #\V))
+ (check-ordering)
(push (cons posn :arg) params)
(incf posn)
(case (get-char)
(push (cons posn :arg) params)
(incf posn)
(case (get-char)
@@
-97,6
+106,7
@@
(t
(return))))
((char= char #\#)
(t
(return))))
((char= char #\#)
+ (check-ordering)
(push (cons posn :remaining) params)
(incf posn)
(case (get-char)
(push (cons posn :remaining) params)
(incf posn)
(case (get-char)
@@
-106,12
+116,14
@@
(t
(return))))
((char= char #\')
(t
(return))))
((char= char #\')
+ (check-ordering)
(incf posn)
(push (cons posn (get-char)) params)
(incf posn)
(unless (char= (get-char) #\,)
(decf posn)))
((char= char #\,)
(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
(push (cons posn nil) params))
((char= char #\:)
(if colonp
@@
-129,6
+141,7
@@
(setf atsignp t)))
(t
(when (char= (schar string (1- posn)) #\,)
(setf atsignp t)))
(t
(when (char= (schar string (1- posn)) #\,)
+ (check-ordering)
(push (cons (1- posn) nil) params))
(return))))
(incf posn))
(push (cons (1- posn) nil) params))
(return))))
(incf posn))
@@
-1145,8
+1158,8
@@
;; subseq expansion.
(subseq foo (1+ slash) (1- end)))))
(first-colon (position #\: name))
;; subseq expansion.
(subseq foo (1+ slash) (1- end)))))
(first-colon (position #\: name))
- (last-colon (if first-colon (position #\: name :from-end t)))
- (package-name (if last-colon
+ (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)))
(subseq name 0 first-colon)
"COMMON-LISP-USER"))
(package (find-package package-name)))
@@
-1156,7
+1169,10
@@
(error 'format-error
:complaint "no package named ~S"
:args (list package-name)))
(error 'format-error
:complaint "no package named ~S"
:args (list package-name)))
- (intern (if first-colon
- (subseq name (1+ first-colon))
- name)
+ (intern (cond
+ ((and second-colon (= second-colon (1+ first-colon)))
+ (subseq name (1+ second-colon)))
+ (first-colon
+ (subseq name (1+ first-colon)))
+ (t name))
package))))
package))))