Skip to content

Commit ce74b2f

Browse files
committed
Lint
1 parent bcf9bbc commit ce74b2f

File tree

4 files changed

+31
-30
lines changed

4 files changed

+31
-30
lines changed

mypyc/irbuild/generator.py

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
from typing import Callable
1414

1515
from mypy.nodes import ARG_OPT, FuncDef, Var
16-
from mypyc.common import ENV_ATTR_NAME, NEXT_LABEL_ATTR_NAME, SELF_NAME
16+
from mypyc.common import ENV_ATTR_NAME, NEXT_LABEL_ATTR_NAME
1717
from mypyc.ir.class_ir import ClassIR
18-
from mypyc.ir.func_ir import FuncDecl, FuncIR, FuncSignature, RuntimeArg
18+
from mypyc.ir.func_ir import FuncDecl, FuncIR
1919
from mypyc.ir.ops import (
2020
NO_TRACEBACK_LINE_NO,
2121
BasicBlock,
@@ -78,9 +78,7 @@ def gen_generator_func(
7878
return func_ir, func_reg
7979

8080

81-
def gen_generator_func_body(
82-
builder: IRBuilder, fn_info: FuncInfo, func_reg: Value | None
83-
) -> None:
81+
def gen_generator_func_body(builder: IRBuilder, fn_info: FuncInfo, func_reg: Value | None) -> None:
8482
"""Generate IR based on the body of a generator function.
8583
8684
Add "__next__", "__iter__" and other generator methods to the generator
@@ -229,10 +227,7 @@ def add_methods_to_generator_class(
229227

230228

231229
def add_helper_to_generator_class(
232-
builder: IRBuilder,
233-
arg_regs: list[Register],
234-
blocks: list[BasicBlock],
235-
fn_info: FuncInfo,
230+
builder: IRBuilder, arg_regs: list[Register], blocks: list[BasicBlock], fn_info: FuncInfo
236231
) -> FuncDecl:
237232
"""Generates a helper method for a generator class, called by '__next__' and 'throw'."""
238233
helper_fn_decl = fn_info.generator_class.ir.method_decls["__mypyc_generator_helper__"]
@@ -252,9 +247,7 @@ def add_iter_to_generator_class(builder: IRBuilder, fn_info: FuncInfo) -> None:
252247
builder.add(Return(builder.self()))
253248

254249

255-
def add_next_to_generator_class(
256-
builder: IRBuilder, fn_info: FuncInfo, fn_decl: FuncDecl
257-
) -> None:
250+
def add_next_to_generator_class(builder: IRBuilder, fn_info: FuncInfo, fn_decl: FuncDecl) -> None:
258251
"""Generates the '__next__' method for a generator class."""
259252
with builder.enter_method(fn_info.generator_class.ir, "__next__", object_rprimitive, fn_info):
260253
none_reg = builder.none_object()
@@ -269,9 +262,7 @@ def add_next_to_generator_class(
269262
builder.add(Return(result))
270263

271264

272-
def add_send_to_generator_class(
273-
builder: IRBuilder, fn_info: FuncInfo, fn_decl: FuncDecl
274-
) -> None:
265+
def add_send_to_generator_class(builder: IRBuilder, fn_info: FuncInfo, fn_decl: FuncDecl) -> None:
275266
"""Generates the 'send' method for a generator class."""
276267
with builder.enter_method(fn_info.generator_class.ir, "send", object_rprimitive, fn_info):
277268
arg = builder.add_argument("arg", object_rprimitive)
@@ -287,9 +278,7 @@ def add_send_to_generator_class(
287278
builder.add(Return(result))
288279

289280

290-
def add_throw_to_generator_class(
291-
builder: IRBuilder, fn_info: FuncInfo, fn_decl: FuncDecl
292-
) -> None:
281+
def add_throw_to_generator_class(builder: IRBuilder, fn_info: FuncInfo, fn_decl: FuncDecl) -> None:
293282
"""Generates the 'throw' method for a generator class."""
294283
with builder.enter_method(fn_info.generator_class.ir, "throw", object_rprimitive, fn_info):
295284
typ = builder.add_argument("type", object_rprimitive)

mypyc/irbuild/main.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def f(x: int) -> int:
2525
from typing import Any, Callable, TypeVar, cast
2626

2727
from mypy.build import Graph
28-
from mypy.nodes import ClassDef, Expression, MypyFile, FuncDef
28+
from mypy.nodes import ClassDef, Expression, FuncDef, MypyFile
2929
from mypy.state import state
3030
from mypy.types import Type
3131
from mypyc.analysis.attrdefined import analyze_always_defined_attrs
@@ -37,7 +37,11 @@ def f(x: int) -> int:
3737
from mypyc.irbuild.builder import IRBuilder
3838
from mypyc.irbuild.mapper import Mapper
3939
from mypyc.irbuild.prebuildvisitor import PreBuildVisitor
40-
from mypyc.irbuild.prepare import build_type_map, find_singledispatch_register_impls, create_generator_class_if_needed
40+
from mypyc.irbuild.prepare import (
41+
build_type_map,
42+
create_generator_class_if_needed,
43+
find_singledispatch_register_impls,
44+
)
4145
from mypyc.irbuild.visitor import IRBuilderVisitor
4246
from mypyc.irbuild.vtable import compute_vtable
4347
from mypyc.options import CompilerOptions
@@ -81,7 +85,9 @@ def build_ir(
8185
if isinstance(fdef, FuncDef):
8286
# Make generator class name sufficiently unique.
8387
suffix = f"___{fdef.line}"
84-
create_generator_class_if_needed(module.fullname, None, fdef, mapper, name_suffix=suffix)
88+
create_generator_class_if_needed(
89+
module.fullname, None, fdef, mapper, name_suffix=suffix
90+
)
8591

8692
# Construct and configure builder objects (cyclic runtime dependency).
8793
visitor = IRBuilderVisitor()

mypyc/irbuild/prepare.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from mypy.semanal import refers_to_fullname
3939
from mypy.traverser import TraverserVisitor
4040
from mypy.types import Instance, Type, get_proper_type
41-
from mypyc.common import PROPSET_PREFIX, get_id_from_name, SELF_NAME
41+
from mypyc.common import PROPSET_PREFIX, SELF_NAME, get_id_from_name
4242
from mypyc.crash import catch_errors
4343
from mypyc.errors import Errors
4444
from mypyc.ir.class_ir import ClassIR
@@ -51,7 +51,14 @@
5151
RuntimeArg,
5252
)
5353
from mypyc.ir.ops import DeserMaps
54-
from mypyc.ir.rtypes import RInstance, RType, dict_rprimitive, none_rprimitive, tuple_rprimitive
54+
from mypyc.ir.rtypes import (
55+
RInstance,
56+
RType,
57+
dict_rprimitive,
58+
none_rprimitive,
59+
object_rprimitive,
60+
tuple_rprimitive,
61+
)
5562
from mypyc.irbuild.mapper import Mapper
5663
from mypyc.irbuild.util import (
5764
get_func_def,
@@ -62,7 +69,6 @@
6269
)
6370
from mypyc.options import CompilerOptions
6471
from mypyc.sametype import is_same_type
65-
from mypyc.ir.rtypes import object_rprimitive
6672

6773

6874
def build_type_map(
@@ -220,11 +226,7 @@ def create_generator_class_if_needed(
220226

221227
# The implementation of most generator functionality is behind this magic method.
222228
helper_fn_decl = FuncDecl(
223-
"__mypyc_generator_helper__",
224-
name,
225-
module_name,
226-
helper_sig,
227-
internal=True,
229+
"__mypyc_generator_helper__", name, module_name, helper_sig, internal=True
228230
)
229231
cir.method_decls[helper_fn_decl.name] = helper_fn_decl
230232

mypyc/irbuild/statement.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,11 @@ def emit_yield_from_or_await(
933933
received_reg = Register(object_rprimitive)
934934

935935
helper_method = "__mypyc_generator_helper__"
936-
if isinstance(val, (Call, MethodCall)) and isinstance(val.type, RInstance) and val.type.class_ir.has_method(helper_method):
936+
if (
937+
isinstance(val, (Call, MethodCall))
938+
and isinstance(val.type, RInstance)
939+
and val.type.class_ir.has_method(helper_method)
940+
):
937941
# This is a generated generator class, and we can use a fast path.
938942
iter_val = val
939943
else:

0 commit comments

Comments
 (0)