Changeset 13190

Timestamp:

Nov 10, 2009, 5:20:27 PM (15 years ago)

Author:

gz

Message:

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

File:

• branches/working-0711/ccl/level-1/l1-readloop-lds.lisp (modified) (5 diffs)

branches/working-0711/ccl/level-1/l1-readloop-lds.lisp

@@ -300 +300 @@
     (and fd (eof-transient-p fd))))
 
+(defvar *save-interactive-source-locations* t)
+
 ;;; This is the part common to toplevel loop and inner break loops.
 (defun read-loop (&key (input-stream *standard-input*)
@@ -318 +320 @@
          (eof-count 0)
          (*show-available-restarts* (and *show-restarts-on-break* *break-condition*))
-         (*nx-source-note-map* (make-hash-table :test #'eq :shared nil)))
+         (map (make-hash-table :test #'eq :shared nil)))
     (declare (dynamic-extent eof-value))
     (loop
@@ -328 +330 @@
               (setq *in-read-loop* nil
                     *break-level* break-level)
-              (clrhash *nx-source-note-map*)
               (multiple-value-bind (form env print-result)
                   (toplevel-read :input-stream input-stream
@@ -334 +335 @@
                                  :prompt-function prompt-function
                                  :eof-value eof-value
-                                 :map *nx-source-note-map*)
+                                 :map (when *save-interactive-source-locations*
+                                        (clrhash map)
+                                        map))
                 (if (eq form eof-value)
                   (progn
@@ -346 +349 @@
                         (abort-break))
                       (exit-interactive-process *current-process*)))
-                  (progn
+                  (let ((*nx-source-note-map* (and *save-interactive-source-locations* map)))
                     (setq eof-count 0)
                     (or (check-toplevel-command form)