Ignore:
Timestamp:
Oct 9, 2009, 5:09:29 PM (10 years ago)
Author:
gz
Message:

make read-toplevel-form call read-recording-source, take keyword args to pass into it (r12663)

Location:
branches/working-0711/ccl/level-1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/level-1/l1-readloop-lds.lisp

    r12410 r12944  
    394394  (force-output output-stream)
    395395  (funcall prompt-function output-stream)
    396   (read-toplevel-form input-stream eof-value))
     396  (read-toplevel-form input-stream :eof-value eof-value))
    397397
    398398(defvar *always-eval-user-defvars* nil)
  • branches/working-0711/ccl/level-1/l1-streams.lisp

    r12305 r12944  
    58585858;;; and the SELECTION-INPUT-STREAM method below.)
    58595859
    5860 (defmethod read-toplevel-form ((stream synonym-stream) eof-value)
    5861   (read-toplevel-form (symbol-value (synonym-stream-symbol stream)) eof-value))
    5862 
    5863 (defmethod read-toplevel-form ((stream two-way-stream) eof-value)
     5860(defmethod read-toplevel-form ((stream synonym-stream) &rest keys)
     5861  (apply #'read-toplevel-form (symbol-value (synonym-stream-symbol stream)) keys))
     5862
     5863(defmethod read-toplevel-form ((stream two-way-stream) &rest keys)
    58645864  (if (typep stream 'echo-stream)
    58655865    (call-next-method)
    5866     (read-toplevel-form (two-way-stream-input-stream stream) eof-value)))
    5867 
    5868 (defmethod read-toplevel-form :after ((stream echoing-two-way-stream) eof-value)
    5869   (declare (ignore eof-value))
     5866    (apply #'read-toplevel-form (two-way-stream-input-stream stream) keys)))
     5867
     5868(defmethod read-toplevel-form :after ((stream echoing-two-way-stream) &key &allow-other-keys)
    58705869  (stream-set-column (two-way-stream-output-stream stream) 0))
    58715870
    5872 (defmethod read-toplevel-form ((stream input-stream)
    5873                                eof-value)
     5871(defmethod read-toplevel-form ((stream input-stream) &key eof-value file-name start-offset map)
    58745872  (loop
    58755873    (let* ((*in-read-loop* nil)
     
    58805878                     (read-command-or-keyword stream eof-value))
    58815879                    ((eq first-char eof-value) eof-value)
    5882                     (t (read stream nil eof-value))))))
     5880                    (t (read-recording-source stream :eofval eof-value
     5881                                              :file-name file-name
     5882                                              :start-offset start-offset
     5883                                              :map map
     5884                                              :save-source-text t))))))
    58835885      (if (eq form eof-value)
    58845886        (return (values form nil t))
     
    59015903
    59025904(defmethod read-toplevel-form ((stream selection-input-stream)
    5903                                eof-value)
     5905                               &key eof-value &allow-other-keys)
    59045906  (if (eq (stream-peek-char stream) :eof)
    59055907    (values eof-value nil t)
Note: See TracChangeset for help on using the changeset viewer.