xpath: Apply predicate list before sorting result when evaluating location step expression #40592
+43
−68
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
servo-highfive
added
the
S-awaiting-review
servo-highfive
removed
the
S-awaiting-review
servo-highfive
added
the
S-awaiting-merge
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
servo-highfive
added
S-tests-failed
simonwuelker
force-pushed
the
xpath-sorting-predicates
branch
from
29e4a21 to
5e475e3
Compare
servo-highfive
added
S-awaiting-review
Member
|
We need to merge #40595 first to fix yanked crate. |
Contributor
Author
|
My bad, I thought rebasing was enough. |
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
yezhizhen
force-pushed
the
xpath-sorting-predicates
branch
from
5e475e3 to
c7d7049
Compare
Member
|
Emm I clicked "rebase branch" in GitHub UI. I thought it would be seamless but somehow got me involved too. Feel free to repush by yourself. @simonwuelker |
servo-highfive
added
the
S-awaiting-merge
Contributor
Author
I don't mind (: |
servo-highfive
removed
the
S-awaiting-merge
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 13, 2025
When a NodeSet is passed to the `id` function then we want to act as if we were computing the union of individual `id` calls for each node in the set. We weren't doing that before. Depends on #40592 Testing: A new test starts to pass --------- Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 13, 2025
When a NodeSet is passed to the `id` function then we want to act as if we were computing the union of individual `id` calls for each node in the set. We weren't doing that before. Depends on #40592 Testing: A new test starts to pass --------- Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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 result of a predicate can depend on the position of the node in its set, and this position is dependent on the axis that the node set came from. This is specified in https://www.w3.org/TR/1999/REC-xpath-19991116/#predicates.
Additionally, this change fixes a small bug in the implementation of
preceding::(#40588) where the root of a subtree would be included twice. That wasn't discovered earlier because nodes are deduplicated at the end of the evaluation.Testing: New tests start to pass, this change adds more tests