Address review comments

Author: p-sawicki

mypyc/primitives/bytes_ops.py

@@ -36,7 +36,7 @@
     error_kind=ERR_MAGIC,
 )
 
-# isinstance(obj, bytes)
+# translate isinstance(obj, bytes)
 isinstance_bytes = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],
@@ -54,7 +54,7 @@
     error_kind=ERR_MAGIC,
 )
 
-# isinstance(obj, bytearray)
+# translate isinstance(obj, bytearray)
 isinstance_bytearray = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],

mypyc/primitives/dict_ops.py

@@ -71,7 +71,7 @@
     error_kind=ERR_MAGIC,
 )
 
-# isinstance(obj, dict)
+# translate isinstance(obj, dict)
 isinstance_dict = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],

mypyc/primitives/float_ops.py

@@ -168,6 +168,7 @@
     error_kind=ERR_NEVER,
 )
 
+# translate isinstance(obj, float)
 isinstance_float = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],

mypyc/primitives/int_ops.py

@@ -297,7 +297,7 @@ def int_unary_op(name: str, c_function_name: str) -> PrimitiveDescription:
     error_kind=ERR_ALWAYS,
 )
 
-# isinstance(obj, int)
+# translate isinstance(obj, int)
 isinstance_int = function_op(
     name="builtints.isinstance",
     arg_types=[object_rprimitive],

mypyc/primitives/list_ops.py

@@ -56,7 +56,7 @@
     extra_int_constants=[(0, int_rprimitive)],
 )
 
-# isinstance(obj, list)
+# translate isinstance(obj, list)
 isinstance_list = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],

mypyc/primitives/set_ops.py

@@ -64,7 +64,7 @@
     error_kind=ERR_MAGIC,
 )
 
-# isinstance(obj, set)
+# translate isinstance(obj, set)
 isinstance_set = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],
@@ -73,7 +73,7 @@
     error_kind=ERR_NEVER,
 )
 
-# isinstance(obj, frozenset)
+# translate isinstance(obj, frozenset)
 isinstance_frozenset = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],

mypyc/primitives/str_ops.py

@@ -48,7 +48,7 @@
     error_kind=ERR_MAGIC,
 )
 
-# isinstance(obj, str)
+# translate isinstance(obj, str)
 isinstance_str = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],

mypyc/primitives/tuple_ops.py

@@ -84,7 +84,7 @@
     error_kind=ERR_MAGIC,
 )
 
-# isinstance(obj, tuple)
+# translate isinstance(obj, tuple)
 isinstance_tuple = function_op(
     name="builtins.isinstance",
     arg_types=[object_rprimitive],

mypyc/test-data/run-bools.test

@@ -230,13 +230,27 @@ def test_mix() -> None:
 0
 
 [case testIsInstance]
+from typing import Any
 def test_built_in() -> None:
-    assert isinstance(True, bool)
-    assert isinstance(False, bool)
+    true: Any = True
+    false: Any = False
+    assert isinstance(true, bool)
+    assert isinstance(false, bool)
 
     assert not isinstance(set(), bool)
     assert not isinstance((), bool)
     assert not isinstance((True, False), bool)
     assert not isinstance({False, True}, bool)
-    assert not isinstance(1, bool)
-    assert not isinstance('False', bool)
+    assert not isinstance(int() + 1, bool)
+    assert not isinstance(str() + 'False', bool)
+
+def test_user_defined() -> None:
+    from userdefinedbool import bool
+
+    b: Any = True
+    assert isinstance(bool(), bool)
+    assert not isinstance(b, bool)
+
+[file userdefinedbool.py]
+class bool:
+    pass

mypyc/test-data/run-bytes.test

@@ -326,20 +326,22 @@ def test_bytes_dunder() -> None:
 
 [case testIsInstance]
 from copysubclass import subbytes, subbytearray
+from typing import Any
 def test_bytes() -> None:
-    assert isinstance(b'', bytes)
-    assert isinstance(b'123', bytes)
-    assert isinstance(b'\xff', bytes)
+    b: Any = b''
+    assert isinstance(b, bytes)
+    assert isinstance(b + b'123', bytes)
+    assert isinstance(b + b'\xff', bytes)
     assert isinstance(subbytes(), bytes)
-    assert isinstance(subbytes(b'123'), bytes)
-    assert isinstance(subbytes(b'\xff'), bytes)
+    assert isinstance(subbytes(b + b'123'), bytes)
+    assert isinstance(subbytes(b + b'\xff'), bytes)
 
     assert not isinstance(set(), bytes)
     assert not isinstance((), bytes)
     assert not isinstance((b'1',b'2',b'3'), bytes)
     assert not isinstance({b'a',b'b'}, bytes)
-    assert not isinstance(1, bytes)
-    assert not isinstance('a', bytes)
+    assert not isinstance(int() + 1, bytes)
+    assert not isinstance(str() + 'a', bytes)
 
 def test_user_defined_bytes() -> None:
     from userdefinedbytes import bytes
@@ -359,8 +361,8 @@ def test_bytearray() -> None:
     assert not isinstance((), bytearray)
     assert not isinstance((bytearray(b'1'),bytearray(b'2'),bytearray(b'3')), bytearray)
     assert not isinstance([bytearray(b'a'),bytearray(b'b')], bytearray)
-    assert not isinstance(1, bytearray)
-    assert not isinstance('a', bytearray)
+    assert not isinstance(int() + 1, bytearray)
+    assert not isinstance(str() + 'a', bytearray)
 
 [file copysubclass.py]
 class subbytes(bytes):