0.7.13.pcl-class.2
[sbcl.git] / package-data-list.lisp-expr
index 87f9323..250739f 100644 (file)
@@ -2,10 +2,9 @@
 
 ;;;; the specifications of target packages, except for a few things
 ;;;; which are handled elsewhere by other mechanisms:
-;;;;   * the creation of the trivial SB-SLOT-ACCESSOR-NAME package
-;;;;   * any SHADOWing and nickname hackery
+;;;;   * any SHADOWing and nickname hackery;
 ;;;;   * the standard, non-SBCL-specific packages COMMON-LISP,
-;;;;     COMMON-LISP-USER, and KEYWORD
+;;;;     COMMON-LISP-USER, and KEYWORD.
 ;;;;
 ;;;; The packages are named SB!FOO here and elsewhere in
 ;;;; cross-compilation, in order to avoid collision with possible
@@ -219,7 +218,7 @@ of SBCL which maintained the CMU-CL-style split into two packages.)"
               "COMPUTE-OLD-NFP" "COPY-MORE-ARG"
               "CURRENT-BINDING-POINTER" "CURRENT-NFP-TN"
               "CURRENT-STACK-POINTER" "DEALLOC-ALIEN-STACK-SPACE"
-              "DEALLOC-NUMBER-STACK-SPACE" "DEF-BOOLEAN-ATTRIBUTE"
+              "DEALLOC-NUMBER-STACK-SPACE"
               "DEF-IR1-TRANSLATOR"
               "!DEF-PRIMITIVE-TYPE" "!DEF-PRIMITIVE-TYPE-ALIAS"
               "DEFINE-SOURCE-TRANSFORM" "!DEF-VM-SUPPORT-ROUTINE"
@@ -232,6 +231,8 @@ of SBCL which maintained the CMU-CL-style split into two packages.)"
               "PHYSENV-DEBUG-LIVE-TN" "PHYSENV-LIVE-TN"
               "FAST-SYMBOL-VALUE" "FOLDABLE"
               "FORCE-TN-TO-STACK"
+             "FUN-INFO-DERIVE-TYPE" "FUN-INFO-IR2-CONVERT"
+             "FUN-INFO-LTN-ANNOTATE" "FUN-INFO-OPTIMIZER"
              "GET-VECTOR-SUBTYPE"
               "HALT"
              "IF-EQ" "INLINE-SYNTACTIC-CLOSURE-LAMBDA"
@@ -239,9 +240,8 @@ of SBCL which maintained the CMU-CL-style split into two packages.)"
               "IR2-COMPONENT-CONSTANTS" "IR2-CONVERT"
               "IR2-PHYSENV-NUMBER-STACK-P"
              "KNOWN-CALL-LOCAL" "KNOWN-RETURN"
-             "LAMBDA-INDEPENDENT-OF-LEXENV-P"
              "LAMBDA-WITH-LEXENV" "LEXENV-FIND"
-              "LOCATION=" "LTN-ANNOTATE"
+             "LOCATION=" "LTN-ANNOTATE"
               "MAKE-ALIAS-TN" "MAKE-CATCH-BLOCK"
               "MAKE-CLOSURE" "MAKE-CONSTANT-TN" "MAKE-FIXNUM"
               "MAKE-LOAD-TIME-CONSTANT-TN" "MAKE-N-TNS" "MAKE-NORMAL-TN"
@@ -249,6 +249,7 @@ of SBCL which maintained the CMU-CL-style split into two packages.)"
               "MAKE-REPRESENTATION-TN" "MAKE-RESTRICTED-TN" "MAKE-SC-OFFSET"
               "MAKE-STACK-POINTER-TN" "MAKE-TN-REF" "MAKE-UNWIND-BLOCK"
              "MAKE-WIRED-TN" "MAYBE-COMPILER-NOTE"
