Restore enclosing stream on popStream instead of clearing to main - #42
Merged
Merged
Conversation
Stream routing tracked the active stream with a single scalar that popStream always reset to nil (the main window). The GemStone/DR protocol nests streams, and asynchronous scripts (e.g. moonwatch repainting the moonWindow side stream) can inject a push/pop between a game stream's open and close. With a scalar pointer, that inner popStream closed the *outer* game stream, so its remaining text spilled into the main window and, in the reverse case, foreign content was stranded in the wrong window. Add StreamStack: the stack of enclosing streams suspended while a nested stream is active. handle_stream_open pushes the previously active stream; handle_stream_close pops to resume it, falling back to the main window (nil) only when nothing is suspended. Unmatched pops can never underflow. @current_stream keeps its role as the active stream, so all existing read sites are unchanged; only open/close mutate the nesting. Adds a StreamStack unit spec and nested-restoration coverage in the tag handler spec, and updates the one prior spec that asserted the old clear-to-nil behavior. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Stream routing tracked the active stream with a single scalar that popStream always reset to nil (the main window). The GemStone/DR protocol nests streams, and asynchronous scripts (e.g. moonwatch repainting the moonWindow side stream) can inject a push/pop between a game stream's open and close. With a scalar pointer, that inner popStream closed the outer game stream, so its remaining text spilled into the main window and, in the reverse case, foreign content was stranded in the wrong window.
Add StreamStack: the stack of enclosing streams suspended while a nested stream is active. handle_stream_open pushes the previously active stream; handle_stream_close pops to resume it, falling back to the main window (nil) only when nothing is suspended. Unmatched pops can never underflow.
@current_stream keeps its role as the active stream, so all existing read sites are unchanged; only open/close mutate the nesting. Adds a StreamStack unit spec and nested-restoration coverage in the tag handler spec, and updates the one prior spec that asserted the old clear-to-nil behavior.