src/lexer-proto.lisp, ...: Kill `lexer-error' pointless CONSUMEDP flag.

[sod] / src / lexer-proto.lisp

diff --git a/src/lexer-proto.lisp b/src/lexer-proto.lisp
index 1850326747a8982cdf7981f2330f9c1d26467117..a70addc853d5fed9ce74c627df574e7e46e7cef7 100644 (file)
--- a/src/lexer-proto.lisp
+++ b/src/lexer-proto.lisp
@@ -79,12 +79,11 @@ (defun syntax-error (scanner expected &key (continuep t))
             (show-token (token-type scanner) (token-value scanner)))))
 
 (export 'lexer-error)
             (show-token (token-type scanner) (token-value scanner)))))
 
 (export 'lexer-error)

-(defun lexer-error (char-scanner expected consumedp)
+(defun lexer-error (char-scanner expected)

   "Signal a continuable lexical error."
   (cerror* "Lexical error: ~
            expected ~{~#[<bug>~;~A~;~A or ~A~:;~A, ~]~} ~
   "Signal a continuable lexical error."
   (cerror* "Lexical error: ~
            expected ~{~#[<bug>~;~A~;~A or ~A~:;~A, ~]~} ~

-           but found ~/sod::show-char/~
-           ~@[ at ~A~]"
+           but found ~/sod::show-char/"

           (mapcar (lambda (exp)
                     (typecase exp
                       (character (format nil "~/sod::show-char/" exp))
           (mapcar (lambda (exp)
                     (typecase exp
                       (character (format nil "~/sod::show-char/" exp))


@@ -96,8 +95,7 @@ (defun lexer-error (char-scanner expected consumedp)
                       (t (format nil "<? ~S>" exp))))
                   expected)
           (and (not (scanner-at-eof-p char-scanner))
                       (t (format nil "<? ~S>" exp))))
                   expected)
           (and (not (scanner-at-eof-p char-scanner))

-               (scanner-current-char char-scanner))
-          (and consumedp (file-location char-scanner))))
+               (scanner-current-char char-scanner))))

 
 (export 'skip-until)
 (defparse skip-until (:context (context token-scanner-context)
 
 (export 'skip-until)
 (defparse skip-until (:context (context token-scanner-context)