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

[Frode Vatvedt Fjeld]

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

Modified Files:
	compiler-types.lisp 
Log Message:
Fixed an off-by-one thingy in numscopes (which represent integer types).

Date: Mon Jan  3 12:52:35 2005
Author: ffjeld

Index: movitz/compiler-types.lisp
diff -u movitz/compiler-types.lisp:1.21 movitz/compiler-types.lisp:1.22
--- movitz/compiler-types.lisp:1.21	Wed Nov 10 16:31:41 2004
+++ movitz/compiler-types.lisp	Mon Jan  3 12:52:33 2005
@@ -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.21 2004/11/10 15:31:41 ffjeld Exp $
+;;;; $Id: compiler-types.lisp,v 1.22 2005/01/03 11:52:33 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -168,9 +168,9 @@
 		(numscope-add-range new-numscope (car sub-range) (- min epsilon) epsilon))
 	      (setf new-numscope
 		(numscope-add-range new-numscope (+ max epsilon) (cdr sub-range) epsilon)))
-	     ((and a (not c))		; (warn "left prune ~D with [~D-~D]" sub-range min max)
+	     ((and a (not c))		; (warn "left prune ~D with [~D - ~D]" new-numscope min max)
 	      (setf new-numscope
-		(numscope-add-range new-numscope max (cdr sub-range) epsilon)))
+		(numscope-add-range new-numscope (+ max epsilon) (cdr sub-range) epsilon)))
 	     ((and (not d) b)		; (warn "right prune ~D with [~D-~D]" sub-range min max)
 	      (setf new-numscope
 		(numscope-add-range new-numscope (car sub-range) min epsilon)))