Remove some unnecessary Piece classes. #1491
Merged
Conversation
This file contains 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
In exploring various optimizations, it's clear that I'll probably need to make some changes to how all of the Piece classes work. The more of those classes there are, the harder that work is. Fortunately, there are a few Piece classes that don't really need to exist. Most were created before we had AdjacentPiece or the ability to insert spaces between pieces. This first commit removes ClausePiece which it turns out behaves exactly like InfixPiece (and then renames ClausesPiece to ClausePiece).
All it did was write its children with some spaces between them.
It was just like InfixPiece but without a first operand. But it's only used by imports, where we can use the import header as the first operand and just use InfixPiece.
It's just an InfixPiece that always splits.
Once you hoist out the optionality of the guard, it's just an InfixPiece.
Make that Piece just for the header part of a for statement or element. (We can almost get rid of this entirely and use AdjacentPiece, but it does some indentation that isn't otherwise supported.) Then to handle the body, we either write it inline if it's a block (the most common), or we use IfPiece, which has the same logic. Rename IfPiece to ControlFlowPiece to emphasize its more general use. It was already used for while statements, so this makes sense.
natebosch
approved these changes
May 17, 2024
kallentu
approved these changes
May 20, 2024
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.
In exploring various optimizations, it's clear that I'll probably need to make some changes to how all of the Piece classes work. The more of those classes there are, the harder that work is.
Fortunately, there are a few Piece classes that don't really need to exist. Most were created before we had AdjacentPiece or the ability to insert spaces between pieces.
Each commit in this PR removes a Piece class or otherwise simplifies them.