Fixed something with iterables (but I forgot what)

Author: stanhebben

CodeModel/src/main/java/org/openzen/zenscript/codemodel/type/member/BuiltinID.java

@@ -527,7 +527,8 @@ public enum BuiltinID {
 	ITERATOR_ARRAY_KEY_VALUES,
 	ITERATOR_ASSOC_KEYS,
 	ITERATOR_ASSOC_KEY_VALUES,
-	ITERATOR_STRING_CHARS;
+	ITERATOR_STRING_CHARS,
+	ITERATOR_ITERABLE;
 
 	private static final BuiltinID[] VALUES = values();
 	public static BuiltinID get(int ordinal) {

DrawableGui/src/main/java/org/openzen/drawablegui/BaseComponentGroup.java

@@ -19,6 +19,11 @@ public abstract class BaseComponentGroup implements DComponent {
 
 	protected abstract DComponent findChild(Predicate<DComponent> predicate);
 
+	protected void onComponentRemoved(DComponent component) {
+		if (hovering == component)
+			hovering = null;
+	}
+	
 	@Override
 	public void onMouseEnter(DMouseEvent e) {
 		DComponent target = getComponent(e.x, e.y);

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedView.java

@@ -60,8 +60,10 @@ public TabbedView(DStyleClass styleClass) {
 		tabs.addListener(new TabListListener());
 
 		currentTab.addListener((oldValue, newValue) -> {
-			if (oldValue != null)
+			if (oldValue != null) {
 				oldValue.content.unmount();
+				onComponentRemoved(oldValue.content);
+			}
 			if (newValue != null)
 				newValue.content.mount(context);
 

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewTab.java

@@ -165,6 +165,7 @@ public void setBounds(DIRectangle bounds) {
 	public void close() {
 		titleListener.close();
 		updatedListener.close();
+		currentTabListener.close();
 
 		unmount();
 	}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/editor/SourceEditor.java

@@ -299,6 +299,7 @@ public void onMouseEnter(DMouseEvent e) {
 
 	@Override
 	public void onMouseExit(DMouseEvent e) {
+		
 		context.getUIContext().setCursor(DUIContext.Cursor.NORMAL);
 	}
 
@@ -816,7 +817,8 @@ public void onLineInserted(int index) {
 		@Override
 		public void onLineChanged(int index) {
 			if (bounds != null) {
-				Destructible.close(drawnTokens.get(index));
+				if (index < drawnTokens.size())
+					Destructible.close(drawnTokens.get(index));
 
 				TokenLine line = tokens.getLine(index);
 				drawnTokens.set(index, lineToTokens(line));

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

@@ -8,7 +8,6 @@
 import org.openzen.zenscript.javashared.JavaClass;
 import org.openzen.zenscript.javashared.JavaMethod;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class JavaForeachWriter {
@@ -60,6 +59,20 @@ public void visitStringCharacterIterator() {
 		handleArray(javaWriter.local(int.class), javaWriter.getLocalVariable(variables[0].variable));
 	}
 
+	public void visitIteratorIterator(Type targetType) {
+		javaWriter.invokeInterface(JavaMethod.getVirtual(JavaClass.ITERABLE, "iterator", "()Ljava/lang/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(targetType);
+		final JavaLocalVariableInfo variable = javaWriter.getLocalVariable(variables[0].variable);
+		javaWriter.store(variable.type, variable.local);
+
+		content.accept(statementVisitor);
+	}
+
 	private void handleArray(final int z, final JavaLocalVariableInfo arrayTypeInfo) {
 		javaWriter.iConst0();
 		javaWriter.storeInt(z);
@@ -73,7 +86,6 @@ private void handleArray(final int z, final JavaLocalVariableInfo arrayTypeInfo)
 		javaWriter.ifICmpLE(endLabel);
 		javaWriter.loadInt(z);
 
-
 		javaWriter.arrayLoad(arrayTypeInfo.type);
 		javaWriter.store(arrayTypeInfo.type, arrayTypeInfo.local);
 		content.accept(statementVisitor);

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

@@ -135,6 +135,9 @@ public Boolean visitForeach(ForeachStatement statement) {
 				case ITERATOR_STRING_CHARS:
 					iteratorWriter.visitStringCharacterIterator();
 					break;
+				case ITERATOR_ITERABLE:
+					iteratorWriter.visitIteratorIterator(context.getType(statement.loopVariables[0].type));
+					break;
 				default:
 					throw new IllegalArgumentException("Invalid iterator: " + statement.iterator.target.getBuiltin());
 			}

JavaShared/src/main/java/org/openzen/zenscript/javashared/JavaClass.java

@@ -21,6 +21,7 @@ public class JavaClass implements Comparable<JavaClass> {
 	public static final JavaClass MAP = new JavaClass("java.util", "Map", JavaClass.Kind.INTERFACE);
 	public static final JavaClass HASHMAP = new JavaClass("java.util", "HashMap", JavaClass.Kind.CLASS);
 	public static final JavaClass ITERATOR = new JavaClass("java.util", "Iterator", JavaClass.Kind.INTERFACE);
+	public static final JavaClass ITERABLE = new JavaClass("java.lang", "Iterable", Kind.INTERFACE);
 	public static final JavaClass ARRAYS = new JavaClass("java.util", "Arrays", Kind.CLASS);
 
 	public static final JavaClass BOOLEAN = new JavaClass("java.lang", "Boolean", Kind.CLASS);

Parser/src/main/java/org/openzen/zenscript/parser/definitions/ParsedFunctionHeader.java

@@ -56,7 +56,7 @@ public static ParsedFunctionHeader parse(ZSTokenParser tokens) throws ParseExcep
 				boolean variadic = tokens.optional(T_DOT3) != null;
 
 				IParsedType type = ParsedTypeBasic.UNDETERMINED;
-				if (tokens.optional(K_AS) != null) {
+				if (tokens.optional(K_AS) != null || tokens.optional(T_COLON) != null) {
 					type = IParsedType.parse(tokens);
 				}
 				ParsedExpression defaultValue = null;

Parser/src/main/java/org/openzen/zenscript/parser/statements/ParsedStatement.java

@@ -99,7 +99,7 @@ public static ParsedStatement parse(ZSTokenParser parser, ParsedAnnotation[] ann
 
 				IParsedType type = null;
 				ParsedExpression initializer = null;
-				if (parser.optional(K_AS) != null) {
+				if (parser.optional(K_AS) != null || parser.optional(T_COLON) != null) {
 					type = IParsedType.parse(parser);
 				}
 				if (parser.optional(T_ASSIGN) != null) {