Clean up parsing (if ...)
#1215
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
Much of this code dates back to when this crate was trying to parse all of WABT's tests as well as the upstream test suite. WABT at the time had syntactical forms that weren't technically supposed to be valid given the upstream test suite, so at the time more was accepted than should be. This commit fixes how `(if ...)` is parsed to require `(then ..)` and `(else ..)` wrappers. Previously these were mistakenly only optional. Additionally this fixes bytecodealliance#1213 by allowing multiple condition-related folded expressions before `(then ..)`. This updates a few of the golden outputs for the spec test suites, notably those that use `(if (foo) (then) (else))` where previously `wast` would erroneously not emit an `else` instruction but now it does. Closes bytecodealliance#1213
pchickey
approved these changes
Sep 25, 2023
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.
Much of this code dates back to when this crate was trying to parse all of WABT's tests as well as the upstream test suite. WABT at the time had syntactical forms that weren't technically supposed to be valid given the upstream test suite, so at the time more was accepted than should be.
This commit fixes how
(if ...)is parsed to require(then ..)and(else ..)wrappers. Previously these were mistakenly only optional. Additionally this fixes #1213 by allowing multiple condition-related folded expressions before(then ..).This updates a few of the golden outputs for the spec test suites, notably those that use
(if (foo) (then) (else))where previouslywastwould erroneously not emit anelseinstruction but now it does.Closes #1213