update elisp reader tests to handle EOF tokens

* test-suite/tests/elisp-reader.test (lex-all, "end-of-input",
  "lexer/1"): Check for an EOF token instead of the symbol `*eoi*'.

diff --git a/test-suite/tests/elisp-reader.test b/test-suite/tests/elisp-reader.test
index fc7cd1b..9832903 100644 (file)
--- a/test-suite/tests/elisp-reader.test
+++ b/test-suite/tests/elisp-reader.test
@@ -32,7 +32,7 @@
 (define (lex-all lexer)
   (let iterate ((result '()))
     (let ((token (lexer)))
-      (if (eq? token '*eoi*)
+      (if (eq? (car token) 'eof)
         (reverse result)
         (iterate (cons token result))))))
 
@@ -43,9 +43,9 @@
 
   (let ((lexer (get-string-lexer "")))
     (pass-if "end-of-input"
-      (and (eq? (lexer) '*eoi*)
-           (eq? (lexer) '*eoi*)
-           (eq? (lexer) '*eoi*))))
+      (and (eq? (car (lexer)) 'eof)
+           (eq? (car (lexer)) 'eof)
+           (eq? (car (lexer)) 'eof))))
 
   (pass-if "single character tokens"
     (equal? (lex-string "()[]'`,,@ . ")
@@ -125,8 +125,8 @@ test\"ab\"\\ abcd
                                         get-lexer/1)))
     (pass-if "lexer/1"
       (and (equal? (lex-all lexer) (lex-string lex1-string))
-           (eq? (lexer) '*eoi*)
-           (eq? (lexer) '*eoi*)))))
+           (eq? (car (lexer)) 'eof)
+           (eq? (car (lexer)) 'eof)))))
 
 
 ; ==============================================================================