;;; spurious attempts at transformation (and possible repeated
;;; warnings.)
(deftransform typep ((object type))
- (unless (constant-continuation-p type)
+ (unless (constant-lvar-p type)
(give-up-ir1-transform "can't open-code test of non-constant type"))
- `(typep object ',(continuation-value type)))
+ `(typep object ',(lvar-value type)))
-;;; If the continuation OBJECT definitely is or isn't of the specified
+;;; If the lvar OBJECT definitely is or isn't of the specified
;;; type, then return T or NIL as appropriate. Otherwise quietly
;;; GIVE-UP-IR1-TRANSFORM.
(defun ir1-transform-type-predicate (object type)
- (declare (type continuation object) (type ctype type))
- (let ((otype (continuation-type object)))
+ (declare (type lvar object) (type ctype type))
+ (let ((otype (lvar-type object)))
(cond ((not (types-equal-or-intersect otype type))
nil)
((csubtypep otype type)
;;; Flush %TYPEP tests whose result is known at compile time.
(deftransform %typep ((object type))
- (unless (constant-continuation-p type)
+ (unless (constant-lvar-p type)
(give-up-ir1-transform))
(ir1-transform-type-predicate
object
- (ir1-transform-specifier-type (continuation-value type))))
+ (ir1-transform-specifier-type (lvar-value type))))
;;; This is the IR1 transform for simple type predicates. It checks
;;; whether the single argument is known to (not) be of the
(deftransform fold-type-predicate ((object) * * :node node :defun-only t)
(let ((ctype (gethash (leaf-source-name
(ref-leaf
- (continuation-use
+ (lvar-uses
(basic-combination-fun node))))
*backend-predicate-types*)))
(aver ctype)
;;; If FIND-CLASS is called on a constant class, locate the CLASS-CELL
;;; at load time.
(deftransform find-classoid ((name) ((constant-arg symbol)) *)
- (let* ((name (continuation-value name))
+ (let* ((name (lvar-value name))
(cell (find-classoid-cell name)))
`(or (classoid-cell-classoid ',cell)
(error "class not yet defined: ~S" name))))
(define-source-transform atom (x)
`(not (consp ,x)))
+#!+sb-unicode
+(define-source-transform base-char-p (x)
+ `(typep ,x 'base-char))
\f
;;;; TYPEP source transform
(defun source-transform-numeric-typep (object type)
(let* ((class (numeric-type-class type))
(base (ecase class
- (integer (containing-integer-type type))
+ (integer (containing-integer-type
+ (if (numeric-type-complexp type)
+ (modified-numeric-type type
+ :complexp :real)
+ type)))
(rational 'rational)
(float (or (numeric-type-format type) 'float))
((nil) 'real))))
;;; Do source transformation for TYPEP of a known union type. If a
;;; union type contains LIST, then we pull that out and make it into a
-;;; single LISTP call. Note that if SYMBOL is in the union, then LIST
-;;; will be a subtype even without there being any (member NIL). We
-;;; just drop through to the general code in this case, rather than
-;;; trying to optimize it.
+;;; single LISTP call. Note that if SYMBOL is in the union, then LIST
+;;; will be a subtype even without there being any (member NIL). We
+;;; currently just drop through to the general code in this case,
+;;; rather than trying to optimize it (but FIXME CSR 2004-04-05: it
+;;; wouldn't be hard to optimize it after all).
(defun source-transform-union-typep (object type)
(let* ((types (union-type-types type))
- (ltype (specifier-type 'list))
- (mtype (find-if #'member-type-p types)))
- (if (and mtype (csubtypep ltype type))
- (let ((members (member-type-members mtype)))
- (once-only ((n-obj object))
- `(or (listp ,n-obj)
- (typep ,n-obj
- '(or ,@(mapcar #'type-specifier
- (remove (specifier-type 'cons)
- (remove mtype types)))
- (member ,@(remove nil members)))))))
+ (type-cons (specifier-type 'cons))
+ (mtype (find-if #'member-type-p types))
+ (members (when mtype (member-type-members mtype))))
+ (if (and mtype
+ (memq nil members)
+ (memq type-cons types))
+ (once-only ((n-obj object))
+ `(or (listp ,n-obj)
+ (typep ,n-obj
+ '(or ,@(mapcar #'type-specifier
+ (remove type-cons
+ (remove mtype types)))
+ (member ,@(remove nil members))))))
(once-only ((n-obj object))
`(or ,@(mapcar (lambda (x)
`(typep ,n-obj ',(type-specifier x)))
`((typep (cdr ,n-obj)
',(type-specifier cdr-type))))))))))
+(defun source-transform-character-set-typep (object type)
+ (let ((pairs (character-set-type-pairs type)))
+ (if (and (= (length pairs) 1)
+ (= (caar pairs) 0)
+ (= (cdar pairs) (1- sb!xc:char-code-limit)))
+ `(characterp ,object)
+ (once-only ((n-obj object))
+ (let ((n-code (gensym "CODE")))
+ `(and (characterp ,n-obj)
+ (let ((,n-code (sb!xc:char-code ,n-obj)))
+ (or
+ ,@(loop for pair in pairs
+ collect
+ `(<= ,(car pair) ,n-code ,(cdr pair)))))))))))
+
;;; Return the predicate and type from the most specific entry in
;;; *TYPE-PREDICATES* that is a supertype of TYPE.
(defun find-supertype-predicate (type)
;;; and signal an error if so. Otherwise, look up the indirect
;;; class-cell and call CLASS-CELL-TYPEP at runtime.
(deftransform %instance-typep ((object spec) (* *) * :node node)
- (aver (constant-continuation-p spec))
- (let* ((spec (continuation-value spec))
+ (aver (constant-lvar-p spec))
+ (let* ((spec (lvar-value spec))
(class (specifier-type spec))
(name (classoid-name class))
- (otype (continuation-type object))
+ (otype (lvar-type object))
(layout (let ((res (info :type :compiler-layout name)))
(if (and res (not (layout-invalid res)))
res
;; If not properly named, error.
((not (and name (eq (find-classoid name) class)))
(compiler-error "can't compile TYPEP of anonymous or undefined ~
- class:~% ~S"
+ class:~% ~S"
class))
(t
;; Delay the type transform to give type propagation a chance.
;; KLUDGE: It looks bad to only do this on explicitly quoted forms,
;; since that would overlook other kinds of constants. But it turns
;; out that the DEFTRANSFORM for TYPEP detects any constant
- ;; continuation, transforms it into a quoted form, and gives this
+ ;; lvar, transforms it into a quoted form, and gives this
;; source transform another chance, so it all works out OK, in a
;; weird roundabout way. -- WHN 2001-03-18
(if (and (consp spec) (eq (car spec) 'quote))
(source-transform-array-typep object type))
(cons-type
(source-transform-cons-typep object type))
+ (character-set-type
+ (source-transform-character-set-typep object type))
(t nil))
`(%typep ,object ,spec)))
(values nil t)))
;;;; coercion
(deftransform coerce ((x type) (* *) * :node node)
- (unless (constant-continuation-p type)
+ (unless (constant-lvar-p type)
(give-up-ir1-transform))
- (let ((tspec (ir1-transform-specifier-type (continuation-value type))))
- (if (csubtypep (continuation-type x) tspec)
+ (let ((tspec (ir1-transform-specifier-type (lvar-value type))))
+ (if (csubtypep (lvar-type x) tspec)
'x
;; Note: The THE here makes sure that specifiers like
;; (SINGLE-FLOAT 0.0 1.0) can raise a TYPE-ERROR.
- `(the ,(continuation-value type)
+ `(the ,(lvar-value type)
,(cond
((csubtypep tspec (specifier-type 'double-float))
'(%double-float x))
projects / sbcl.git / blobdiff