Changeset 11995 for branches/0.15.x

Timestamp:

06/06/09 14:15:00 (14 years ago)

Author:

vvoutilainen

Message:

Backport the packaging changes for macroexpand-all and compiler-let.

Location:

branches/0.15.x/abcl/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (2 diffs)
• Symbol.java (modified) (2 diffs)
• autoloads.lisp (modified) (2 diffs)
• precompiler.lisp (modified) (2 diffs)

branches/0.15.x/abcl/src/org/armedbear/lisp/Lisp.java

@@ -77 +77 @@
   public static final Package PACKAGE_JAVA =
     Packages.createPackage("JAVA");
+  public static final Package PACKAGE_LISP =
+    Packages.createPackage("LISP");
 
   // ### nil
@@ -111 +113 @@
         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)

branches/0.15.x/abcl/src/org/armedbear/lisp/Symbol.java

@@ -2889 +2889 @@
   public static final Symbol GETENV =
     PACKAGE_EXT.addExternalSymbol("GETENV");
+  public static final Symbol MACROEXPAND_ALL =
+    PACKAGE_EXT.addExternalSymbol("MACROEXPAND-ALL");
 
   // MOP.
@@ -3018 +3020 @@
     PACKAGE_EXT.addExternalSymbol("*INSPECTOR-HOOK*");
 
+  public static final Symbol COMPILER_LET=
+    PACKAGE_LISP.addExternalSymbol("COMPILER-LET");
 }

branches/0.15.x/abcl/src/org/armedbear/lisp/autoloads.lisp

@@ -306 +306 @@
 (export 'describe-compiler-policy)
 (autoload 'describe-compiler-policy)
+(export 'macroexpand-all)
+(autoload 'macroexpand-all)
 
 ;; JVM compiler.
@@ -311 +313 @@
 (export '(jvm-compile-package))
 (autoload '%with-compilation-unit "jvm")
+
+(in-package "LISP")
+(export 'compiler-let)
+(autoload 'compiler-let)

branches/0.15.x/abcl/src/org/armedbear/lisp/precompiler.lisp

@@ -1001 +1001 @@
 (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)
@@ -1014 +1015 @@
                        (eval (cadr binding))) bindings)
       (macroexpand-all `(progn ,@forms) env))))
+
+(in-package #:system)
 
 (defun set-function-definition (name new old)