Ignore:
Timestamp:
Aug 1, 2009, 3:50:08 PM (10 years ago)
Author:
gz
Message:

ftypes - r12467/r12500/r12512/r12514 from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl/lib/format.lisp

    r12410 r12515  
    22462246(defun nx-could-be-type (form type &optional transformed &aux (env *nx-lexical-environment*))
    22472247  (unless transformed (setq form (nx-transform form env)))
    2248   (if (constantp form)
    2249     (typep (eval-constant form) type env)
    2250     (multiple-value-bind (win-p sure-p) (subtypep (nx-form-type form env) `(not ,type) env)
    2251       (not (and win-p sure-p)))))
     2248  (if (nx-form-constant-p form env)
     2249    (typep (nx-form-constant-value form env) type env)
     2250    (not (types-disjoint-p (nx-form-type form env) type env))))
    22522251
    22532252(defun format-require-type (form type &optional description)
     
    23822381         ;; Would need to extend :undefined-function warnings to handle previously-undefined package.
    23832382         (when sym
    2384            (when (nth-value 1 (nx1-call-result-type sym (list* '*standard-output* arg colon atsign parms)))
     2383           (when (nx1-check-typed-call sym (list* '*standard-output* arg colon atsign parms))
    23852384             ;; Whined, just get out now.
    23862385             (throw 'format-error nil))))))
Note: See TracChangeset for help on using the changeset viewer.