Skip to content
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

Disallow f-strings in match pattern literal #7857

Merged
merged 1 commit into from
Oct 9, 2023

Conversation

dhruvmanila
Copy link
Member

@dhruvmanila dhruvmanila commented Oct 9, 2023

Summary

This PR fixes a bug to disallow f-strings in match pattern literal.

literal_pattern ::=  signed_number
                     | signed_number "+" NUMBER
                     | signed_number "-" NUMBER
                     | strings
                     | "None"
                     | "True"
                     | "False"
                     | signed_number: NUMBER | "-" NUMBER

Source: https://docs.python.org/3/reference/compound_stmts.html#grammar-token-python-grammar-literal_pattern

Also,

$ python /tmp/t.py
  File "/tmp/t.py", line 4
    case "hello " f"{name}":
         ^^^^^^^^^^^^^^^^^^
SyntaxError: patterns may only match literals and attribute lookups

Test Plan

Update existing test case and accordingly the snapshots. Also, add a new test case to verify that the parser does raise an error.

@dhruvmanila dhruvmanila added the bug Something isn't working label Oct 9, 2023
@dhruvmanila dhruvmanila force-pushed the dhruv/fstring-disallowed-in-match-literal branch from 17dd524 to b08dad3 Compare October 9, 2023 08:02
<location:@L> <strings:StringLiteralOrFString+> <end_location:@R> =>? Ok(ast::PatternMatchValue {
<location:@L> <strings:StringLiteral+> <end_location:@R> =>? Ok(ast::PatternMatchValue {
Copy link
Member Author

Choose a reason for hiding this comment

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

Quite a big diff for a one word change 😅

@dhruvmanila dhruvmanila force-pushed the dhruv/fstring-disallowed-in-match-literal branch from b08dad3 to 6dae6fc Compare October 9, 2023 08:04
Copy link
Member

@konstin konstin left a comment

Choose a reason for hiding this comment

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

Could you add a test that f-strings in match raise an error?

@dhruvmanila dhruvmanila force-pushed the dhruv/fstring-disallowed-in-match-literal branch from 6dae6fc to 9a3d882 Compare October 9, 2023 10:01
@dhruvmanila dhruvmanila enabled auto-merge (squash) October 9, 2023 10:05
@dhruvmanila dhruvmanila merged commit 43883b7 into main Oct 9, 2023
15 checks passed
@dhruvmanila dhruvmanila deleted the dhruv/fstring-disallowed-in-match-literal branch October 9, 2023 10:11
@github-actions
Copy link
Contributor

github-actions bot commented Oct 9, 2023

PR Check Results

Ecosystem

✅ ecosystem check detected no changes.

konstin pushed a commit that referenced this pull request Oct 11, 2023
## Summary

This PR fixes a bug to disallow f-strings in match pattern literal.

```
literal_pattern ::=  signed_number
                     | signed_number "+" NUMBER
                     | signed_number "-" NUMBER
                     | strings
                     | "None"
                     | "True"
                     | "False"
                     | signed_number: NUMBER | "-" NUMBER
```

Source:
https://docs.python.org/3/reference/compound_stmts.html#grammar-token-python-grammar-literal_pattern

Also,

```console
$ python /tmp/t.py
  File "/tmp/t.py", line 4
    case "hello " f"{name}":
         ^^^^^^^^^^^^^^^^^^
SyntaxError: patterns may only match literals and attribute lookups
```

## Test Plan

Update existing test case and accordingly the snapshots. Also, add a new
test case to verify that the parser does raise an error.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants