X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fntrace.lisp;h=d666736a0099549b39b49eda289eec59064b62d5;hb=422b88abf96f4842a3d0999cd3b80d96f5a153d6;hp=fd96b83fe7533c0a8ba15fcf36d8933f59f2c361;hpb=e0814eee6f6dea52db010b45a330100f2fe65832;p=sbcl.git

diff --git a/src/code/ntrace.lisp b/src/code/ntrace.lisp
index fd96b83..d666736 100644
--- a/src/code/ntrace.lisp
+++ b/src/code/ntrace.lisp
@@ -29,15 +29,15 @@
   "If the trace indentation exceeds this value, then indentation restarts at
    0.")
 
-(defvar *trace-encapsulate-default* :default
+(defvar *trace-encapsulate-default* t
   #+sb-doc
   "the default value for the :ENCAPSULATE option to TRACE")
 
 ;;;; internal state
 
 ;;; a hash table that maps each traced function to the TRACE-INFO. The
-;;; entry for a closure is the shared function-entry object.
-(defvar *traced-functions* (make-hash-table :test 'eq))
+;;; entry for a closure is the shared function entry object.
+(defvar *traced-funs* (make-hash-table :test 'eq))
 
 ;;; A TRACE-INFO object represents all the information we need to
 ;;; trace a given function.
@@ -139,7 +139,7 @@
 (defun trace-redefined-update (fname new-value)
   (when (fboundp fname)
     (let* ((fun (trace-fdefinition fname))
-	   (info (gethash fun *traced-functions*)))
+	   (info (gethash fun *traced-funs*)))
       (when (and info (trace-info-named info))
 	(untrace-1 fname)
 	(trace-1 fname info new-value)))))
@@ -162,8 +162,8 @@
 			((nil) exp)
 			(:encapsulated
 			 `(flet ((sb-debug:arg (n)
-				   (declare (special argument-list))
-				   (elt argument-list n)))
+				   (declare (special arg-list))
+				   (elt arg-list n)))
 			    (declare (ignorable #'sb-debug:arg))
 			    ,exp))))
 		 (fun (coerce `(lambda () ,bod) 'function)))
@@ -183,7 +183,7 @@
     (dolist (entry *traced-entries*)
       (when (cdr entry) (incf depth)))
     (format t
-	    "~@V,0T~W: "
+	    "~V,0@T~W: "
 	    (+ (mod (* depth *trace-indentation-step*)
 		    (- *max-trace-indentation* *trace-indentation-step*))
 	       *trace-indentation-step*)
@@ -248,14 +248,18 @@
 		    (or (not wherein)
 			(trace-wherein-p frame wherein)))))
        (when conditionp
-	 (let ((sb-kernel:*current-level* 0)
+	 (let ((sb-kernel:*current-level-in-print* 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)))
+	       ;; FIXME: These special variables should be given
+	       ;; *FOO*-style names, and probably declared globally
+	       ;; with DEFVAR.
+	       (locally
+		 (declare (special basic-definition arg-list))
+		 (prin1 `(,(trace-info-what info) ,@arg-list)))
 	       (print-frame-call frame))
 	   (terpri)
 	   (trace-print frame (trace-info-print info)))
@@ -283,7 +287,7 @@
 		 (or (cdr entry)
 		     (let ((cond (trace-info-condition-after info)))
 		       (and cond (funcall (cdr cond) frame)))))
-	(let ((sb-kernel:*current-level* 0)
+	(let ((sb-kernel:*current-level-in-print* 0)
 	      (*standard-output* *trace-output*)
 	      (*in-trace* t))
 	  (fresh-line)
@@ -310,11 +314,11 @@
     (let ((frame (sb-di:frame-down (sb-di:top-frame))))
       (funcall start frame nil)
       (let ((*traced-entries* *traced-entries*))
-	(declare (special basic-definition argument-list))
+	(declare (special basic-definition arg-list))
 	(funcall cookie frame nil)
 	(let ((vals
 	       (multiple-value-list
-		(apply basic-definition argument-list))))
+		(apply basic-definition arg-list))))
 	  (funcall (trace-end-breakpoint-fun info) frame nil vals nil)
 	  (values-list vals))))))
 
@@ -330,7 +334,7 @@
 	  (values definition t
 		  (nth-value 2 (trace-fdefinition definition)))
 	  (trace-fdefinition function-or-name))
-    (when (gethash fun *traced-functions*)
+    (when (gethash fun *traced-funs*)
       (warn "~S is already TRACE'd, untracing it." function-or-name)
       (untrace-1 fun))
 
@@ -397,7 +401,7 @@
 	    (sb-di:activate-breakpoint start)
 	    (sb-di:activate-breakpoint end)))))
 
-      (setf (gethash fun *traced-functions*) info)))
+      (setf (gethash fun *traced-funs*) info)))
 
   function-or-name)
 
@@ -477,8 +481,8 @@
 	`(let ,(binds) (list ,@(forms)))
 	`(list ,@(forms)))))
 
-(defun %list-traced-functions ()
-  (loop for x being each hash-value in *traced-functions*
+(defun %list-traced-funs ()
+  (loop for x being each hash-value in *traced-funs*
 	collect (trace-info-what x)))
 
 (defmacro trace (&rest specs)
@@ -559,14 +563,14 @@
    -AFTER and -ALL forms are evaluated in the null environment."
   (if specs
       (expand-trace specs)
-      '(%list-traced-functions)))
+      '(%list-traced-funs)))
 
 ;;;; untracing
 
 ;;; Untrace one function.
 (defun untrace-1 (function-or-name)
   (let* ((fun (trace-fdefinition function-or-name))
-	 (info (gethash fun *traced-functions*)))
+	 (info (gethash fun *traced-funs*)))
     (cond
      ((not info)
       (warn "Function is not TRACEd: ~S" function-or-name))
@@ -578,11 +582,11 @@
 	(sb-di:delete-breakpoint (trace-info-start-breakpoint info))
 	(sb-di:delete-breakpoint (trace-info-end-breakpoint info))))
       (setf (trace-info-untraced info) t)
-      (remhash fun *traced-functions*)))))
+      (remhash fun *traced-funs*)))))
 
 ;;; Untrace all traced functions.
 (defun untrace-all ()
-  (dolist (fun (%list-traced-functions))
+  (dolist (fun (%list-traced-funs))
     (untrace-1 fun))
   t)