Merge branch 'to-bytes' of https://github.com/BobTheBuidler/mypy into to-bytes

Author: BobTheBuidler

mypyc/primitives/int_ops.py

@@ -307,21 +307,12 @@ def int_unary_op(name: str, c_function_name: str) -> PrimitiveDescription:
     error_kind=ERR_NEVER,
 )
 
-
-# int.to_bytes(length, byteorder, signed=...)
-int_to_bytes_op = custom_op(
-    arg_types=[int_rprimitive, int_rprimitive, str_rprimitive, bool_rprimitive],
-    return_type=bytes_rprimitive,
-    c_function_name="CPyTagged_ToBytes",
-    error_kind=ERR_MAGIC,
-)
-
-# specialized custom_op cases for int.to_bytes:
+# specialized custom_op cases for int.to_bytes
 
 # int.to_bytes(length, "big")
 # int.to_bytes(length, "big", signed=...)
 int_to_big_endian_op = custom_op(
-    arg_types=[int_rprimitive, int_rprimitive, bool_rprimitive],
+    arg_types=[int_rprimitive, c_pyssize_t_rprimitive, bool_rprimitive],
     return_type=bytes_rprimitive,
     c_function_name="CPyTagged_ToBigEndianBytes",
     error_kind=ERR_MAGIC,
@@ -330,8 +321,16 @@ def int_unary_op(name: str, c_function_name: str) -> PrimitiveDescription:
 # int.to_bytes(length, "little")
 # int.to_bytes(length, "little", signed=...)
 int_to_little_endian_op = custom_op(
-    arg_types=[int_rprimitive, int_rprimitive, bool_rprimitive],
+    arg_types=[int_rprimitive, c_pyssize_t_rprimitive, bool_rprimitive],
     return_type=bytes_rprimitive,
     c_function_name="CPyTagged_ToLittleEndianBytes",
     error_kind=ERR_MAGIC,
 )
+
+# int.to_bytes(length, byteorder, signed=...)
+int_to_bytes_op = custom_op(
+    arg_types=[int_rprimitive, c_pyssize_t_rprimitive, str_rprimitive, bool_rprimitive],
+    return_type=bytes_rprimitive,
+    c_function_name="CPyTagged_ToBytes",
+    error_kind=ERR_MAGIC,
+)

mypyc/test-data/irbuild-int.test

@@ -224,15 +224,15 @@ def f(x):
     x :: int
     r0 :: bytes
 L0:
-    r0 = CPyTagged_ToBigEndianBytes(x, 4, 0)
+    r0 = CPyTagged_ToBigEndianBytes(x, 2, 0)
     return r0
 def g(x):
     x :: int
     r0 :: bytes
 L0:
-    r0 = CPyTagged_ToLittleEndianBytes(x, 8, 1)
+    r0 = CPyTagged_ToLittleEndianBytes(x, 4, 1)
     return r0
-def h(x):
+def h(x, byteorder):
     x :: int
     byteorder :: str
     r0 :: bytes

mypyc/test-data/run-integers.test

@@ -578,12 +578,12 @@ from testutil import assertRaises
 def to_bytes(n: int, length: int, byteorder: str, signed: bool = False) -> bytes:
     return n.to_bytes(length, byteorder, signed=signed)
 def test_to_bytes() -> None:
-    assert to_bytes(255, 2, "big") == b'\x00\xff'
-    assert to_bytes(255, 2, "little") == b'\xff\x00'
-    assert to_bytes(-1, 2, "big", True) == b'\xff\xff'
-    assert to_bytes(0, 1, "big") == b'\x00'
+    assert to_bytes(255, 2, "big") == b'\x00\xff', to_bytes(255, 2, "big")
+    assert to_bytes(255, 2, "little") == b'\xff\x00', to_bytes(255, 2, "little")
+    assert to_bytes(-1, 2, "big", True) == b'\xff\xff', to_bytes(-1, 2, "big", True)
+    assert to_bytes(0, 1, "big") == b'\x00', to_bytes(0, 1, "big")
     # test with a value that does not fit in 64 bits
-    assert to_bytes(10**30, 16, "big") == b'\x00\x00\x00\x0c\x9f,\x9c\xd0Ft\xed\xea@\x00\x00\x00'
+    assert to_bytes(10**30, 16, "big") == b'\x00\x00\x00\x0c\x9f,\x9c\xd0Ft\xed\xea@\x00\x00\x00', to_bytes(10**30, 16, "big")
     # unsigned, too large for 1 byte
     with assertRaises(OverflowError):
         to_bytes(256, 1, "big")