fixing imports in new files

csanadtelbisz · csanadtelbisz · commit 3adb96151ccb · 2025-07-18T15:41:49.000+02:00
diff --git a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/algorithm/bounded/AbstractMonolithicExpr.kt b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/algorithm/bounded/AbstractMonolithicExpr.kt
@@ -27,10 +27,11 @@ import hu.bme.mit.theta.core.type.booltype.BoolExprs
 import hu.bme.mit.theta.core.type.booltype.BoolLitExpr
 import hu.bme.mit.theta.core.type.booltype.BoolType
 import hu.bme.mit.theta.core.type.booltype.IffExpr
-import hu.bme.mit.theta.core.type.booltype.SmartBoolExprs.*
+import hu.bme.mit.theta.core.type.booltype.SmartBoolExprs.And
+import hu.bme.mit.theta.core.type.booltype.SmartBoolExprs.Not
+import hu.bme.mit.theta.core.type.booltype.SmartBoolExprs.Or
 import hu.bme.mit.theta.core.utils.ExprUtils
 import hu.bme.mit.theta.core.utils.indexings.VarIndexingFactory
-import java.util.HashMap
 
 fun MonolithicExpr.createAbstract(prec: PredPrec): MonolithicExpr {
   // TODO: handle initOffsetIndex in abstract initExpr
diff --git a/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/BasicConstDecl.kt b/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/BasicConstDecl.kt
@@ -17,10 +17,7 @@ package hu.bme.mit.theta.core.decl
 
 import hu.bme.mit.theta.core.type.Type
 import hu.bme.mit.theta.core.utils.UniqueIdProvider
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.PolymorphicSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
 import kotlinx.serialization.descriptors.element
@@ -71,14 +68,14 @@ data class BasicConstDecl<DeclType : Type>(
             1 -> type = decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))
             2 -> id = decodeIntElement(descriptor, 2)
             CompositeDecoder.DECODE_DONE -> break
-            else -> error("Unexpected index: $index")
+            else -> throw SerializationException("Unexpected index: $index")
           }
         }
 
         BasicConstDecl(
-          name = name ?: error("Missing name"),
-          type = type ?: error("Missing type"),
-          id = id ?: error("Missing id"),
+          name = name ?: throw SerializationException("Missing name"),
+          type = type ?: throw SerializationException("Missing type"),
+          id = id ?: throw SerializationException("Missing id"),
         )
       }
   }
diff --git a/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/IndexedConstDecl.kt b/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/IndexedConstDecl.kt
@@ -84,9 +84,9 @@ data class IndexedConstDecl<DeclType : Type>(
         }
 
         IndexedConstDecl(
-          varDecl = varDecl ?: error("Missing varDecl"),
-          index = index ?: error("Missing index"),
-          id = id ?: error("Missing id"),
+          varDecl = varDecl ?: throw SerializationException("Missing varDecl"),
+          index = index ?: throw SerializationException("Missing index"),
+          id = id ?: throw SerializationException("Missing id"),
         )
       }
   }
diff --git a/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/ParamDecl.kt b/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/ParamDecl.kt
@@ -18,10 +18,7 @@ package hu.bme.mit.theta.core.decl
 import hu.bme.mit.theta.common.Utils
 import hu.bme.mit.theta.core.type.Type
 import hu.bme.mit.theta.core.utils.UniqueIdProvider
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.PolymorphicSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
 import kotlinx.serialization.descriptors.element
@@ -73,14 +70,14 @@ data class ParamDecl<DeclType : Type>(
             1 -> type = decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))
             2 -> id = decodeIntElement(descriptor, 2)
             CompositeDecoder.DECODE_DONE -> break
-            else -> error("Unexpected index: $index")
+            else -> throw SerializationException("Unexpected index: $index")
           }
         }
 
         ParamDecl(
-          name = name ?: error("Missing name"),
-          type = type ?: error("Missing type"),
-          id = id ?: error("Missing id"),
+          name = name ?: throw SerializationException("Missing name"),
+          type = type ?: throw SerializationException("Missing type"),
+          id = id ?: throw SerializationException("Missing id"),
         )
       }
   }
diff --git a/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/VarDecl.kt b/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/decl/VarDecl.kt
@@ -86,14 +86,14 @@ data class VarDecl<DeclType : Type>(
             1 -> type = decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))
             2 -> id = decodeIntElement(descriptor, 2)
             CompositeDecoder.DECODE_DONE -> break
