Merge with trunks for fixing bug of incorrect ignoring super method

jossonsmith · jossonsmith · commit 42dfaa113d96 · 2006-08-20T09:00:43.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -24,6 +24,7 @@
 import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
 import org.eclipse.jdt.core.dom.EnumDeclaration;
 import org.eclipse.jdt.core.dom.Expression;
+import org.eclipse.jdt.core.dom.ExpressionStatement;
 import org.eclipse.jdt.core.dom.FieldAccess;
 import org.eclipse.jdt.core.dom.FieldDeclaration;
 import org.eclipse.jdt.core.dom.IBinding;
@@ -55,7 +56,6 @@
 import org.eclipse.jdt.core.dom.TypeDeclarationStatement;
 import org.eclipse.jdt.core.dom.TypeLiteral;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.PrimitiveType.Code;
 
 public class ASTScriptVisitor extends ASTKeywordParser {
 
@@ -1370,6 +1370,17 @@ public boolean visit(MethodDeclaration node) {
 						argsList = superRet.arguments();
 					}
 				}
+			} else if (statement instanceof ExpressionStatement) {
+				ExpressionStatement sttmt = (ExpressionStatement) statement;
+				Expression exp = sttmt.getExpression();
+				if (exp instanceof SuperMethodInvocation) {
+					SuperMethodInvocation superRet = (SuperMethodInvocation) exp;
+					if (superRet.getName().toString().equals(node.getName().toString())) {
+						// same method name
+						needToCheckArgs = true;
+						argsList = superRet.arguments();
+					}
+				}
 			} else if (statement instanceof SuperConstructorInvocation) {
 				SuperConstructorInvocation superConstructor = (SuperConstructorInvocation) statement;
 				needToCheckArgs = true;
@@ -1394,6 +1405,9 @@ public boolean visit(MethodDeclaration node) {
 							isOnlySuper = false;
 							break;
 						}
+					} else {
+						isOnlySuper = false;
+						break;
 					}
 				}
 				if (isOnlySuper) {
