X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fntrace.lisp;h=fd96b83fe7533c0a8ba15fcf36d8933f59f2c361;hb=e0814eee6f6dea52db010b45a330100f2fe65832;hp=cdf16608c8b0bdbd2ea2332f246fbadb94f4ba4e;hpb=1a6def3955b715472eb2c75b15660912b9f90173;p=sbcl.git diff --git a/src/code/ntrace.lisp b/src/code/ntrace.lisp index cdf1660..fd96b83 100644 --- a/src/code/ntrace.lisp +++ b/src/code/ntrace.lisp @@ -145,19 +145,19 @@ (trace-1 fname info new-value))))) (push #'trace-redefined-update *setf-fdefinition-hook*) -;;; Annotate some forms to evaluate with pre-converted functions. Each -;;; form is really a cons (exp . function). Loc is the code location -;;; to use for the lexical environment. If Loc is NIL, evaluate in the -;;; null environment. If Form is NIL, just return NIL. +;;; Annotate a FORM to evaluate with pre-converted functions. FORM is +;;; really a cons (EXP . FUNCTION). LOC is the code location to use +;;; for the lexical environment. If LOC is NIL, evaluate in the null +;;; environment. If FORM is NIL, just return NIL. (defun coerce-form (form loc) (when form (let ((exp (car form))) (if (sb-di:code-location-p loc) (let ((fun (sb-di:preprocess-for-eval exp loc))) (cons exp - #'(lambda (frame) - (let ((*current-frame* frame)) - (funcall fun frame))))) + (lambda (frame) + (let ((*current-frame* frame)) + (funcall fun frame))))) (let* ((bod (ecase loc ((nil) exp) (:encapsulated @@ -168,12 +168,13 @@ ,exp)))) (fun (coerce `(lambda () ,bod) 'function))) (cons exp - #'(lambda (frame) - (declare (ignore frame)) - (let ((*current-frame* nil)) - (funcall fun))))))))) + (lambda (frame) + (declare (ignore frame)) + (let ((*current-frame* nil)) + (funcall fun))))))))) + (defun coerce-form-list (forms loc) - (mapcar #'(lambda (x) (coerce-form x loc)) forms)) + (mapcar (lambda (x) (coerce-form x loc)) forms)) ;;; Print indentation according to the number of trace entries. ;;; Entries whose condition was false don't count. @@ -182,7 +183,7 @@ (dolist (entry *traced-entries*) (when (cdr entry) (incf depth))) (format t - "~@V,0T~D: " + "~@V,0T~W: " (+ (mod (* depth *trace-indentation-step*) (- *max-trace-indentation* *trace-indentation-step*)) *trace-indentation-step*) @@ -202,7 +203,7 @@ (dolist (ele forms) (fresh-line) (print-trace-indentation) - (format t "~S = ~S" (car ele) (funcall (cdr ele) frame)))) + (format t "~@<~S ~_= ~S~:>" (car ele) (funcall (cdr ele) frame)))) ;;; Test a BREAK option, and break if true. (defun trace-maybe-break (info break where frame) @@ -234,35 +235,35 @@ (defun trace-start-breakpoint-fun (info) (let (conditionp) (values - #'(lambda (frame bpt) - (declare (ignore bpt)) - (discard-invalid-entries frame) - (let ((condition (trace-info-condition info)) - (wherein (trace-info-wherein info))) - (setq conditionp - (and (not *in-trace*) - (or (not condition) - (funcall (cdr condition) frame)) - (or (not wherein) - (trace-wherein-p frame wherein))))) - - (when conditionp - (let ((sb-kernel:*current-level* 0) - (*standard-output* *trace-output*) - (*in-trace* t)) - (fresh-line) - (print-trace-indentation) - (if (trace-info-encapsulated info) - (locally (declare (special basic-definition argument-list)) - (prin1 `(,(trace-info-what info) ,@argument-list))) - (print-frame-call frame)) - (terpri) - (trace-print frame (trace-info-print info))) - (trace-maybe-break info (trace-info-break info) "before" frame))) - - #'(lambda (frame cookie) - (declare (ignore frame)) - (push (cons cookie conditionp) *traced-entries*))))) + + (lambda (frame bpt) + (declare (ignore bpt)) + (discard-invalid-entries frame) + (let ((condition (trace-info-condition info)) + (wherein (trace-info-wherein info))) + (setq conditionp + (and (not *in-trace*) + (or (not condition) + (funcall (cdr condition) frame)) + (or (not wherein) + (trace-wherein-p frame wherein))))) + (when conditionp + (let ((sb-kernel:*current-level* 0) + (*standard-output* *trace-output*) + (*in-trace* t)) + (fresh-line) + (print-trace-indentation) + (if (trace-info-encapsulated info) + (locally (declare (special basic-definition argument-list)) + (prin1 `(,(trace-info-what info) ,@argument-list))) + (print-frame-call frame)) + (terpri) + (trace-print frame (trace-info-print info))) + (trace-maybe-break info (trace-info-break info) "before" frame))) + + (lambda (frame cookie) + (declare (ignore frame)) + (push (cons cookie conditionp) *traced-entries*))))) ;;; This prints a representation of the return values delivered. ;;; First, this checks to see that cookie is at the top of @@ -271,35 +272,35 @@ ;;; see whether the function is still traced and that the condition ;;; succeeded before printing anything. (defun trace-end-breakpoint-fun (info) - #'(lambda (frame bpt *trace-values* cookie) - (declare (ignore bpt)) - (unless (eq cookie (caar *traced-entries*)) - (setf *traced-entries* - (member cookie *traced-entries* :key #'car))) - - (let ((entry (pop *traced-entries*))) - (when (and (not (trace-info-untraced info)) - (or (cdr entry) - (let ((cond (trace-info-condition-after info))) - (and cond (funcall (cdr cond) frame))))) - (let ((sb-kernel:*current-level* 0) - (*standard-output* *trace-output*) - (*in-trace* t)) - (fresh-line) - (pprint-logical-block (*standard-output* nil) - (print-trace-indentation) - (pprint-indent :current 2) - (format t "~S returned" (trace-info-what info)) - (dolist (v *trace-values*) - (write-char #\space) - (pprint-newline :linear) - (prin1 v))) - (terpri) - (trace-print frame (trace-info-print-after info))) - (trace-maybe-break info - (trace-info-break-after info) - "after" - frame))))) + (lambda (frame bpt *trace-values* cookie) + (declare (ignore bpt)) + (unless (eq cookie (caar *traced-entries*)) + (setf *traced-entries* + (member cookie *traced-entries* :key #'car))) + + (let ((entry (pop *traced-entries*))) + (when (and (not (trace-info-untraced info)) + (or (cdr entry) + (let ((cond (trace-info-condition-after info))) + (and cond (funcall (cdr cond) frame))))) + (let ((sb-kernel:*current-level* 0) + (*standard-output* *trace-output*) + (*in-trace* t)) + (fresh-line) + (pprint-logical-block (*standard-output* nil) + (print-trace-indentation) + (pprint-indent :current 2) + (format t "~S returned" (trace-info-what info)) + (dolist (v *trace-values*) + (write-char #\space) + (pprint-newline :linear) + (prin1 v))) + (terpri) + (trace-print frame (trace-info-print-after info))) + (trace-maybe-break info + (trace-info-break-after info) + "after" + frame))))) ;;; This function is called by the trace encapsulation. It calls the ;;; breakpoint hook functions with NIL for the breakpoint and cookie,