-            else -> error("Unexpected index: $index")
+            else -> throw SerializationException("Unexpected index: $index")
           }
         }
 
         VarDecl(
-          name = name ?: error("Missing name"),
-          type = type ?: error("Missing type"),
-          id = id ?: error("Missing id"),
+          name = name ?: throw SerializationException("Missing name"),
+          type = type ?: throw SerializationException("Missing type"),
+          id = id ?: throw SerializationException("Missing id"),
         )
       }
   }
diff --git a/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/type/arraytype/ArrayLitExpr.kt b/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/type/arraytype/ArrayLitExpr.kt
@@ -23,10 +23,7 @@ import hu.bme.mit.theta.core.type.LitExpr
 import hu.bme.mit.theta.core.type.NullaryExpr
 import hu.bme.mit.theta.core.type.Type
 import hu.bme.mit.theta.core.utils.ExprSimplifier
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.PolymorphicSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.PairSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -131,14 +128,14 @@ data class ArrayLitExpr<IndexType : Type, ElemType : Type>(
                 decodeSerializableElement(descriptor, 2, PolymorphicSerializer(Type::class))
                   as ArrayType<Type, Type>
             CompositeDecoder.DECODE_DONE -> break
-            else -> error("Unexpected index: $index")
+            else -> throw SerializationException("Unexpected index: $index")
           }
         }
 
         ArrayLitExpr(
-          elements = elements ?: error("Missing elements"),
-          elseElem = elseElem ?: error("Missing elseElem"),
-          type = type ?: error("Missing type"),
+          elements = elements ?: throw SerializationException("Missing elements"),
+          elseElem = elseElem ?: throw SerializationException("Missing elseElem"),
+          type = type ?: throw SerializationException("Missing type"),
         )
       }
   }
diff --git a/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/type/arraytype/ArrayType.kt b/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/type/arraytype/ArrayType.kt
@@ -22,10 +22,7 @@ import hu.bme.mit.theta.core.type.Type
 import hu.bme.mit.theta.core.type.abstracttype.EqExpr
 import hu.bme.mit.theta.core.type.abstracttype.Equational
 import hu.bme.mit.theta.core.type.abstracttype.NeqExpr
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.PolymorphicSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
 import kotlinx.serialization.descriptors.element
@@ -98,13 +95,13 @@ data class ArrayType<IndexType : Type, ElemType : Type>(
               elemType =
                 decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))
             CompositeDecoder.DECODE_DONE -> break
-            else -> error("Unexpected index: $index")
+            else -> throw SerializationException("Unexpected index: $index")
           }
         }
 
         ArrayType(
-          indexType = indexType ?: error("Missing indexType"),
-          elemType = elemType ?: error("Missing elemType"),
+          indexType = indexType ?: throw SerializationException("Missing indexType"),
+          elemType = elemType ?: throw SerializationException("Missing elemType"),
         )
       }
   }
diff --git a/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/type/functype/FuncType.kt b/subprojects/common/core/src/main/kotlin/hu/bme/mit/theta/core/type/functype/FuncType.kt
@@ -18,10 +18,7 @@ package hu.bme.mit.theta.core.type.functype
 import hu.bme.mit.theta.common.Utils
 import hu.bme.mit.theta.core.type.DomainSize
 import hu.bme.mit.theta.core.type.Type
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.PolymorphicSerializer
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
+import kotlinx.serialization.*
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
 import kotlinx.serialization.descriptors.element
@@ -87,13 +84,13 @@ data class FuncType<ParamType : Type, ResultType : Type>(
               resultType =
                 decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))
             CompositeDecoder.DECODE_DONE -> break
