Report unexpected errors in the reader

[jscl.git] / test.lisp

diff --git a/test.lisp b/test.lisp
index 99e75d0..adf8c12 100644 (file)
--- a/test.lisp
+++ b/test.lisp
@@ -69,14 +69,17 @@
 (defun consp (x) (consp x))
 
 (defun car (x) (car x))
+(defun cdr (x) (cdr x))
+
 (defun caar (x) (car (car x)))
 (defun cadr (x) (car (cdr x)))
-(defun caddr (x) (car (cdr (cdr x))))
-(defun cadddr (x) (car (cdr (cdr (cdr x)))))
-(defun cdr (x) (cdr x))
 (defun cdar (x) (cdr (car x)))
 (defun cddr (x) (cdr (cdr x)))
-(defun cdddr (x) (cdr (cdr x)))
+
+(defun caddr (x) (car (cdr (cdr x))))
+(defun cdddr (x) (cdr (cdr (cdr x))))
+
+(defun cadddr (x) (car (cdr (cdr (cdr x)))))
 
 (defun first (x) (car x))
 (defun second (x) (cadr x))
@@ -451,13 +454,15 @@
   (skip-whitespaces-and-comments stream)
   (let ((ch (%peek-char stream)))
     (cond
+      ((null ch)
+       (error "Unspected EOF"))
       ((char= ch #\))
        (%read-char stream)
        nil)
       ((char= ch #\.)
        (%read-char stream)
-       (skip-whitespaces-and-comments stream)
        (prog1 (ls-read stream)
+         (skip-whitespaces-and-comments stream)
          (unless (char= (%read-char stream) #\))
            (error "')' was expected."))))
       (t
@@ -467,8 +472,10 @@
   (let ((string "")
         (ch nil))
     (setq ch (%read-char stream))
-    (while (not (char= ch #\"))
-      (when (char= ch #\\)
+    (while (not (eql ch #\"))
+      (when (null ch)
+        (error "Unexpected EOF"))
+      (when (eql ch #\\)
         (setq ch (%read-char stream)))
       (setq string (concat string (string ch)))
       (setq ch (%read-char stream)))
@@ -550,6 +557,7 @@
 (defun mark-binding-as-declared (b)
   (setcar (cdddr b) t))
 
+
 (defvar *variable-counter* 0)
 (defun gvarname (symbol)
   (concat "v" (integer-to-string (incf *variable-counter*))))
@@ -935,7 +943,7 @@
                 "})()" *newline*))))
 
 (define-compilation js-eval (string)
-  (concat "eval(" (ls-compile string env fenv)  ")"))
+  (concat "eval.apply(window, [" (ls-compile string env fenv)  "])"))
 
 
 (define-compilation error (string)