/[gcl]/gcl/cmpnew/gcl_cmptype.lsp
ViewVC logotype

Diff of /gcl/cmpnew/gcl_cmptype.lsp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.7 by camm, Mon Dec 27 22:16:54 2004 UTC revision 1.8 by camm, Tue Dec 28 22:24:18 2004 UTC
# Line 235  Line 235 
235             (type-and type1 (second type2))))             (type-and type1 (second type2))))
236          ((and (consp type1) (eq (car type1) 'values))          ((and (consp type1) (eq (car type1) 'values))
237             (type-and (second type1) type2))             (type-and (second type1) type2))
238          ((eq type1 t) type2)          ((member type1 '(t * object) :test #'eq) type2)
239          ((eq type1 '*) type2)          ((member type2 '(t * object) :test #'eq) type1)
         ((eq type1 'object) type2)  
         ((eq type2 'object) type1)  
         ((eq type2 t) type1)  
         ((eq type2 '*) type1)  
240          ((or (integer-typep type1) (integer-typep type2))          ((or (integer-typep type1) (integer-typep type2))
241           (integer-type-and type1 type2))           (integer-type-and type1 type2))
242          ((consp type1)          ((consp type1)

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26