Remove SpellList

s5bug · Sirius902 · s5bug · commit a0cb1540086f · 2025-07-13T20:23:35.000-07:00
Co-authored-by: Sirius902 &lt;10891979+Sirius902@users.noreply.github.com&gt;
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/ActionUtils.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/ActionUtils.kt
@@ -313,7 +313,6 @@ inline val Boolean.asActionResult get() = listOf(BooleanIota(this))
 inline val Double.asActionResult get() = listOf(DoubleIota(this))
 inline val Number.asActionResult get() = listOf(DoubleIota(this.toDouble()))
 
-inline val SpellList.asActionResult get() = listOf(ListIota(Vector.from(this)))
 inline val List<Iota>.asActionResult get() = listOf(ListIota(Vector.from(this)))
 
 inline val BlockPos.asActionResult get() = listOf(Vec3Iota(Vec3.atCenterOf(this)))
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/SpellList.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/SpellList.kt
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/CastingVM.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/CastingVM.kt
@@ -2,7 +2,6 @@ package at.petrak.hexcasting.api.casting.eval.vm
 
 import at.petrak.hexcasting.api.HexAPI
 import at.petrak.hexcasting.api.casting.PatternShapeMatch.*
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.eval.*
 import at.petrak.hexcasting.api.casting.eval.sideeffects.OperatorSideEffect
 import at.petrak.hexcasting.api.casting.eval.vm.CastingImage.ParenthesizedIota