+             "MAYBE-INLINE-SYNTACTIC-CLOSURE"
               "META-PRIMITIVE-TYPE-OR-LOSE"
               "META-SB-OR-LOSE" "META-SC-NUMBER-OR-LOSE" "META-SC-OR-LOSE"
               "MORE-ARG-CONTEXT" "MOVABLE" "MOVE" "MULTIPLE-CALL"
@@ -565,6 +566,9 @@ like *STACK-TOP-HINT* and unsupported stuff like *TRACED-FUN-LIST*."
              "*USE-IMPLEMENTATION-TYPES*"
              "*DERIVE-FUNCTION-TYPES*"
 
+             ;; ..and inspector of compiler policy
+             "DESCRIBE-COMPILER-POLICY"
+
              ;; a special form for breaking out of our "declarations
              ;; are assertions" default
              "TRULY-THE"
@@ -612,7 +616,8 @@ like *STACK-TOP-HINT* and unsupported stuff like *TRACED-FUN-LIST*."
 
              ;; miscellaneous useful supported extensions
              "QUIT"
-
+            "*MODULE-PROVIDER-FUNCTIONS*"
+            
              ;; RUN-PROGRAM is not only useful for users, but also
              ;; useful to implement parts of SBCL itself, so we're
              ;; going to have to implement it anyway, so we might
@@ -693,6 +698,7 @@ retained, possibly temporariliy, because it might be used internally."
              "SIMPLE-PARSE-ERROR"
              "SIMPLE-PROGRAM-ERROR" "SIMPLE-STREAM-ERROR"
              "SIMPLE-STYLE-WARNING"
+            "SPECIAL-FORM-FUNCTION"
              "STYLE-WARN"
 
              ;; bootstrapping magic, to make things happen both in
@@ -732,12 +738,14 @@ retained, possibly temporariliy, because it might be used internally."
             "COMPOUND-OBJECT-P"
              "SWAPPED-ARGS-FUN"
              "ANY/TYPE" "EVERY/TYPE"
+            "EQUAL-BUT-NO-CAR-RECURSION"
              "TYPE-BOUND-NUMBER"
              "CONSTANTLY-T" "CONSTANTLY-NIL" "CONSTANTLY-0"
              "PSXHASH"
              "%BREAK"
             "NTH-BUT-WITH-SANE-ARG-ORDER"
             "DEPRECATION-WARNING"
+            "BIT-VECTOR-="
 
              ;; ..and macros..
              "COLLECT"
@@ -747,6 +755,8 @@ retained, possibly temporariliy, because it might be used internally."
              "DEFENUM"
              "DEFPRINTER"
              "AVER" "ENFORCE-TYPE"
+             "AWHEN" "ACOND" "IT"
+            "!DEF-BOOLEAN-ATTRIBUTE"
 
             ;; ..and CONDITIONs..
             "BUG"
@@ -792,6 +802,7 @@ retained, possibly temporariliy, because it might be used internally."
              ;; hash caches
              "DEFINE-HASH-CACHE"
              "DEFUN-CACHED"
+             "DEFINE-CACHED-SYNONYM"
 
              ;; time
              "FORMAT-DECODED-TIME"
@@ -851,9 +862,11 @@ retained, possibly temporariliy, because it might be used internally."
              "ABOUT-TO-MODIFY-SYMBOL-VALUE"
             "SYMBOL-SELF-EVALUATING-P"
              "PRINT-PRETTY-ON-STREAM-P"
+            "ARRAY-READABLY-PRINTABLE-P"
              "LOOKS-LIKE-NAME-OF-SPECIAL-VAR-P"
              "POSITIVE-PRIMEP"
              "EVAL-IN-LEXENV"
+            "DEBUG-NAMIFY"
 
              ;; These could be moved back into SB!EXT if someone has
              ;; compelling reasons, but hopefully we can get by
@@ -890,7 +903,12 @@ retained, possibly temporariliy, because it might be used internally."
              "!BEGIN-COLLECTING-COLD-INIT-FORMS"
             "!COLD-INIT-FORMS"
             "COLD-FSET"