-            else -> error("Unexpected index: $index")
+            else -> throw SerializationException("Unexpected index: $index")
           }
         }
 
         FuncType(
-          paramType = paramType ?: error("Missing paramType"),
-          resultType = resultType ?: error("Missing resultType"),
+          paramType = paramType ?: throw SerializationException("Missing paramType"),
+          resultType = resultType ?: throw SerializationException("Missing resultType"),
         )
       }
   }

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,7 @@ package hu.bme.mit.theta.core.decl`
`17`	`17`
`18`	`18`	`import hu.bme.mit.theta.core.type.Type`
`19`	`19`	`import hu.bme.mit.theta.core.utils.UniqueIdProvider`
`20`		`-import kotlinx.serialization.KSerializer`
`21`		`-import kotlinx.serialization.PolymorphicSerializer`
`22`		`-import kotlinx.serialization.SerialName`
`23`		`-import kotlinx.serialization.Serializable`
	`20`	`+import kotlinx.serialization.*`
`24`	`21`	`import kotlinx.serialization.descriptors.SerialDescriptor`
`25`	`22`	`import kotlinx.serialization.descriptors.buildClassSerialDescriptor`
`26`	`23`	`import kotlinx.serialization.descriptors.element`
`@@ -71,14 +68,14 @@ data class BasicConstDecl<DeclType : Type>(`
`71`	`68`	`1 -> type = decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))`
`72`	`69`	`2 -> id = decodeIntElement(descriptor, 2)`
`73`	`70`	`CompositeDecoder.DECODE_DONE -> break`
`74`		`- else -> error("Unexpected index: $index")`
	`71`	`+ else -> throw SerializationException("Unexpected index: $index")`
`75`	`72`	`}`
`76`	`73`	`}`
`77`	`74`
`78`	`75`	`BasicConstDecl(`
`79`		`- name = name ?: error("Missing name"),`
`80`		`- type = type ?: error("Missing type"),`
`81`		`- id = id ?: error("Missing id"),`
	`76`	`+ name = name ?: throw SerializationException("Missing name"),`
	`77`	`+ type = type ?: throw SerializationException("Missing type"),`
	`78`	`+ id = id ?: throw SerializationException("Missing id"),`
`82`	`79`	`)`
`83`	`80`	`}`
`84`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ data class IndexedConstDecl<DeclType : Type>(`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`IndexedConstDecl(`
`87`		`- varDecl = varDecl ?: error("Missing varDecl"),`
`88`		`- index = index ?: error("Missing index"),`
`89`		`- id = id ?: error("Missing id"),`
	`87`	`+ varDecl = varDecl ?: throw SerializationException("Missing varDecl"),`
	`88`	`+ index = index ?: throw SerializationException("Missing index"),`
	`89`	`+ id = id ?: throw SerializationException("Missing id"),`
`90`	`90`	`)`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,7 @@ package hu.bme.mit.theta.core.decl`
`18`	`18`	`import hu.bme.mit.theta.common.Utils`
`19`	`19`	`import hu.bme.mit.theta.core.type.Type`
`20`	`20`	`import hu.bme.mit.theta.core.utils.UniqueIdProvider`
`21`		`-import kotlinx.serialization.KSerializer`
`22`		`-import kotlinx.serialization.PolymorphicSerializer`
`23`		`-import kotlinx.serialization.SerialName`
`24`		`-import kotlinx.serialization.Serializable`
	`21`	`+import kotlinx.serialization.*`
`25`	`22`	`import kotlinx.serialization.descriptors.SerialDescriptor`
`26`	`23`	`import kotlinx.serialization.descriptors.buildClassSerialDescriptor`
`27`	`24`	`import kotlinx.serialization.descriptors.element`
`@@ -73,14 +70,14 @@ data class ParamDecl<DeclType : Type>(`
`73`	`70`	`1 -> type = decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))`
`74`	`71`	`2 -> id = decodeIntElement(descriptor, 2)`
`75`	`72`	`CompositeDecoder.DECODE_DONE -> break`
`76`		`- else -> error("Unexpected index: $index")`
	`73`	`+ else -> throw SerializationException("Unexpected index: $index")`
`77`	`74`	`}`
`78`	`75`	`}`
`79`	`76`
`80`	`77`	`ParamDecl(`
`81`		`- name = name ?: error("Missing name"),`
`82`		`- type = type ?: error("Missing type"),`
`83`		`- id = id ?: error("Missing id"),`
	`78`	`+ name = name ?: throw SerializationException("Missing name"),`
	`79`	`+ type = type ?: throw SerializationException("Missing type"),`
	`80`	`+ id = id ?: throw SerializationException("Missing id"),`
`84`	`81`	`)`
`85`	`82`	`}`
`86`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,14 +86,14 @@ data class VarDecl<DeclType : Type>(`
`86`	`86`	`1 -> type = decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))`
`87`	`87`	`2 -> id = decodeIntElement(descriptor, 2)`
`88`	`88`	`CompositeDecoder.DECODE_DONE -> break`
`89`		`- else -> error("Unexpected index: $index")`
	`89`	`+ else -> throw SerializationException("Unexpected index: $index")`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`VarDecl(`
