[movitz-cvs] CVS update: movitz/compiler-types.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz
In directory common-lisp.net:/tmp/cvs-serv22865

Modified Files:
	compiler-types.lisp 
Log Message:
*** empty log message ***
Date: Wed Nov 10 16:31:41 2004
Author: ffjeld

Index: movitz/compiler-types.lisp
diff -u movitz/compiler-types.lisp:1.20 movitz/compiler-types.lisp:1.21
--- movitz/compiler-types.lisp:1.20	Wed Sep 15 12:19:06 2004
+++ movitz/compiler-types.lisp	Wed Nov 10 16:31:41 2004
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Wed Sep 10 00:40:07 2003
 ;;;;                
-;;;; $Id: compiler-types.lisp,v 1.20 2004/09/15 10:19:06 ffjeld Exp $
+;;;; $Id: compiler-types.lisp,v 1.21 2004/11/10 15:31:41 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -667,7 +667,7 @@
 	      (cdar intscope)))
     (list (movitz-read (caar intscope))))
    ((and (null members) (null intscope))
-    (warn "Not singleton, nulloton."))))
+    (break "Not singleton, nulloton."))))
 
 (defun movitz-subtypep (type0 type1)
   "Compile-time subtypep."
@@ -678,11 +678,11 @@
 (defun encoded-integer-types-add (code0 integer-range0 members0 include0 complement0
 				  code1 integer-range1 members1 include1 complement1)
   "Return the integer type that can result from adding a member of type0 to a member of type1."
-  (declare (ignore members0 members1))
+  ;; (declare (ignore members0 members1))
   (cond
-   ((or include0 include1)
+   ((or include0 include1 members0 members1)
     ;; We can't know..
-    'integer)
+    'number)
    ((or complement0 complement1)
     (break "adding complement types..?"))
    (t (let ((integer-range (numscope-plus (encoded-numscope code0 integer-range0)