8000 [mypyc] Add bytes primitive type (#10881) · python/mypy@10dc451 · GitHub
[go: up one dir, main page]
Skip to content

Commit 10dc451

Browse files
97littleleaf1197littleleaf11
authored
[mypyc] Add bytes primitive type (#10881)
Replaces #9611.
1 parent 9b10175 commit 10dc451

File tree

13 files changed

+119
-45
lines changed

13 files changed

+119
-45
lines changed

‎mypy/typeshed/stdlib/typing.pyi

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import collections # Needed by aliases like DefaultDict, see mypy issue 2986
22
import sys
33
from abc import ABCMeta, abstractmethod
44
from types import BuiltinFunctionType, CodeType, FrameType, FunctionType, MethodType, ModuleType, TracebackType
5+
from typing_extensions import Literal as _Literal
56

67
if sys.version_info >= (3, 7):
7< 8000 code>8
from types import MethodDescriptorType, MethodWrapperType, WrapperDescriptorType
@@ -563,19 +564,35 @@ class Match(Generic[AnyStr]):
563564
# this match instance.
564565
re: Pattern[AnyStr]
565566
def expand(self, template: AnyStr) -> AnyStr: ...
566-
# TODO: The return for a group may be None, except if __group is 0 or not given.
567+
# group() returns "AnyStr" or "AnyStr | None", depending on the pattern.
567568
@overload
568-
def group(self, __group: Union[str, int] = ...) -> AnyStr: ...
569+
def group(self, __group: _Literal[0] = ...) -> AnyStr: ...
569570
@overload
570-
def group(self, __group1: Union[str, int], __group2: Union[str, int], *groups: Union[str, int]) -> Tuple[AnyStr, ...]: ...
571-
def groups(self, default: AnyStr = ...) -> Sequence[AnyStr]: ...
572-
def groupdict(self, default: AnyStr = ...) -> dict[str, AnyStr]: ...
571+
def group(self, __group: str | int) -> AnyStr | Any: ...
572+
@overload
573+
def group(self, __group1: str | int, __group2: str | int, *groups: str | int) -> Tuple[AnyStr | Any, ...]: ...
574+
# Each item of groups()'s return tuple is either "AnyStr" or
575+
# "AnyStr | None", depending on the pattern.
576+
@overload
577+
def groups(self) -> Tuple[AnyStr | Any, ...]: ...
578+
@overload
579+
def groups(self, default: _T) -> Tuple[AnyStr | _T, ...]: ...
580+
# Each value in groupdict()'s return dict is either "AnyStr" or
581+
# "AnyStr | None", depending on the pattern.
582+
@overload
583+
def groupdict(self) -> dict[str, AnyStr | Any]: ...
584+
@overload
585+
def groupdict(self, default: _T) -> dict[str, AnyStr | _T]: ...
573586
def start(self, __group: Union[int, str] = ...) -> int: ...
574587
def end(self, __group: Union[int, str] = ...) -> int: ...
575588
def span(self, __group: Union[int, str] = ...) -> Tuple[int, int]: ...
576589
@property
577590
def regs(self) -> Tuple[Tuple[int, int], ...]: ... # undocumented
578-
def __getitem__(self, g: Union[int, str]) -> AnyStr: ...
591+
# __getitem__() returns "AnyStr" or "AnyStr | None", depending on the pattern.
592+
@overload
593+
def __getitem__(self, __key: _Literal[0]) -> AnyStr: ...
594+
@overload
595+
def __getitem__(self, __key: int | str) -> AnyStr | Any: ...
579596
if sys.version_info >= (3, 9):
580597
def __class_getitem__(cls, item: Any) -> GenericAlias: ...
581598

‎mypyc/codegen/emit.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
is_list_rprimitive, is_dict_rprimitive, is_set_rprimitive, is_tuple_rprimitive,
1616
is_none_rprimitive, is_object_rprimitive, object_rprimitive, is_str_rprimitive,
1717
int_rprimitive, is_optional_type, optional_value_type, is_int32_rprimitive,
18-
is_int64_rprimitive, is_bit_rprimitive, is_range_rprimitive
18+
is_int64_rprimitive, is_bit_rprimitive, is_range_rprimitive, is_bytes_rprimitive
1919
)
2020
from mypyc.ir.func_ir import FuncDecl
2121
from mypyc.ir.class_ir import ClassIR, all_concrete_classes
@@ -451,8 +451,8 @@ def emit_cast(self,
451451

452452
# TODO: Verify refcount handling.
453453
if (is_list_rprimitive(typ) or is_dict_rprimitive(typ) or is_set_rprimitive(typ)
454-
or is_str_rprimitive(typ) or is_range_rprimitive(typ) or is_float_rprimitive(typ)
455-
or is_int_rprimitive(typ) or is_bool_rprimitive(typ)):
454+
or is_str_rprimitive(typ) or is_bytes_rprimitive(typ) or is_range_rprimitive(typ)
455+
or is_float_rprimitive(typ) or is_int_rprimitive(typ) or is_bool_rprimitive(typ)):
456456
if declare_dest:
457457
self.emit_line('PyObject *{};'.format(dest))
458458
if is_list_rprimitive(typ):
@@ -463,6 +463,8 @@ def emit_cast(self,
463463
prefix = 'PySet'
464464
elif is_str_rprimitive(typ):
465465
prefix = 'PyUnicode'
466+
elif is_bytes_rprimitive(typ):
467+
prefix = 'PyBytes'
466468
elif is_range_rprimitive(typ):
467469
prefix = 'PyRange'
468470
elif is_float_rprimitive(typ):

‎mypyc/ir/rtypes.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,9 @@ def __hash__(self) -> int:
328328
# (PyUnicode).
329329
str_rprimitive: Final = RPrimitive("builtins.str", is_unboxed=False, is_refcounted=True)
330330

331+
# Python bytes object.
332+
bytes_rprimitive: Final = RPrimitive('builtins.bytes', is_unboxed=False, is_refcounted=True)
333+
331334
# Tuple of an arbitrary length (corresponds to Tuple[t, ...], with
332335
# explicit '...').
333336
tuple_rprimitive: Final = RPrimitive("builtins.tuple", is_unboxed=False, is_refcounted=True)
@@ -410,6 +413,10 @@ def is_str_rprimitive(rtype: RType) -> bool:
410413
return isinstance(rtype, RPrimitive) and rtype.name == 'builtins.str'
411414

412415

416+
def is_bytes_rprimitive(rtype: RType) -> bool:
417+
return isinstance(rtype, RPrimitive) and rtype.name == 'builtins.bytes'
418+
419+
413420
def is_tuple_rprimitive(rtype: RType) -> bool:
414421
return isinstance(rtype, RPrimitive) and rtype.name == 'builtins.tuple'
415422

‎mypyc/irbuild/ll_builder.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
c_pyssize_t_rprimitive, is_short_int_rprimitive, is_tagged, PyVarObject, short_int_rprimitive,
3333
is_list_rprimitive, is_tuple_rprimitive, is_dict_rprimitive, is_set_rprimitive, PySetObject,
3434
none_rprimitive, RTuple, is_bool_rprimitive, is_str_rprimitive, c_int_rprimitive,
35-
pointer_rprimitive, PyObject, bit_rprimitive, is_bit_rprimitive,
36-
object_pointer_rprimitive, c_size_t_rprimitive, dict_rprimitive, PyListObject
35+
pointer_rprimitive, PyObject, PyListObject, bit_rprimitive, is_bit_rprimitive,
36+
object_pointer_rprimitive, c_size_t_rprimitive, dict_rprimitive, bytes_rprimitive
3737
)
3838
from mypyc.ir.func_ir import FuncDecl, FuncSignature
3939
from mypyc.ir.class_ir import ClassIR, all_concrete_classes
@@ -802,7 +802,7 @@ def load_str(self, value: str) -> Value:
802802

803803
def load_bytes(self, value: bytes) -> Value:
804804
"""Load a bytes literal value."""
805-
return self.add(LoadLiteral(value, object_rprimitive))
805+
return self.add(LoadLiteral(value, bytes_rprimitive))
806806

807807
def load_complex(self, value: complex) -> Value:
808808
"""Load a complex literal value."""

‎mypyc/irbuild/mapper.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from mypyc.ir.rtypes import (
1313
RType, RUnion, RTuple, RInstance, object_rprimitive, dict_rprimitive, tuple_rprimitive,
1414
none_rprimitive, int_rprimitive, float_rprimitive, str_rprimitive, bool_rprimitive,
15-
list_rprimitive, set_rprimitive, range_rprimitive
15+
list_rprimitive, set_rprimitive, range_rprimitive, bytes_rprimitive
1616
)
1717
from mypyc.ir.func_ir import FuncSignature, FuncDecl, RuntimeArg
1818
from mypyc.ir.class_ir import ClassIR
@@ -43,10 +43,12 @@ def type_to_rtype(self, typ: Optional[Type]) -> RType:
4343
return int_rprimitive
4444
elif typ.type.fullname == 'builtins.float':
4545
return float_rprimitive
46-
elif typ.type.fullname == 'builtins.str':
47-
return str_rprimitive
4846
elif typ.type.fullname == 'builtins.bool':
4947
return bool_rprimitive
48+
elif typ.type.fullname == 'builtins.str':
49+
return str_rprimitive
50+
elif typ.type.fullname == 'builtins.bytes':
51+
return bytes_rprimitive
5052
elif typ.type.fullname == 'builtins.list':
5153
return list_rprimitive
5254
# Dict subclasses are at least somewhat common and we

‎mypyc/primitives/bytes_ops.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"""Primitive bytes ops."""
2+
3+
from mypyc.ir.rtypes import object_rprimitive
4+
from mypyc.primitives.registry import load_address_op
5+
6+
7+
# Get the 'bytes' type object.
8+
load_address_op(
9+
name='builtins.bytes',
10+
type=object_rprimitive,
11+
src='PyBytes_Type')

‎mypyc/primitives/registry.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ def load_address_op(name: str,
239239
# Import various modules that set up global state.
240240
import mypyc.primitives.int_ops # noqa
241241
import mypyc.primitives.str_ops # noqa
242+
import mypyc.primitives.bytes_ops # noqa
242243
import mypyc.primitives.list_ops # noqa
243244
import mypyc.primitives.dict_ops # noqa
244245
import mypyc.primitives.tuple_ops # noqa

‎mypyc/test-data/driver/driver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
def extract_line(tb):
2828
formatted = '\n'.join(format_tb(tb))
29-
m = re.search('File "native.py", line ([0-9]+), in test_', formatted)
29+
m = re.search('File "(native|driver).py", line ([0-9]+), in (test_|<module>)', formatted)
3030
if m is None:
3131
return "0"
3232
return m.group(1)

‎mypyc/test-data/fixtures/ir.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,14 @@ def __truediv__(self, n: complex) -> complex: pass
9696
def __neg__(self) -> complex: pass
9797

9898
class bytes:
99+
@overload
100+
def __init__(self) -> None: pass
101+
@overload
99102
def __init__(self, x: object) -> None: pass
100-
def __add__(self, x: object) -> bytes: pass
101-
def __eq__(self, x:object) -> bool:pass
103+
def __add__(self, x: bytes) -> bytes: pass
104+
def __eq__(self, x: object) -> bool: pass
102105
def __ne__(self, x: object) -> bool: pass
106+
def __getitem__(self, i: int) -> int: pass
103107
def join(self, x: Iterable[object]) -> bytes: pass
104108

105109
class bool(int):

‎mypyc/test-data/irbuild-basic.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ def f() -> bytes:
761761
return b'1234'
762762
[out]
763763
def f():
764-
r0, x, r1 :: object
764+
r0, x, r1 :: bytes
765765
L0:
766766
r0 = b'\xf0'
767767
x = r0

0 commit comments

Comments
 (0)
0