[Nice-commit] Nice/src/mlsub/typing/lowlevel K0.java,1.23,1.24 Engine.java,1.34,1.35
Brought to you by:
bonniot
|
From: Daniel B. <bo...@us...> - 2005-02-16 22:35:29
|
Update of /cvsroot/nice/Nice/src/mlsub/typing/lowlevel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5448/src/mlsub/typing/lowlevel Modified Files: K0.java Engine.java Log Message: Fix classes whose parent has less type parameters that the grand-parent, by creating a new TypeConstructor when this is discovered (fixes #1097571). Index: K0.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/K0.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** K0.java 29 Jun 2004 18:38:18 -0000 1.23 --- K0.java 16 Feb 2005 22:34:49 -0000 1.24 *************** *** 168,172 **** } ! /*********************************************************************** * Pretty printing --- 168,176 ---- } ! void discard(int x) ! { ! garbage.set(x); ! } ! /*********************************************************************** * Pretty printing Index: Engine.java =================================================================== RCS file: /cvsroot/nice/Nice/src/mlsub/typing/lowlevel/Engine.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Engine.java 29 Jun 2004 18:38:18 -0000 1.34 --- Engine.java 16 Feb 2005 22:34:49 -0000 1.35 *************** *** 941,945 **** return k0.isMinimal(e.getId()); } ! public Element lowestInstance(Element e) { --- 941,951 ---- return k0.isMinimal(e.getId()); } ! ! public final void discard(Element e) ! { ! concreteElements.clear(e.getId()); ! k0.discard(e.getId()); ! } ! public Element lowestInstance(Element e) { |