mirror of
https://github.com/astral-sh/ruff
synced 2026-01-08 15:14:19 -05:00
## Summary This PR updates the with-items parsing logic to use speculative parsing instead. ### Existing logic First, let's understand the previous logic: 1. The parser sees `(`, it doesn't know whether it's part of a parenthesized with items or a parenthesized expression 2. Consider it a parenthesized with items and perform a hand-rolled speculative parsing 3. Then, verify the assumption and if it's incorrect convert the parsed with items into an appropriate expression which becomes part of the first with item Here, in (3) there are lots of edge cases which we've to deal with: 1. Trailing comma with a single element should be [converted to the expression as is](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2140-L2153)) 2. Trailing comma with multiple elements should be [converted to a tuple expression](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2155-L2178)) 3. Limit the allowed expression based on whether it's [(1)](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2144-L2152)) or [(2)](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2157-L2171)) 4. [Consider postfix expressions](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2181-L2200)) after (3) 5. [Consider `if` expressions](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2203-L2208)) after (3) 6. [Consider binary expressions](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2210-L2228)) after (3) Consider other cases like * [Single generator expression](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2020-L2035)) * [Expecting a comma](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2122-L2130)) And, this is all possible only if we allow parsing these expressions in the [with item parsing logic](9b2cf569b2/crates/ruff_python_parser/src/parser/statement.rs (L2287-L2334)). ### Speculative parsing With #11457 merged, we can simplify this logic by changing the step (3) from above to just rewind the parser back to the `(` if our assumption (parenthesized with-items) was incorrect and then continue parsing it considering parenthesized expression. This also behaves a lot similar to what a PEG parser does which is to consider the first grammar rule and if it fails consider the second grammar rule and so on. resolves: #11639 ## Test Plan - [x] Verify the updated snapshots - [x] Run the fuzzer on around 3000 valid source code (locally)
Ruff Python Parser
Ruff's Python parser is a hand-written recursive descent parser which can parse Python source code into an Abstract Syntax Tree (AST). It also utilizes the Pratt parsing technique to parse expressions with different precedence.
Try out the parser in the playground.
Python version support
The parser supports the latest Python syntax, which is currently Python 3.12.
It does not throw syntax errors if it encounters a syntax feature that is not
supported by the target-version.
This will be fixed in a future release (see https://github.com/astral-sh/ruff/issues/6591).
Contributing
Refer to the contributing guidelines to get started and GitHub issues with the parser label for issues that need help.