-             "!DEFUN-FROM-COLLECTED-COLD-INIT-FORMS"))
+             "!DEFUN-FROM-COLLECTED-COLD-INIT-FORMS"
+
+            ;; hooks for contrib/ stuff we're insufficiently sure
+            ;; about to add to SB!EXT
+            "*REPL-PROMPT-FUN*"
+            "*REPL-READ-FORM-FUN*"))
 
  ;; FIXME: This package is awfully huge. It'd probably be good to
  ;; split it. There's at least one natural way to split it: the
@@ -929,7 +947,8 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "%ARRAY-FILL-POINTER-P"
              "%ASIN" "%ASINH"
              "%ATAN" "%ATAN2" "%ATANH"
-             "%CALLER-FRAME-AND-PC" "%CHECK-BOUND" "%CLOSURE-FUN"
+             "%CALLER-FRAME-AND-PC" "%CHECK-BOUND"
+            "%CHECK-VECTOR-SEQUENCE-BOUNDS" "%CLOSURE-FUN"
              "%CLOSURE-INDEX-REF" "%COS" "%COS-QUICK"
              "%COSH" "%DATA-VECTOR-AND-INDEX"
             "%DEPOSIT-FIELD"
@@ -994,6 +1013,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "BINDING-STACK-POINTER-SAP" "BIT-BASH-COPY"
              "BIT-INDEX" "BOGUS-ARG-TO-VALUES-LIST-ERROR"
              "BOOLE-CODE"
+            "BOUNDING-INDICES-BAD-ERROR"
              "BYTE-SPECIFIER"
              "%BYTE-BLT"
              "CALLABLE" "CASE-BODY-ERROR"
@@ -1033,7 +1053,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "DOUBLE-FLOAT-SIGNIFICAND"
              "FLOAT-WAIT"
              "DYNAMIC-SPACE-FREE-POINTER" "DYNAMIC-USAGE"
-            "END-TOO-LARGE-ERROR"
+            "EFFECTIVE-FIND-POSITION-TEST" "EFFECTIVE-FIND-POSITION-KEY"
              "ERROR-NUMBER-OR-LOSE"
              "FAILED-%WITH-ARRAY-DATA"
              "FDEFINITION-OBJECT"
@@ -1073,15 +1093,20 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "JUST-DUMP-IT-NORMALLY"
              "KEY-INFO" "KEY-INFO-NAME"
              "KEY-INFO-P" "KEY-INFO-TYPE"
-             "LAYOUT-DEPTHOID"
-             "LAYOUT-INVALID-ERROR" "LEXENV"
+             "LAYOUT-DEPTHOID" "LAYOUT-INVALID-ERROR"
+            "LEXENV" "LEXENV-DESIGNATOR"
              "LINE-LENGTH"
              "ANSI-STREAM"
              "ANSI-STREAM-BIN" "ANSI-STREAM-BOUT"
+            "ANSI-STREAM-CLOSE"
+            "ANSI-STREAM-ELEMENT-TYPE"
              "ANSI-STREAM-IN" "ANSI-STREAM-IN-BUFFER"
              "ANSI-STREAM-IN-INDEX"
+            "ANSI-STREAM-INPUT-STREAM-P"
              "ANSI-STREAM-MISC" "ANSI-STREAM-N-BIN"
+            "ANSI-STREAM-OPEN-STREAM-P"
              "ANSI-STREAM-OUT" "ANSI-STREAM-SOUT"
+            "ANSI-STREAM-OUTPUT-STREAM-P"
              "LIST-TO-VECTOR*" 
             "LOGICAL-HOST" "LOGICAL-HOST-DESIGNATOR"
              #!+long-float "LONG-FLOAT-EXPONENT"
@@ -1097,7 +1122,8 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "MAKE-KEY-INFO" "MAKE-LISP-OBJ"
             #!+long-float "MAKE-LONG-FLOAT"
              "MAKE-MEMBER-TYPE" "MAKE-NAMED-TYPE"
