Merge pull request #177 from ZenCodeLang/feature/refactor-use-invalid…

…-check Fix: Use isInvalid method instead of comparing to INVALID to check for invalidtypes
ZenCodeLang · Oct 11, 2024 · 7e3a6da · 7e3a6da
2 parents 81799c9 + 2140993
commit 7e3a6da
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...Model/src/main/java/org/openzen/zenscript/codemodel/compilation/MatchedCallArguments.java b/...Model/src/main/java/org/openzen/zenscript/codemodel/compilation/MatchedCallArguments.java
@@ -202,7 +202,7 @@ private static <T extends AnyMethod> MatchedCallArguments<T> applyWidening(
 							.orElse(value);
 				}).toArray(Expression[]::new);
 
-		if (Stream.of(expressions).anyMatch(e -> e.type == BasicTypeID.INVALID)) {
+		if (Stream.of(expressions).anyMatch(e -> e.type.isInvalid())) {
 			return new MatchedCallArguments<>(
 					method,
 					new CallArguments(CastedExpression.Level.INVALID, expansionTypeArguments, typeArguments, expressions)

diff --git a/Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionBinary.java b/Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionBinary.java
@@ -45,7 +45,7 @@ public Compiling(ExpressionCompiler compiler, CodePosition position, CompilingEx
 		@Override
 		public Expression eval() {
 			Expression leftValue = this.left.eval();
-			if (leftValue.type == BasicTypeID.INVALID)
+			if (leftValue.type.isInvalid())
 				return leftValue;
 
 			ResolvedType resolved = compiler.resolve(leftValue.type);
@@ -57,7 +57,7 @@ public Expression eval() {
 		@Override
 		public CastedExpression cast(CastedEval cast) {
 			Expression leftValue = this.left.eval();
-			if (leftValue.type == BasicTypeID.INVALID)
+			if (leftValue.type.isInvalid())
 				return CastedExpression.invalid(leftValue);
 
 			ResolvedType resolved = compiler.resolve(leftValue.type);

diff --git a/Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionIndex.java b/Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionIndex.java
@@ -49,7 +49,7 @@ public Compiling(ExpressionCompiler compiler, CodePosition position, CompilingEx
 		@Override
 		public Expression eval() {
 			Expression value = this.value.eval();
-			if (value.type == BasicTypeID.INVALID)
+			if (value.type.isInvalid())
 				return value;
 
 			ResolvedType resolved = compiler.resolve(value.type);
@@ -61,7 +61,7 @@ public Expression eval() {
 		@Override
 		public CastedExpression cast(CastedEval cast) {
 			Expression value = this.value.eval();
-			if (value.type == BasicTypeID.INVALID)
+			if (value.type.isInvalid())
 				return CastedExpression.invalid(value);
 
 			ResolvedType resolved = compiler.resolve(value.type);
@@ -115,7 +115,7 @@ public Expression eval() {
 		@Override
 		public CastedExpression cast(CastedEval cast) {
 			Expression instance = this.instance.eval();
-			if (instance.type == BasicTypeID.INVALID)
+			if (instance.type.isInvalid())
 				return CastedExpression.invalid(instance);
 
 			return compiler.resolve(instance.type).findOperator(OperatorType.INDEXSET)

diff --git a/Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionUnary.java b/Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionUnary.java
@@ -40,7 +40,7 @@ public Compiling(ExpressionCompiler compiler, CodePosition position, CompilingEx
 		@Override
 		public Expression eval() {
 			Expression value = this.value.eval();
-			if (value.type == BasicTypeID.INVALID)
+			if (value.type.isInvalid())
 				return value;
 
 			ResolvedType resolvedType = compiler.resolve(value.type);
@@ -52,7 +52,7 @@ public Expression eval() {
 		@Override
 		public CastedExpression cast(CastedEval cast) {
 			Expression value = this.value.eval();
-			if (value.type == BasicTypeID.INVALID)
+			if (value.type.isInvalid())
 				return CastedExpression.invalid(value);
 
 			ResolvedType resolvedType = compiler.resolve(value.type);

diff --git a/Validator/src/main/java/org/openzen/zenscript/validator/visitors/ExpressionValidator.java b/Validator/src/main/java/org/openzen/zenscript/validator/visitors/ExpressionValidator.java
@@ -674,7 +674,7 @@ public Void visitMemoized(MemoizedExpression expression) {
 	}
 
 	private void checkCorrectType(CodePosition position, TypeID expected, TypeID actual) {
-		if (actual == BasicTypeID.INVALID)
+		if (actual.isInvalid())
 			return; // in this case the underlying error will already by reported elsewhere
 
 		if (!expected.equals(actual)) {