Add more testing

Author: jairov4

mypyc/irbuild/env_class.py

@@ -20,7 +20,6 @@ def g() -> int:
 from mypy.nodes import Argument, FuncDef, SymbolNode, Var
 from mypyc.common import BITMAP_BITS, ENV_ATTR_NAME, SELF_NAME, bitmap_name
 from mypyc.ir.class_ir import ClassIR
-from mypyc.ir.func_ir import FuncSignature
 from mypyc.ir.ops import Call, GetAttr, SetAttr, Value
 from mypyc.ir.rtypes import RInstance, bitmap_rprimitive, object_rprimitive
 from mypyc.irbuild.builder import IRBuilder, SymbolTarget
@@ -57,17 +56,17 @@ class is generated, the function environment has not yet been
     return env_class
 
 
-def finalize_env_class(builder: IRBuilder, sig: FuncSignature) -> None:
+def finalize_env_class(builder: IRBuilder) -> None:
     """Generate, instantiate, and set up the environment of an environment class."""
     instantiate_env_class(builder)
 
     # Iterate through the function arguments and replace local definitions (using registers)
     # that were previously added to the environment with references to the function's
     # environment class.
     if builder.fn_info.is_nested:
-        add_args_to_env(builder, sig, local=False, base=builder.fn_info.callable_class)
+        add_args_to_env(builder, local=False, base=builder.fn_info.callable_class)
     else:
-        add_args_to_env(builder, sig, local=False, base=builder.fn_info)
+        add_args_to_env(builder, local=False, base=builder.fn_info)
 
 
 def instantiate_env_class(builder: IRBuilder) -> Value:
@@ -92,15 +91,15 @@ def instantiate_env_class(builder: IRBuilder) -> Value:
     return curr_env_reg
 
 
-def load_env_registers(builder: IRBuilder, sig: FuncSignature) -> None:
+def load_env_registers(builder: IRBuilder) -> None:
     """Load the registers for the current FuncItem being visited.
 
     Adds the arguments of the FuncItem to the environment. If the
     FuncItem is nested inside of another function, then this also
     loads all of the outer environments of the FuncItem into registers
     so that they can be used when accessing free variables.
     """
-    add_args_to_env(builder, sig, local=True)
+    add_args_to_env(builder, local=True)
 
     fn_info = builder.fn_info
     fitem = fn_info.fitem
@@ -171,7 +170,6 @@ def num_bitmap_args(builder: IRBuilder, args: list[Argument]) -> int:
 
 def add_args_to_env(
     builder: IRBuilder,
-    sig: FuncSignature,
     local: bool = True,
     base: FuncInfo | ImplicitClass | None = None,
     reassign: bool = True,

mypyc/irbuild/function.py

@@ -275,11 +275,11 @@ def c() -> None:
         create_switch_for_generator_class(builder)
         add_raise_exception_blocks_to_generator_class(builder, fitem.line)
     else:
-        load_env_registers(builder, sig)
+        load_env_registers(builder)
         gen_arg_defaults(builder)
 
     if builder.fn_info.contains_nested and not builder.fn_info.is_generator:
-        finalize_env_class(builder, sig)
+        finalize_env_class(builder)
 
     builder.ret_types[-1] = sig.ret_type
 

mypyc/irbuild/generator.py

@@ -51,9 +51,9 @@
 
 def gen_generator_func(builder: IRBuilder, sig: FuncSignature) -> None:
     setup_generator_class(builder)
-    load_env_registers(builder, sig)
+    load_env_registers(builder)
     gen_arg_defaults(builder)
-    finalize_env_class(builder, sig)
+    finalize_env_class(builder)
     builder.add(Return(instantiate_generator_class(builder)))
 
 
@@ -340,7 +340,7 @@ def setup_env_for_generator_class(builder: IRBuilder, sig: FuncSignature) -> Non
 
     # Add arguments from the original generator function to the
     # environment of the generator class.
-    add_args_to_env(builder, sig, local=False, base=cls, reassign=False)
+    add_args_to_env(builder, local=False, base=cls, reassign=False)
 
     # Set the next label register for the generator class.
     cls.next_label_reg = builder.read(cls.next_label_target, fitem.line)

mypyc/irbuild/ll_builder.py

@@ -1440,6 +1440,7 @@ def dunder_op(self, lreg: Value, rreg: Value | None, op: str, line: int) -> Valu
 
         if op == "in" and method_name == "__contains__":
             # contains needs to swap the r and l values
+            assert rreg, "'in' operator is binary and must have a valid right value"
             tmp = lreg
             lreg = rreg
             rreg = tmp

mypyc/test-data/run-valuetype.test

@@ -246,6 +246,23 @@ class A:
     def __repr__(self) -> str:
         return f"A({self.x})"
 
+def test_direct_dunders() -> None:
+    a = A(1, 2)
+    assert a.__hash__() == hash(1)
+    assert a.__eq__(A(1, 2))
+    assert not a.__eq__(A(2, 3))
+    assert a.__len__() == 1
+    assert a.__lt__(A(2, 3))
+    assert a.__le__(A(2, 3))
+    assert not a.__gt__(A(2, 3))
+    assert not a.__ge__(A(2, 3))
+    assert a.__contains__(1)
+    assert not a.__contains__(2)
+    assert a.__bool__()
+    assert not A(0, 1).__bool__()
+    assert a.__str__() == "A(1)"
+    assert a.__repr__() == "A(1)"
+
 def test_value_type_in_key() -> None:
     a = A(1, 2)
     d = {a: 1}

mypyc/test/test_run.py

@@ -413,7 +413,23 @@ class TestRunStrictDunderTyping(TestRun):
 
     strict_dunder_typing = True
     test_name_suffix = "_dunder_typing"
-    files = ["run-dunders.test", "run-floats.test"]
+    files = [
+        "run-async.test",
+        "run-bools.test",
+        "run-bytes.test",
+        "run-classes.test",
+        "run-dunders.test",
+        "run-exceptions.test",
+        "run-floats.test",
+        "run-functions.test",
+        "run-generators.test",
+        "run-i16.test",
+        "run-i32.test",
+        "run-i64.test",
+        "run-integers.test",
+        "run-lists.test",
+        "run-traits.test",
+    ] + (["run-match.test"] if sys.version_info >= (3, 10) else [])
 
 
 def fix_native_line_number(message: str, fnam: str, delta: int) -> str: