Skip to content

Commit 841878c

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 05b3d71 commit 841878c

File tree

2 files changed

+13
-28
lines changed

2 files changed

+13
-28
lines changed

mypyc/irbuild/for_helpers.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,17 +1225,18 @@ def get_expr_length_value(
12251225
def _is_supported_forloop_iter(builder: IRBuilder, expr: Expression) -> bool:
12261226
if is_sequence_rprimitive(builder.node_type(expr)):
12271227
return True
1228-
return (
1229-
isinstance(expr, CallExpr)
1230-
and (
1231-
(isinstance(expr.callee, RefExpr) and expr.callee.fullname in {
1232-
"builtins.range", "builtins.enumerate", "builtins.zip", "builtins.reversed"
1233-
})
1234-
or (isinstance(expr.callee, MemberExpr) and expr.callee.name in {"keys", "values", "items"})
1228+
return isinstance(expr, CallExpr) and (
1229+
(
1230+
isinstance(expr.callee, RefExpr)
1231+
and expr.callee.fullname
1232+
in {"builtins.range", "builtins.enumerate", "builtins.zip", "builtins.reversed"}
1233+
)
1234+
or (
1235+
isinstance(expr.callee, MemberExpr) and expr.callee.name in {"keys", "values", "items"}
12351236
)
12361237
)
12371238

1238-
1239+
12391240
def _create_iterable_lexpr(index_name: str, index_type: Type) -> NameExpr:
12401241
"""This helper spoofs a NameExpr to use as the lvalue in one of the for loop helpers."""
12411242
index = NameExpr(index_name)

mypyc/irbuild/specialize.py

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
)
7878
from mypyc.irbuild.builder import IRBuilder
7979
from mypyc.irbuild.for_helpers import (
80-
_is_supported_forloop_iter,
8180
_create_iterable_lexpr,
81+
_is_supported_forloop_iter,
8282
comprehension_helper,
8383
for_loop_helper,
8484
sequence_from_generator_preallocate_helper,
@@ -435,15 +435,7 @@ def body_insts() -> None:
435435
index = _create_iterable_lexpr(index_name, index_type)
436436
index_reg = builder.add_local_reg(index.node, builder.type_to_rtype(index_type))
437437

438-
for_loop_helper(
439-
builder,
440-
index,
441-
arg,
442-
body_insts,
443-
None,
444-
is_async=False,
445-
line=expr.line,
446-
)
438+
for_loop_helper(builder, index, arg, body_insts, None, is_async=False, line=expr.line)
447439
builder.goto_and_activate(loop_exit)
448440
return retval
449441
return None
@@ -476,20 +468,12 @@ def body_insts() -> None:
476468
builder.assign(retval, builder.false(), -1)
477469
builder.goto(loop_exit)
478470
builder.activate_block(true_block)
479-
471+
480472
index_type = builder._analyze_iterable_item_type(arg)
481473
index = _create_iterable_lexpr(index_name, index_type)
482474
index_reg = builder.add_local_reg(index.node, builder.type_to_rtype(index_type))
483475

484-
for_loop_helper(
485-
builder,
486-
index,
487-
arg,
488-
body_insts,
489-
None,
490-
is_async=False,
491-
line=expr.line,
492-
)
476+
for_loop_helper(builder, index, arg, body_insts, None, is_async=False, line=expr.line)
493477
builder.goto_and_activate(loop_exit)
494478
return retval
495479
return None

0 commit comments

Comments
 (0)