;;;--------------------------------------------------------------------------
;;; Indicators and error messages.
-(defun show-char (stream char &optional colonp atsignp)
- "Format CHAR to STREAM in a readable way.
-
- Usable in `format''s ~/.../ command."
- (declare (ignore colonp atsignp))
- (cond ((null char) (write-string "<end-of-file>" stream))
+(defun show-char (char)
+ "Format CHAR as a string in a readable way."
+ (cond ((null char) "<end-of-file>")
((and (graphic-char-p char) (char/= char #\space))
- (format stream "`~C'" char))
- (t (format stream "<~(~:C~)>" char))))
+ (format nil "`~C'" char))
+ (t (format nil "<~(~:C~)>" char))))
(defun skip-until (scanner token-types &key keep-end)
"This is the implementation of the `skip-until' parser."
(#\' (case (length contents)
(1 (char contents 0))
(0 (cerror*-with-location (start-floc)
- "Lexical error: ~
- empty character literal")
+ 'simple-lexer-error
+ :format-control
+ "Empty character literal")
#\?)
(t (cerror*-with-location (start-floc)
- "Lexical error: ~
- too many characters ~
- in literal")
+ 'simple-lexer-error
+ :format-control
+ "Too many characters ~
+ in character literal")
(char contents 0))))))
(values (etypecase it
(character :char)