Changeset 13190


Ignore:
Timestamp:
Nov 11, 2009, 1:20:27 AM (10 years ago)
Author:
gz
Message:

Merge r13182/r13183 (*save-interactive-source-locations*)

File:
1 edited

Legend:

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

    r13146 r13190  
    300300    (and fd (eof-transient-p fd))))
    301301
     302(defvar *save-interactive-source-locations* t)
     303
    302304;;; This is the part common to toplevel loop and inner break loops.
    303305(defun read-loop (&key (input-stream *standard-input*)
     
    318320         (eof-count 0)
    319321         (*show-available-restarts* (and *show-restarts-on-break* *break-condition*))
    320          (*nx-source-note-map* (make-hash-table :test #'eq :shared nil)))
     322         (map (make-hash-table :test #'eq :shared nil)))
    321323    (declare (dynamic-extent eof-value))
    322324    (loop
     
    328330              (setq *in-read-loop* nil
    329331                    *break-level* break-level)
    330               (clrhash *nx-source-note-map*)
    331332              (multiple-value-bind (form env print-result)
    332333                  (toplevel-read :input-stream input-stream
     
    334335                                 :prompt-function prompt-function
    335336                                 :eof-value eof-value
    336                                  :map *nx-source-note-map*)
     337                                 :map (when *save-interactive-source-locations*
     338                                        (clrhash map)
     339                                        map))
    337340                (if (eq form eof-value)
    338341                  (progn
     
    346349                        (abort-break))
    347350                      (exit-interactive-process *current-process*)))
    348                   (progn
     351                  (let ((*nx-source-note-map* (and *save-interactive-source-locations* map)))
    349352                    (setq eof-count 0)
    350353                    (or (check-toplevel-command form)
Note: See TracChangeset for help on using the changeset viewer.