-             "MAKE-NULL-LEXENV" "MAKE-NUMERIC-TYPE"
+             "MAKE-NULL-LEXENV" "MAKE-NULL-INTERACTIVE-LEXENV"
+            "MAKE-NUMERIC-TYPE"
              "MAKE-SINGLE-FLOAT" "MAKE-SPECIALIZABLE-ARRAY"
              "%MAKE-INSTANCE"
             "MAKE-VALUE-CELL"
@@ -1107,7 +1133,9 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "MUTATOR-SELF"
              "NAMED-TYPE" "NAMED-TYPE-NAME" "NAMED-TYPE-P"
              "NATIVE-BYTE-ORDER" "NEGATE"
-             "NEVER-SUBTYPEP" "NIL-FUN-RETURNED-ERROR"
+            "NEGATION-TYPE" "NEGATION-TYPE-TYPE"
+             "NEVER-SUBTYPEP" "NIL-ARRAY-ACCESSED-ERROR"
+            "NIL-FUN-RETURNED-ERROR"
              "NOT-<=-ERROR" "NOT-=-ERROR"
              "NOT-DUMPED-AT-ALL"
              "NUMERIC-CONTAGION" "NUMERIC-TYPE"
@@ -1144,6 +1172,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "OBJECT-NOT-SIMPLE-ARRAY-DOUBLE-FLOAT-ERROR"
              "OBJECT-NOT-SIMPLE-ARRAY-ERROR"
              #!+long-float "OBJECT-NOT-SIMPLE-ARRAY-LONG-FLOAT-ERROR"
+            "OBJECT-NOT-SIMPLE-ARRAY-NIL-ERROR"
              "OBJECT-NOT-SIMPLE-ARRAY-SINGLE-FLOAT-ERROR"
              "OBJECT-NOT-SIMPLE-ARRAY-UNSIGNED-BYTE-16-ERROR"
              "OBJECT-NOT-SIMPLE-ARRAY-UNSIGNED-BYTE-2-ERROR"
@@ -1176,6 +1205,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "SCALE-DOUBLE-FLOAT"
             #!+long-float "SCALE-LONG-FLOAT"
              "SCALE-SINGLE-FLOAT"
+             "SEQUENCE-COUNT"
              "SEQUENCE-END" "SEQUENCE-OF-CHECKED-LENGTH-GIVEN-TYPE"
              "SET-ARRAY-HEADER" "SET-HEADER-DATA" "SHIFT-TOWARDS-END"
              "SHIFT-TOWARDS-START" "SHRINK-VECTOR" "SIGNED-BYTE-32-P"
@@ -1184,6 +1214,7 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-P"
              "SIMPLE-ARRAY-DOUBLE-FLOAT-P"
             #!+long-float "SIMPLE-ARRAY-LONG-FLOAT-P"
+            "SIMPLE-ARRAY-NIL-P"
              "SIMPLE-ARRAY-P"
              "SIMPLE-ARRAY-SINGLE-FLOAT-P"
              "SIMPLE-ARRAY-UNSIGNED-BYTE-16-P"
@@ -1200,7 +1231,8 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "SINGLE-FLOAT-BITS" "SINGLE-FLOAT-EXPONENT"
              "SINGLE-FLOAT-INT-EXPONENT"
              "SINGLE-FLOAT-SIGNIFICAND"
-             "SINGLE-VALUE-TYPE" "SPECIALIZABLE" "SPECIALIZABLE-VECTOR"
+             "SINGLE-VALUE-TYPE" "SINGLE-VALUE-SPECIFIER-TYPE"
+             "SPECIALIZABLE" "SPECIALIZABLE-VECTOR"
              "SPECIFIER-TYPE" "STACK-REF"
              "STREAMLIKE" "STRINGABLE"
              "STRUCTURE-RAW-SLOT-TYPE-AND-SIZE"
