Fixing bug for such a class

zhourenjian · zhourenjian · commit 49051188b34b · 2010-06-01T07:02:11.000Z
class A {
	class B () {
	}
	static class C extends A {
	}
}
In generated *.js , A.B should be declared before A.C:
 c$.$A$B$ = function () ... 
 c$.Clazz.decorateAsClass ( ...
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -2492,13 +2492,14 @@ public void endVisit(TypeDeclaration node) {
 		}
 		buffer.append(");\r\n");
 		
-		buffer.append(laterBuffer);
+		StringBuffer laterBufferBackup = laterBuffer;
+		//buffer.append(laterBuffer);
 		laterBuffer = new StringBuffer();
 		// Enum is considered as static member!
 
 		List bodyDeclarations = node.bodyDeclarations();
 		StringBuffer tmpBuffer = buffer;
-		StringBuffer tmpLaterBuffer = laterBuffer;
+		//StringBuffer tmpLaterBuffer = laterBuffer;
 //		StringBuffer tmpMethodBuffer = methodBuffer;
 //		buffer = new StringBuffer();
 //		laterBuffer = new StringBuffer();
@@ -2599,7 +2600,7 @@ public void endVisit(TypeDeclaration node) {
 		buffer.append(laterBuffer);
 
 		tmpBuffer = buffer;
-		tmpLaterBuffer = laterBuffer;
+		StringBuffer tmpLaterBuffer = laterBuffer;
 		buffer = new StringBuffer();
 		laterBuffer = new StringBuffer();
 		/* Testing class declarations in initializers */
@@ -2655,6 +2656,21 @@ public void endVisit(TypeDeclaration node) {
 			buffer.append(methodBuffer);
 			methodBuffer = new StringBuffer();
 		}
+		// method first
+		/*
+		 * Fixing bug for such class
+		 * class A {
+		 * 	class B () {
+		 * 	}
+		 * 	static class C extends A {
+		 * 	}
+		 * }
+		 * A.B should be declared before A.C:
+		 * c$.$A$B$ = function () ... 
+		 * c$.Clazz.decorateAsClass ( ...
+		 */
+		buffer.append(laterBufferBackup);
+		
 		for (Iterator iter = bodyDeclarations.iterator(); iter.hasNext();) {
 			ASTNode element = (ASTNode) iter.next();
 			if (element instanceof TypeDeclaration) {
