unnecessary extra anonymous function in Clazz.load

BobHanson · BobHanson · commit 977b0e787aac · 2017-09-05T08:03:45.000-05:00
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
@@ -59,6 +59,7 @@
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 
 // TODO: all calls to inner classes should be referenced to the outer class for Clazz.load
+// TODO: static calls to static methods do not trigger dependency
 
 // BH 8/30/2017 -- all i/o working, including printf and FileOutputStream
 // BH 8/19/2017 -- String must implement CharSequence, so all .length() -> .length$()
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/DependencyASTVisitor.java
@@ -226,7 +226,10 @@ public String getDependencyScript(StringBuffer buf) {
 		} else {
 			buf = new StringBuffer();
 			buf.append("Clazz.load (");
-			if (musts.size() != 0 || requires.size() != 0) {
+			
+			// add must/requires
+			
+			if (musts.size() > 0 || requires.size() > 0) {
 				buf.append("[");
 				String[] ss = musts.toArray(new String[0]);
 				Arrays.sort(ss);
@@ -241,15 +244,22 @@ public String getDependencyScript(StringBuffer buf) {
 			} else {
 				buf.append("null, ");
 			}
-			if (classNameSet.size() > 1) {
+			
+			// add class names
+			
+			boolean isArray = (classNameSet.size() > 1); 
+			if (isArray) {
 				buf.append("[");
 			}
 			joinArrayClasses(buf, getClassNames(), null);
-			if (classNameSet.size() > 1) {
+			if (isArray) {
 				buf.append("]");
 			}
 			buf.append(", ");
-			if (optionals.size() != 0) {
+			
+			// add optionals
+			
+			if (optionals.size() > 0) {
 				buf.append("[");
 				String[] ss = optionals.toArray(new String[0]);
 				Arrays.sort(ss);
@@ -258,9 +268,18 @@ public String getDependencyScript(StringBuffer buf) {
 			} else {
 				buf.append("null, ");
 			}
-			buf.append("function () {\r\n");
-			buf.append(js);
-			buf.append("});\r\n");
+			
+			// check for anonymous wrapper if not multiple classes
+			
+			if (isArray || !js.endsWith("})()\r\n") || !js.startsWith("\r\n(function")) {
+				buf.append("function(){\r\n");
+				buf.append(js);
+				buf.append("}");
+			} else {
+				// just make outer function not anonymous
+				buf.append("\r\n").append(js.substring(3, js.length() - 5));
+			}
+			buf.append(");\r\n");
 			js = buf.toString();
 		}
 		return prefix + js;
