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

[sod] / src / lexer-impl.lisp

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 --------------------------------------------------