[armedbear-cvs] r11671 - in branches/0.13.x/abcl: . src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Thu Feb 19 08:54:48 2009
New Revision: 11671

Log:
Merge removal of CLOS from TRACE from trunk by Erik in r11668.

Update ChangeLog.

Bless as abcl-0.12.43.


Modified:
   branches/0.13.x/abcl/ChangeLog
   branches/0.13.x/abcl/src/org/armedbear/lisp/Version.java
   branches/0.13.x/abcl/src/org/armedbear/lisp/trace.lisp

Modified: branches/0.13.x/abcl/ChangeLog
==============================================================================
--- branches/0.13.x/abcl/ChangeLog	(original)
+++ branches/0.13.x/abcl/ChangeLog	Thu Feb 19 08:54:48 2009
@@ -1,3 +1,82 @@
+2009-02-19  ehuelsmann  <ehuelsmann>
+
+	* src/org/armedbear/lisp/trace.lisp:
+	[svn r11668] Prevent CLOS from kicking in on TRACE; makes sure the
+	compiler doesn't get called to compile an effective-method-
+	function. Enables TRACEing the compiler.
+	[ce9fac0d5de7] [tip]
+
+2009-02-18  ehuelsmann  <ehuelsmann>
+
+	* src/org/armedbear/lisp/top-level.lisp:
+	[svn r11667] Move the binding of *PRINT-LENGTH* outside of the inner
+	REPL-loop; now it only gets re-bound upon the TOP-LEVEL restart.
+	[a33371702612]
+
+2009-02-18  vvoutilainen  <vvoutilainen>
+
+	* COPYING:
+	[svn r11665] Add a mention about classpath exception in the
+	beginning of the file.
+	[c798d072e18a]
+
+2009-02-19  Mark  <evenson at panix.com>
+
+	* LICENSE, build-abcl.lisp, build.xml,
+	src/org/armedbear/lisp/trace.lisp:
+	Interrmediate checkin on path to candidate release for TRACE.
+
+	Start of 'build-abcl.lisp' normalization.
+
+	Merge through [svn r11660].
+	[71a1ef1a6a2a]
+
+2009-02-15  ehuelsmann  <ehuelsmann>
+
+	* build-abcl.lisp:
+	[svn r11660] Fix our lisp based build for CLISP 2.47 (and hopefully
+	from there onwards).
+	[f29f8cbf0e42]
+
+2009-02-14  mevenson  <mevenson>
+
+	* src/org/armedbear/lisp/trace.lisp:
+	[svn r11659] Re-enable compilation of TRACE forms.
+
+	Introduces a bug by including a reference to CLOS in the TRACE
+	facility, which makes tracing of forms that access the compiler
+	(FORMAT et. al.) problematic.
+
+	Proposed solution to ship as 0.13.0. --Mark
+	[3a1b97072c14]
+
+2009-02-14  vvoutilainen  <vvoutilainen>
+
+	* COPYING, LICENSE:
+	[svn r11658] Move GPLv2 text to COPYING, append Classpath exception
+	to COPYING, delete LICENSE.
+	[ef6c55d91667]
+
+2009-02-12  Mark  <evenson at panix.com>
+
+	* bugs/trace-1.lisp, src/org/armedbear/lisp/trace.lisp:
+	Reverted first two fixes of r11627 to fix TRACE.
+
+	Problems interacting with SLIME.
+	[aee2bfc511c4]
+
+2009-02-11  Mark  <evenson at panix.com>
+
+	* ChangeLog:
+	Merge through svn r11655.
+	[c848818df171]
+
+2009-02-10  mevenson  <mevenson>
+
+	* COPYING:
+	[svn r11655] Change reference from COPYING to LICENSE.
+	[adc9feb07f46]
+
 2009-02-10  mevenson  <mevenson>
 
 	* COPYING:

Modified: branches/0.13.x/abcl/src/org/armedbear/lisp/Version.java
==============================================================================
--- branches/0.13.x/abcl/src/org/armedbear/lisp/Version.java	(original)
+++ branches/0.13.x/abcl/src/org/armedbear/lisp/Version.java	Thu Feb 19 08:54:48 2009
@@ -41,6 +41,6 @@
 
   public static String getVersion()
   {
-    return "0.12.42";
+    return "0.12.43";
   }
 }

Modified: branches/0.13.x/abcl/src/org/armedbear/lisp/trace.lisp
==============================================================================
--- branches/0.13.x/abcl/src/org/armedbear/lisp/trace.lisp	(original)
+++ branches/0.13.x/abcl/src/org/armedbear/lisp/trace.lisp	Thu Feb 19 08:54:48 2009
@@ -34,6 +34,7 @@
 (export 'untraced-function) ;; For FIND-GENERIC-FUNCTION in clos.lisp.
 
 (require "FORMAT")
+
 (defvar *trace-info-hashtable* (make-hash-table :test #'equal))
 
 (defstruct trace-info name untraced-function breakp)
@@ -41,12 +42,6 @@
 (defvar *trace-depth* 0
   "Current depth of stack push for use of TRACE facility.")
 
-
-;;; XXX This eventually blows up in the compiler.How can we "punt" on  this and MAKE-LOAD-FORM ???
-(require "CLOS") 
-(defmethod make-load-form ((object trace-info) &optional environment)
-  (make-load-form-saving-slots object :environment environment))
-
 (defun list-traced-functions ()
   (copy-list *traced-names*))
 
@@ -63,9 +58,8 @@
         (setf breakp (nth (1+ index) args))
         (setf args (append (subseq args 0 index) (subseq args (+ index 2))))))
     (dolist (arg args)
-      (let ((info (make-trace-info :name arg
-                                   :breakp breakp)))
-        (push `(trace-1 ',arg ,info) results)))
+      (push `(trace-1 ',arg (make-trace-info :name ',arg
+                                             :breakp ,breakp)) results))
     `(list ,@(nreverse results))))
 
 (defun trace-1 (name info)
@@ -122,23 +116,13 @@
       (let ((*traced-names* '()))
         (setf (fdefinition name) traced-function)))))
 
-(defun untraced-function (name)
-  (let ((info (gethash name *trace-info-hashtable*)))
-    (and info (trace-info-untraced-function info))))
-
-(defun trace-redefined-update (name untraced-function)
-  (when (and *traced-names* (find name *traced-names* :test #'equal))
-    (let* ((info (gethash name *trace-info-hashtable*))
-           (traced-function (traced-function name info untraced-function)))
-      (setf (trace-info-untraced-function info) untraced-function)
-      (let ((*traced-names* '()))
-        (setf (fdefinition name) traced-function)))))
-
 (defun indent (string)
   (concatenate 'string
                (make-string (* (1+ *trace-depth*) 2) :initial-element #\space)
                string))
 
+
+
 (defmacro untrace (&rest args)
   (cond ((null args)
          `(untrace-all))