[Nice-commit] Nice/src/mlsub/typing TupleType.java,1.6,1.7 FunType.java,1.9,1.10

[Daniel B. <bo...@us...>]

Update of /cvsroot/nice/Nice/src/mlsub/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22896/src/mlsub/typing

Modified Files:
	TupleType.java FunType.java 
Log Message:
Do not allow a soft type variable to become greater than Object if it is
already constrained to be smaller than another type, as that is obviously
unsafe.


Index: FunType.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/FunType.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FunType.java	28 Feb 2003 20:52:13 -0000	1.9
--- FunType.java	17 Jun 2005 14:14:08 -0000	1.10
***************
*** 70,75 ****
     ****************************************************************/
  
!   public int getId() 		{ throw new Error(); }
!   public void setId(int value) 	{ throw new Error(); }
    
    Kind kind;
--- 70,75 ----
     ****************************************************************/
  
!   public int getId()           { return mlsub.typing.lowlevel.Engine.INVALID; }
!   public void setId(int value) { throw new Error(); }
    
    Kind kind;

Index: TupleType.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/TupleType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TupleType.java	28 Feb 2003 20:52:12 -0000	1.6
--- TupleType.java	17 Jun 2005 14:14:08 -0000	1.7
***************
*** 53,58 ****
     ****************************************************************/
  
!   public int getId() 		{ throw new Error(); }
!   public void setId(int value) 	{ throw new Error(); }
    
    final Kind kind;
--- 53,58 ----
     ****************************************************************/
  
!   public int getId()           { return mlsub.typing.lowlevel.Engine.INVALID; }
!   public void setId(int value) { throw new Error(); }
    
    final Kind kind;