Fixed bug that "AClass.this.someMethod()" invocations inside AClass is compiled to this.callbacks["AClass"].someMethod() which is wrong. Fixed now without "callbacks" segment.

zhourenjian · zhourenjian · commit b450d7d8e765 · 2007-07-05T16:49:02.000Z
diff --git a/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -2011,9 +2011,25 @@ public boolean visit(SuperMethodInvocation node) {
 	public boolean visit(ThisExpression node) {
 		Name qualifier = node.getQualifier();
 		if (qualifier != null) {
-			buffer.append("this.callbacks[\"");
-			qualifier.accept(this);
-			buffer.append("\"]");
+			ASTNode xparent = node.getParent();
+			while (xparent != null 
+					&& !(xparent instanceof AbstractTypeDeclaration)
+					&& !(xparent instanceof AnonymousClassDeclaration)) {
+				xparent = xparent.getParent();
+			}
+			if (xparent == null 
+					|| xparent.getParent() == null // CompilationUnit
+							|| xparent.getParent().getParent() == null) {
+				buffer.append("this");
+			} else {
+				/*
+				 * only need callbacks wrapper in inner classes
+				 * or anonymous classes.
+				 */
+				buffer.append("this.callbacks[\"");
+				qualifier.accept(this);
+				buffer.append("\"]");
+			}
 		} else {
 			buffer.append("this");
 		}
