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

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Mon Aug  6 00:45:59 2012
New Revision: 14061

Log:
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.

Modified:
   trunk/abcl/src/org/armedbear/lisp/Package.java
   trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/Package.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Package.java	Sun Aug  5 22:41:30 2012	(r14060)
+++ trunk/abcl/src/org/armedbear/lisp/Package.java	Mon Aug  6 00:45:59 2012	(r14061)
@@ -865,7 +865,7 @@
     public String printObject()
     {
         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("\")");
             return sb.toString();

Modified: trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Sun Aug  5 22:41:30 2012	(r14060)
+++ trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp	Mon Aug  6 00:45:59 2012	(r14061)
@@ -1191,7 +1191,7 @@
 
 (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"
                      (list +java-string+) +lisp-object+))