nice-commit

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

Update of /cvsroot/nice/Nice/src/mlsub/typing
In directory sc8-pr-cvs1:/tmp/cvs-serv11194/src/mlsub/typing

Modified Files:
	NullnessKind.java 
Log Message:
The non-null marker '!' is smaller than any nullness marker.


Index: NullnessKind.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/mlsub/typing/NullnessKind.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NullnessKind.java	1 Aug 2002 00:27:53 -0000	1.1
--- NullnessKind.java	31 Aug 2003 00:32:56 -0000	1.2
***************
*** 26,37 ****
    public static NullnessKind instance = new NullnessKind();
  
!   public static void initialize(TypeConstructor maybeTC)
    {
!     maybe = maybeTC;
    }
  
    public int arity() { return 1; }
  
!   private static TypeConstructor maybe;
  
    public Monotype freshMonotype()
--- 26,42 ----
    public static NullnessKind instance = new NullnessKind();
  
!   public static void setMaybe(TypeConstructor tc)
    {
!     maybe = tc;
!   }
! 
!   public static void setSure(TypeConstructor tc)
!   {
!     sure = tc;
    }
  
    public int arity() { return 1; }
  
!   private static TypeConstructor maybe, sure;
  
    public Monotype freshMonotype()
***************
*** 41,44 ****
--- 46,50 ----
      try {
        Typing.leq(tc, maybe);
+       Typing.leq(sure, tc);
      } catch(TypingEx ex) {
        bossa.util.Internal.error("Nullness creation error");