X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/e0808c472145fc81e52898bc9ac289e10c4f4f41..3c46cb3a94f2407959c3f5899f87f763a3e3865c:/src/fragment-parse.lisp diff --git a/src/fragment-parse.lisp b/src/fragment-parse.lisp index 8d0f939..c958da3 100644 --- a/src/fragment-parse.lisp +++ b/src/fragment-parse.lisp @@ -87,7 +87,7 @@ (values end-chars nil nil))) (return (values it t t))) (:eof - (lexer-error char-scanner '(:any) cp) + (lexer-error char-scanner '(:any)) (return (values (result) t t))) ;; Opening and closing brackets. Opening brackets push things @@ -98,7 +98,7 @@ ((or #\) #\] #\}) (if (eql it delim) (setf delim (pop stack)) - (cerror* "Unmatched `~C.'." it))) + (cerror* "Unmatched `~C'" it))) ;; String and character literals. ((seq ((quote (or #\" #\')) @@ -112,7 +112,7 @@ ;; This really shouldn't be able to happen. (t (assert cp) - (lexer-error char-scanner exp cp))))))))) + (lexer-error char-scanner exp))))))))) (export 'parse-delimited-fragment) (defun parse-delimited-fragment (scanner begin end &key keep-end) @@ -135,11 +135,12 @@ (if (if (eq begin t) (not (scanner-at-eof-p scanner)) (eql (token-type scanner) begin)) - (multiple-value-prog1 (values (scan-c-fragment scanner - (if (listp end) - end - (list end))) - t t) + (multiple-value-prog1 + (values (scan-c-fragment scanner + (if (listp end) end + (list end))) + t + t) (scanner-step scanner) (unless keep-end (scanner-step scanner))) (values (list begin) nil nil)))