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

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Oct 25 16:18:05 2009
New Revision: 12222

Log:
Centralize package creation for consistency:
 Create PRECOMPILER with the other packages.

Modified:
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/precompiler.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	Sun Oct 25 16:18:05 2009
@@ -85,6 +85,8 @@
     Packages.createPackage("FORMAT");
   public static final Package PACKAGE_XP =
     Packages.createPackage("XP");
+  public static final Package PACKAGE_PRECOMPILER =
+    Packages.createPackage("PRECOMPILER");
 
 
   // ### nil
@@ -130,6 +132,10 @@
         PACKAGE_FORMAT.usePackage(PACKAGE_CL);
         PACKAGE_FORMAT.usePackage(PACKAGE_EXT);
         PACKAGE_XP.usePackage(PACKAGE_CL);
+        PACKAGE_PRECOMPILER.addNickname("PRE");
+        PACKAGE_PRECOMPILER.usePackage(PACKAGE_CL);
+        PACKAGE_PRECOMPILER.usePackage(PACKAGE_EXT);
+        PACKAGE_PRECOMPILER.usePackage(PACKAGE_SYS);
       }
     catch (Throwable t)
       {

Modified: trunk/abcl/src/org/armedbear/lisp/precompiler.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/precompiler.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/precompiler.lisp	Sun Oct 25 16:18:05 2009
@@ -331,12 +331,6 @@
         (t
          form)))
 
-(in-package "EXTENSIONS")
-
-(unless (find-package "PRECOMPILER")
-  (make-package "PRECOMPILER"
-                :nicknames '("PRE")
-                :use '("COMMON-LISP" "EXTENSIONS" "SYSTEM")))
 
 (in-package "PRECOMPILER")