Started moving to InvalidTypeID of BasicTypeID.Invalid

Author: jaredlll08

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/CastedExpression.java

@@ -5,6 +5,7 @@
 import org.openzen.zenscript.codemodel.expression.Expression;
 import org.openzen.zenscript.codemodel.expression.InvalidExpression;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.InvalidTypeID;
 
 public class CastedExpression {
 	public enum Level {
@@ -63,7 +64,7 @@ public CastedExpression(Level level, Expression value) {
 
 	public CastedExpression(CodePosition position, CompileError error) {
 		this.level = Level.INVALID;
-		this.value = new InvalidExpression(position, BasicTypeID.INVALID, error);
+		this.value = new InvalidExpression(position, new InvalidTypeID(position, error), error);
 		this.error = error;
 	}
 

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/CompileErrors.java

@@ -498,6 +498,10 @@ public static CompileError returnValueInVoidFunction() {
 		return new CompileError(CompileExceptionCode.RETURN_VALUE_VOID, "Return type is void; cannot return a value");
 	}
 
+	public static CompileError missingThrownType() {
+		return new CompileError(CompileExceptionCode.MISSING_THROWN_TYPE, "Statement doesn't throw anything");
+	}
+
 	public static CompileError missingReturn() {
 		return new CompileError(CompileExceptionCode.MISSING_RETURN, "Missing return");
 	}

CodeModel/src/main/java/org/openzen/zenscript/codemodel/compilation/impl/compiler/ExpressionCompilerImpl.java

@@ -309,7 +309,7 @@ public Expression interfaceCast(ImplementationMemberInstance implementation, Exp
 
 		@Override
 		public Expression invalid(CompileError error) {
-			return new InvalidExpression(position, BasicTypeID.INVALID, error);
+			return new InvalidExpression(position, new InvalidTypeID(position, error), error);
 		}
 
 		@Override

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

@@ -1,6 +1,7 @@
 package org.openzen.zenscript.parser.statements;
 
 import org.openzen.zencode.shared.CodePosition;
+import org.openzen.zenscript.codemodel.compilation.CompileErrors;
 import org.openzen.zenscript.codemodel.compilation.CompilingVariable;
 import org.openzen.zenscript.codemodel.compilation.StatementCompiler;
 import org.openzen.zenscript.codemodel.compilation.statement.CompilingStatement;
@@ -9,6 +10,7 @@
 import org.openzen.zenscript.codemodel.statement.VarStatement;
 import org.openzen.zenscript.codemodel.statement.VariableID;
 import org.openzen.zenscript.codemodel.type.BasicTypeID;
+import org.openzen.zenscript.codemodel.type.InvalidTypeID;
 import org.openzen.zenscript.codemodel.type.TypeID;
 
 public class ParsedCatchClause {
@@ -40,7 +42,7 @@ public Compiling(StatementCompiler compiler, CompilingVariable exceptionVariable
 		}
 
 		public CatchClause complete() {
-			TypeID exceptionType = compiler.expressions().getThrowableType().orElse(BasicTypeID.INVALID);
+			TypeID exceptionType = compiler.expressions().getThrowableType().orElse(new InvalidTypeID(position, CompileErrors.missingThrownType()));
 			VarStatement exceptionVariable = new VarStatement(position, this.exceptionVariable.id, this.exceptionVariable.name, exceptionType, null, true);
 			return new CatchClause(position, exceptionVariable, content.complete());
 		}

Shared/src/main/java/org/openzen/zencode/shared/CompileExceptionCode.java

@@ -129,6 +129,7 @@ public enum CompileExceptionCode {
 	INVALID_CALL_ARGUMENT,
 	NO_ACCESS,
 	MISSING_RETURN_VALUE,
+	MISSING_THROWN_TYPE,
 	TRY_CATCH_RESOURCE_REQUIRES_INITIALIZER,
 	INVALID_SUPERCLASS,
 	INVALID_OVERRIDE,

Validator/src/main/java/org/openzen/zenscript/validator/visitors/TypeValidator.java

@@ -32,6 +32,9 @@ public Void visitBasic(TypeContext context, BasicTypeID basic) {
 		if (basic == BasicTypeID.UNDETERMINED)
 			validator.logError(position, CompileErrors.typeNotDetermined(context.display));
 
+		if (basic.isInvalid()) {
+			validator.logError(position, CompileErrors.invalidType());
+		}
 		return null;
 	}