nice-commit

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

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

Modified Files:
	PolySymbol.java MethodDeclaration.java 
Log Message:
Only check for double resolve in MethodDeclaration.Symbol, and avoid
messing up the type by adding the nullness marker twice.


Index: PolySymbol.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/PolySymbol.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PolySymbol.java	30 Aug 2003 10:37:12 -0000	1.16
--- PolySymbol.java	30 Aug 2003 10:57:32 -0000	1.17
***************
*** 58,67 ****
    void resolve()
    {
!     // Check that resolving has not already been done.
!     if (syntacticType != null)
!       {
!         type = syntacticType.resolveToLowlevel();
!         syntacticType = null;
!       }
    }
    
--- 58,63 ----
    void resolve()
    {
!     type = syntacticType.resolveToLowlevel();
!     syntacticType = null;
    }
    

Index: MethodDeclaration.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodDeclaration.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** MethodDeclaration.java	30 Aug 2003 10:37:12 -0000	1.46
--- MethodDeclaration.java	30 Aug 2003 10:57:32 -0000	1.47
***************
*** 312,320 ****
      void resolve()
      {
!       super.resolve();
  
!       // The method has a raw type, while the symbol needs a nullness marker
!       MethodDeclaration.this.type = this.type;
!       this.type = Types.addSure(this.type);
      }
  
--- 312,324 ----
      void resolve()
      {
!       // Check that resolving has not already been done.
!       if (syntacticType != null)
!         {
!           super.resolve();
  
!           // The method has a raw type, while the symbol needs a nullness marker
!           MethodDeclaration.this.type = this.type;
!           this.type = Types.addSure(this.type);
!         }
      }