Changeset 11671


Ignore:
Timestamp:
02/19/09 08:54:48 (12 years ago)
Author:
Mark Evenson
Message:

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

Update ChangeLog?.

Bless as abcl-0.12.43.

Location:
branches/0.13.x/abcl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.13.x/abcl/ChangeLog

    r11661 r11671  
     12009-02-19  ehuelsmann  <ehuelsmann>
     2
     3  * src/org/armedbear/lisp/trace.lisp:
     4  [svn r11668] Prevent CLOS from kicking in on TRACE; makes sure the
     5  compiler doesn't get called to compile an effective-method-
     6  function. Enables TRACEing the compiler.
     7  [ce9fac0d5de7] [tip]
     8
     92009-02-18  ehuelsmann  <ehuelsmann>
     10
     11  * src/org/armedbear/lisp/top-level.lisp:
     12  [svn r11667] Move the binding of *PRINT-LENGTH* outside of the inner
     13  REPL-loop; now it only gets re-bound upon the TOP-LEVEL restart.
     14  [a33371702612]
     15
     162009-02-18  vvoutilainen  <vvoutilainen>
     17
     18  * COPYING:
     19  [svn r11665] Add a mention about classpath exception in the
     20  beginning of the file.
     21  [c798d072e18a]
     22
     232009-02-19  Mark  <evenson@panix.com>
     24
     25  * LICENSE, build-abcl.lisp, build.xml,
     26  src/org/armedbear/lisp/trace.lisp:
     27  Interrmediate checkin on path to candidate release for TRACE.
     28
     29  Start of 'build-abcl.lisp' normalization.
     30
     31  Merge through [svn r11660].
     32  [71a1ef1a6a2a]
     33
     342009-02-15  ehuelsmann  <ehuelsmann>
     35
     36  * build-abcl.lisp:
     37  [svn r11660] Fix our lisp based build for CLISP 2.47 (and hopefully
     38  from there onwards).
     39  [f29f8cbf0e42]
     40
     412009-02-14  mevenson  <mevenson>
     42
     43  * src/org/armedbear/lisp/trace.lisp:
     44  [svn r11659] Re-enable compilation of TRACE forms.
     45
     46  Introduces a bug by including a reference to CLOS in the TRACE
     47  facility, which makes tracing of forms that access the compiler
     48  (FORMAT et. al.) problematic.
     49
     50  Proposed solution to ship as 0.13.0. --Mark
     51  [3a1b97072c14]
     52
     532009-02-14  vvoutilainen  <vvoutilainen>
     54
     55  * COPYING, LICENSE:
     56  [svn r11658] Move GPLv2 text to COPYING, append Classpath exception
     57  to COPYING, delete LICENSE.
     58  [ef6c55d91667]
     59
     602009-02-12  Mark  <evenson@panix.com>
     61
     62  * bugs/trace-1.lisp, src/org/armedbear/lisp/trace.lisp:
     63  Reverted first two fixes of r11627 to fix TRACE.
     64
     65  Problems interacting with SLIME.
     66  [aee2bfc511c4]
     67
     682009-02-11  Mark  <evenson@panix.com>
     69
     70  * ChangeLog:
     71  Merge through svn r11655.
     72  [c848818df171]
     73
     742009-02-10  mevenson  <mevenson>
     75
     76  * COPYING:
     77  [svn r11655] Change reference from COPYING to LICENSE.
     78  [adc9feb07f46]
     79
    1802009-02-10  mevenson  <mevenson>
    281
  • branches/0.13.x/abcl/src/org/armedbear/lisp/Version.java

    r11662 r11671  
    4242  public static String getVersion()
    4343  {
    44     return "0.12.42";
     44    return "0.12.43";
    4545  }
    4646}
  • branches/0.13.x/abcl/src/org/armedbear/lisp/trace.lisp

    r11661 r11671  
    3535
    3636(require "FORMAT")
     37
    3738(defvar *trace-info-hashtable* (make-hash-table :test #'equal))
    3839
     
    4142(defvar *trace-depth* 0
    4243  "Current depth of stack push for use of TRACE facility.")
    43 
    44 
    45 ;;; XXX This eventually blows up in the compiler.How can we "punt" on  this and MAKE-LOAD-FORM ???
    46 (require "CLOS")
    47 (defmethod make-load-form ((object trace-info) &optional environment)
    48   (make-load-form-saving-slots object :environment environment))
    4944
    5045(defun list-traced-functions ()
     
    6459        (setf args (append (subseq args 0 index) (subseq args (+ index 2))))))
    6560    (dolist (arg args)
    66       (let ((info (make-trace-info :name arg
    67                                    :breakp breakp)))
    68         (push `(trace-1 ',arg ,info) results)))
     61      (push `(trace-1 ',arg (make-trace-info :name ',arg
     62                                             :breakp ,breakp)) results))
    6963    `(list ,@(nreverse results))))
    7064
     
    123117        (setf (fdefinition name) traced-function)))))
    124118
    125 (defun untraced-function (name)
    126   (let ((info (gethash name *trace-info-hashtable*)))
    127     (and info (trace-info-untraced-function info))))
    128 
    129 (defun trace-redefined-update (name untraced-function)
    130   (when (and *traced-names* (find name *traced-names* :test #'equal))
    131     (let* ((info (gethash name *trace-info-hashtable*))
    132            (traced-function (traced-function name info untraced-function)))
    133       (setf (trace-info-untraced-function info) untraced-function)
    134       (let ((*traced-names* '()))
    135         (setf (fdefinition name) traced-function)))))
    136 
    137119(defun indent (string)
    138120  (concatenate 'string
    139121               (make-string (* (1+ *trace-depth*) 2) :initial-element #\space)
    140122               string))
     123
     124
    141125
    142126(defmacro untrace (&rest args)
Note: See TracChangeset for help on using the changeset viewer.