0.7.6.3:

[sbcl.git] / src / code / class.lisp

diff --git a/src/code/class.lisp b/src/code/class.lisp
index 20bfe11..0733b25 100644 (file)
--- a/src/code/class.lisp
+++ b/src/code/class.lisp
@@ -29,7 +29,7 @@
             #+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
@@ -96,7 +96,7 @@
 ;;; 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")
 
@@ -233,7 +233,7 @@
 \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
@@ -735,6 +735,10 @@
   #-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)))
@@ -1181,8 +1185,8 @@
      :translation integer
      :inherits (rational real number generic-number))
     (fixnum
-     :translation (integer #.sb!vm:*target-most-negative-fixnum*
-                          #.sb!vm:*target-most-positive-fixnum*)
+     :translation (integer #.sb!xc:most-negative-fixnum
+                          #.sb!xc:most-positive-fixnum)
      :inherits (integer rational real number
                generic-number)
      :codes (#.sb!vm:even-fixnum-lowtag #.sb!vm:odd-fixnum-lowtag))
@@ -1227,7 +1231,7 @@
                    (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))