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

[Erik Huelsmann]

Author: ehuelsmann
Date: Fri Oct 23 17:59:14 2009
New Revision: 12218

Log:
Centralize package creation (in Lisp.java).

This moves the creation of the XP and FORMAT packages away from boot.lisp.

Modified:
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/boot.lisp
   trunk/abcl/src/org/armedbear/lisp/print.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Fri Oct 23 17:59:14 2009
@@ -81,6 +81,11 @@
     Packages.createPackage("LISP");
   public static final Package PACKAGE_THREADS =
     Packages.createPackage("THREADS");
+  public static final Package PACKAGE_FORMAT =
+    Packages.createPackage("FORMAT");
+  public static final Package PACKAGE_XP =
+    Packages.createPackage("XP");
+
 
   // ### nil
   public static final LispObject NIL = Nil.NIL;
@@ -122,6 +127,9 @@
         PACKAGE_THREADS.usePackage(PACKAGE_CL);
         PACKAGE_THREADS.usePackage(PACKAGE_EXT);
         PACKAGE_THREADS.usePackage(PACKAGE_SYS);
+        PACKAGE_FORMAT.usePackage(PACKAGE_CL);
+        PACKAGE_FORMAT.usePackage(PACKAGE_EXT);
+        PACKAGE_XP.usePackage(PACKAGE_CL);
       }
     catch (Throwable t)
       {
@@ -2777,6 +2785,7 @@
     loadClass("org.armedbear.lisp.StructureObject");
     loadClass("org.armedbear.lisp.ash");
     loadClass("org.armedbear.lisp.Java");
+    loadClass("org.armedbear.lisp.PackageFunctions");
     cold = false;
   }
 }

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	Fri Oct 23 17:59:14 2009
@@ -175,14 +175,6 @@
 (load-system-file "defpackage")
 (load-system-file "define-modify-macro")
 
-;;; Package definitions.
-(defpackage "FORMAT" (:use "CL" "EXT"))
-
-(defpackage "XP"
-  (:use "CL")
-  (:export
-   #:output-pretty-object))
-
 (defconstant lambda-list-keywords
   '(&optional &rest &key &aux &body &whole &allow-other-keys &environment))
 

Modified: trunk/abcl/src/org/armedbear/lisp/print.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/print.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/print.lisp	Fri Oct 23 17:59:14 2009
@@ -273,7 +273,7 @@
 
 (defun %print-object (object stream)
   (if *print-pretty*
-      (xp:output-pretty-object object stream)
+      (xp::output-pretty-object object stream)
       (output-ugly-object object stream)))
 
 (defun %check-object (object stream)