XPath: Flatten the AST to make it more flexible #39800
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current XPath AST is tightly tied to the parser grammar. To address issues like #39739, we'll want to do optimization passes on the AST in the future, which requires relaxing it's structure first.
This PR moves the AST structure into a separate module and flattens it into a shape where most expressions are variants of the core
Expressionenum.This also has the nice side effect of being a net reduction in LoC and making the AST significantly easier to read.
I think the difference between the old and new structure is best explained by example.
One of our unit tests parses
concat('hello', ' ', 'world'), and the current AST looks like this:After this change, the AST looks like this:
Testing: No behaviour change intended, covered by existing tests.
Part of #34527