Skip to content

Commit 66cae4b

Browse files
authored
[mypyc] Refactor: rename c_unary_op to unary_op (#10803)
We've been getting rid of the `c_` prefixes.
1 parent d569ccc commit 66cae4b

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

mypyc/primitives/generic_ops.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
object_pointer_rprimitive, c_size_t_rprimitive, c_pyssize_t_rprimitive
1616
)
1717
from mypyc.primitives.registry import (
18-
binary_op, c_unary_op, method_op, function_op, custom_op, ERR_NEG_INT
18+
binary_op, unary_op, method_op, function_op, custom_op, ERR_NEG_INT
1919
)
2020

2121

@@ -97,14 +97,14 @@
9797
for op, funcname in [('-', 'PyNumber_Negative'),
9898
('+', 'PyNumber_Positive'),
9999
('~', 'PyNumber_Invert')]:
100-
c_unary_op(name=op,
101-
arg_type=object_rprimitive,
102-
return_type=object_rprimitive,
103-
c_function_name=funcname,
104-
error_kind=ERR_MAGIC,
105-
priority=0)
100+
unary_op(name=op,
101+
arg_type=object_rprimitive,
102+
return_type=object_rprimitive,
103+
c_function_name=funcname,
104+
error_kind=ERR_MAGIC,
105+
priority=0)
106106

107-
c_unary_op(
107+
unary_op(
108108
name='not',
109109
arg_type=object_rprimitive,
110110
return_type=c_int_rprimitive,

mypyc/primitives/int_ops.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
str_rprimitive, bit_rprimitive, RType
1616
)
1717
from mypyc.primitives.registry import (
18-
load_address_op, c_unary_op, CFunctionDescription, function_op, binary_op, custom_op
18+
load_address_op, unary_op, CFunctionDescription, function_op, binary_op, custom_op
1919
)
2020

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

115115

116116
def int_unary_op(name: str, c_function_name: str) -> CFunctionDescription:
117-
return c_unary_op(name=name,
118-
arg_type=int_rprimitive,
119-
return_type=int_rprimitive,
120-
c_function_name=c_function_name,
121-
error_kind=ERR_NEVER)
117+
return unary_op(name=name,
118+
arg_type=int_rprimitive,
119+
return_type=int_rprimitive,
120+
c_function_name=c_function_name,
121+
error_kind=ERR_NEVER)
122122

123123

124124
int_neg_op = int_unary_op('-', 'CPyTagged_Negate')

mypyc/primitives/registry.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,17 @@ def custom_op(arg_types: List[RType],
202202
extra_int_constants, 0)
203203

204204

205-
def c_unary_op(name: str,
206-
arg_type: RType,
207-
return_type: RType,
208-
c_function_name: str,
209-
error_kind: int,
210-
truncated_type: Optional[RType] = None,
211-
ordering: Optional[List[int]] = None,
212-
extra_int_constants: List[Tuple[int, RType]] = [],
213-
steals: StealsDescription = False,
214-
is_borrowed: bool = False,
215-
priority: int = 1) -> CFunctionDescription:
205+
def unary_op(name: str,
206+
arg_type: RType,
207+
return_type: RType,
208+
c_function_name: str,
209+
error_kind: int,
210+
truncated_type: Optional[RType] = None,
211+
ordering: Optional[List[int]] = None,
212+
extra_int_constants: List[Tuple[int, RType]] = [],
213+
steals: StealsDescription = False,
214+
is_borrowed: bool = False,
215+
priority: int = 1) -> CFunctionDescription:
216216
"""Define a c function call op for an unary operation.
217217
218218
This will be automatically generated by matching against the AST.

0 commit comments

Comments
 (0)