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

Not sure what the idea was.  It seems to control printing the location
as part of the message, but the error printing machinery takes care of
doing that anyway; and even so, it seems to hang off this flag.

Kill it, and the redundant printing of the location.

diff --git a/doc/parsing.tex b/doc/parsing.tex
index 20ade826aa4471bf4fa33714c641c06d10edefa3..a83f26bbc722f802626ef6cf4fa2ac57fe8fb39c 100644 (file)
--- a/doc/parsing.tex
+++ b/doc/parsing.tex
@@ -768,7 +768,7 @@ file-location protocols.
 \end{describe}
 
 \begin{describe}{fun}
 \end{describe}
 
 \begin{describe}{fun}

-    {lexer-error @<char-scanner> @<expected> @<consumed-flag>}
+    {lexer-error @<char-scanner> @<expected>}

 \end{describe}
 
 \begin{describe}{parseform}
 \end{describe}
 
 \begin{describe}{parseform}

diff --git a/src/fragment-parse.lisp b/src/fragment-parse.lisp
index 15a7d141248a2b1cbf8b9903363afe487eb4308f..8e32b077933c0f572cfcf62e29b5e18c19112354 100644 (file)
--- a/src/fragment-parse.lisp
+++ b/src/fragment-parse.lisp
@@ -87,7 +87,7 @@ (defun scan-c-fragment (scanner end-chars)
                         (values end-chars nil nil)))
               (return (values it t t)))
              (:eof
                         (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
               (return (values (result) t t)))
 
              ;; Opening and closing brackets.  Opening brackets push things


@@ -112,7 +112,7 @@ (defun scan-c-fragment (scanner end-chars)
              ;; This really shouldn't be able to happen.
              (t
               (assert cp)
              ;; 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)
 
 (export 'parse-delimited-fragment)
 (defun parse-delimited-fragment (scanner begin end &key keep-end)

diff --git a/src/lexer-impl.lisp b/src/lexer-impl.lisp
index b579278086bef90d92c2f61ccb4715a0d3aa0f75..821849bad202d9764cfdbd02a1a9db25d1e798b5 100644 (file)
--- a/src/lexer-impl.lisp
+++ b/src/lexer-impl.lisp
@@ -109,7 +109,7 @@ (defmethod scanner-token ((scanner sod-token-scanner))
          (cond-parse (:consumedp cp :expected exp)
            ((satisfies whitespace-char-p) (parse :whitespace))
            ((scan-comment char-scanner))
          (cond-parse (:consumedp cp :expected exp)
            ((satisfies whitespace-char-p) (parse :whitespace))
            ((scan-comment char-scanner))

-           (t (if cp (lexer-error char-scanner exp cp) (return)))))
+           (t (if cp (lexer-error char-scanner exp) (return)))))

 
        ;; Now parse something.
        (cond-parse (:consumedp cp :expected exp)
 
        ;; Now parse something.
        (cond-parse (:consumedp cp :expected exp)


@@ -168,7 +168,7 @@ (defmethod scanner-token ((scanner sod-token-scanner))
          ;; must make progress on every call.
          (t
           (assert cp)
          ;; must make progress on every call.
          (t
           (assert cp)

-          (lexer-error char-scanner exp cp)
+          (lexer-error char-scanner exp)

           (scanner-token scanner)))))))
 
 ;;;----- That's all, folks --------------------------------------------------
           (scanner-token scanner)))))))
 
 ;;;----- That's all, folks --------------------------------------------------

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)