j2s 3.2.4.09 fixes method c() not allowed.

BobHanson · BobHanson · commit b816360a2796 · 2019-10-27T19:08:58.000-05:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -19,7 +19,8 @@ public class CorePlugin extends Plugin {
 	 * register the bundle version properly. So we use VERSION here instead.
 	 * 
 	 */
-	public static String VERSION = "3.2.4.08";
+	public static String VERSION = "3.2.4.09";
+	// BH 2019.10.27 -- 3.2.4.09 fixes problem with method of name c() becoming c$() -- constructor
 	// BH 2019.10.25 -- 3.2.4.09 adds j2s.compiler.java.version (default 8)
 	// BH 2019.10.25 -- 3.2.4.09 adds j2s.break.on.error (default false)
 	// BH 2019.10.25 -- 3.2.4.09 fixes missing resource copy for git projects
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -5014,7 +5014,8 @@ private static boolean classHasNoParameterMethod(ITypeBinding methodClass, Strin
 				|| j2sName.indexOf("$", 2) >= 0 || j2sName.equals("c$")
 				|| className != null && NameMapper.isMethodNonqualified(className, mBinding.getName()))
 			return j2sName;
-		return j2sName + "$";
+		// c() must be changed to c$$, not c$, which is the constructor
+		return (j2sName.equals("c") ? "c$$" : j2sName + "$");
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Class.java b/sources/net.sf.j2s.java.core/src/test/Test_Class.java
@@ -13,9 +13,13 @@ class Test_Class extends Test_ {
 	private void test(String s) {
 		
 	}
+
+    void c() {
+		
+	}
 	
 	private void test(Integer i) {
-		
+		c();
 	}
 	
 	int test1 = 0;

Original file line number	Diff line number	Diff line change
`@@ -5014,7 +5014,8 @@ private static boolean classHasNoParameterMethod(ITypeBinding methodClass, Strin`
`5014`	`5014`	`\|\| j2sName.indexOf("$", 2) >= 0 \|\| j2sName.equals("c$")`
`5015`	`5015`	`\|\| className != null && NameMapper.isMethodNonqualified(className, mBinding.getName()))`
`5016`	`5016`	`return j2sName;`
`5017`		`- return j2sName + "$";`
	`5017`	`+ // c() must be changed to c$$, not c$, which is the constructor`
	`5018`	`+ return (j2sName.equals("c") ? "c$$" : j2sName + "$");`
`5018`	`5019`	`}`
`5019`	`5020`
`5020`	`5021`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,13 @@ class Test_Class extends Test_ {`
`13`	`13`	`private void test(String s) {`
`14`	`14`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ void c() {`
	`18`	`+`
	`19`	`+ }`
`16`	`20`
`17`	`21`	`private void test(Integer i) {`
`18`		`-`
	`22`	`+ c();`
`19`	`23`	`}`
`20`	`24`
`21`	`25`	`int test1 = 0;`