[Nice-commit] Nice/src/mlsub/typing MonotypeVar.java,1.21,1.22
Brought to you by:
bonniot
From: Daniel B. <bo...@us...> - 2005-06-09 14:11:46
|
Update of /cvsroot/nice/Nice/src/mlsub/typing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26693/src/mlsub/typing Modified Files: MonotypeVar.java Log Message: Forward setUnknown to raw types in all cases. Index: MonotypeVar.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/MonotypeVar.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MonotypeVar.java 9 Jun 2005 11:57:00 -0000 1.21 --- MonotypeVar.java 9 Jun 2005 14:11:37 -0000 1.22 *************** *** 237,249 **** if (equivalent != null) { ! if (persistentKind == null) { ! if (! allowUnknown) ! throw mlsub.typing.lowlevel.LowlevelUnsatisfiable.instance; } else { ! Monotype raw = ((MonotypeConstructor) equivalent()).getTP()[0]; ! raw.setUnknown(leq, geq); } } --- 237,249 ---- if (equivalent != null) { ! if (kind == NullnessKind.instance) { ! Monotype raw = ((MonotypeConstructor) equivalent()).getTP()[0]; ! raw.setUnknown(leq, geq); } else { ! if (! allowUnknown) ! throw mlsub.typing.lowlevel.LowlevelUnsatisfiable.instance; } } |