FORWARD-REFERENCED-CLASSes; error reporting on
CLASS-DEFAULT-INITARGS, CLASS-PRECEDENCE-LIST and CLASS-SLOTS
has been improved;
+ ** SXHASH on CLOS instances now uses a slot internal to the
+ instance to return different numbers on distinct instances,
+ while preserving the same return value through invocations of
+ CHANGE-CLASS;
* fixed some bugs shown by Paul Dietz' test suite:
** DOLIST puts its body in TAGBODY
** SET-EXCLUSIVE-OR sends arguments to :TEST function in the
whose instances can be used as Lisp streams (e.g. passed as the
first argument to <function>format</>).</para>
+<para>&SBCL; supports a MetaObject Protocol which is intended to be
+compatible with &AMOP;; exceptions to this (as distinct from current
+bugs<!-- Such as the distinction between CL:FIND-CLASS and
+SB-PCL::FIND-CLASS :-( -->) are that
+<function>compute-effective-method</> only returns one value, not
+two<!-- FIXME: anything else? What about extensions? (e.g. COMPUTE-SLOTS
+behaviour) -->.</para>
+
</sect2>
<sect2><title>Support For Unix</>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
<!-- markup for common expressions -->
+ <!ENTITY AMOP "<acronym>AMOP</>">
<!ENTITY ANSI "<acronym>ANSI</>">
<!ENTITY CMUCL "<application>CMU CL</>">
<!ENTITY IEEE "<acronym>IEEE</>">
(logxor 422371266
(sxhash ; through DEFTRANSFORM
(class-name (layout-class (%instance-layout x)))))
- ;; Nice though it might be to return a nontrivial
- ;; hash value for other instances (especially
- ;; STANDARD-OBJECTs) there seems to be no good way
- ;; to do so. We can't even do the CLASS-NAME trick
- ;; (as used above for STRUCTURE-OBJECT) because
- ;; then CHANGE-CLASS would cause SXHASH values to
- ;; change, ouch! -- WHN recording wisdom of CSR
- 309518995))
+ (sxhash-instance x)))
(symbol (sxhash x)) ; through DEFTRANSFORM
(array
(typecase x
(sxhash (char-code x)))) ; through DEFTRANSFORM
;; general, inefficient case of NUMBER
(number (sxhash-number x))
+ (generic-function (sxhash-instance x))
(t 42))))
(sxhash-recurse x)))
\f
\f
(defun allocate-standard-instance (wrapper
&optional (slots-init nil slots-init-p))
- (let ((instance (%make-standard-instance nil))
+ (let ((instance (%make-standard-instance nil (get-instance-hash-code)))
(no-of-slots (wrapper-no-of-instance-slots wrapper)))
(setf (std-instance-wrapper instance) wrapper)
(setf (std-instance-slots instance)
(defun allocate-funcallable-instance (wrapper &optional
(slots-init nil slots-init-p))
- (let ((fin (%make-pcl-funcallable-instance nil nil)))
+ (let ((fin (%make-pcl-funcallable-instance nil nil
+ (get-instance-hash-code))))
(set-funcallable-instance-fun
fin
#'(sb-kernel:instance-lambda (&rest args)
;; KLUDGE: Note that neither of these slots is ever accessed by its
;; accessor name as of sbcl-0.pre7.63. Presumably everything works
;; by puns based on absolute locations. Fun fun fun.. -- WHN 2001-10-30
- :slot-names (clos-slots name)
+ :slot-names (clos-slots name hash-code)
:boa-constructor %make-pcl-funcallable-instance
:superclass-name sb-kernel:funcallable-instance
:metaclass-name sb-kernel:random-pcl-class
`(funcallable-instance-p ,fin))
(defmacro fsc-instance-wrapper (fin)
`(sb-kernel:%funcallable-instance-layout ,fin))
+;;; FIXME: This seems to bear no relation at all to the CLOS-SLOTS
+;;; slot in the FUNCALLABLE-INSTANCE structure, above, which
+;;; (bizarrely) seems to be set to the NAME of the
+;;; FUNCALLABLE-INSTANCE. At least, the index 1 seems to return the
+;;; NAME, and the index 2 NIL. Weird. -- CSR, 2002-11-07
(defmacro fsc-instance-slots (fin)
`(sb-kernel:%funcallable-instance-info ,fin 0))
+(defmacro fsc-instance-hash (fin)
+ `(sb-kernel:%funcallable-instance-info ,fin 3))
\f
(declaim (inline clos-slots-ref (setf clos-slots-ref)))
(declaim (ftype (function (simple-vector index) t) clos-slots-ref))
(slots nil))
|#
(sb-kernel:!defstruct-with-alternate-metaclass standard-instance
- :slot-names (slots)
+ :slot-names (slots hash-code)
:boa-constructor %make-standard-instance
:superclass-name sb-kernel:instance
:metaclass-name cl:standard-class
;;; weakening of STD-INSTANCE-P.
(defmacro std-instance-slots (x) `(sb-kernel:%instance-ref ,x 1))
(defmacro std-instance-wrapper (x) `(sb-kernel:%instance-layout ,x))
+;;; KLUDGE: This one doesn't "work" on structures. However, we
+;;; ensure, in SXHASH and friends, never to call it on structures.
+(defmacro std-instance-hash (x) `(sb-kernel:%instance-ref ,x 2))
;;; FIXME: These functions are called every place we do a
;;; CALL-NEXT-METHOD, and probably other places too. It's likely worth
,wrapper
nil)))
\f
+;;;; support for useful hashing of PCL instances
+(let ((hash-code 0))
+ (declare (fixnum hash-code))
+ (defun get-instance-hash-code ()
+ (if (< hash-code most-positive-fixnum)
+ (incf hash-code)
+ (setq hash-code 0))))
+
+(defun sb-impl::sxhash-instance (x)
+ (cond
+ ((std-instance-p x) (std-instance-hash x))
+ ((fsc-instance-p x) (fsc-instance-hash x))
+ (t (bug "SXHASH-INSTANCE called on some weird thing: ~S" x))))
+\f
;;;; structure-instance stuff
;;;;
;;;; FIXME: Now that the code is SBCL-only, this extra layer of
(complex 1.0 2.0) (complex 1.0d0 2.0)
(complex 1.5 -3/2) (complex 1.5 -1.5d0)
- #\x #\X #\*))
+ #\x #\X #\*
+
+ #'allocate-instance #'no-applicable-method))
(make-psxhash-extra-subtests ()
(list (copy-seq "")
(copy-seq #*)
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.7.9.35"
+"0.7.9.36"
projects / sbcl.git / commitdiff