Skip to content

bpo-42282: Fold constants inside named expressions #23190

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.

Sign up for GitHub

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
ncoghlan merged 5 commits into from
Nov 7, 2020
Merged

bpo-42282: Fold constants inside named expressions #23190

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ca7c28
bpo-42282: Fold constants inside named expressions
ncoghlan Nov 7, 2020
45e3d50
Fix inverted comparison op folding
ncoghlan Nov 7, 2020
3addcc9
Fix comment
ncoghlan Nov 7, 2020
f8e52c0
Still clear errors that occur in constant folding
ncoghlan Nov 7, 2020
a4741aa
Minor code tweak (need to trigger new CI run anyway)
ncoghlan Nov 7, 2020
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
Prev Previous commit
Next Next commit
Fix inverted comparison op folding
  • Loading branch information
@ncoghlan
ncoghlan committed Nov 7, 2020
commit 45e3d50ae29fab97065a91fee1e4d9f98bbbe6d2
11 changes: 10 additions & 1 deletion Python/ast_opt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fold_unaryop(expr_ty node, PyArena *arena, _PyASTOptimizeState *state)
of !=. Detecting such cases doesn't seem worthwhile.
Python uses </> for 'is subset'/'is superset' operations on sets.
They don't satisfy not folding laws. */
int op = asdl_seq_GET(arg->v.Compare.ops, 0);
cmpop_ty op = asdl_seq_GET(arg->v.Compare.ops, 0);
switch (op) {
case Is:
op = IsNot;
Expand All @@ -63,6 +63,15 @@ fold_unaryop(expr_ty node, PyArena *arena, _PyASTOptimizeState *state)
case NotIn:
op = In;
break;
// The remaining comparison operators can't be safely inverted
case Eq:
case NotEq:
case Lt:
case LtE:
case Gt:
case GtE:
op = 0; // The AST enums leave "0" free as an "unused" marker
break;
// No default case, so the compiler will emit a warning if new
// unary operators are added without being handled here
}
Expand Down