From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 May 2016 08:26:09 +0000 (+0100)
Subject: src/lexer-proto.lisp (lexer-error): Improve error reporting.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/7524b4b2da30055e98de7f86507bec081b419f83

src/lexer-proto.lisp (lexer-error): Improve error reporting.

Now EXPECTED can be `nil' to produce a simple `unexpected THING'
message.
---

diff --git a/src/lexer-proto.lisp b/src/lexer-proto.lisp
index 349e2a0..8f19401 100644
--- a/src/lexer-proto.lisp
+++ b/src/lexer-proto.lisp
@@ -84,8 +84,10 @@ (defun lexer-error (char-scanner expected &key location)
   "Signal a continuable lexical error."
   (cerror*-with-location (or location char-scanner)
 			 "Lexical error: ~
-			  expected ~{~#[<bug>~;~A~;~A or ~A~:;~A, ~]~} ~
-			  but found ~/sod::show-char/"
+			  ~:[unexpected~;~
+			     expected ~:*~{~#[~;~A~;~A or ~A~:;~A, ~]~} ~
+			     but found~] ~
+			  ~/sod::show-char/"
 	   (mapcar (lambda (exp)
 		     (typecase exp
 		       (character (format nil "~/sod::show-char/" exp))