@@ -1256,56 +1288,64 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
              "LAYOUT-PURE" "DSD-RAW-TYPE"
              "DEFSTRUCT-DESCRIPTION" "UNDEFINE-STRUCTURE"
              "DD-COPIER" "UNDEFINE-FUN-NAME" "DD-TYPE"
-             "CLASS-STATE" "INSTANCE"
+             "CLASSOID-STATE" "INSTANCE"
              "*TYPE-SYSTEM-INITIALIZED*" "FIND-LAYOUT"
              "DSD-NAME" "%TYPEP" "DD-RAW-INDEX"
-             "DD-NAME" "CLASS-SUBCLASSES"
-             "CLASS-LAYOUT" "CLASS-%NAME"
+             "DD-NAME" "CLASSOID-SUBCLASSES"
+             "CLASSOID-LAYOUT" "CLASSOID-NAME"
              "DD-RAW-LENGTH" "NOTE-NAME-DEFINED"
              "%CODE-CODE-SIZE" "DD-SLOTS"
+            "DD-INCLUDE"
              "%IMAGPART" "DSD-ACCESSOR-NAME"
              "%CODE-DEBUG-INFO" "DSD-%NAME"
-             "LAYOUT-CLASS" "LAYOUT-INVALID"
+             "LAYOUT-CLASSOID" "LAYOUT-INVALID"
              "%SIMPLE-FUN-NAME" "DSD-TYPE" "%INSTANCEP"
              "DEFSTRUCT-SLOT-DESCRIPTION" "%SIMPLE-FUN-ARGLIST"
              "%SIMPLE-FUN-NEXT" "LAYOUT-CLOS-HASH-LENGTH" "DD-PREDICATE-NAME"
-             "CLASS-PROPER-NAME" "%NOTE-TYPE-DEFINED" "LAYOUT-INFO"
+             "CLASSOID-PROPER-NAME" "%NOTE-TYPE-DEFINED" "LAYOUT-INFO"
              "%SET-INSTANCE-LAYOUT" "DD-DEFAULT-CONSTRUCTOR"
              "LAYOUT-OF" "%SIMPLE-FUN-SELF" "%REALPART"
-             "STRUCTURE-CLASS-P" "DSD-INDEX"
+             "STRUCTURE-CLASSOID-P" "DSD-INDEX"
              "%INSTANCE-LAYOUT" "LAYOUT-CLOS-HASH"
              "%SIMPLE-FUN-TYPE" "PROCLAIM-AS-FUN-NAME"
              "BECOME-DEFINED-FUN-NAME"
-             "%NUMERATOR" "CLASS-TYPEP"
+             "%NUMERATOR" "CLASSOID-TYPEP"
              "DSD-READ-ONLY"
+            "DSD-DEFAULT"
              "LAYOUT-INHERITS" "DD-LENGTH" "%CODE-ENTRY-POINTS"
              "%DENOMINATOR"
-             "MAKE-STANDARD-CLASS"
-             "CLASS-CELL-TYPEP" 
-             "FIND-CLASS-CELL" "EXTRACT-FUN-TYPE"
-             "FUNCALLABLE-STRUCTURE-CLASS"
+
+            "STANDARD-CLASSOID"
+            "CLASSOID-OF"
+             "MAKE-STANDARD-CLASSOID"
+             "CLASSOID-CELL-TYPEP" 
+             "FIND-CLASSOID-CELL" "EXTRACT-FUN-TYPE"
+             "FUNCALLABLE-STRUCTURE-CLASSOID"
              "%RANDOM-DOUBLE-FLOAT"
             #!+long-float "%RANDOM-LONG-FLOAT"
              "%RANDOM-SINGLE-FLOAT"
-             "RANDOM-PCL-CLASS" 
+             "RANDOM-PCL-CLASSOID" 
              "%FUNCALLABLE-INSTANCE-INFO" "RANDOM-CHUNK"
