[Nice-commit] Nice/src/bossa/syntax TupleExp.java,1.19,1.20 Pattern.java,1.57,1.58 OverloadedSymbolExp.java,1.54,1.55 MethodBodyDefinition.java,1.130,1.131

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

Update of /cvsroot/nice/Nice/src/bossa/syntax
In directory sc8-pr-cvs1:/tmp/cvs-serv30616/src/bossa/syntax

Modified Files:
	TupleExp.java Pattern.java OverloadedSymbolExp.java 
	MethodBodyDefinition.java 
Log Message:
Use the Types.rawType, since this is higher-level, and better documenting.


Index: TupleExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/TupleExp.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TupleExp.java	29 May 2003 14:17:19 -0000	1.19
--- TupleExp.java	19 Jun 2003 15:32:00 -0000	1.20
***************
*** 72,76 ****
      Monotype m = expectedType.getMonotype();
      // get rid of the nullness part
!     m = ((MonotypeConstructor) m).getTP()[0];
  
      // Get the expected component types
--- 72,76 ----
      Monotype m = expectedType.getMonotype();
      // get rid of the nullness part
!     m = Types.rawType((MonotypeConstructor) m);
  
      // Get the expected component types

Index: Pattern.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Pattern.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** Pattern.java	18 Jun 2003 18:12:46 -0000	1.57
--- Pattern.java	19 Jun 2003 15:32:00 -0000	1.58
***************
*** 221,225 ****
      // the argument is not null
      Typing.leq(mc.getTC(), PrimitiveType.sureTC);
!     Monotype type = mc.getTP()[0];
  
      if (constraint != null)
--- 221,225 ----
      // the argument is not null
      Typing.leq(mc.getTC(), PrimitiveType.sureTC);
!     Monotype type = Types.rawType(mc);
  
      if (constraint != null)

Index: OverloadedSymbolExp.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/OverloadedSymbolExp.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** OverloadedSymbolExp.java	28 May 2003 12:57:26 -0000	1.54
--- OverloadedSymbolExp.java	19 Jun 2003 15:32:00 -0000	1.55
***************
*** 24,27 ****
--- 24,29 ----
  import mlsub.typing.Monotype;
  
+ import nice.tools.code.Types;
+ 
  /**
     A symbol, for which overloading resolution has yet to be done.
***************
*** 362,368 ****
    {
      // remove nullness marker
!     Monotype[] m = ((FunType)
!       ((mlsub.typing.MonotypeConstructor) t.getMonotype()).getTP()[0])
!       .domain();
  
      Monotype[] dom;
--- 364,368 ----
    {
      // remove nullness marker
!     Monotype[] m = ((FunType) Types.rawType(t.getMonotype())).domain();
  
      Monotype[] dom;

Index: MethodBodyDefinition.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodBodyDefinition.java,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** MethodBodyDefinition.java	18 Jun 2003 18:12:46 -0000	1.130
--- MethodBodyDefinition.java	19 Jun 2003 15:32:00 -0000	1.131
***************
*** 303,308 ****
      Types.setMarkedKind(m1);
      Types.setMarkedKind(m2);
!     Typing.leq(((MonotypeConstructor) m1.equivalent()).getTP()[0],
! 	       ((MonotypeConstructor) m2.equivalent()).getTP()[0]);
    }
    void doResolve()
--- 303,307 ----
      Types.setMarkedKind(m1);
      Types.setMarkedKind(m2);
!     Typing.leq(Types.rawType(m1), Types.rawType(m2));
    }
    void doResolve()