[Nice-commit] Nice/src/bossa/syntax Arguments.java,1.19,1.20 MethodDeclaration.java,1.49,1.50 NiceClass.java,1.65,1.66 NiceFieldAccess.java,1.18,1.19 RetypedJavaMethod.java,1.10,1.11 Statement.java,1.19,1.20

[<ar...@us...>]

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

Modified Files:
	Arguments.java MethodDeclaration.java NiceClass.java 
	NiceFieldAccess.java RetypedJavaMethod.java Statement.java 
Log Message:
Removed some useless code.

Index: Arguments.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Arguments.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Arguments.java	11 Aug 2003 19:31:31 -0000	1.19
--- Arguments.java	21 Nov 2003 08:09:58 -0000	1.20
***************
*** 273,277 ****
          if (param instanceof FormalParameters.NamedParameter) 
            {
-             FormalParameters.NamedParameter namedParam = (FormalParameters.NamedParameter)param;
              for (int i = 0; i < arguments.length; i++)
                if (arguments[i].name != null)
--- 273,276 ----

Index: MethodDeclaration.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/MethodDeclaration.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** MethodDeclaration.java	7 Nov 2003 23:34:19 -0000	1.49
--- MethodDeclaration.java	21 Nov 2003 08:09:58 -0000	1.50
***************
*** 121,129 ****
    }
    
-   public String getSyntacticReturnType()
-   {
-     return String.valueOf(getReturnType());
-   }
- 
    boolean isIgnored()
    {
--- 121,124 ----
***************
*** 251,255 ****
        (syntacticConstraint != null ? syntacticConstraint
         : Constraint.toString(getType().getConstraint()))
!       + getSyntacticReturnType()
        + " "
        + getName().toQuotedString()
--- 246,250 ----
        (syntacticConstraint != null ? syntacticConstraint
         : Constraint.toString(getType().getConstraint()))
!       + String.valueOf(getReturnType())
        + " "
        + getName().toQuotedString()

Index: NiceClass.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceClass.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** NiceClass.java	15 Nov 2003 17:25:47 -0000	1.65
--- NiceClass.java	21 Nov 2003 08:09:58 -0000	1.66
***************
*** 597,601 ****
      mlsub.typing.TypeSymbol[] ourBinders = definition.getBinders();
      TypeScope scope = Node.getGlobalTypeScope();
-     Map map = null;
      if (binders != null)
        {
--- 597,600 ----
***************
*** 672,676 ****
    private void checkFields (FormalParameters.Parameter[] allFields)
    {
-     int len = allFields.length;
      for (int f = 0; f < fields.length; f++)
        fields[f].checkNoDuplicate(allFields, f);
--- 671,674 ----

Index: NiceFieldAccess.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/NiceFieldAccess.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** NiceFieldAccess.java	15 Nov 2003 13:02:15 -0000	1.18
--- NiceFieldAccess.java	21 Nov 2003 08:09:59 -0000	1.19
***************
*** 64,76 ****
    
    /****************************************************************
-    * Code generation
-    ****************************************************************/
- 
-   private Type fieldType()
-   {
-     return javaReturnType();
-   }
- 
-   /****************************************************************
     * Debug only
     ****************************************************************/
--- 64,67 ----

Index: RetypedJavaMethod.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/RetypedJavaMethod.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RetypedJavaMethod.java	8 Nov 2003 15:36:52 -0000	1.10
--- RetypedJavaMethod.java	21 Nov 2003 08:09:59 -0000	1.11
***************
*** 58,62 ****
      this.methodName = methodName;
      this.javaTypes = javaTypes;
-     this.syntacticReturnType = returnType.toString();
    }
  
--- 58,61 ----
***************
*** 274,287 ****
      return res + ")";
    }
- 
-   public String getSyntacticReturnType()
-   {
-     if (ignoredRetyping)
-       return syntacticReturnType;
- 
-     return super.getSyntacticReturnType();
-   }
- 
-   String syntacticReturnType;
  
    boolean ignoredRetyping;
--- 273,276 ----

Index: Statement.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/Statement.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Statement.java	18 Jul 2003 22:56:49 -0000	1.19
--- Statement.java	21 Nov 2003 08:09:59 -0000	1.20
***************
*** 73,84 ****
    }
  
-   static gnu.expr.Expression sequence(gnu.expr.Expression e1, gnu.expr.Expression e2)
-   {
-     gnu.expr.Expression[] array=new gnu.expr.Expression[2];
-     array[0]=e1;
-     array[1]=e2;
-     return new gnu.expr.BeginExp(array);
-   }
-   
    /****************************************************************
     * Location
--- 73,76 ----