-             "MAKE-FUNCALLABLE-STRUCTURE-CLASS" "LAYOUT-CLOS-HASH-MAX"
-             "CLASS-CELL-NAME" "BUILT-IN-CLASS-DIRECT-SUPERCLASSES"
+             "MAKE-FUNCALLABLE-STRUCTURE-CLASSOID" "LAYOUT-CLOS-HASH-MAX"
+             "CLASSOID-CELL-NAME" "BUILT-IN-CLASSOID-DIRECT-SUPERCLASSES"
+            "BUILT-IN-CLASSOID-TRANSLATION"
              "RANDOM-LAYOUT-CLOS-HASH"
-             "CLASS-PCL-CLASS" "FUNCALLABLE-STRUCTURE"
+             "CLASSOID-PCL-CLASS" "FUNCALLABLE-STRUCTURE"
              "FUNCALLABLE-INSTANCE-FUN"
              "%FUNCALLABLE-INSTANCE-LAYOUT"
-             "BASIC-STRUCTURE-CLASS" 
-             "CLASS-CELL-CLASS"
-             "FUNCALLABLE-STRUCTURE-CLASS-P" "REGISTER-LAYOUT"
+             "BASIC-STRUCTURE-CLASSOID" 
+             "CLASSOID-CELL-CLASSOID"
+             "FUNCALLABLE-STRUCTURE-CLASSOID-P" "REGISTER-LAYOUT"
              "FUNCALLABLE-INSTANCE" "RANDOM-FIXNUM-MAX"
-             "MAKE-RANDOM-PCL-CLASS" "INSTANCE-LAMBDA"
+             "MAKE-RANDOM-PCL-CLASSOID" "INSTANCE-LAMBDA"
              "%FUNCALLABLE-INSTANCE-LEXENV" "%MAKE-SYMBOL"
              "%FUNCALLABLE-INSTANCE-FUN" "SYMBOL-HASH"
 
-             "MAKE-UNDEFINED-CLASS" "CLASS-DIRECT-SUPERCLASSES" "MAKE-LAYOUT"
-             "REDEFINE-LAYOUT-WARNING" "SLOT-CLASS"
-             "INSURED-FIND-CLASS" "ORDER-LAYOUT-INHERITS"
+            "BUILT-IN-CLASSOID"
+             "MAKE-UNDEFINED-CLASSOID" "FIND-CLASSOID" "CLASSOID"
+            "CLASSOID-DIRECT-SUPERCLASSES" "MAKE-LAYOUT"
+             "REDEFINE-LAYOUT-WARNING" "SLOT-CLASSOID"
+             "INSURED-FIND-CLASSOID" "ORDER-LAYOUT-INHERITS"
              "STD-COMPUTE-CLASS-PRECEDENCE-LIST"
 
              ;; symbols from former SB!CONDITIONS
@@ -1352,29 +1392,6 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
     :use ("CL")
     :export ())
 
- #!+mp
- #s(sb-cold:package-data
-    :name "SB!MP"
-    :doc "public (but unstable): multiprocessing support"
-    :export ("*ALL-PROCESSES*" "*CURRENT-PROCESS*"
-             "*CURRENT-STACK-GROUP*" "*INITIAL-STACK-GROUP*"
-             "*MULTI-PROCESSING*" "ALL-PROCESSES"
-             "ATOMIC-DECF" "ATOMIC-INCF" "ATOMIC-POP"
-             "ATOMIC-PUSH" "CURRENT-PROCESS"
-             "DESTROY-PROCESS" "DISABLE-PROCESS"
-             "ENABLE-PROCESS" "INIT-STACK-GROUPS"
-             "LOCK" "MAKE-STACK-GROUP" "MAKE-LOCK"
-             "MAKE-PROCESS" "PROCESS-ACTIVE-P" "PROCESS-ALIVE-P"
-             "PROCESS-IDLE-TIME" "PROCESS-INTERRUPT"
-             "PROCESS-NAME" "PROCESS-PRESET"
-             "PROCESS-REAL-TIME" "PROCESS-RUN-TIME"
-             "PROCESS-STATE" "PROCESS-WAIT-UNTIL-FD-USABLE"
-             "PROCESS-WAIT" "PROCESS-WAIT-WITH-TIMEOUT"
-             "PROCESS-WHOSTATE" "PROCESS-YIELD" "PROCESSP"
-             "RESTART-PROCESS" "SHOW-PROCESSES"
-             "STACK-GROUP-RESUME" "WITHOUT-SCHEDULING"
-             "WITH-LOCK-HELD"))
-
  #s(sb-cold:package-data
     :name "SB!PCL"
     :doc
