fix(engine): use depth-based cursor restoration in Call/Return#233
Merged
fix(engine): use depth-based cursor restoration in Call/Return#233
Conversation
When a callee advances via continue_search at the same tree level, the cursor should stay at the matched position. Previously, Return always restored to the exact position saved at Call time, causing duplicate matches when sequences contained alternations. Changed from saving/restoring cursor position (descendant_index) to saving/restoring cursor depth. On Return, we go up to the saved depth level, which preserves sibling advances while still restoring level when the callee descended into children.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
{[A B] @x}*)continue_searchwhile restoring tree level when callee descendedProblem
When
{[A B] @x}*iterates:lexical_declarationviacontinue_search{(saved at Call time)Nav::Nextfrom{goes tolexical_declarationagainSolution
Instead of saving/restoring exact cursor position, save/restore tree depth:
cursor.depth()This preserves sibling advances while correctly restoring level after descending into children.
Test plan