smite-scenarios: deduplicate executor variable resolvers - #232
Merged
Conversation
Chand-ra
reviewed
Sep 5, 2026
| &FundingTransaction | ||
| ); | ||
|
|
||
| /// Consumes an affine variable, leaving its slot void so it cannot be used |
There was a problem hiding this comment.
Nit: Rust doesn't have "voids". What we're doing is replacing the used variable with None.
Something like this would perhaps be better?
Consumes an affine variable, replacing it with `None` to prevent double-use.
Contributor
Author
There was a problem hiding this comment.
We are using the term void in the codebase to refer to a None Variable.
For example: https://github.com/erickcestari/smite/blob/7ab8dfbc37ec56a86c06ab1619f1b82637579d71/smite-ir/src/tests.rs#L1999
There was a problem hiding this comment.
You're right. A comment there says:
// SendMessage is last and has void output.
which uses void in the same breadth as you do here. I don't like it there either, but I guess it is a colloquial for the project atp and hence fine.
NishantBansal2003
suggested changes
Sep 6, 2026
erickcestari
force-pushed
the
refactor-exec-func
branch
from
September 6, 2026 22:49
0082c12 to
67b42d4
Compare
morehouse
approved these changes
Sep 9, 2026
Chand-ra
approved these changes
Sep 9, 2026
The 17 `resolve_*` functions differed only in the matched variant, and the two `consume_sent_*` functions only in the affine type they voided. Generate the resolvers with a `define_resolver!` macro that shares one `type_mismatch` panic, and replace the consumers with a single `consume_affine` that takes the expected `VariableType`.
erickcestari
force-pushed
the
refactor-exec-func
branch
from
September 9, 2026 19:12
67b42d4 to
f7d2016
Compare
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
4 participants
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.
The 17
resolve_*functions differed only in the matched variant, and the twoconsume_sent_*functions only in the affine type they voided.Generate the resolvers with a
define_resolver!macro that shares onetype_mismatchpanic, and replace the consumers with a singleconsume_affinethat takes the expectedVariableType.