Skip to content

Commit 32a9ab6

Browse files
pre-commit-ci[bot]BobTheBuidler
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent e4513ba commit 32a9ab6

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
@@ -1247,17 +1247,18 @@ def get_expr_length_value(
12471247
def _is_supported_forloop_iter(builder: IRBuilder, expr: Expression) -> bool:
12481248
if is_sequence_rprimitive(builder.node_type(expr)):
12491249
return True
1250-
return (
1251-
isinstance(expr, CallExpr)
1252-
and (
1253-
(isinstance(expr.callee, RefExpr) and expr.callee.fullname in {
1254-
"builtins.range", "builtins.enumerate", "builtins.zip", "builtins.reversed"
1255-
})
1256-
or (isinstance(expr.callee, MemberExpr) and expr.callee.name in {"keys", "values", "items"})
1250+
return isinstance(expr, CallExpr) and (
1251+
(
1252+
isinstance(expr.callee, RefExpr)
1253+
and expr.callee.fullname
1254+
in {"builtins.range", "builtins.enumerate", "builtins.zip", "builtins.reversed"}
1255+
)
1256+
or (
1257+
isinstance(expr.callee, MemberExpr) and expr.callee.name in {"keys", "values", "items"}
12571258
)
12581259
)
12591260

1260-
1261+
12611262
def _create_iterable_lexpr(index_name: str, index_type: Type) -> NameExpr:
12621263
"""This helper spoofs a NameExpr to use as the lvalue in one of the for loop helpers."""
12631264
index = NameExpr(index_name)

mypyc/irbuild/specialize.py

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
from mypyc.irbuild.builder import IRBuilder
8080
from mypyc.irbuild.constant_fold import constant_fold_expr
8181
from mypyc.irbuild.for_helpers import (
82-
_is_supported_forloop_iter,
8382
_create_iterable_lexpr,
83+
_is_supported_forloop_iter,
8484
comprehension_helper,
8585
for_loop_helper,
8686
sequence_from_generator_preallocate_helper,
@@ -438,15 +438,7 @@ def body_insts() -> None:
438438
index = _create_iterable_lexpr(index_name, index_type)
439439
index_reg = builder.add_local_reg(index.node, builder.type_to_rtype(index_type))
440440

441-
for_loop_helper(
442-
builder,
443-
index,
444-
arg,
445-
body_insts,
446-
None,
447-
is_async=False,
448-
line=expr.line,
449-
)
441+
for_loop_helper(builder, index, arg, body_insts, None, is_async=False, line=expr.line)
450442
builder.goto_and_activate(loop_exit)
451443
return retval
452444
return None
@@ -479,20 +471,12 @@ def body_insts() -> None:
479471
builder.assign(retval, builder.false(), -1)
480472
builder.goto(loop_exit)
481473
builder.activate_block(true_block)
482-
474+
483475
index_type = builder._analyze_iterable_item_type(arg)
484476
index = _create_iterable_lexpr(index_name, index_type)
485477
index_reg = builder.add_local_reg(index.node, builder.type_to_rtype(index_type))
486478

487-
for_loop_helper(
488-
builder,
489-
index,
490-
arg,
491-
body_insts,
492-
None,
493-
is_async=False,
494-
line=expr.line,
495-
)
479+
for_loop_helper(builder, index, arg, body_insts, None, is_async=False, line=expr.line)
496480
builder.goto_and_activate(loop_exit)
497481
return retval
498482
return None

0 commit comments

Comments
 (0)