Code review

Author: cdce8p

mypyc/test-data/irbuild-tuple.test

@@ -389,10 +389,32 @@ L4:
 from typing import Tuple
 def f(a: Tuple[int, ...], b: Tuple[int, ...]) -> None:
     c = a + b
+    d = a + (1, 2)
+def g(a: Tuple[int, int], b: Tuple[int, int]) -> None:
+    c = a + b
 [out]
 def f(a, b):
     a, b, r0, c :: tuple
+    r1 :: tuple[int, int]
+    r2 :: object
+    r3, d :: tuple
 L0:
     r0 = PySequence_Concat(a, b)
     c = r0
+    r1 = (2, 4)
+    r2 = box(tuple[int, int], r1)
+    r3 = PySequence_Concat(a, r2)
+    d = r3
+    return 1
+def g(a, b):
+    a, b :: tuple[int, int]
+    r0, r1 :: object
+    r2 :: tuple
+    r3, c :: tuple[int, int, int, int]
+L0:
+    r0 = box(tuple[int, int], a)
+    r1 = box(tuple[int, int], b)
+    r2 = PySequence_Concat(r0, r1)
+    r3 = unbox(tuple[int, int, int, int], r2)
+    c = r3
     return 1

mypyc/test-data/run-lists.test

@@ -267,7 +267,7 @@ print(g())
 7
 
 [case testListOps]
-from typing import Any
+from typing import Any, cast
 from testutil import assertRaises
 
 def test_slicing() -> None:
@@ -301,7 +301,12 @@ def test_add() -> None:
     res = [1, 2, 3, 4]
     assert [1, 2] + [3, 4] == res
     with assertRaises(TypeError, 'can only concatenate list (not "tuple") to list'):
-        assert [1, 2] + (3, 4) == res  # type: ignore[operator]
+        assert [1, 2] + cast(Any, (3, 4)) == res
+    l1 = [1, 2]
+    id_l1 = id(l1)
+    l1 += [3, 4]
+    assert l1 == res
+    assert id_l1 == id(l1)
     assert in_place_add([3, 4]) == res
     assert in_place_add((3, 4)) == res
     assert in_place_add({3, 4}) == res

mypyc/test-data/run-tuples.test

@@ -146,7 +146,7 @@ assert Record.__annotations__ == {
 }, Record.__annotations__
 
 [case testTupleOps]
-from typing import Tuple, Final, List, Any, Optional
+from typing import Tuple, Final, List, Any, Optional, cast
 from testutil import assertRaises
 
 def f() -> Tuple[()]:
@@ -260,4 +260,4 @@ def test_add() -> None:
     res = (1, 2, 3, 4)
     assert (1, 2) + (3, 4) == res
     with assertRaises(TypeError, 'can only concatenate tuple (not "list") to tuple'):
-        assert (1, 2) + [3, 4] == res  # type: ignore[operator]
+        assert (1, 2) + cast(Any, [3, 4]) == res