Refactor the wast component resolver
#614
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
Currently `(start $f)` fails to compile because the loop that parses values expected a `(result ..)` to always be present, but it is not alwyas guaranteed to be present.
The purpose of this commit is to cut down on the complexity of reading and understanding the resolver for components. These were some refactorings I noticed during review that I think help make it a bit more clear in each function what's happenign. * Add a new `Resolver` type to encapsulate the `Vec<ComponentResolver>` stack * Move freestanding functions to methods on `Resolver` and remove lifetime arguments on each function. * Rename the `ComponentResolver` type to `ComponentState` to avoid conflicting with `Resolver`. * Move `register*` functions to `ComponentState`
This refactors the injection of aliases to share the same code across components themselves, component types, and instance types. This way the drain of `aliases_to_insert` is only processed in one location to avoid having to worry about it from multiple locations.
alexcrichton
force-pushed
the
refactor-component-resolve
branch
from
2bc3e69
to
0f37f2f
Compare
peterhuene
approved these changes
May 19, 2022
code-terror
pushed a commit
to code-terror/wasm-tools
that referenced
this pull request
Aug 24, 2022
* Fix a failing test on `main` Currently `(start $f)` fails to compile because the loop that parses values expected a `(result ..)` to always be present, but it is not alwyas guaranteed to be present. * Refactor the `wast` resolver The purpose of this commit is to cut down on the complexity of reading and understanding the resolver for components. These were some refactorings I noticed during review that I think help make it a bit more clear in each function what's happenign. * Add a new `Resolver` type to encapsulate the `Vec<ComponentResolver>` stack * Move freestanding functions to methods on `Resolver` and remove lifetime arguments on each function. * Rename the `ComponentResolver` type to `ComponentState` to avoid conflicting with `Resolver`. * Move `register*` functions to `ComponentState` * Refactor alias injection in component resolution This refactors the injection of aliases to share the same code across components themselves, component types, and instance types. This way the drain of `aliases_to_insert` is only processed in one location to avoid having to worry about it from multiple locations.
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.
More details in the two commits below, but this is entirely stylistic changes with no functional changes intended.
Closes #599