Skip to content

bpo-46820: Fix a SyntaxError in a numeric literal followed by "not in" #31479

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.

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
merged 1 commit into from
Feb 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions Lib/test/test_grammar.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,15 @@ def check_error(test):
check("1e3in x")
check("1jin x")

check("0xfnot in x")
check("0o7not in x")
check("0b1not in x")
check("9not in x")
check("0not in x")
check("1.not in x")
check("1e3not in x")
check("1jnot in x")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit: At this point maybe we want to make these strings dynamically:

for infix in ["and", "or", "in", "not in"]:
        check(f"0xf{infix} x")
        check(f"0o7{infix} x")
        check(f"0b1{infix} x")
        check(f"9{infix} x")
        check(f"0{infix} x")
        check(f"1.{infix} x")
        check(f"1e3{infix} x")
        check(f"1j{infix} x")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll rewrite tests in a separate PR.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a test with an underscore literal, just for completeness' sake?

Suggested change
check("1jnot in x")
check("1jnot in x")
check("1_000not in x")


with warnings.catch_warnings():
warnings.simplefilter('ignore', SyntaxWarning)
check("0xfis x")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix parsing a numeric literal immediately (without spaces) followed by "not
in" keywords, like in ``1not in x``. Now the parser only emits a warning,
not a syntax error.
3 changes: 3 additions & 0 deletions Parser/tokenizer.c
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,9 @@ verify_end_of_number(struct tok_state *tok, int c, const char *kind)
else if (c == 'o') {
r = lookahead(tok, "r");
}
else if (c == 'n') {
r = lookahead(tok, "ot");
}
if (r) {
tok_backup(tok, c);
if (parser_warn(tok, "invalid %s literal", kind)) {
Expand Down