Skip to content

fix: op consumption check should happen in CastingVM instead of PatternIota #1035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Robotgiggle merged 1 commit into from
May 8, 2026
+7 −4
Merged

fix: op consumption check should happen in CastingVM instead of PatternIota #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/CastingVM.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ class CastingVM(var image: CastingImage, val env: CastingEnvironment) {
resolutionType = ResolvedPatternType.ERRORED,
sound = HexEvalSounds.MISHAP,
)
} else if (result.newData != null && result.newData.opsConsumed > env.maxOpCount()) {
result.copy(
newData = null,
sideEffects = listOf(OperatorSideEffect.DoMishap(MishapEvalTooMuch(), Mishap.Context(null, null))),
resolutionType = ResolvedPatternType.ERRORED,
sound = HexEvalSounds.MISHAP,
)
} else {
result
}
Expand Down
4 changes: 0 additions & 4 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/iota/PatternIota.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ public boolean toleratesOther(Iota that) {
continuation
);

if (result.getNewImage().getOpsConsumed() > vm.getEnv().maxOpCount()) {
throw new MishapEvalTooMuch();
}

var cont2 = result.getNewContinuation();
// TODO parens also break prescience
var sideEffects = result.getSideEffects();
Expand Down
Loading