Changeset 12218


Ignore:
Timestamp:
10/23/09 21:59:14 (12 years ago)
Author:
ehuelsmann
Message:

Centralize package creation (in Lisp.java).

This moves the creation of the XP and FORMAT packages away from boot.lisp.

Location:
trunk/abcl/src/org/armedbear/lisp
Files:
3 edited

Legend:

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

    r12214 r12218  
    8282  public static final Package PACKAGE_THREADS =
    8383    Packages.createPackage("THREADS");
     84  public static final Package PACKAGE_FORMAT =
     85    Packages.createPackage("FORMAT");
     86  public static final Package PACKAGE_XP =
     87    Packages.createPackage("XP");
     88
    8489
    8590  // ### nil
     
    123128        PACKAGE_THREADS.usePackage(PACKAGE_EXT);
    124129        PACKAGE_THREADS.usePackage(PACKAGE_SYS);
     130        PACKAGE_FORMAT.usePackage(PACKAGE_CL);
     131        PACKAGE_FORMAT.usePackage(PACKAGE_EXT);
     132        PACKAGE_XP.usePackage(PACKAGE_CL);
    125133      }
    126134    catch (Throwable t)
     
    27782786    loadClass("org.armedbear.lisp.ash");
    27792787    loadClass("org.armedbear.lisp.Java");
     2788    loadClass("org.armedbear.lisp.PackageFunctions");
    27802789    cold = false;
    27812790  }
  • trunk/abcl/src/org/armedbear/lisp/boot.lisp

    r12216 r12218  
    176176(load-system-file "define-modify-macro")
    177177
    178 ;;; Package definitions.
    179 (defpackage "FORMAT" (:use "CL" "EXT"))
    180 
    181 (defpackage "XP"
    182   (:use "CL")
    183   (:export
    184    #:output-pretty-object))
    185 
    186178(defconstant lambda-list-keywords
    187179  '(&optional &rest &key &aux &body &whole &allow-other-keys &environment))
  • trunk/abcl/src/org/armedbear/lisp/print.lisp

    r11391 r12218  
    274274(defun %print-object (object stream)
    275275  (if *print-pretty*
    276       (xp:output-pretty-object object stream)
     276      (xp::output-pretty-object object stream)
    277277      (output-ugly-object object stream)))
    278278
Note: See TracChangeset for help on using the changeset viewer.