Fixing bug that anonymous class with final variables may be compiled with unnecessary variables which result in script errors.

zhourenjian · zhourenjian · commit 3b4461647268 · 2009-04-12T16:41:32.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTFinalVariable.java b/src/net/sf/j2s/core/astvisitors/ASTFinalVariable.java
@@ -40,4 +40,46 @@ public ASTFinalVariable(int blockLevel, String variableName, String methodScope)
 	public String toString() {
 		return variableName + ":" + variableName;
 	}
+
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + blockLevel;
+		result = prime * result
+				+ ((methodScope == null) ? 0 : methodScope.hashCode());
+		result = prime * result
+				+ ((toVariableName == null) ? 0 : toVariableName.hashCode());
+		result = prime * result
+				+ ((variableName == null) ? 0 : variableName.hashCode());
+		return result;
+	}
+
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		final ASTFinalVariable other = (ASTFinalVariable) obj;
+		if (blockLevel != other.blockLevel)
+			return false;
+		if (methodScope == null) {
+			if (other.methodScope != null)
+				return false;
+		} else if (!methodScope.equals(other.methodScope))
+			return false;
+		if (toVariableName == null) {
+			if (other.toVariableName != null)
+				return false;
+		} else if (!toVariableName.equals(other.toVariableName))
+			return false;
+		if (variableName == null) {
+			if (other.variableName != null)
+				return false;
+		} else if (!variableName.equals(other.variableName))
+			return false;
+		return true;
+	}
+	
 }
diff --git a/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java
@@ -37,6 +37,7 @@
 import org.eclipse.jdt.core.dom.FieldDeclaration;
 import org.eclipse.jdt.core.dom.ForStatement;
 import org.eclipse.jdt.core.dom.IBinding;
+import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.IPackageBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
@@ -45,6 +46,7 @@
 import org.eclipse.jdt.core.dom.InfixExpression;
 import org.eclipse.jdt.core.dom.InstanceofExpression;
 import org.eclipse.jdt.core.dom.LabeledStatement;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.MethodInvocation;
 import org.eclipse.jdt.core.dom.Modifier;
 import org.eclipse.jdt.core.dom.Name;
@@ -57,6 +59,7 @@
 import org.eclipse.jdt.core.dom.QualifiedName;
 import org.eclipse.jdt.core.dom.ReturnStatement;
 import org.eclipse.jdt.core.dom.SimpleName;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.StringLiteral;
 import org.eclipse.jdt.core.dom.SuperFieldAccess;
 import org.eclipse.jdt.core.dom.SuperMethodInvocation;
@@ -442,7 +445,36 @@ public void endVisit(Block node) {
 		blockLevel--;
 		super.endVisit(node);
 	}
-	
+
+	public void endVisit(MethodDeclaration node) {
+		List finalVars = ((ASTVariableVisitor) getAdaptable(ASTVariableVisitor.class)).finalVars;
+		List visitedVars = ((ASTVariableVisitor) getAdaptable(ASTVariableVisitor.class)).visitedVars;
+		List normalVars = ((ASTVariableVisitor) getAdaptable(ASTVariableVisitor.class)).normalVars;
+		List parameters = node.parameters();
+		String methodSig = null;
+		IMethodBinding resolveBinding = node.resolveBinding();
+		if (resolveBinding != null) {
+			methodSig = resolveBinding.getKey();
+		}
+		for (int i = parameters.size() - 1; i >= 0; i--) {
+			SingleVariableDeclaration varDecl = (SingleVariableDeclaration) parameters.get(i);
+			
+			SimpleName name = varDecl.getName();
+			IBinding binding = name.resolveBinding();
+			if (binding != null) {
+				String identifier = name.getIdentifier();
+				ASTFinalVariable f = new ASTFinalVariable(blockLevel + 1, identifier, methodSig);
+				f.toVariableName = getIndexedVarName(identifier, normalVars.size());
+				normalVars.remove(f);
+				if ((binding.getModifiers() & Modifier.FINAL) != 0) {
+					finalVars.remove(f);
+				}
+				visitedVars.remove(f);
+			}
+		}
+		super.endVisit(node);
+	}
+
 	public boolean visit(BooleanLiteral node) {
 		buffer.append(node.booleanValue());
 		return false;
