[armedbear-cvs] r13183 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Tue Jan 25 16:24:03 2011
New Revision: 13183

Log:
Make sure we autoload FORMAT whenever we've booted far enough
and the functions actually invoke simple-format.

Modified:
   trunk/abcl/src/org/armedbear/lisp/Primitives.java
   trunk/abcl/src/org/armedbear/lisp/autoloads.lisp
   trunk/abcl/src/org/armedbear/lisp/boot.lisp
   trunk/abcl/src/org/armedbear/lisp/format.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/Primitives.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Primitives.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Primitives.java	Tue Jan 25 16:24:03 2011
@@ -1738,11 +1738,7 @@
         }
     };
 
-    private static final Symbol _SIMPLE_FORMAT_FUNCTION_ =
-        internSpecial("*SIMPLE-FORMAT-FUNCTION*", PACKAGE_SYS, _FORMAT);
-
     static void checkRedefinition(LispObject arg)
-
     {
         final LispThread thread = LispThread.currentThread();
         if (_WARN_ON_REDEFINITION_.symbolValue(thread) != NIL) {

Modified: trunk/abcl/src/org/armedbear/lisp/autoloads.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/autoloads.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/autoloads.lisp	Tue Jan 25 16:24:03 2011
@@ -435,3 +435,11 @@
 
 (sys::autoload-macro '(pprint-logical-block) "pprint")
 
+(in-package "SYSTEM")
+
+;; This one must be last, or at least past print-object and clos:
+;; we don't want FORMATs executed before we can load those to end us
+;; in a debugger. This command replaces the earlier function binding
+;; where simple-format calls sys::%format
+
+(autoload 'simple-format "format")
\ No newline at end of file

Modified: trunk/abcl/src/org/armedbear/lisp/boot.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/boot.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/boot.lisp	Tue Jan 25 16:24:03 2011
@@ -121,7 +121,7 @@
 (in-package #:system)
 
 (defun simple-format (destination control-string &rest args)
-  (apply *simple-format-function* destination control-string args))
+  (apply #'format destination control-string args))
 
 (export 'simple-format '#:system)
 

Modified: trunk/abcl/src/org/armedbear/lisp/format.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/format.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/format.lisp	Tue Jan 25 16:24:03 2011
@@ -2866,7 +2866,7 @@
                    (t (args param)))))
              (apply (fdefinition symbol) stream (next-arg) colonp atsignp (args)))))
 
-(setf sys::*simple-format-function* #'format)
+(setf (symbol-function 'sys::simple-format) #'format)
 
 
 (provide 'format)