X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftoplevel.lisp;h=2b7691885bb1c312f6f27d22f57abac9903be119;hb=840832c6ca7fae0af981d721bdbb38e567d575cf;hp=1348ad7457da873008dfe4bc0cec5f7b38dd7fe6;hpb=dc5e3163fe667e2629c7769aa8cf2e501eeeefa6;p=sbcl.git diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp index 1348ad7..2b76918 100644 --- a/src/code/toplevel.lisp +++ b/src/code/toplevel.lisp @@ -65,7 +65,8 @@ (/show0 "back from INFINITE-ERROR-PROTECTOR") (let ((*current-error-depth* (1+ *current-error-depth*))) (/show0 "in INFINITE-ERROR-PROTECT, incremented error depth") - #+sb-show (sb-debug:backtrace) + ;; arbitrary truncation + #!+sb-show (sb!debug:backtrace 8) ,@forms))) ;;; a helper function for INFINITE-ERROR-PROTECT @@ -125,7 +126,6 @@ ;;;; miscellaneous external functions -#!-mp ; The multi-processing version is defined in multi-proc.lisp. (defun sleep (n) #!+sb-doc "This function causes execution to be suspended for N seconds. N may @@ -215,7 +215,7 @@ (type (unsigned-byte 20) count) (values (unsigned-byte 20))) (let ((loc (int-sap (- (sap-int ptr) (+ offset sb!vm:n-word-bytes))))) - (cond ((<= (sap-int loc) end-of-stack) 0) + (cond ((< (sap-int loc) end-of-stack) 0) ((= offset bytes-per-scrub-unit) (look (int-sap (- (sap-int ptr) bytes-per-scrub-unit)) 0 count)) @@ -228,7 +228,7 @@ (type (unsigned-byte 20) count) (values (unsigned-byte 20))) (let ((loc (int-sap (- (sap-int ptr) offset)))) - (cond ((<= (sap-int loc) end-of-stack) 0) + (cond ((< (sap-int loc) end-of-stack) 0) ((= offset bytes-per-scrub-unit) count) ((zerop (sb!kernel::get-lisp-obj-address (stack-ref loc 0))) @@ -259,7 +259,10 @@ "Evaluate FORM, returning whatever it returns and adjusting ***, **, *, +++, ++, +, ///, //, /, and -." (setf - form) - (let ((results (multiple-value-list (eval form)))) + (let ((results + (multiple-value-list + (eval-in-lexenv form + (make-null-interactive-lexenv))))) (setf /// // // / / results @@ -301,6 +304,8 @@ (noprint nil) ; Has a --noprint option been seen? (options (rest *posix-argv*))) ; skipping program name + (declare (type list options)) + (/show0 "done with outer LET in TOPLEVEL-INIT") ;; FIXME: There are lots of ways for errors to happen around here @@ -390,6 +395,7 @@ (flet (;; If any of POSSIBLE-INIT-FILE-NAMES names a real file, ;; return its truename. (probe-init-files (&rest possible-init-file-names) + (declare (type list possible-init-file-names)) (/show0 "entering PROBE-INIT-FILES") (prog1 (find-if (lambda (x) @@ -496,7 +502,7 @@ ;; get you out to here. (with-simple-restart (abort - "Reduce debugger level (leaving debugger, returning to toplevel).") + "~@") (catch 'toplevel-catcher #!-sunos (sb!unix:unix-sigsetmask 0) ; FIXME: What is this for? ;; in the event of a control-stack-exhausted-error, we should @@ -506,26 +512,56 @@ (repl noprint) (critically-unreachable "after REPL"))))))) +;;; Our default REPL prompt is the minimal traditional one. +(defun repl-prompt-fun (stream) + (fresh-line stream) + (write-string "* " stream)) ; arbitrary but customary REPL prompt + +;;; Our default form reader does relatively little magic, but does +;;; handle the Unix-style EOF-is-end-of-process convention. +(defun repl-read-form-fun (in out) + (declare (type stream in out) (ignore out)) + (let* ((eof-marker (cons nil nil)) + (form (read in nil eof-marker))) + (if (eq form eof-marker) + (quit) + form))) + +;;; hooks to support customized toplevels like ACL-style toplevel +;;; from KMR on sbcl-devel 2002-12-21 +(defvar *repl-read-form-fun* #'repl-read-form-fun + "a function of two stream arguments IN and OUT for the toplevel REPL to + call: Return the next Lisp form to evaluate (possibly handling other + magic -- like ACL-style keyword commands -- which precede the next + Lisp form). The OUT stream is there to support magic which requires + issuing new prompts.") +(defvar *repl-prompt-fun* #'repl-prompt-fun + "a function of one argument STREAM for the toplevel REPL to call: Prompt + the user for input.") + (defun repl (noprint) (/show0 "entering REPL") (let ((eof-marker (cons :eof nil))) (loop - ;; see comment preceding definition of SCRUB-CONTROL-STACK + ;; (See comment preceding the definition of SCRUB-CONTROL-STACK.) (scrub-control-stack) (unless noprint - (fresh-line) - (write-string "* ") ; arbitrary but customary REPL prompt - (flush-standard-output-streams)) - (let ((form (read *standard-input* nil eof-marker))) - (cond ((eq form eof-marker) - (/show0 "doing QUIT for EOF in REPL") - (quit)) - (t - (let ((results (multiple-value-list (interactive-eval form)))) - (unless noprint - (dolist (result results) - (fresh-line) - (prin1 result)))))))))) + (funcall *repl-prompt-fun* *standard-output*) + ;; (Should *REPL-PROMPT-FUN* be responsible for doing its own + ;; FORCE-OUTPUT? I can't imagine a valid reason for it not to + ;; be done here, so leaving it up to *REPL-PROMPT-FUN* seems + ;; odd. But maybe there *is* a valid reason in some + ;; circumstances? perhaps some deadlock issue when being driven + ;; by another process or something...) + (force-output *standard-output*)) + (let* ((form (funcall *repl-read-form-fun* + *standard-input* + *standard-output*)) + (results (multiple-value-list (interactive-eval form)))) + (unless noprint + (dolist (result results) + (fresh-line) + (prin1 result))))))) ;;; suitable value for *DEBUGGER-HOOK* for a noninteractive Unix-y program (defun noprogrammer-debugger-hook-fun (condition old-debugger-hook)