Index: /trunk/ccl/level-1/l1-reader.lisp
===================================================================
--- /trunk/ccl/level-1/l1-reader.lisp	(revision 5049)
+++ /trunk/ccl/level-1/l1-reader.lisp	(revision 5050)
@@ -438,5 +438,5 @@
 
 (defun %next-char-and-attr (stream &optional (attrtab (rdtab.ttab *readtable*)))
-  (let* ((ch (stream-read-char  stream)))
+  (let* ((ch (read-char stream nil :eof)))
     (if (eq ch :eof)
       (values nil nil)
@@ -536,5 +536,5 @@
          (multi-escaped nil))
     (do* ((attrtab (rdtab.ttab *readtable*))
-          (char 1stchar (stream-read-char stream)))
+          (char 1stchar (read-char stream nil :eof )))
          ((eq char :eof))
       (flet ((add-note-escape-pos (char token escapes)
@@ -547,5 +547,5 @@
                     (= attr $cht_wsp))
             (when (or (not (= attr $cht_wsp)) %keep-whitespace%)
-              (stream-unread-char stream char))
+              (unread-char char stream))
             (return ))
           (if (= attr $cht_ill)
@@ -573,5 +573,5 @@
                           (setq double-colon t)
                           (progn
-			    (stream-unread-char stream nextch)
+			    (unread-char nextch stream)
                             (setq double-colon nil)))
                         (%casify-token token escapes)
@@ -781,5 +781,5 @@
               (let* ((ch nil))
                 (loop 
-                    (if (or (eq :eof (setq ch (stream-read-char stream)))
+                    (if (or (eq :eof (setq ch (read-char stream nil :eof)))
                             (eq ch #\NewLine)
 			    (eq ch *alternate-line-terminator*))