#+sb-xc cl:class
(:make-load-form-fun class-make-load-form-fun)
(:include ctype
- (:class-info (type-class-or-lose #-sb-xc 'sb!xc:class
+ (class-info (type-class-or-lose #-sb-xc 'sb!xc:class
#+sb-xc 'cl:class)))
(:constructor nil)
#-no-ansi-print-object
;; that CL:CLASS-NAME is a generic function.)
(%name nil :type symbol)
;; the current layout for this class, or NIL if none assigned yet
- (layout nil :type (or sb!kernel::layout null))
+ (layout nil :type (or layout null))
;; How sure are we that this class won't be redefined?
;; :READ-ONLY = We are committed to not changing the effective
;; slots or superclasses.
;;; Note: This bound is set somewhat less than MOST-POSITIVE-FIXNUM
;;; in order to guarantee that several hash values can be added without
;;; overflowing into a bignum.
-(defconstant layout-clos-hash-max (ash most-positive-fixnum -3)
+(def!constant layout-clos-hash-max (ash most-positive-fixnum -3)
#!+sb-doc
"the inclusive upper bound on LAYOUT-CLOS-HASH values")
(clos-hash-6 (random-layout-clos-hash) :type index)
(clos-hash-7 (random-layout-clos-hash) :type index)
;; the class that this is a layout for
- (class (required-argument)
+ (class (missing-arg)
;; FIXME: Do we really know this is a CL:CLASS? Mightn't it
;; be a SB-PCL:CLASS under some circumstances? What goes here
;; when the LAYOUT is in fact a PCL::WRAPPER?
;; renamed because some of us find it confusing to call something
;; a depth when it isn't quite.
(depthoid -1 :type layout-depthoid)
- ;; The number of top-level descriptor cells in each instance.
+ ;; the number of top level descriptor cells in each instance
(length 0 :type index)
;; If this layout has some kind of compiler meta-info, then this is
;; it. If a structure, then we store the DEFSTRUCT-DESCRIPTION here.
\f
;;;; support for the hash values used by CLOS when working with LAYOUTs
-(defconstant layout-clos-hash-length 8)
+(def!constant layout-clos-hash-length 8)
#!-sb-fluid (declaim (inline layout-clos-hash))
(defun layout-clos-hash (layout i)
;; FIXME: Either this I should be declared to be `(MOD
(let ((old-length (layout-length old-layout)))
(unless (= old-length length)
(warn "change in instance length of class ~S:~% ~
- ~A length: ~D~% ~
- ~A length: ~D"
+ ~A length: ~W~% ~
+ ~A length: ~W"
name
old-context old-length
context length)
(declaim (ftype (function (symbol index simple-vector layout-depthoid) layout)
find-and-init-or-check-layout))
(defun find-and-init-or-check-layout (name length inherits depthoid)
- (/show0 "entering FIND-AND-INIT-OR-CHECK-LAYOUT")
(let ((layout (find-layout name)))
(init-or-check-layout layout
(or (sb!xc:find-class name nil)
#-sb-xc (declare (type sb!xc:class new-value))
(ecase (info :type :kind name)
((nil))
+ (:forthcoming-defclass-type
+ ;; XXX Currently, nothing needs to be done in this case. Later, when
+ ;; PCL is integrated tighter into SBCL, this might need more work.
+ nil)
(:instance
(let ((old (class-of (sb!xc:find-class name)))
(new (class-of new-value)))
(character :enumerable t :translation base-char)
(base-char :enumerable t
:inherits (character)
- :codes (#.sb!vm:base-char-type))
- (symbol :codes (#.sb!vm:symbol-header-type))
+ :codes (#.sb!vm:base-char-widetag))
+ (symbol :codes (#.sb!vm:symbol-header-widetag))
(instance :state :read-only)
- (system-area-pointer :codes (#.sb!vm:sap-type))
- (weak-pointer :codes (#.sb!vm:weak-pointer-type))
- (code-component :codes (#.sb!vm:code-header-type))
- (lra :codes (#.sb!vm:return-pc-header-type))
- (fdefn :codes (#.sb!vm:fdefn-type))
+ (system-area-pointer :codes (#.sb!vm:sap-widetag))
+ (weak-pointer :codes (#.sb!vm:weak-pointer-widetag))
+ (code-component :codes (#.sb!vm:code-header-widetag))
+ (lra :codes (#.sb!vm:return-pc-header-widetag))
+ (fdefn :codes (#.sb!vm:fdefn-widetag))
(random-class) ; used for unknown type codes
(function
- :codes (#.sb!vm:closure-header-type
- #.sb!vm:simple-fun-header-type)
+ :codes (#.sb!vm:closure-header-widetag
+ #.sb!vm:simple-fun-header-widetag)
:state :read-only)
(funcallable-instance
:inherits (function)
:state :read-only)
- ;; FIXME: Are COLLECTION and MUTABLE-COLLECTION used for anything
- ;; any more? COLLECTION is not defined in ANSI Common Lisp..
- (collection :hierarchical-p nil :state :read-only)
- (mutable-collection :state :read-only
- :inherits (collection))
- (generic-sequence :state :read-only
- :inherits (collection))
- (mutable-sequence :state :read-only
- :direct-superclasses (mutable-collection
- generic-sequence)
- :inherits (mutable-collection
- generic-sequence
- collection))
- (generic-array :state :read-only
- :inherits (mutable-sequence
- mutable-collection
- generic-sequence
- collection))
- (generic-vector :state :read-only
- :inherits (generic-array
- mutable-sequence mutable-collection
- generic-sequence collection))
- (array :translation array :codes (#.sb!vm:complex-array-type)
- :inherits (generic-array mutable-sequence mutable-collection
- generic-sequence collection))
+ (array :translation array :codes (#.sb!vm:complex-array-widetag)
+ :hierarchical-p nil)
(simple-array
- :translation simple-array :codes (#.sb!vm:simple-array-type)
- :inherits (array generic-array mutable-sequence mutable-collection
- generic-sequence collection))
+ :translation simple-array :codes (#.sb!vm:simple-array-widetag)
+ :inherits (array))
(sequence
- :translation (or cons (member nil) vector)
- :inherits (mutable-sequence mutable-collection generic-sequence
- collection))
+ :translation (or cons (member nil) vector))
(vector
- :translation vector :codes (#.sb!vm:complex-vector-type)
- :direct-superclasses (array sequence generic-vector)
- :inherits (array sequence generic-vector generic-array
- mutable-sequence mutable-collection generic-sequence
- collection))
+ :translation vector :codes (#.sb!vm:complex-vector-widetag)
+ :direct-superclasses (array sequence)
+ :inherits (array sequence))
(simple-vector
- :translation simple-vector :codes (#.sb!vm:simple-vector-type)
+ :translation simple-vector :codes (#.sb!vm:simple-vector-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array
- sequence generic-vector generic-array
- mutable-sequence mutable-collection
- generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(bit-vector
- :translation bit-vector :codes (#.sb!vm:complex-bit-vector-type)
- :inherits (vector array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :translation bit-vector :codes (#.sb!vm:complex-bit-vector-widetag)
+ :inherits (vector array sequence))
(simple-bit-vector
- :translation simple-bit-vector :codes (#.sb!vm:simple-bit-vector-type)
+ :translation simple-bit-vector :codes (#.sb!vm:simple-bit-vector-widetag)
:direct-superclasses (bit-vector simple-array)
:inherits (bit-vector vector simple-array
- array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ array sequence))
(simple-array-unsigned-byte-2
:translation (simple-array (unsigned-byte 2) (*))
- :codes (#.sb!vm:simple-array-unsigned-byte-2-type)
+ :codes (#.sb!vm:simple-array-unsigned-byte-2-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-unsigned-byte-4
:translation (simple-array (unsigned-byte 4) (*))
- :codes (#.sb!vm:simple-array-unsigned-byte-4-type)
+ :codes (#.sb!vm:simple-array-unsigned-byte-4-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-unsigned-byte-8
:translation (simple-array (unsigned-byte 8) (*))
- :codes (#.sb!vm:simple-array-unsigned-byte-8-type)
+ :codes (#.sb!vm:simple-array-unsigned-byte-8-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-unsigned-byte-16
:translation (simple-array (unsigned-byte 16) (*))
- :codes (#.sb!vm:simple-array-unsigned-byte-16-type)
+ :codes (#.sb!vm:simple-array-unsigned-byte-16-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-unsigned-byte-32
:translation (simple-array (unsigned-byte 32) (*))
- :codes (#.sb!vm:simple-array-unsigned-byte-32-type)
+ :codes (#.sb!vm:simple-array-unsigned-byte-32-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-signed-byte-8
:translation (simple-array (signed-byte 8) (*))
- :codes (#.sb!vm:simple-array-signed-byte-8-type)
+ :codes (#.sb!vm:simple-array-signed-byte-8-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-signed-byte-16
:translation (simple-array (signed-byte 16) (*))
- :codes (#.sb!vm:simple-array-signed-byte-16-type)
+ :codes (#.sb!vm:simple-array-signed-byte-16-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-signed-byte-30
:translation (simple-array (signed-byte 30) (*))
- :codes (#.sb!vm:simple-array-signed-byte-30-type)
+ :codes (#.sb!vm:simple-array-signed-byte-30-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-signed-byte-32
:translation (simple-array (signed-byte 32) (*))
- :codes (#.sb!vm:simple-array-signed-byte-32-type)
+ :codes (#.sb!vm:simple-array-signed-byte-32-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-single-float
:translation (simple-array single-float (*))
- :codes (#.sb!vm:simple-array-single-float-type)
+ :codes (#.sb!vm:simple-array-single-float-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-double-float
:translation (simple-array double-float (*))
- :codes (#.sb!vm:simple-array-double-float-type)
+ :codes (#.sb!vm:simple-array-double-float-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
#!+long-float
(simple-array-long-float
:translation (simple-array long-float (*))
- :codes (#.sb!vm:simple-array-long-float-type)
+ :codes (#.sb!vm:simple-array-long-float-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-complex-single-float
:translation (simple-array (complex single-float) (*))
- :codes (#.sb!vm:simple-array-complex-single-float-type)
+ :codes (#.sb!vm:simple-array-complex-single-float-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
(simple-array-complex-double-float
:translation (simple-array (complex double-float) (*))
- :codes (#.sb!vm:simple-array-complex-double-float-type)
+ :codes (#.sb!vm:simple-array-complex-double-float-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ :inherits (vector simple-array array sequence))
#!+long-float
(simple-array-complex-long-float
:translation (simple-array (complex long-float) (*))
- :codes (#.sb!vm:simple-array-complex-long-float-type)
+ :codes (#.sb!vm:simple-array-complex-long-float-widetag)
:direct-superclasses (vector simple-array)
- :inherits (vector simple-array array sequence
- generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
- (generic-string
- :state :read-only
- :inherits (mutable-sequence mutable-collection generic-sequence
- collection))
+ :inherits (vector simple-array array sequence))
(string
:translation string
- :codes (#.sb!vm:complex-string-type)
- :direct-superclasses (vector generic-string)
- :inherits (vector array sequence
- generic-vector generic-array generic-string
- mutable-sequence mutable-collection
- generic-sequence collection))
+ :codes (#.sb!vm:complex-string-widetag)
+ :direct-superclasses (vector)
+ :inherits (vector array sequence))
(simple-string
:translation simple-string
- :codes (#.sb!vm:simple-string-type)
+ :codes (#.sb!vm:simple-string-widetag)
:direct-superclasses (string simple-array)
:inherits (string vector simple-array
- array sequence
- generic-string generic-vector generic-array mutable-sequence
- mutable-collection generic-sequence collection))
+ array sequence))
(list
:translation (or cons (member nil))
- :inherits (sequence mutable-sequence mutable-collection
- generic-sequence collection))
+ :inherits (sequence))
(cons
:codes (#.sb!vm:list-pointer-lowtag)
:translation cons
- :inherits (list sequence
- mutable-sequence mutable-collection
- generic-sequence collection))
+ :inherits (list sequence))
(null
:translation (member nil)
- :inherits (list sequence
- mutable-sequence mutable-collection
- generic-sequence collection symbol)
- :direct-superclasses (list symbol))
- (generic-number :state :read-only)
- (number :translation number :inherits (generic-number))
+ :inherits (symbol list sequence)
+ :direct-superclasses (symbol list))
+ (number :translation number)
(complex
:translation complex
- :inherits (number generic-number)
- :codes (#.sb!vm:complex-type))
+ :inherits (number)
+ :codes (#.sb!vm:complex-widetag))
(complex-single-float
:translation (complex single-float)
- :inherits (complex number generic-number)
- :codes (#.sb!vm:complex-single-float-type))
+ :inherits (complex number)
+ :codes (#.sb!vm:complex-single-float-widetag))
(complex-double-float
:translation (complex double-float)
- :inherits (complex number generic-number)
- :codes (#.sb!vm:complex-double-float-type))
+ :inherits (complex number)
+ :codes (#.sb!vm:complex-double-float-widetag))
#!+long-float
(complex-long-float
:translation (complex long-float)
- :inherits (complex number generic-number)
- :codes (#.sb!vm:complex-long-float-type))
- (real :translation real :inherits (number generic-number))
+ :inherits (complex number)
+ :codes (#.sb!vm:complex-long-float-widetag))
+ (real :translation real :inherits (number))
(float
:translation float
- :inherits (real number generic-number))
+ :inherits (real number))
(single-float
:translation single-float
- :inherits (float real number generic-number)
- :codes (#.sb!vm:single-float-type))
+ :inherits (float real number)
+ :codes (#.sb!vm:single-float-widetag))
(double-float
:translation double-float
- :inherits (float real number generic-number)
- :codes (#.sb!vm:double-float-type))
+ :inherits (float real number)
+ :codes (#.sb!vm:double-float-widetag))
#!+long-float
(long-float
:translation long-float
- :inherits (float real number generic-number)
- :codes (#.sb!vm:long-float-type))
+ :inherits (float real number)
+ :codes (#.sb!vm:long-float-widetag))
(rational
:translation rational
- :inherits (real number generic-number))
+ :inherits (real number))
(ratio
:translation (and rational (not integer))
- :inherits (rational real number generic-number)
- :codes (#.sb!vm:ratio-type))
+ :inherits (rational real number)
+ :codes (#.sb!vm:ratio-widetag))
(integer
:translation integer
- :inherits (rational real number generic-number))
+ :inherits (rational real number))
(fixnum
- :translation (integer #.sb!vm:*target-most-negative-fixnum*
- #.sb!vm:*target-most-positive-fixnum*)
- :inherits (integer rational real number
- generic-number)
+ :translation (integer #.sb!xc:most-negative-fixnum
+ #.sb!xc:most-positive-fixnum)
+ :inherits (integer rational real number)
:codes (#.sb!vm:even-fixnum-lowtag #.sb!vm:odd-fixnum-lowtag))
(bignum
:translation (and integer (not fixnum))
- :inherits (integer rational real number
- generic-number)
- :codes (#.sb!vm:bignum-type))
+ :inherits (integer rational real number)
+ :codes (#.sb!vm:bignum-widetag))
(stream
:state :read-only
:depth 3
(if (eq name t)
nil
(mapcar #'sb!xc:find-class direct-superclasses)))))
- (setf (info :type :kind name) :primitive
+ (setf (info :type :kind name) #+sb-xc-host :defined #-sb-xc-host :primitive
(class-cell-class (find-class-cell name)) class)
(unless trans-p
(setf (info :type :builtin name) class))
(inherits-list (second x))
(class (make-standard-class :name name))
(class-cell (find-class-cell name)))
+ ;; Needed to open-code the MAP, below
+ (declare (type list inherits-list))
(setf (class-cell-class class-cell) class
(info :type :class name) class-cell
(info :type :kind name) :instance)
;;; FIXME: It would be good to arrange for this to be called when the
;;; cross-compiler is being built, not just when the target Lisp is
;;; being cold loaded. Perhaps this could be moved to its own file
-;;; late in the stems-and-flags.lisp-expr sequence, and be put in
+;;; late in the build-order.lisp-expr sequence, and be put in
;;; !COLD-INIT-FORMS there?
(defun !class-finalize ()
(dohash (name layout *forward-referenced-layouts*)
projects / sbcl.git / blobdiff