array initialization fix -- SwingJS only

BobHanson · BobHanson · commit 2910a8f4386b · 2024-08-14T09:41:34.000-05:00
//BH 2024.07.14 -- 5.0.1-v4 fixes numerical array initializer using
characters ['a','b',...], but not new int[] { "test".charAt(3) }
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20240627180429 
+20240814092323 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp
@@ -1 +1 @@
-20240627180429 
+20240814092323 
diff --git a/sources/net.sf.j2s.core/src/j2s/CorePlugin.java b/sources/net.sf.j2s.core/src/j2s/CorePlugin.java
@@ -26,11 +26,13 @@ public class CorePlugin extends Plugin {
 	 * the actual "x.y.z" version is specified in plugin.xml.
 	 * 
 	 */
-	public static String VERSION = "5.0.1-v2";
+	public static String VERSION = "5.0.1-v4";
 	
 	// if you change the x.x.x number, be sure to also indicate that in 
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
+	// BH 2024.07.14 -- 5.0.1-v4 fixes numerical array initializer using characters ['a','b',...]
+	// BH 2024.02.22 -- 5.0.1-v3 fixes long extension issue causing MutableBitInteger to miscalculate subtraction(no change in version #)
 	// BH 2023.11.27 -- 5.0.1-v2 final refactoring and creatiton of J2SUtil
 	// BH 2023.11.21 -- 5.0.1-v2 adds Java8 syntaxes for try and switch; removes dependency for instanceOf and exception checking
 	// BH 2023.11.09 -- 5.0.1-v1 merges Jmol legacy (.j2sjmol) with Java8//11 (.j2s)
diff --git a/sources/net.sf.j2s.core/src/j2s/jmol/J2SLegacyVisitor.java b/sources/net.sf.j2s.core/src/j2s/jmol/J2SLegacyVisitor.java
@@ -2100,7 +2100,7 @@ public boolean visit(ArrayCreation node) {
 						buffer.append(" Clazz.newBooleanArray(");
 						boxList(dim, ", ");
 						buffer.append(", false)");
-					} else {
+					} else { 
 						if (dim != null && dim.size() > 1) {
 							buffer.append(" Clazz.newArray(");
 							boxList(dim, ", ");
@@ -2140,6 +2140,8 @@ public boolean visit(ArrayInitializer node) {
 			buffer.append("]");
 			return false;
 		}
+		// note that this does NOT allow for new byte[] {'a', 'b', 'c'}
+		// only implemented that for SwingJS
 		if (elementType.isPrimitive()) {
 			String typeCode = elementType.getName();
 			if ("int".equals(typeCode)
diff --git a/sources/net.sf.j2s.core/src/j2s/swingjs/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/j2s/swingjs/Java2ScriptVisitor.java
@@ -31,7 +31,11 @@
 // TODO: superclass inheritance for JAXB XmlAccessorType
 // TODO: Transpiler bug allows static String name, but JavaScript function().name is read-only and will be "clazz"
 
-//BH 2024.02.22 -- 3.3.1-v7 fixes long extension issue causing MutableBitInteger to miscalculate subtraction(no change in version #)
+//BH 2024.07.14 -- 5.0.1-v4 fixes numerical array initializer using characters ['a','b',...], but not new int[] { "test".charAt(3) }
+//BH 2024.02.22 -- 5.0.1-v3 fixes long extension issue causing MutableBitInteger to miscalculate subtraction(no change in version #)
+//BH 2023.11.27 -- 5.0.1-v2 final refactoring and creatiton of J2SUtil
+//BH 2023.11.21 -- 5.0.1-v2 adds Java8 syntaxes for try and switch; removes dependency for instanceOf and exception checking
+//BH 2023.11.09 -- 5.0.1-v1 merges Jmol legacy (.j2sjmol) with Java8//11 (.j2s)
 //BH 2023.03.29 -- 3.3.1-v7 fixes outer static method call from within lambda expression. 
 //BH 2023.02.09 -- 3.3.1.v6 fixes j2s.excluded.paths needing /src/xxxx
 //BH 2022.06.27 -- 3.3.1-v5 fixes missing method annotations
@@ -3015,15 +3019,63 @@ private void addArrayConstructor(ITypeBinding binding, List<ASTNode> dim) {
 
 	public boolean visit(ArrayInitializer node) {
 		// as in: public String[] d = {"1", "2"};
-		buffer.append(clazzArray(node.resolveTypeBinding(), ARRAY_INITIALIZED));
+		ITypeBinding type = node.resolveTypeBinding();
+		buffer.append(clazzArray(type, ARRAY_INITIALIZED));
 		buffer.append(", [");
+		int toChar = toCharType(type);
 		@SuppressWarnings("unchecked")
-		List<ASTNode> expressions = node.expressions();
-		visitList(expressions, ", ");
+		List<ASTNode> ex = node.expressions();
+		if (toChar == 0) {
+			visitList(ex, ", ");
+		} else {
+			fixCharArrayInit(buffer, ex, toChar);
+		}
 		buffer.append("])");
 		return false;
 	}
 
+	private static int toCharType(ITypeBinding type) {
+		switch (type == null ? "" : type.getName()) {
+		case "char[]":
+			return 1;
+		case "byte[]":
+		case "short[]":
+		case "int[]":
+		case "long[]":
+		case "float[]":
+		case "double[]":
+			return -1;
+		default:
+			return 0;
+		}
+	}
+
+	private void fixCharArrayInit(StringBuffer buffer, List<ASTNode> list, int toChar) {
+		for (Iterator<ASTNode> iter = list.iterator(); iter.hasNext();) {
+			int pt = buffer.length();
+			appendBoxingNode(iter.next(), false, null, false, false);
+			if (toChar != 0) {
+				String s = buffer.substring(pt);
+				// only fix "x" and number
+				// not fixed:  int[] a = new int[] {"test".charAt(0)}
+				try {
+				if (pt > 0 && (s.charAt(0) == '"') != (toChar == 1)) {
+					buffer.replace(pt,  buffer.length(), 
+							(toChar == 1 ? 
+							"\"" + ((char) Integer.parseInt(s)) + "\"" 
+							: s.length() == 3 ? "" + (byte) s.charAt(1) : s)
+							);
+				}
+				} catch (@SuppressWarnings("unused") Exception e) {
+					// ignore
+				}
+			}
+			if (!iter.hasNext())
+				return;
+			buffer.append(", ");
+		}
+	}
+
 	public boolean visit(Assignment node) {
 		// note that this is not
 		// var x = ..... -- that is a visit(VariableDeclaration)
@@ -4431,8 +4483,6 @@ private void addNonCharacter(Expression exp) {
 		switch (name) {
 		case "char":
 		case "Character":
-			addOperand(exp, false);
-			break;
 		case "Byte":
 		case "Short":
 		case "Integer":
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Array.java b/sources/net.sf.j2s.java.core/src/test/Test_Array.java
@@ -7,7 +7,7 @@
 
 class Test_Array extends Test_ {
 
-	static Object ax1 =new int[2][];
+	static Object ax1 =new int[2][]; 
 	static Object ax = new int[2][3][];
 
 
@@ -60,8 +60,18 @@ class Test_Array extends Test_ {
 			{ { 0, 1, 2 }, { 3, 4, 5 }, { 0, 1, 2 }, { 3, 4, 5 }, { 0, 1, 2 }, { 3, 4, 5 } } };
 
 	public static void main(String[] args) {
-	
-
+			char cc = Character.valueOf('c');
+			byte b = Byte.valueOf((byte)3); 
+			char[] chs = new char[] {65, 'B', cc, Character.valueOf('c')};
+			int[] ints = new int[] {1,2, 'a', 3, b + 1}; // NOT "3".charAt(0)};
+			short[] shorts = new short[] {1,2, 'a', +3};
+			long[] longs = new long[] {1,2, 'a', 3}; 
+			float[] floats = new float[] {1,2, 'a', 3};
+			double[] dbls = new double[] {1,2, 'a', 3};
+			byte[] by  = new byte[] { 0, 'a', 'b', 'c' + 2, b  }; 
+			byte[][] by2  = new byte[][] { {0, 'd'}, {'b', 'c' + 1} }; 
+			System.out.println(Arrays.toString(by));
+			
 			int[] a = new int[] {1,2,3};
 			int i = 2, jj;
 			a[--i] *= a[i + 1];
