Skip to content

[mypyc] Refactor: rename c_unary_op to unary_op for consistency #10803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions mypyc/primitives/generic_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
object_pointer_rprimitive, c_size_t_rprimitive, c_pyssize_t_rprimitive
)
from mypyc.primitives.registry import (
binary_op, c_unary_op, method_op, function_op, custom_op, ERR_NEG_INT
binary_op, unary_op, method_op, function_op, custom_op, ERR_NEG_INT
)


Expand Down Expand Up @@ -97,14 +97,14 @@
for op, funcname in [('-', 'PyNumber_Negative'),
('+', 'PyNumber_Positive'),
('~', 'PyNumber_Invert')]:
c_unary_op(name=op,
arg_type=object_rprimitive,
return_type=object_rprimitive,
c_function_name=funcname,
error_kind=ERR_MAGIC,
priority=0)
unary_op(name=op,
arg_type=object_rprimitive,
return_type=object_rprimitive,
c_function_name=funcname,
error_kind=ERR_MAGIC,
priority=0)

c_unary_op(
unary_op(
name='not',
arg_type=object_rprimitive,
return_type=c_int_rprimitive,
Expand Down
12 changes: 6 additions & 6 deletions mypyc/primitives/int_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
str_rprimitive, bit_rprimitive, RType
)
from mypyc.primitives.registry import (
load_address_op, c_unary_op, CFunctionDescription, function_op, binary_op, custom_op
load_address_op, unary_op, CFunctionDescription, function_op, binary_op, custom_op
)

# These int constructors produce object_rprimitives that then need to be unboxed
Expand Down Expand Up @@ -114,11 +114,11 @@ def int_binary_op(name: str, c_function_name: str,


def int_unary_op(name: str, c_function_name: str) -> CFunctionDescription:
return c_unary_op(name=name,
arg_type=int_rprimitive,
return_type=int_rprimitive,
c_function_name=c_function_name,
error_kind=ERR_NEVER)
return unary_op(name=name,
arg_type=int_rprimitive,
return_type=int_rprimitive,
c_function_name=c_function_name,
error_kind=ERR_NEVER)


int_neg_op = int_unary_op('-', 'CPyTagged_Negate')
Expand Down
22 changes: 11 additions & 11 deletions mypyc/primitives/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,17 +202,17 @@ def custom_op(arg_types: List[RType],
extra_int_constants, 0)


def c_unary_op(name: str,
arg_type: RType,
return_type: RType,
c_function_name: str,
error_kind: int,
truncated_type: Optional[RType] = None,
ordering: Optional[List[int]] = None,
extra_int_constants: List[Tuple[int, RType]] = [],
steals: StealsDescription = False,
is_borrowed: bool = False,
priority: int = 1) -> CFunctionDescription:
def unary_op(name: str,
arg_type: RType,
return_type: RType,
c_function_name: str,
error_kind: int,
truncated_type: Optional[RType] = None,
ordering: Optional[List[int]] = None,
extra_int_constants: List[Tuple[int, RType]] = [],
steals: StealsDescription = False,
is_borrowed: bool = False,
priority: int = 1) -> CFunctionDescription:
"""Define a c function call op for an unary operation.

This will be automatically generated by matching against the AST.
Expand Down