[WIP] implemented getReturnTyp() for some Statements

WIP: Not really tested and contains RuntimeExceptions that I used for testing
WIP: Not all possible return types covered
WIP: Not really clear which order/priority some statement contents should be checked
WIP: Not dealing with type mismatches or one branch returning something a subclass of the other branch's return type

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/BlockStatement.java

@@ -5,12 +5,19 @@
  */
 package org.openzen.zenscript.codemodel.statement;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zencode.shared.CompileException;
+import org.openzen.zencode.shared.CompileExceptionCode;
 import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.BasicTypeID;
 import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
@@ -84,4 +91,24 @@ public class BlockStatement extends Statement {
 			normalized[i++] = statement.normalize(scope, modified);
 		return new BlockStatement(position, normalized);
 	}
+
+	@Override
+	public StoredType getReturnType() {
+		final List<StoredType> collect = Arrays.stream(statements)
+				.map(Statement::getReturnType)
+				.distinct()
+				.collect(Collectors.toList());
+		if(collect.isEmpty())
+			return super.getReturnType();
+		if(collect.size() == 1)
+			return collect.get(0);
+
+		final long count = collect.stream().map(s -> s.type).distinct().count();
+		if(count == 1L)
+			return collect.get(0);
+
+		else
+			//TODO make this real?
+			throw new IllegalStateException("More than one possible storedType: " + count);
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/DoWhileStatement.java

@@ -11,6 +11,7 @@ import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -72,4 +73,9 @@ public class DoWhileStatement extends LoopStatement {
 		result.content = content.normalize(scope, modified.concat(this, result));
 		return result;
 	}
+
+	@Override
+	public StoredType getReturnType() {
+		return content.getReturnType();
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/ForeachStatement.java

@@ -12,6 +12,7 @@ import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.member.ref.IteratorMemberRef;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -77,4 +78,9 @@ public class ForeachStatement extends LoopStatement {
 		result.content = content.normalize(scope, modified.concat(this, result));
 		return result;
 	}
+
+	@Override
+	public StoredType getReturnType() {
+		return content.getReturnType();
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/IfStatement.java

@@ -83,4 +83,24 @@ public class IfStatement extends Statement {
 				onThen.normalize(scope, modified),
 				onElse == null ? null : onElse.normalize(scope, modified));
 	}
+
+	@Override
+	public StoredType getReturnType() {
+		final StoredType thenType = onThen.getReturnType();
+		if(onElse == null)
+			return thenType;
+		final StoredType elseType = onElse.getReturnType();
+		if(thenType == elseType)
+			return thenType;
+
+		if(thenType == null)
+			return elseType;
+		if(elseType == null)
+			return thenType;
+
+		if(thenType.type != elseType.type)
+			//TODO make this real?
+			throw new IllegalStateException("If and Else return different things?!?");
+		return thenType;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/SwitchStatement.java

@@ -6,13 +6,18 @@
 package org.openzen.zenscript.codemodel.statement;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
 import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -78,4 +83,27 @@ public class SwitchStatement extends LoopStatement {
 		}
 		return result;
 	}
+
+	@Override
+	public StoredType getReturnType() {
+		//return super.getReturnType();
+		final List<StoredType> collect = cases.stream()
+				.flatMap(aCase -> Arrays.stream(aCase.statements))
+				.map(Statement::getReturnType)
+				.filter(Objects::nonNull)
+				.collect(Collectors.toList());
+
+		if(collect.isEmpty())
+			return null;
+
+		if(collect.size() == 1)
+			return collect.get(0);
+
+		final long c = collect.stream().map(s -> s.type).distinct().count();
+		if(c == 1)
+			return collect.get(0);
+		else
+			//TODO make this real
+			throw new IllegalStateException("Too many possible types: " + c);
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/TryCatchStatement.java

@@ -12,6 +12,7 @@ import org.openzen.zencode.shared.CodePosition;
 import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -89,4 +90,14 @@ public class TryCatchStatement extends Statement {
 		Statement tFinallyClause = finallyClause == null ? null : finallyClause.normalize(scope, modified);
 		return new TryCatchStatement(position, tResource, tContent, tCatchClauses, tFinallyClause);
 	}
+
+	@Override
+	public StoredType getReturnType() {
+		if(finallyClause != null && finallyClause.getReturnType() != null)
+			return finallyClause.getReturnType();
+
+		final StoredType contentType = content.getReturnType();
+		//TODO check catch clauses and do stuff I guess?
+		return contentType;
+	}
 }

CodeModel/src/main/java/org/openzen/zenscript/codemodel/statement/WhileStatement.java

@@ -11,6 +11,7 @@ import org.openzen.zencode.shared.ConcatMap;
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.ExpressionTransformer;
 import org.openzen.zenscript.codemodel.scope.TypeScope;
+import org.openzen.zenscript.codemodel.type.StoredType;
 
 /**
  *
@@ -72,4 +73,9 @@ public class WhileStatement extends LoopStatement {
 		result.content = content.normalize(scope, modified.concat(this, result));
 		return result;
 	}
+
+	@Override
+	public StoredType getReturnType() {
+		return content.getReturnType();
+	}
 }