;;; If FIND-CLASS is called on a constant class, locate the CLASS-CELL
;;; at load time.
-(deftransform find-class ((name) ((constant-arg symbol)) *)
+(deftransform find-classoid ((name) ((constant-arg symbol)) *)
(let* ((name (continuation-value name))
- (cell (find-class-cell name)))
- `(or (class-cell-class ',cell)
+ (cell (find-classoid-cell name)))
+ `(or (classoid-cell-classoid ',cell)
(error "class not yet defined: ~S" name))))
\f
;;;; standard type predicates, i.e. those defined in package COMMON-LISP,
;;; binds specified by TYPE. BASE is the name of the base type, for
;;; declaration. We make SAFETY locally 0 to inhibit any checking of
;;; this assertion.
-#!-negative-zero-is-not-zero
(defun transform-numeric-bound-test (n-object type base)
(declare (type numeric-type type))
(let ((low (numeric-type-low type))
(declare (optimize (safety 0)))
(and ,@(when low
(if (consp low)
- `((> (the ,base ,n-object) ,(car low)))
- `((>= (the ,base ,n-object) ,low))))
+ `((> (truly-the ,base ,n-object) ,(car low)))
+ `((>= (truly-the ,base ,n-object) ,low))))
,@(when high
(if (consp high)
- `((< (the ,base ,n-object) ,(car high)))
- `((<= (the ,base ,n-object) ,high))))))))
-
-#!+negative-zero-is-not-zero
-(defun transform-numeric-bound-test (n-object type base)
- (declare (type numeric-type type))
- (let ((low (numeric-type-low type))
- (high (numeric-type-high type))
- (float-type-p (csubtypep type (specifier-type 'float)))
- (x (gensym))
- (y (gensym)))
- `(locally
- (declare (optimize (safety 0)))
- (and ,@(when low
- (if (consp low)
- `((let ((,x (the ,base ,n-object))
- (,y ,(car low)))
- ,(if (not float-type-p)
- `(> ,x ,y)
- `(if (and (zerop ,x) (zerop ,y))
- (> (float-sign ,x) (float-sign ,y))
- (> ,x ,y)))))
- `((let ((,x (the ,base ,n-object))
- (,y ,low))
- ,(if (not float-type-p)
- `(>= ,x ,y)
- `(if (and (zerop ,x) (zerop ,y))
- (>= (float-sign ,x) (float-sign ,y))
- (>= ,x ,y)))))))
- ,@(when high
- (if (consp high)
- `((let ((,x (the ,base ,n-object))
- (,y ,(car high)))
- ,(if (not float-type-p)
- `(< ,x ,y)
- `(if (and (zerop ,x) (zerop ,y))
- (< (float-sign ,x) (float-sign ,y))
- (< ,x ,y)))))
- `((let ((,x (the ,base ,n-object))
- (,y ,high))
- ,(if (not float-type-p)
- `(<= ,x ,y)
- `(if (and (zerop ,x) (zerop ,y))
- (<= (float-sign ,x) (float-sign ,y))
- (<= ,x ,y)))))))))))
+ `((< (truly-the ,base ,n-object) ,(car high)))
+ `((<= (truly-the ,base ,n-object) ,high))))))))
;;; Do source transformation of a test of a known numeric type. We can
;;; assume that the type doesn't have a corresponding predicate, since
,(transform-numeric-bound-test n-object type base)))
(:complex
`(and (complexp ,n-object)
- ,(once-only ((n-real `(realpart (the complex ,n-object)))
- (n-imag `(imagpart (the complex ,n-object))))
+ ,(once-only ((n-real `(realpart (truly-the complex ,n-object)))
+ (n-imag `(imagpart (truly-the complex ,n-object))))
`(progn
,n-imag ; ignorable
(and (typep ,n-real ',base)
(aver (constant-continuation-p spec))
(let* ((spec (continuation-value spec))
(class (specifier-type spec))
- (name (sb!xc:class-name class))
+ (name (classoid-name class))
(otype (continuation-type object))
(layout (let ((res (info :type :compiler-layout name)))
(if (and res (not (layout-invalid res)))
((csubtypep otype class)
t)
;; If not properly named, error.
- ((not (and name (eq (sb!xc:find-class name) class)))
+ ((not (and name (eq (find-classoid name) class)))
(compiler-error "can't compile TYPEP of anonymous or undefined ~
class:~% ~S"
class))
(t
(values '(lambda (x) (declare (ignore x)) t) 'layout-of)))
(cond
- ((and (eq (class-state class) :sealed) layout
- (not (class-subclasses class)))
+ ((and (eq (classoid-state class) :sealed) layout
+ (not (classoid-subclasses class)))
;; Sealed and has no subclasses.
(let ((n-layout (gensym)))
`(and (,pred object)
`((when (layout-invalid ,n-layout)
(%layout-invalid-error object ',layout))))
(eq ,n-layout ',layout)))))
- ((and (typep class 'basic-structure-class) layout)
+ ((and (typep class 'basic-structure-classoid) layout)
;; structure type tests; hierarchical layout depths
(let ((depthoid (layout-depthoid layout))
(n-layout (gensym)))
(t
(/noshow "default case -- ,PRED and CLASS-CELL-TYPEP")
`(and (,pred object)
- (class-cell-typep (,get-layout object)
- ',(find-class-cell name)
- object)))))))))
+ (classoid-cell-typep (,get-layout object)
+ ',(find-classoid-cell name)
+ object)))))))))
;;; If the specifier argument is a quoted constant, then we consider
;;; converting into a simple predicate or other stuff. If the type is
(typecase type
(numeric-type
(source-transform-numeric-typep object type))
- (sb!xc:class
+ (classoid
`(%instance-typep ,object ,spec))
(array-type
(source-transform-array-typep object type))
((csubtypep tspec (specifier-type 'float))
'(%single-float x))
((and (csubtypep tspec (specifier-type 'simple-vector))
- (policy node (< safety 3)))
+ ;; Can we avoid checking for dimension issues like
+ ;; (COERCE FOO '(SIMPLE-VECTOR 5)) returning a
+ ;; vector of length 6?
+ (or (policy node (< safety 3)) ; no need in unsafe code
+ (and (array-type-p tspec) ; no need when no dimensions
+ (equal (array-type-dimensions tspec) '(*)))))
`(if (simple-vector-p x)
x
(replace (make-array (length x)) x)))
(t
(give-up-ir1-transform)))))))
+
projects / sbcl.git / blobdiff