WIP Array initializers; moved size variable naming to multiArray function

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/ArrayInitializerHelper.java

@@ -5,9 +5,9 @@ import org.objectweb.asm.Label;
 import org.objectweb.asm.Type;
 
 public class ArrayInitializerHelper {
-	public static void visitProjected(JavaWriter javaWriter, int[] sizeLocations, int[] counterLocations, int dim, int originArrayLocation, Type originArrayType, int functionLocation, Type functionType, Type currentArrayType) {
+	public static void visitProjected(JavaWriter javaWriter, int[] sizeLocations, int dim, int originArrayLocation, Type originArrayType, int functionLocation, Type functionType, Type currentArrayType) {
 
-		visitMultiDimArray(javaWriter, sizeLocations, counterLocations, dim, currentArrayType, (elementType1, counterLocations1, sizeLocations1) -> {
+		visitMultiDimArray(javaWriter, sizeLocations, dim, currentArrayType, (elementType, counterLocations) -> {
 			//Load origin array
 			javaWriter.loadObject(originArrayLocation);
 
@@ -29,11 +29,15 @@ public class ArrayInitializerHelper {
 
 
 	public static void visitMultiDimArrayWithDefaultValue(JavaWriter javaWriter, int dim, int defaultLocation, Type currentArrayType, int[] sizeLocations) {
-		visitMultiDimArray(javaWriter, sizeLocations, new int[dim], dim, currentArrayType, (elementType, counterLocations, sizeLocations1) -> javaWriter.load(elementType, defaultLocation));
+		visitMultiDimArray(javaWriter, sizeLocations, new int[dim], dim, currentArrayType, (elementType, counterLocations) -> javaWriter.load(elementType, defaultLocation));
+	}
+
+	public static void visitMultiDimArray(JavaWriter javaWriter, int[] sizeLocations, int dim, Type currentArrayType, InnermostFunction innermostFunction){
+		visitMultiDimArray(javaWriter, sizeLocations, new int[dim], dim, currentArrayType, innermostFunction);
 	}
 
 
-	public static void visitMultiDimArray(JavaWriter javaWriter, int[] sizeLocations, int[] counterLocations, int dim, Type currentArrayType, InnermostFunction innermostFunction) {
+	private static void visitMultiDimArray(JavaWriter javaWriter, int[] sizeLocations, int[] counterLocations, int dim, Type currentArrayType, InnermostFunction innermostFunction) {
 		final Label begin = new Label();
 		final Label end = new Label();
 		javaWriter.label(begin);
@@ -63,7 +67,7 @@ public class ArrayInitializerHelper {
 		javaWriter.dup();
 		javaWriter.loadInt(forLoopCounter);
 		if (dim == 1) {
-			innermostFunction.apply(elementType, counterLocations, sizeLocations);
+			innermostFunction.apply(elementType, counterLocations);
 		} else {
 			visitMultiDimArray(javaWriter, sizeLocations, counterLocations, dim - 1, elementType, innermostFunction);
 		}
@@ -79,11 +83,15 @@ public class ArrayInitializerHelper {
 		javaWriter.nameVariable(forLoopCounter, "i" + dim, loopStart, loopEnd, Type.getType(int.class));
 
 		javaWriter.label(end);
+
+		for (int i = 0; i < sizeLocations.length; i++) {
+			javaWriter.nameVariable(sizeLocations[i], "size" + (sizeLocations.length - i), begin, end, Type.getType(int.class));
+		}
 	}
 
 	@FunctionalInterface
 	public interface InnermostFunction {
-		void apply(Type elementType, int[] counterLocations, int[] sizeLocations);
+		void apply(Type elementType, int[] counterLocations);
 	}
 }
 

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/JavaExpressionVisitor.java

@@ -3062,12 +3062,7 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 				//D2Array = new T[arguments[1]][];
 				//Arrays.fill(D2Array, D1Array);
 
-				final Type ASMType;
-				{
-					final char[] chars = new char[type.dimension];
-					Arrays.fill(chars, '[');
-					ASMType = Type.getType(new String(chars) + context.getDescriptor(type.elementType));
-				}
+				final Type ASMType = context.getType(expression.type);
 				final Type ASMElementType = context.getType(type.elementType);
 
 				final Label begin = new Label();
@@ -3077,6 +3072,8 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 				final int defaultValueLocation = javaWriter.local(ASMElementType);
 
 				if (builtin == BuiltinID.ARRAY_CONSTRUCTOR_SIZED) {
+					//TODO type.elementType.type.accept(JavaDefaultExpressionVisitor.Instance).accept(this);
+					//TODO I still need to write that one, I guess
 					if (CompilerUtils.isPrimitive(type.elementType.type))
 						if (type.elementType.type == BasicTypeID.FLOAT) javaWriter.constant(0f);
 						else if (type.elementType.type == BasicTypeID.DOUBLE) javaWriter.constant(0D);
@@ -3112,9 +3109,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 
 				//naming the variables
 				javaWriter.nameVariable(defaultValueLocation, "defaultValue", begin, end, ASMElementType);
-				for (int i = 0; i < arraySizes.length; i++) {
-					javaWriter.nameVariable(arraySizes[i], "size" + (arraySizes.length - i), begin, end, Type.getType(int.class));
-				}
 				return;
 			}
 			case ARRAY_CONSTRUCTOR_LAMBDA: {
@@ -3153,7 +3147,6 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 				final int functionLocation = javaWriter.local(functionType);
 				javaWriter.storeObject(functionLocation);
 
-				int[] variableCounterLocations = new int[type.dimension];
 				Type destinationArrayType = context.getType(expression.type);
 
 
@@ -3183,15 +3176,12 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 				}
 
 
-				ArrayInitializerHelper.visitProjected(javaWriter, arraySizes, variableCounterLocations, type.dimension, originArrayLocation, originArrayType, functionLocation, functionType, destinationArrayType);
+				ArrayInitializerHelper.visitProjected(javaWriter, arraySizes, type.dimension, originArrayLocation, originArrayType, functionLocation, functionType, destinationArrayType);
 
 				javaWriter.label(end);
 
 				//naming the variables
 				javaWriter.nameVariable(functionLocation, "projectionFunction", begin, end, functionType);
-				for (int i = 0; i < arraySizes.length; i++) {
-					javaWriter.nameVariable(arraySizes[i], "size" + (arraySizes.length - i), begin, end, Type.getType(int.class));
-				}
 				return;
 
 			}