Changeset 14061


Ignore:
Timestamp:
08/06/12 07:45:59 (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/Package.java

    r14000 r14061  
    866866    {
    867867        if (_PRINT_FASL_.symbolValue() != NIL && name != null) {
    868             StringBuilder sb = new StringBuilder("#.(FIND-PACKAGE \"");
     868            StringBuilder sb = new StringBuilder("#.(CL:FIND-PACKAGE \"");
    869869            sb.append(name);
    870870            sb.append("\")");
  • trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

    r13850 r14061  
    11921192(defun serialize-package (pkg)
    11931193  "Generate code to restore a serialized package."
    1194   (emit 'ldc (pool-string (concatenate 'string "#.(FIND-PACKAGE \""
     1194  (emit 'ldc (pool-string (concatenate 'string "#.(CL:FIND-PACKAGE \""
    11951195                                       (package-name pkg) "\")")))
    11961196  (emit-invokestatic +lisp+ "readObjectFromString"
Note: See TracChangeset for help on using the changeset viewer.