@@ -1382,18 +1399,13 @@ is a good idea, but see SB-SYS re. blurring of boundaries."
 extensions, but even they are not guaranteed to be present in
 later versions of SBCL, and the other stuff in here is
 definitely not guaranteed to be present in later versions of SBCL."
-    ;; FIXME: SB-PCL should probably USE-PACKAGE SB-KERNEL, since SB-PCL
-    ;; is built on SB-KERNEL, and in the absence of USE-PACKAGE, it ends
-    ;; up using a thundering herd of explicit prefixes to get to
-    ;; SB-KERNEL symbols. However, it'll probably be too messy to do
-    ;; this until the duplicate SB-PCL:CLASS/CL:CLASS hierarchy kludge
-    ;; is unscrewed, since until it is there are too many things which
-    ;; conflict between the two packages.
-    :use ("CL" "SB!INT" "SB!EXT" "SB!WALKER")
+    :use ("CL" "SB!INT" "SB!EXT" "SB!WALKER" "SB!KERNEL")
     :import-from (("SB!KERNEL" "FUNCALLABLE-INSTANCE-P" "%FUN-DOC"
                    "PACKAGE-DOC-STRING"
                    "PACKAGE-HASHTABLE-SIZE" "PACKAGE-HASHTABLE-FREE"
                    "PACKAGE-INTERNAL-SYMBOLS" "PACKAGE-EXTERNAL-SYMBOLS"))
+    ;; FIXME: should we now reexport CLASS and friends, too?
+    ;; Probably.  See if AMOP has a list of exported symbols.
     :reexport ("ADD-METHOD" "ALLOCATE-INSTANCE"
                "COMPUTE-APPLICABLE-METHODS"
                "ENSURE-GENERIC-FUNCTION"
@@ -1512,8 +1524,7 @@ SB-KERNEL) have been undone, but probably more remain."
              "DEPORT-BOOLEAN" "DEPORT-INTEGER"
              "FROB-DO-BODY"
              "ENABLE-INTERRUPT" "ENUMERATION"
-             "FD-STREAM" "FD-STREAM-FD"
-             "FD-STREAM-P" 
+             "FD-STREAM-FD" "FD-STREAM-P" 
              "FOREIGN-SYMBOL-ADDRESS" "FOREIGN-SYMBOL-ADDRESS-AS-INTEGER"
              "GET-PAGE-SIZE" "GET-SYSTEM-INFO"
              "IGNORE-INTERRUPT"
@@ -1828,6 +1839,7 @@ structure representations"
              "SIMPLE-ARRAY-COMPLEX-SINGLE-FLOAT-WIDETAG"
              "SIMPLE-ARRAY-DOUBLE-FLOAT-WIDETAG"
              #!+long-float "SIMPLE-ARRAY-LONG-FLOAT-WIDETAG"
+            "SIMPLE-ARRAY-NIL-WIDETAG"
              "SIMPLE-ARRAY-SINGLE-FLOAT-WIDETAG"
              "SIMPLE-ARRAY-WIDETAG" "SIMPLE-ARRAY-UNSIGNED-BYTE-16-WIDETAG"
              "SIMPLE-ARRAY-UNSIGNED-BYTE-2-WIDETAG"