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

[Ville Voutilainen]

Author: vvoutilainen
Date: Sat Jun  6 10:03:16 2009
New Revision: 11994

Log:
Move macroexpand-all and compiler-let to EXT and LISP packages,
respectively.


Modified:
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/Symbol.java
   trunk/abcl/src/org/armedbear/lisp/autoloads.lisp
   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	Sat Jun  6 10:03:16 2009
@@ -76,6 +76,8 @@
     Packages.createPackage("PROFILER");
   public static final Package PACKAGE_JAVA =
     Packages.createPackage("JAVA");
+  public static final Package PACKAGE_LISP =
+    Packages.createPackage("LISP");
 
   // ### nil
   public static final LispObject NIL = Nil.NIL;
@@ -110,6 +112,9 @@
         PACKAGE_PROF.usePackage(PACKAGE_EXT);
         PACKAGE_JAVA.usePackage(PACKAGE_CL);
         PACKAGE_JAVA.usePackage(PACKAGE_EXT);
+        PACKAGE_LISP.usePackage(PACKAGE_CL);
+        PACKAGE_LISP.usePackage(PACKAGE_EXT);
+        PACKAGE_LISP.usePackage(PACKAGE_SYS);
       }
     catch (Throwable t)
       {

Modified: trunk/abcl/src/org/armedbear/lisp/Symbol.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Symbol.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Symbol.java	Sat Jun  6 10:03:16 2009
@@ -2857,6 +2857,8 @@
     PACKAGE_EXT.addExternalSymbol("INTERRUPT-LISP");
   public static final Symbol GETENV =
     PACKAGE_EXT.addExternalSymbol("GETENV");
+  public static final Symbol MACROEXPAND_ALL =
+    PACKAGE_EXT.addExternalSymbol("MACROEXPAND-ALL");
 
   // MOP.
   public static final Symbol STANDARD_READER_METHOD =
@@ -2986,4 +2988,6 @@
   public static final Symbol _INSPECTOR_HOOK_ =
     PACKAGE_EXT.addExternalSymbol("*INSPECTOR-HOOK*");
 
+  public static final Symbol COMPILER_LET=
+    PACKAGE_LISP.addExternalSymbol("COMPILER-LET");
 }

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	Sat Jun  6 10:03:16 2009
@@ -306,8 +306,14 @@
 (autoload 'compile-file-if-needed "compile-file")
 (export 'describe-compiler-policy)
 (autoload 'describe-compiler-policy)
+(export 'macroexpand-all)
+(autoload 'macroexpand-all)
 
 ;; JVM compiler.
 (in-package "JVM")
 (export '(jvm-compile-package))
 (autoload '%with-compilation-unit "jvm")
+
+(in-package "LISP")
+(export 'compiler-let)
+(autoload 'compiler-let)

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	Sat Jun  6 10:03:16 2009
@@ -1000,11 +1000,12 @@
 
 (export '(precompile-form))
 
-(in-package #:system)
-
+(in-package #:ext)
 (defun macroexpand-all (form &optional env)
   (precompiler:precompile-form form nil env))
 
+(in-package #:lisp)
+
 (defmacro compiler-let (bindings &body forms &environment env)
   (let ((bindings (mapcar #'(lambda (binding)
                               (if (atom binding) (list binding) binding))
@@ -1014,6 +1015,8 @@
                        (eval (cadr binding))) bindings)
       (macroexpand-all `(progn , at forms) env))))
 
+(in-package #:system)
+
 (defun set-function-definition (name new old)
   (let ((*warn-on-redefinition* nil))
     (sys::%set-lambda-name new name)