Bring Variable and VariableSet back to 100% coverage

ashuping · Oct 18, 2024 · 81414a9 · 81414a9
1 parent 5f07d0a
commit 81414a9
Show file tree

Hide file tree

Showing 3 changed files with 394 additions and 177 deletions.
diff --git a/exseos/types/Variable.py b/exseos/types/Variable.py
@@ -402,10 +402,8 @@ def __init__(self, v1: Variable, v2: Variable, note: str = ""):
 
 		msg = (
 			f"{type(v1).__name__} {v1.name} has {v1_type}, "
-			+ f"but {type(v2).__name} {v2.name} has {v2_type}!"
-			+ f" {note}"
-			if note
-			else ""
+			+ f"but {type(v2).__name__} {v2.name} has {v2_type}!"
+			+ (f" {note}" if note else "")
 		)
 
 		super().__init__(msg)
@@ -436,10 +434,8 @@ def __init__(self, v1: Variable, v2: Variable, note: str = ""):
 
 		msg = (
 			f"{type(v1).__name__} {v1.name} has {v1_type}, "
-			+ f"but {type(v2).__name} {v2.name} has {v2_type}!"
-			+ f" {note}"
-			if note
-			else ""
+			+ f"but {type(v2).__name__} {v2.name} has {v2_type}!"
+			+ (f" {note}" if note else "")
 		)
 
 		super().__init__(msg)
@@ -693,7 +689,11 @@ def assert_types_match(
 	if v1.var_type == Nothing() or v2.var_type == Nothing():
 		return Okay(None)
 
-	if issubclass(v2.var_type.val, v1.var_type.val):
+	if issubclass(v2.var_type.val, v1.var_type.val) and not (
+		# Special case: bools are apparently a subclass of int in python.
+		# We don't want that behavior here.
+		v2.var_type.val is bool and v1.var_type.val is int
+	):
 		return Okay(None)
 
 	if v1.var_type_inferred or v2.var_type_inferred: