WIP Array initializers, pt. III

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

@@ -3269,7 +3269,9 @@ public class JavaExpressionVisitor implements ExpressionVisitor<Void>, JavaNativ
 
 								//TODO invoke?
 								//javaWriter.invokeVirtual(new JavaMethod(JavaClass.fromInternalName("lambda1", JavaClass.Kind.CLASS), JavaMethod.Kind.INSTANCE, "accept", true, "(Ljava/lang/String;)Ljava/lang/String;", 0, false));
-								throw new UnsupportedOperationException("Cannot use projection functions yet!");
+
+								//FIXME Critical! Currently returning the same object!
+								//throw new UnsupportedOperationException("Cannot use projection functions yet!");
 							}
 						});
 

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

@@ -1,9 +1,15 @@
 package org.openzen.zenscript.javabytecode.compiler;
 
 import org.objectweb.asm.Label;
+import org.objectweb.asm.Type;
 import org.openzen.zenscript.codemodel.statement.Statement;
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.javabytecode.JavaLocalVariableInfo;
+import org.openzen.zenscript.javashared.JavaClass;
+import org.openzen.zenscript.javashared.JavaMethod;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class JavaForeachWriter {
 
@@ -83,6 +89,29 @@ public class JavaForeachWriter {
 	}
 
 	public void visitAssocKeyValueIterator() {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		javaWriter.invokeInterface(JavaMethod.getVirtual(JavaClass.MAP, "entrySet", "()Ljava/util/Set;", 0));
+		javaWriter.invokeInterface(JavaMethod.getVirtual(JavaClass.COLLECTION, "iterator", "()Ljava/util/Iterator;", 0));
+
+		javaWriter.label(startLabel);
+		javaWriter.dup();
+		javaWriter.invokeInterface(JavaMethod.getVirtual(JavaClass.ITERATOR, "hasNext", "()Z", 0));
+		javaWriter.ifEQ(endLabel);
+		javaWriter.invokeInterface(JavaMethod.getVirtual(JavaClass.ITERATOR, "next", "()Ljava/lang/Object;", 0));
+		javaWriter.checkCast(Type.getType(Map.Entry.class));
+		javaWriter.dup(false);
+
+
+		final JavaLocalVariableInfo keyVariable = javaWriter.getLocalVariable(variables[0].variable);
+		final JavaLocalVariableInfo valueVariable = javaWriter.getLocalVariable(variables[1].variable);
+
+		javaWriter.invokeInterface(JavaMethod.getVirtual(JavaClass.fromInternalName("java/util/Map$Entry", JavaClass.Kind.INTERFACE), "getKey", "()Ljava/lang/Object;", 0));
+		javaWriter.store(keyVariable.type, keyVariable.local);
+
+		javaWriter.invokeInterface(JavaMethod.getVirtual(JavaClass.fromInternalName("java/util/Map$Entry", JavaClass.Kind.INTERFACE), "getValue", "()Ljava/lang/Object;", 0));
+		javaWriter.store(valueVariable.type, valueVariable.local);
+		content.accept(statementVisitor);
+
+
+		//throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
 	}
 }

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

@@ -393,6 +393,9 @@ public class JavaWriter {
                 case Type.DOUBLE:
                     type = Opcodes.T_DOUBLE;
                     break;
+                case Type.CHAR:
+                    type = Opcodes.T_CHAR;
+                    break;
                 default:
                     throw new RuntimeException("Unsupported array type: " + componentType);
             }

JavaBytecodeCompiler/src/main/java/org/openzen/zenscript/javabytecode/compiler/definitions/JavaExpansionMemberVisitor.java

@@ -83,9 +83,10 @@ public class JavaExpansionMemberVisitor implements MemberVisitor<Void> {
 
 		if (!isStatic) {
 			methodWriter.nameVariable(0, "expandedObj", methodStart, methodEnd, Type.getType(expandedClassDescriptor));
+			methodWriter.nameParameter(0, "expandedObj");
 			for (final FunctionParameter parameter : member.header.parameters) {
 				methodWriter.nameParameter(0, parameter.name);
-				methodWriter.nameVariable(javaModule.getParameterInfo(parameter).index + 1, parameter.name, methodStart, methodEnd, context.getType(parameter.type));
+				methodWriter.nameVariable(javaModule.getParameterInfo(parameter).index, parameter.name, methodStart, methodEnd, context.getType(parameter.type));
 			}
 		} else {
 			for (final FunctionParameter parameter : member.header.parameters) {