X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=lispstrack.lisp;h=46c07c63d8fb3c586c8db0fe794e349587846346;hb=4f17b56fa136f97d11975d081a861351eb64db76;hp=0cd2d69cc9e3bd63545fda76d152bc9a4d96f0e0;hpb=c145fe9a3356a4a710dc8ccd9cb34c2e852f2370;p=jscl.git

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 0cd2d69..46c07c6 100644
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -120,13 +120,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
@@ -136,8 +138,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)))