Update of /cvsroot/sbcl/sbcl/src/code
In directory usw-pr-cvs1:/tmp/cvs-serv8104/src/code
Modified Files:
early-type.lisp late-type.lisp reader.lisp typedefs.lisp
Log Message:
0.7.3.4:
small cleanups...
...clean.sh should remove more stuff, notably *.orig files.
...s/might-contain-other-types?/might-contain-other-types-p/
...DB README note suggestion from sbcl-devel 2002-04
Index: early-type.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/early-type.lisp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** early-type.lisp 8 Apr 2002 22:00:39 -0000 1.24
--- early-type.lisp 26 Apr 2002 14:40:47 -0000 1.25
***************
*** 25,29 ****
(class-info (type-class-or-lose 'hairy))
(enumerable t)
! (might-contain-other-types? t))
(:copier nil)
#!+cmu (:pure nil))
--- 25,29 ----
(class-info (type-class-or-lose 'hairy))
(enumerable t)
! (might-contain-other-types-p t))
(:copier nil)
#!+cmu (:pure nil))
***************
*** 233,237 ****
;;; common parent of UNION-TYPE and INTERSECTION-TYPE.
(defstruct (compound-type (:include ctype
! (might-contain-other-types? t))
(:constructor nil)
(:copier nil))
--- 233,237 ----
;;; common parent of UNION-TYPE and INTERSECTION-TYPE.
(defstruct (compound-type (:include ctype
! (might-contain-other-types-p t))
(:constructor nil)
(:copier nil))
Index: late-type.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/late-type.lisp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** late-type.lisp 19 Apr 2002 16:27:21 -0000 1.45
--- late-type.lisp 26 Apr 2002 14:40:47 -0000 1.46
***************
*** 69,73 ****
;; If TYPE2 might be concealing something related to our class
;; hierarchy
! (if (type-might-contain-other-types? type2)
;; too confusing, gotta punt
(values nil nil)
--- 69,73 ----
;; If TYPE2 might be concealing something related to our class
;; hierarchy
! (if (type-might-contain-other-types-p type2)
;; too confusing, gotta punt
(values nil nil)
***************
*** 930,934 ****
t)
(;; When TYPE2 might be the universal type in disguise
! (type-might-contain-other-types? type2)
;; Now that the UNION and HAIRY COMPLEX-SUBTYPEP-ARG2 methods
;; can delegate to us (more or less as CALL-NEXT-METHOD) when
--- 930,934 ----
t)
(;; When TYPE2 might be the universal type in disguise
! (type-might-contain-other-types-p type2)
;; Now that the UNION and HAIRY COMPLEX-SUBTYPEP-ARG2 methods
;; can delegate to us (more or less as CALL-NEXT-METHOD) when
***************
*** 1055,1060 ****
;; system could make it start confidently returning
;; incorrect results.) -- WHN 2002-03-08
! (unless (or (type-might-contain-other-types? complement-type1)
! (type-might-contain-other-types? type2))
;; Because of the way our types which don't contain
;; other types are disjoint subsets of the space of
--- 1055,1060 ----
;; system could make it start confidently returning
;; incorrect results.) -- WHN 2002-03-08
! (unless (or (type-might-contain-other-types-p complement-type1)
! (type-might-contain-other-types-p type2))
;; Because of the way our types which don't contain
;; other types are disjoint subsets of the space of
Index: reader.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/reader.lisp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** reader.lisp 12 Apr 2002 12:15:56 -0000 1.17
--- reader.lisp 26 Apr 2002 14:40:47 -0000 1.18
***************
*** 179,183 ****
(let ((really-from-readtable (or from-readtable *standard-readtable*)))
;; Copy FROM-CHAR entries to TO-CHAR entries, but make sure that if
! ;; from char is a constituent you don't copy non-movable secondary
;; attributes (constituent types), and that said attributes magically
;; appear if you transform a non-constituent to a constituent.
--- 179,183 ----
(let ((really-from-readtable (or from-readtable *standard-readtable*)))
;; Copy FROM-CHAR entries to TO-CHAR entries, but make sure that if
! ;; FROM-CHAR is a constituent you don't copy non-movable secondary
;; attributes (constituent types), and that said attributes magically
;; appear if you transform a non-constituent to a constituent.
***************
*** 204,208 ****
(set-cat-entry char +char-attr-terminating-macro+ rt))
(set-cmt-entry char function rt)
! T))
(defun get-macro-character (char &optional (rt *readtable*))
--- 204,208 ----
(set-cat-entry char +char-attr-terminating-macro+ rt))
(set-cmt-entry char function rt)
! t))
(defun get-macro-character (char &optional (rt *readtable*))
***************
*** 1173,1177 ****
(setq exponent (if negative-exponent (- exponent) exponent)))
(setq exponent (+ (* exponent 10) dig)))
! ;; Generate and return the float, depending on float-char:
(let* ((float-format (case (char-upcase float-char)
(#\E *read-default-float-format*)
--- 1173,1177 ----
(setq exponent (if negative-exponent (- exponent) exponent)))
(setq exponent (+ (* exponent 10) dig)))
! ;; Generate and return the float, depending on FLOAT-CHAR:
(let* ((float-format (case (char-upcase float-char)
(#\E *read-default-float-format*)
Index: typedefs.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/typedefs.lisp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** typedefs.lisp 8 Apr 2002 22:00:39 -0000 1.15
--- typedefs.lisp 26 Apr 2002 14:40:47 -0000 1.16
***************
*** 89,93 ****
;; contain other types, like HAIRY-TYPE and INTERSECTION-TYPE, can
;; violate this rule.
! (might-contain-other-types? nil :read-only t))
(def!method print-object ((ctype ctype) stream)
(print-unreadable-object (ctype stream :type t)
--- 89,93 ----
;; contain other types, like HAIRY-TYPE and INTERSECTION-TYPE, can
;; violate this rule.
! (might-contain-other-types-p nil :read-only t))
(def!method print-object ((ctype ctype) stream)
(print-unreadable-object (ctype stream :type t)
|