`94`		`- name = name ?: error("Missing name"),`
`95`		`- type = type ?: error("Missing type"),`
`96`		`- id = id ?: error("Missing id"),`
	`94`	`+ name = name ?: throw SerializationException("Missing name"),`
	`95`	`+ type = type ?: throw SerializationException("Missing type"),`
	`96`	`+ id = id ?: throw SerializationException("Missing id"),`
`97`	`97`	`)`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,7 @@ import hu.bme.mit.theta.core.type.LitExpr`
`23`	`23`	`import hu.bme.mit.theta.core.type.NullaryExpr`
`24`	`24`	`import hu.bme.mit.theta.core.type.Type`
`25`	`25`	`import hu.bme.mit.theta.core.utils.ExprSimplifier`
`26`		`-import kotlinx.serialization.KSerializer`
`27`		`-import kotlinx.serialization.PolymorphicSerializer`
`28`		`-import kotlinx.serialization.SerialName`
`29`		`-import kotlinx.serialization.Serializable`
	`26`	`+import kotlinx.serialization.*`
`30`	`27`	`import kotlinx.serialization.builtins.ListSerializer`
`31`	`28`	`import kotlinx.serialization.builtins.PairSerializer`
`32`	`29`	`import kotlinx.serialization.descriptors.SerialDescriptor`
`@@ -131,14 +128,14 @@ data class ArrayLitExpr<IndexType : Type, ElemType : Type>(`
`131`	`128`	`decodeSerializableElement(descriptor, 2, PolymorphicSerializer(Type::class))`
`132`	`129`	`as ArrayType<Type, Type>`
`133`	`130`	`CompositeDecoder.DECODE_DONE -> break`
`134`		`- else -> error("Unexpected index: $index")`
	`131`	`+ else -> throw SerializationException("Unexpected index: $index")`
`135`	`132`	`}`
`136`	`133`	`}`
`137`	`134`
`138`	`135`	`ArrayLitExpr(`
`139`		`- elements = elements ?: error("Missing elements"),`
`140`		`- elseElem = elseElem ?: error("Missing elseElem"),`
`141`		`- type = type ?: error("Missing type"),`
	`136`	`+ elements = elements ?: throw SerializationException("Missing elements"),`
	`137`	`+ elseElem = elseElem ?: throw SerializationException("Missing elseElem"),`
	`138`	`+ type = type ?: throw SerializationException("Missing type"),`
`142`	`139`	`)`
`143`	`140`	`}`
`144`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,7 @@ import hu.bme.mit.theta.core.type.Type`
`22`	`22`	`import hu.bme.mit.theta.core.type.abstracttype.EqExpr`
`23`	`23`	`import hu.bme.mit.theta.core.type.abstracttype.Equational`
`24`	`24`	`import hu.bme.mit.theta.core.type.abstracttype.NeqExpr`
`25`		`-import kotlinx.serialization.KSerializer`
`26`		`-import kotlinx.serialization.PolymorphicSerializer`
`27`		`-import kotlinx.serialization.SerialName`
`28`		`-import kotlinx.serialization.Serializable`
	`25`	`+import kotlinx.serialization.*`
`29`	`26`	`import kotlinx.serialization.descriptors.SerialDescriptor`
`30`	`27`	`import kotlinx.serialization.descriptors.buildClassSerialDescriptor`
`31`	`28`	`import kotlinx.serialization.descriptors.element`
`@@ -98,13 +95,13 @@ data class ArrayType<IndexType : Type, ElemType : Type>(`
`98`	`95`	`elemType =`
`99`	`96`	`decodeSerializableElement(descriptor, 1, PolymorphicSerializer(Type::class))`
`100`	`97`	`CompositeDecoder.DECODE_DONE -> break`
`101`		`- else -> error("Unexpected index: $index")`
	`98`	`+ else -> throw SerializationException("Unexpected index: $index")`
`102`	`99`	`}`
`103`	`100`	`}`
`104`	`101`
`105`	`102`	`ArrayType(`
`106`		`- indexType = indexType ?: error("Missing indexType"),`
`107`		`- elemType = elemType ?: error("Missing elemType"),`
	`103`	`+ indexType = indexType ?: throw SerializationException("Missing indexType"),`
	`104`	`+ elemType = elemType ?: throw SerializationException("Missing elemType"),`
`108`	`105`	`)`
`109`	`106`	`}`
`110`	`107`	`}`