type-errors

johnkerl · Dec 2, 2023 · 50bc7fe · 50bc7fe
1 parent e99d960
commit 50bc7fe
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/pkg/dsl/cst/builtin_functions.go b/pkg/dsl/cst/builtin_functions.go
@@ -753,6 +753,9 @@ func (node *LogicalANDOperatorNode) Evaluate(
 		if btype == mlrval.MT_VOID || btype == mlrval.MT_ABSENT {
 			return mlrval.ABSENT
 		}
+		if btype != mlrval.MT_BOOL {
+			return mlrval.FromNotNamedTypeError("&&", bout, "absent or boolean")
+		}
 		return bout
 	}
 
@@ -763,11 +766,14 @@ func (node *LogicalANDOperatorNode) Evaluate(
 			return bout
 		}
 		if btype == mlrval.MT_VOID {
-			return mlrval.VOID
+			return mlrval.FromNotNamedTypeError("&&", bout, "absent or boolean")
 		}
 		if btype == mlrval.MT_ABSENT {
 			return mlrval.ABSENT
 		}
+		if btype != mlrval.MT_BOOL {
+			return mlrval.FromNotNamedTypeError("&&", bout, "absent or boolean")
+		}
 		return bout
 	}
 
@@ -827,6 +833,12 @@ func (node *LogicalOROperatorNode) Evaluate(
 		if btype == mlrval.MT_VOID || btype == mlrval.MT_ABSENT {
 			return mlrval.ABSENT
 		}
+		if btype == mlrval.MT_VOID {
+			return mlrval.FromNotNamedTypeError("||", bout, "absent or boolean")
+		}
+		if btype != mlrval.MT_BOOL {
+			return mlrval.FromNotNamedTypeError("||", bout, "absent or boolean")
+		}
 		return bout
 	}
 
@@ -837,11 +849,14 @@ func (node *LogicalOROperatorNode) Evaluate(
 			return bout
 		}
 		if btype == mlrval.MT_VOID {
-			return mlrval.VOID
+			return mlrval.FromNotNamedTypeError("||", bout, "absent or boolean")
 		}
 		if btype == mlrval.MT_ABSENT {
 			return mlrval.ABSENT
 		}
+		if btype != mlrval.MT_BOOL {
+			return mlrval.FromNotNamedTypeError("||", bout, "absent or boolean")
+		}
 		return bout
 	}