Changeset 5976

Timestamp:

Mar 2, 2007, 4:08:05 AM (18 years ago)

Author:

Gary Byers

Message:

Don't call QUIT on EOF, call EXIT-INTERACTIVE-PROCESS instead.

Look at *QUIT-ON-EOF* when deciding what to do in response to EOF.

File:

• trunk/ccl/level-1/l1-readloop-lds.lisp (modified) (2 diffs)

trunk/ccl/level-1/l1-readloop-lds.lisp

@@ -192 +192 @@
           (return t))))))
 
+(defparameter *quit-on-eof* nil)
+
 ;;; This is the part common to toplevel loop and inner break loops.
 (defun read-loop (&key (break-level *break-level*)
@@ -206 +208 @@
     (loop
       (restart-case
-        (catch :abort ;last resort...
-          (loop
-            (catch-cancel
-              (loop                
-                (setq *in-read-loop* nil
-                      *break-level* break-level)
-                (multiple-value-bind (form path print-result)
-                    (toplevel-read :input-stream input-stream
-                                   :output-stream output-stream
-                                   :prompt-function prompt-function
-                                   :eof-value eof-value)
-                  (if (eq form eof-value)
-                    (if (and (not *batch-flag*)
-                             (eof-transient-p (stream-device input-stream :input)))
-                      (progn
-                        (stream-clear-input input-stream)
-                        (abort-break))
-                      (quit))
-                    (or (check-toplevel-command form)
-                        (let* ((values (toplevel-eval form path)))
+       (catch :abort                    ;last resort...
+         (loop
+           (catch-cancel
+            (loop                
+              (setq *in-read-loop* nil
+                    *break-level* break-level)
+              (multiple-value-bind (form path print-result)
+                  (toplevel-read :input-stream input-stream
+                                 :output-stream output-stream
+                                 :prompt-function prompt-function
+                                 :eof-value eof-value)
+                (if (eq form eof-value)
+                  (if (and (not *batch-flag*)
+                           (not *quit-on-eof*)
+                           (eof-transient-p (stream-device input-stream :input)))
+                    (progn
+                      (stream-clear-input input-stream)
+                      (abort-break))
+                    (exit-interactive-process *current-process*))
+                  (or (check-toplevel-command form)
+                      (let* ((values (toplevel-eval form path)))
                         (if print-result (toplevel-print values))))))))
-            (format *terminal-io* "~&Cancelled")))
-        (abort () :report (lambda (stream)
-                            (if (eq break-level 0)
-                              (format stream "Return to toplevel.")
-                              (format stream "Return to break level ~D." break-level)))
-               #| ; Handled by interactive-abort
-                ; go up one more if abort occurred while awaiting/reading input               
-                (when (and *in-read-loop* (neq break-level 0))
-                  (abort))
-                |#
+           (format *terminal-io* "~&Cancelled")))
+       (abort () :report (lambda (stream)
+                           (if (eq break-level 0)
+                             (format stream "Return to toplevel.")
+                             (format stream "Return to break level ~D." break-level)))
+              #|                        ; Handled by interactive-abort
+                                        ; go up one more if abort occurred while awaiting/reading input               
+              (when (and *in-read-loop* (neq break-level 0))
+              (abort))
+              |#
                )
         (abort-break ()