Changeset 14061

Timestamp:

08/06/12 07:45:59 (8 years ago)

Author:

ehuelsmann

Message:

Qualify FIND-PACKAGE when used to serialize a package in a FASL:
the current package at FASL load time may not import the CL package.

Patch by: Vladimir Sedach.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Package.java (modified) (1 diff)
• compiler-pass2.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Package.java

@@ -866 +866 @@
     {
         if (_PRINT_FASL_.symbolValue() != NIL && name != null) {
-            StringBuilder sb = new StringBuilder("#.(FIND-PACKAGE \"");
+            StringBuilder sb = new StringBuilder("#.(CL:FIND-PACKAGE \"");
             sb.append(name);
             sb.append("\")");

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -1192 +1192 @@
 (defun serialize-package (pkg)
   "Generate code to restore a serialized package."
-  (emit 'ldc (pool-string (concatenate 'string "#.(FIND-PACKAGE \""
+  (emit 'ldc (pool-string (concatenate 'string "#.(CL:FIND-PACKAGE \""
                                        (package-name pkg) "\")")))
   (emit-invokestatic +lisp+ "readObjectFromString"