@@ -40,7 +39,7 @@ class CastingVM(var image: CastingImage, val env: CastingEnvironment) {
      */
     fun queueExecuteAndWrapIotas(iotas: List<Iota>, world: ServerLevel): ExecutionClientView {
         // Initialize the continuation stack to a single top-level eval for all iotas.
-        var continuation = SpellContinuation.Done.pushFrame(FrameEvaluate(SpellList.LList(0, iotas), false))
+        var continuation = SpellContinuation.Done.pushFrame(FrameEvaluate(Vector.from(iotas), false))
         // Begin aggregating info
         val info = TempControllerInfo(earlyExit = false)
         var lastResolutionType = ResolvedPatternType.UNRESOLVED
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/ContinuationFrame.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/ContinuationFrame.kt
@@ -1,8 +1,8 @@
 package at.petrak.hexcasting.api.casting.eval.vm
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.eval.CastResult
 import at.petrak.hexcasting.api.casting.iota.Iota
+import at.petrak.hexcasting.api.utils.Vector
 import at.petrak.hexcasting.common.lib.hex.HexContinuationTypes
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.Tag
@@ -60,10 +60,10 @@ interface ContinuationFrame {
          */
         @JvmStatic
         fun fromNBT(tag: CompoundTag, world: ServerLevel): ContinuationFrame {
-            val type = getTypeFromTag(tag) ?: return FrameEvaluate(SpellList.LList(0, listOf()), false)
+            val type = getTypeFromTag(tag) ?: return FrameEvaluate(Vector.empty(), false)
 
             return (tag.get(HexContinuationTypes.KEY_DATA) as? CompoundTag)?.let { type.deserializeFromNBT(it, world) }
-                    ?: FrameEvaluate(SpellList.LList(0, listOf()), false)
+                    ?: FrameEvaluate(Vector.empty(), false)
         }
 
         /**
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/FrameEvaluate.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/FrameEvaluate.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.api.casting.eval.vm
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.eval.CastResult
 import at.petrak.hexcasting.api.casting.eval.ResolvedPatternType
 import at.petrak.hexcasting.api.casting.iota.Iota
@@ -20,7 +19,7 @@ import net.minecraft.server.level.ServerLevel
  * @property list the *remaining* list of patterns to be evaluated
  * @property isMetacasting only for sound effects, if this is being cast from a hermes / iris
  */
-data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : ContinuationFrame {
+data class FrameEvaluate(val list: Vector<Iota>, val isMetacasting: Boolean) : ContinuationFrame {
     // Discard this frame and keep discarding frames.
     override fun breakDownwards(stack: List<Iota>) = false to stack
 
@@ -31,21 +30,21 @@ data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : Cont
         harness: CastingVM
     ): CastResult {
         // If there are patterns left...
-        return if (list.nonEmpty) {
-            val newCont = if (list.cdr.nonEmpty) { // yay TCO
+        return if (!list.isEmpty()) {
+            val newCont = if (!list.tail().isEmpty()) { // yay TCO
                 // ...enqueue the evaluation of the rest of the patterns...
-                continuation.pushFrame(FrameEvaluate(list.cdr, this.isMetacasting))
+                continuation.pushFrame(FrameEvaluate(list.tail(), this.isMetacasting))
             } else continuation
             // ...before evaluating the first one in the list.
-            val update = harness.executeInner(list.car, level, newCont)
+            val update = harness.executeInner(list.head(), level, newCont)
             if (this.isMetacasting && update.sound != HexEvalSounds.MISHAP) {
                 update.copy(sound = HexEvalSounds.HERMES)
             } else {
                 update
             }
         } else {
             // If there are no patterns (e.g. empty Hermes), just return OK.
-            CastResult(ListIota(Vector.from(list)), continuation, null, listOf(), ResolvedPatternType.EVALUATED, HexEvalSounds.HERMES)
+            CastResult(ListIota(list), continuation, null, listOf(), ResolvedPatternType.EVALUATED, HexEvalSounds.HERMES)
         }
     }
 
@@ -54,7 +53,7 @@ data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : Cont
         "isMetacasting" %= isMetacasting
     }
 
-    override fun size() = list.size()
+    override fun size() = list.size
 
     override val type: ContinuationFrame.Type<*> = TYPE
 
@@ -63,10 +62,10 @@ data class FrameEvaluate(val list: SpellList, val isMetacasting: Boolean) : Cont
         val TYPE: ContinuationFrame.Type<FrameEvaluate> = object : ContinuationFrame.Type<FrameEvaluate> {
             override fun deserializeFromNBT(tag: CompoundTag, world: ServerLevel): FrameEvaluate {
                 return FrameEvaluate(
-                    SpellList.LList(0, HexIotaTypes.LIST.deserialize(
+                    HexIotaTypes.LIST.deserialize(
                         tag.getList("patterns", Tag.TAG_COMPOUND),
                         world
-                    )!!.list),
+                    )!!.list,
                     tag.getBoolean("isMetacasting"))
             }
 
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/FrameForEach.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/vm/FrameForEach.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.api.casting.eval.vm
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.eval.CastResult
 import at.petrak.hexcasting.api.casting.eval.ResolvedPatternType
 import at.petrak.hexcasting.api.casting.iota.Iota
@@ -26,8 +25,8 @@ import net.minecraft.server.level.ServerLevel
  * @property acc concatenated list of final stack states after Thoth exit
  */
 data class FrameForEach(
-    val data: SpellList,
-    val code: SpellList,
+    val data: Vector<Iota>,
+    val code: Vector<Iota>,
     val baseStack: List<Iota>?,
     val acc: Vector<Iota>
 ) : ContinuationFrame {
@@ -54,14 +53,14 @@ data class FrameForEach(
         }
 
         // If we still have data to process...
-        val (stackTop, newImage, newCont) = if (data.nonEmpty) {
+        val (stackTop, newImage, newCont) = if (!data.isEmpty()) {
             // push the next datum to the top of the stack,
             val cont2 = continuation
                 // put the next Thoth object back on the stack for the next Thoth cycle,
-                .pushFrame(FrameForEach(data.cdr, code, stack, nextAcc))
+                .pushFrame(FrameForEach(data.tail(), code, stack, nextAcc))
                 // and prep the Thoth'd code block for evaluation.
                 .pushFrame(FrameEvaluate(code, true))
-            Triple(data.car, harness.image.withUsedOp(), cont2)
+            Triple(data.head(), harness.image.withUsedOp(), cont2)
         } else {
             // Else, dump our final list onto the stack.
             Triple(ListIota(nextAcc), harness.image, continuation)
@@ -87,7 +86,7 @@ data class FrameForEach(
         "accumulator" %= acc.toList().serializeToNBT()
     }
 
-    override fun size() = data.size() + code.size() + acc.size + (baseStack?.size ?: 0)
+    override fun size() = data.size + code.size + acc.size + (baseStack?.size ?: 0)
 
     override val type: ContinuationFrame.Type<*> = TYPE
 
@@ -96,8 +95,8 @@ data class FrameForEach(
         val TYPE: ContinuationFrame.Type<FrameForEach> = object : ContinuationFrame.Type<FrameForEach> {
             override fun deserializeFromNBT(tag: CompoundTag, world: ServerLevel): FrameForEach {
                 return FrameForEach(
-                    SpellList.LList(0, HexIotaTypes.LIST.deserialize(tag.getList("data", Tag.TAG_COMPOUND), world)!!.list),
-                    SpellList.LList(0, HexIotaTypes.LIST.deserialize(tag.getList("code", Tag.TAG_COMPOUND), world)!!.list),
+                    HexIotaTypes.LIST.deserialize(tag.getList("data", Tag.TAG_COMPOUND), world)!!.list,
+                    HexIotaTypes.LIST.deserialize(tag.getList("code", Tag.TAG_COMPOUND), world)!!.list,
                     if (tag.hasList("base", Tag.TAG_COMPOUND))
                         HexIotaTypes.LIST.deserialize(tag.getList("base", Tag.TAG_COMPOUND), world)!!.list.toList()
                     else
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpEval.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpEval.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.common.casting.actions.eval
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
 import at.petrak.hexcasting.api.casting.eval.OperationResult
@@ -11,6 +10,7 @@ import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
 import at.petrak.hexcasting.api.casting.evaluatable
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughArgs
+import at.petrak.hexcasting.api.utils.Vector
 import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
 
 object OpEval : Action {
@@ -30,7 +30,7 @@ object OpEval : Action {
                     continuation.pushFrame(FrameFinishEval) // install a break-boundary after eval
                 }
 
-        val instrsList = instrs.map({ SpellList.LList(0, listOf(it)) }, { SpellList.LList(0, it) })
+        val instrsList = instrs.map({ Vector.from(listOf(it)) }, { Vector.from(it) })
         val frame = FrameEvaluate(instrsList, true)
 
         val image2 = image.withUsedOp().copy(stack = newStack)
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpForEach.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/eval/OpForEach.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.common.casting.actions.eval
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.castables.Action
 import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
 import at.petrak.hexcasting.api.casting.eval.OperationResult
@@ -24,7 +23,7 @@ object OpForEach : Action {
         stack.removeLastOrNull()
         stack.removeLastOrNull()
 
-        val frame = FrameForEach(SpellList.LList(0, datums), SpellList.LList(0, instrs), null, Vector.empty())
+        val frame = FrameForEach(datums, instrs, null, Vector.empty())
         val image2 = image.withUsedOp().copy(stack = stack)
 
         return OperationResult(image2, listOf(), continuation.pushFrame(frame), HexEvalSounds.THOTH)
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpCons.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpCons.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.common.casting.actions.lists
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
@@ -12,6 +11,6 @@ object OpCons : ConstMediaAction {
     override fun execute(args: List<Iota>, env: CastingEnvironment): List<Iota> {
         val bottom = args.getList(0, argc)
         val top = args[1]
-        return SpellList.LPair(top, SpellList.LList(0, bottom)).asActionResult
+        return bottom.prepended(top).asActionResult
     }
 }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpModifyInPlace.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpModifyInPlace.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.common.casting.actions.lists
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.asActionResult
 import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
@@ -14,6 +13,6 @@ object OpModifyInPlace : ConstMediaAction {
         val list = args.getList(0, argc)
         val index = args.getPositiveIntUnder(1, list.size, argc)
         val iota = args[2]
-        return SpellList.LList(0, list).modifyAt(index) { SpellList.LPair(iota, it.cdr) }.asActionResult
+        return list.updated(index, iota).asActionResult
     }
 }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpUnCons.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/lists/OpUnCons.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.common.casting.actions.lists
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.castables.ConstMediaAction
 import at.petrak.hexcasting.api.casting.eval.CastingEnvironment
 import at.petrak.hexcasting.api.casting.getList
@@ -12,9 +11,9 @@ import at.petrak.hexcasting.api.utils.Vector
 object OpUnCons : ConstMediaAction {
     override val argc = 1
     override fun execute(args: List<Iota>, env: CastingEnvironment): List<Iota> {
-        val list = SpellList.LList(0, args.getList(0, argc))
-        if (list.nonEmpty) {
-            return listOf(ListIota(Vector.from(list.cdr)), list.car)
+        val list = args.getList(0, argc)
+        if (!list.isEmpty()) {
+            return listOf(ListIota(Vector.from(list.tail())), list.head())
         }
         return listOf(args[0], NullIota())
     }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/ListArithmetic.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/ListArithmetic.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.common.casting.arithmetic
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.arithmetic.Arithmetic
 import at.petrak.hexcasting.api.casting.arithmetic.Arithmetic.*
 import at.petrak.hexcasting.api.casting.arithmetic.engine.InvalidOperatorException
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/OperatorUtils.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/OperatorUtils.kt
@@ -1,17 +1,17 @@
 package at.petrak.hexcasting.common.casting.arithmetic.operator
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.iota.DoubleIota
 import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.iota.ListIota
 import at.petrak.hexcasting.api.casting.mishaps.MishapInvalidIota
+import at.petrak.hexcasting.api.utils.Vector
 import kotlin.math.abs
 import kotlin.math.roundToInt
 
-fun Iterator<IndexedValue<Iota>>.nextList(argc: Int = 0): SpellList {
+fun Iterator<IndexedValue<Iota>>.nextList(argc: Int = 0): Vector<Iota> {
     val (idx, x) = this.next()
     if (x is ListIota) {
-        return SpellList.LList(0, x.list)
+        return x.list
     } else {
         throw MishapInvalidIota.ofType(x, if (argc == 0) idx else argc - (idx + 1), "list")
     }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorReplace.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorReplace.kt
@@ -1,6 +1,5 @@
 package at.petrak.hexcasting.common.casting.arithmetic.operator.list
 
-import at.petrak.hexcasting.api.casting.SpellList
 import at.petrak.hexcasting.api.casting.arithmetic.operator.Operator
 import at.petrak.hexcasting.api.casting.arithmetic.operator.OperatorBasic
 import at.petrak.hexcasting.api.casting.arithmetic.predicates.IotaMultiPredicate
@@ -16,8 +15,8 @@ object OperatorReplace : OperatorBasic(3, IotaMultiPredicate.triple(IotaPredicat
     override fun apply(iotas: Iterable<Iota>, env: CastingEnvironment): Iterable<Iota> {
         val it = iotas.iterator().withIndex()
         val list = it.nextList(arity)
-        val index = it.nextPositiveIntUnder(list.size(), arity)
+        val index = it.nextPositiveIntUnder(list.size, arity)
         val iota = it.next().value
-        return list.modifyAt(index) { SpellList.LPair(iota, it.cdr) }.asActionResult
+        return list.updated(index, iota).asActionResult
     }
 }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorUnCons.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/arithmetic/operator/list/OperatorUnCons.kt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package at.petrak.hexcasting.common.casting.actions.lists`
`2`	`2`
`3`		`-import at.petrak.hexcasting.api.casting.SpellList`
`4`	`3`	`import at.petrak.hexcasting.api.casting.asActionResult`
`5`	`4`	`import at.petrak.hexcasting.api.casting.castables.ConstMediaAction`
`6`	`5`	`import at.petrak.hexcasting.api.casting.eval.CastingEnvironment`
`@@ -12,6 +11,6 @@ object OpCons : ConstMediaAction {`
`12`	`11`	`override fun execute(args: List<Iota>, env: CastingEnvironment): List<Iota> {`
`13`	`12`	`val bottom = args.getList(0, argc)`
`14`	`13`	`val top = args[1]`
`15`		`- return SpellList.LPair(top, SpellList.LList(0, bottom)).asActionResult`
	`14`	`+ return bottom.prepended(top).asActionResult`
`16`	`15`	`}`
`17`	`16`	`}`