Skip to content

replace SpellContinuation recursive codec with more natural list form #1156

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
s5bug wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

replace SpellContinuation recursive codec with more natural list form #1156

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
45 changes: 13 additions & 32 deletions Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/SpellContinuation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,42 +20,23 @@ sealed interface SpellContinuation {
fun pushFrame(frame: ContinuationFrame): SpellContinuation = NotDone(frame, this)

companion object {
// TODO port: maybe serialize to list like before?
// TODO port: maybe unit should be first
@JvmStatic
val CODEC = Codec.recursive<SpellContinuation>(
SpellContinuation::class.java.simpleName
) { recursed: Codec<SpellContinuation> ->
Codec.withAlternative<SpellContinuation>(
Codec.unit(Done),
RecordCodecBuilder.create<NotDone> { inst ->
inst.group(
ContinuationFrame.Type.TYPED_CODEC.fieldOf("frame").forGetter { it.frame },
recursed.fieldOf("next").forGetter { it.next }
).apply(inst, ::NotDone)
}
)
}
val CODEC = ContinuationFrame.Type.TYPED_CODEC.listOf().xmap(::fromList, ::toList)
@JvmStatic
val STREAM_CODEC = StreamCodec.recursive<RegistryFriendlyByteBuf, SpellContinuation> { recursed ->
withAlternative(
StreamCodec.unit(Done),
StreamCodec.composite(
ContinuationFrame.Type.TYPED_STREAM_CODEC, NotDone::frame,
recursed, NotDone::next,
::NotDone
).map(Function.identity()) { it as NotDone }
)
val STREAM_CODEC = ContinuationFrame.Type.TYPED_STREAM_CODEC.apply(ByteBufCodecs.list()).map(::fromList, ::toList)

private fun fromList(list: List<ContinuationFrame>): SpellContinuation {
return list.foldRight(Done, ::NotDone)
}

private fun <B: ByteBuf, T> withAlternative(primary: StreamCodec<B, T>, alternative: StreamCodec<B, T>): StreamCodec<B, T> {
return ByteBufCodecs.either<B, T, T>(
primary,
alternative
).map<T>(
Function { either: Either<T, T> -> Either.unwrap(either) },
Function { value: T -> Either.left(value) }
)
private fun toList(sc: SpellContinuation): List<ContinuationFrame> {
val result = ArrayList<ContinuationFrame>()
var acc = sc
while(acc is NotDone) {
result.add(acc.frame)
acc = acc.next
}
return result
}
}
}
Loading