Update of /cvsroot/nice/Nice/src/nice/tools/typing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32734/src/nice/tools/typing
Modified Files:
Types.java
Log Message:
Handle type variables that are used simultaneously with and without
nullness markers (implements RFE #738496).
Index: Types.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/nice/tools/typing/Types.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Types.java 17 Mar 2004 00:36:46 -0000 1.6
--- Types.java 16 Jun 2004 10:00:34 -0000 1.7
***************
*** 99,110 ****
{
m = m.equivalent();
! if (!(m instanceof MonotypeConstructor))
! {
! // It is probably a bug if this happens
! //Internal.warning("Not kinded monotype: " + m);
! return m;
! }
! else
! return ((MonotypeConstructor) m).getTP()[0];
}
--- 99,106 ----
{
m = m.equivalent();
! if (! (m.getKind() == NullnessKind.instance))
! return m;
!
! return ((MonotypeConstructor) m).getTP()[0];
}
|
