Refactor StringifyTypeExpr
#4597
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
zygoloid
approved these changes
Nov 27, 2024
toolchain/sem_ir/stringify_type.cpp
Outdated
| struct Step { | ||
| // The instruction's file. | ||
| const File& sem_ir; | ||
| class StepStack { |
There was a problem hiding this comment.
Would it make sense to move this out of the function? That might enable more refactoring, such as splitting this function into smaller functions, at a later stage.
There was a problem hiding this comment.
Possibly, though that seems out of scope for this PR.
There was a problem hiding this comment.
Oh I hadn't realized how little else was going on in this file. I've moved it out into an anonymous namespace.
toolchain/sem_ir/stringify_type.cpp
Outdated
| step_stack.PushString("]"); | ||
| step_stack.PushArrayBound(inst.bound_id); | ||
| step_stack.PushString("; "); | ||
| step_stack.PushInstId(sem_ir.types().GetInstId(inst.element_type_id)); |
There was a problem hiding this comment.
We seem to be doing this a lot; maybe we should add a PushTypeId for this.
|
FYI, I did some small cleanups to the |
bricknerb
pushed a commit
to bricknerb/carbon-lang
that referenced
this pull request
Nov 28, 2024
* Make the step stack into a class * Make the operations on the stack (pushing, popping, test for done) into methods on the stack class. * Add more kinds of steps (array bound and name). * Rewrite cases to use the new kinds of steps. Afterward, none use `Step::Next()` or the step index, so those get removed. * Add another convenience method `PushTypeId`. * Remove the `SemIR::File&` member from the steps, since it doesn't change. Hopefully using `step_stack.Push`... calls makes it clear that they are resolved in the reverse order they are executed. --------- Co-authored-by: Josh L <[email protected]>
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.
Step::Next()or the step index, so those get removed.PushTypeId.SemIR::File&member from the steps, since it doesn't change.Hopefully using
step_stack.Push... calls makes it clear that they are resolved in the reverse order they are executed.