nice-commit

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

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

Modified Files:
	UnknownMonotype.java MonotypeVar.java Monotype.java 
Log Message:
Handle setting the unknown flag on monotype variables that have been frozen.


Index: MonotypeVar.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/MonotypeVar.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MonotypeVar.java	9 Jun 2005 14:11:37 -0000	1.22
--- MonotypeVar.java	21 Jun 2005 18:31:00 -0000	1.23
***************
*** 230,236 ****
    private boolean unknown;
  
!   boolean isUnknown() { return unknown; }
  
!   void setUnknown(boolean leq, boolean geq)
      throws mlsub.typing.lowlevel.Unsatisfiable
    {
--- 230,236 ----
    private boolean unknown;
  
!   public boolean isUnknown() { return unknown; }
  
!   public void setUnknown(boolean leq, boolean geq)
      throws mlsub.typing.lowlevel.Unsatisfiable
    {

Index: Monotype.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/Monotype.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Monotype.java	18 Jun 2005 09:58:39 -0000	1.13
--- Monotype.java	21 Jun 2005 18:31:00 -0000	1.14
***************
*** 121,127 ****
    }
  
!   boolean isUnknown() { return false; }
  
!   void setUnknown(boolean leq, boolean geq)
      throws mlsub.typing.lowlevel.Unsatisfiable
    {
--- 121,127 ----
    }
  
!   public boolean isUnknown() { return false; }
  
!   public void setUnknown(boolean leq, boolean geq)
      throws mlsub.typing.lowlevel.Unsatisfiable
    {

Index: UnknownMonotype.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/UnknownMonotype.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UnknownMonotype.java	25 May 2005 11:52:30 -0000	1.3
--- UnknownMonotype.java	21 Jun 2005 18:30:59 -0000	1.4
***************
*** 30,34 ****
    public TypeSymbol cloneTypeSymbol() { return this; }
  
!   boolean isUnknown() { return true; }
  
    Monotype canonify() { return this; }
--- 30,34 ----
    public TypeSymbol cloneTypeSymbol() { return this; }
  
!   public boolean isUnknown() { return true; }
  
    Monotype canonify() { return this; }