From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 May 2016 08:26:09 +0000 (+0100)
Subject: src/lexer-proto.lisp (lexer-error): Use Oxford comma for expected tokens.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/3c46cb3a94f2407959c3f5899f87f763a3e3865c

src/lexer-proto.lisp (lexer-error): Use Oxford comma for expected tokens.
---

diff --git a/src/lexer-proto.lisp b/src/lexer-proto.lisp
index 8f19401..5405da7 100644
--- a/src/lexer-proto.lisp
+++ b/src/lexer-proto.lisp
@@ -85,7 +85,8 @@ (defun lexer-error (char-scanner expected &key location)
   (cerror*-with-location (or location char-scanner)
 			 "Lexical error: ~
 			  ~:[unexpected~;~
-			     expected ~:*~{~#[~;~A~;~A or ~A~:;~A, ~]~} ~
+			     expected ~:*~{~#[~;~A~;~A or ~A~:;~
+					      ~@{~A, ~#[~;or ~A~]~}~]~} ~
 			     but found~] ~
 			  ~/sod::show-char/"
 	   (mapcar (lambda (exp)