Skip to content

Make escaper patterns increment the op count #1172

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

Open
Robotgiggle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make escaper patterns increment the op count #1172

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
4 changes: 2 additions & 2 deletions Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpCloseParen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ object OpCloseParen : Action {
if (newParenCount == 0) {
val newStack = image.stack.toMutableList()
newStack.add(ListIota(image.parenthesized.toList().map { it.iota }))
val image2 = image.copy(
val image2 = image.withUsedOp().copy(
stack = newStack,
parenCount = newParenCount,
parenthesized = listOf()
Expand All @@ -34,7 +34,7 @@ object OpCloseParen : Action {
// we need to add the close paren
val newParens = image.parenthesized.toMutableList()
newParens.add(ParenthesizedIota(thisIota, false))
val image2 = image.copy(
val image2 = image.withUsedOp().copy(
parenCount = newParenCount,
parenthesized = newParens
)
Expand Down
4 changes: 2 additions & 2 deletions Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpEscape.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import at.petrak.hexcasting.common.lib.hex.HexEvalSounds

object OpEscape : Action {
override fun operate(env: CastingEnvironment, image: CastingImage, continuation: SpellContinuation): OperationResult {
val image2 = image.copy(
val image2 = image.withUsedOp().copy(
escapeNext = true
)
return OperationResult(image2, listOf(), continuation, HexEvalSounds.NORMAL_EXECUTE)
}

override fun operateInParens(env: CastingEnvironment, image: CastingImage, continuation: SpellContinuation, thisIota: Iota): ParenthesizedOperationResult {
val image2 = image.copy(
val image2 = image.withUsedOp().copy(
escapeNext = true
)
return ParenthesizedOperationResult(image2, listOf(), continuation, HexEvalSounds.NORMAL_EXECUTE, ResolvedPatternType.EVALUATED)
Expand Down
4 changes: 2 additions & 2 deletions Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpOpenParen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import at.petrak.hexcasting.common.lib.hex.HexEvalSounds

object OpOpenParen : Action {
override fun operate(env: CastingEnvironment, image: CastingImage, continuation: SpellContinuation): OperationResult {
val image2 = image.copy(
val image2 = image.withUsedOp().copy(
parenCount = image.parenCount + 1
)
return OperationResult(image2, listOf(), continuation, HexEvalSounds.NORMAL_EXECUTE)
Expand All @@ -22,7 +22,7 @@ object OpOpenParen : Action {
// we have escaped the parens onto the stack; we just also record our count.
val newParens = image.parenthesized.toMutableList()
newParens.add(CastingImage.ParenthesizedIota(thisIota, false))
val image2 = image.copy(
val image2 = image.withUsedOp().copy(
parenthesized = newParens,
parenCount = image.parenCount + 1
)
Expand Down
2 changes: 1 addition & 1 deletion Common/src/main/java/at/petrak/hexcasting/common/casting/actions/escaping/OpUndo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ object OpUndo : Action {
HexActions.CLOSE_PAREN.prototype.angles -> newParenCount++
}
}
val image2 = image.copy(
val image2 = image.withUsedOp().copy(
parenthesized = newParens,
parenCount = newParenCount
)
Expand Down
Loading