Changeset 5050

Timestamp:

Aug 28, 2006, 3:57:15 AM (18 years ago)

Author:

Gary Byers

Message:

Use READ-CHAR instead of STREAM-READ-CHAR, since it may be faster in
some cases.

File:

• trunk/ccl/level-1/l1-reader.lisp (modified) (5 diffs)

trunk/ccl/level-1/l1-reader.lisp

@@ -438 +438 @@
 
 (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 +536 @@
          (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 +547 @@
                     (= 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 +573 @@
                           (setq double-colon t)
                           (progn
-                            (stream-unread-char stream nextch)
+                            (unread-char nextch stream)
                             (setq double-colon nil)))
                         (%casify-token token escapes)
@@ -781 +781 @@
               (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*))