#18 Renamed Serializer to XstsSerializer

ftsrg · Nov 7, 2024 · e0aeaf5 · e0aeaf5
1 parent c0be153
commit e0aeaf5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 21 deletions.
diff --git a/subprojects/semantifyr/src/main/kotlin/commands/CompileCommand.kt b/subprojects/semantifyr/src/main/kotlin/commands/CompileCommand.kt
@@ -6,7 +6,7 @@ import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.file
 import hu.bme.mit.semantifyr.oxsts.semantifyr.reader.OxstsReader
 import hu.bme.mit.semantifyr.oxsts.semantifyr.reader.prepareOxsts
-import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.Serializer
+import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.XstsSerializer
 import hu.bme.mit.semantifyr.oxsts.semantifyr.transformation.XstsTransformer
 import hu.bme.mit.semantifyr.oxsts.semantifyr.utils.loggerFactory
 import java.io.File
@@ -35,7 +35,7 @@ class CompileCommand : CliktCommand("compile") {
         val transformer = XstsTransformer(reader)
 
         val xsts = transformer.transform(targetName, rewriteChoice = true)
-        val xstsString = Serializer.serialize(xsts)
+        val xstsString = XstsSerializer.serialize(xsts)
 
         val outputFile = output ?: File(model.path.replace(".oxsts", ".xsts"))
 

diff --git a/subprojects/semantifyr/src/main/kotlin/commands/VerifyCommand.kt b/subprojects/semantifyr/src/main/kotlin/commands/VerifyCommand.kt
@@ -4,7 +4,7 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.file
 import hu.bme.mit.semantifyr.oxsts.semantifyr.reader.OxstsReader
 import hu.bme.mit.semantifyr.oxsts.semantifyr.reader.prepareOxsts
-import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.Serializer
+import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.XstsSerializer
 import hu.bme.mit.semantifyr.oxsts.semantifyr.transformation.XstsTransformer
 import hu.bme.mit.semantifyr.oxsts.semantifyr.utils.loggerFactory
 import java.io.File
@@ -31,7 +31,7 @@ class VerifyCommand : BaseVerifyCommand("verify") {
         val transformer = XstsTransformer(reader)
 
         val xsts = transformer.transform(targetName, rewriteChoice = true)
-        val xstsString = Serializer.serialize(xsts)
+        val xstsString = XstsSerializer.serialize(xsts)
 
         val output = model.path.replace(".oxsts", ".xsts")
 

diff --git a/...c/main/kotlin/serialization/Serializer.kt → ...in/kotlin/serialization/XstsSerializer.kt b/...c/main/kotlin/serialization/Serializer.kt → ...in/kotlin/serialization/XstsSerializer.kt
@@ -43,16 +43,9 @@ import hu.bme.mit.semantifyr.oxsts.model.oxsts.Variable
 import hu.bme.mit.semantifyr.oxsts.model.oxsts.XSTS
 import hu.bme.mit.semantifyr.oxsts.semantifyr.utils.referencedElement
 
-object Serializer {
-    fun serializeProperty(xsts: XSTS): String {
-        val text = indent {
-            append(xsts.property)
-        }
+object XstsSerializer {
 
-        return text
-    }
-
-    fun serialize(xsts: XSTS, includeProperty: Boolean = true): String {
+    fun serialize(xsts: XSTS): String {
         val text = indent {
             for (type in xsts.enums) {
                 append(type)
@@ -76,11 +69,9 @@ object Serializer {
 
             appendLine("env {}")
 
-            if (includeProperty) {
-                appendLine()
+            appendLine()
 
-                append(xsts.property)
-            }
+            append(xsts.property)
         }
 
         return text

diff --git a/subprojects/semantifyr/src/testFixtures/kotlin/CompilationTest.kt b/subprojects/semantifyr/src/testFixtures/kotlin/CompilationTest.kt
@@ -7,7 +7,7 @@
 package hu.bme.mit.semantifyr.oxsts.semantifyr
 
 import hu.bme.mit.semantifyr.oxsts.semantifyr.reader.OxstsReader
-import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.Serializer
+import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.XstsSerializer
 import hu.bme.mit.semantifyr.oxsts.semantifyr.transformation.XstsTransformer
 import org.junit.jupiter.api.Assertions
 import java.io.File
@@ -23,7 +23,7 @@ open class CompilationTest {
 
         val transformer = XstsTransformer(reader)
         val xsts = transformer.transform("Mission", rewriteChoice)
-        val serializedXsts = Serializer.serialize(xsts)
+        val serializedXsts = XstsSerializer.serialize(xsts)
 
         File("$directory/model.xsts").writeText(serializedXsts)
     }

diff --git a/subprojects/semantifyr/src/testFixtures/kotlin/VerificationTest.kt b/subprojects/semantifyr/src/testFixtures/kotlin/VerificationTest.kt
@@ -8,7 +8,7 @@ package hu.bme.mit.semantifyr.oxsts.semantifyr
 
 import hu.bme.mit.semantifyr.oxsts.model.oxsts.Target
 import hu.bme.mit.semantifyr.oxsts.semantifyr.reader.OxstsReader
-import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.Serializer
+import hu.bme.mit.semantifyr.oxsts.semantifyr.serialization.XstsSerializer
 import hu.bme.mit.semantifyr.oxsts.semantifyr.theta.ThetaExecutor
 import hu.bme.mit.semantifyr.oxsts.semantifyr.transformation.XstsTransformer
 import hu.bme.mit.semantifyr.oxsts.semantifyr.utils.EnvVar
@@ -104,7 +104,7 @@ open class VerificationTest {
 
         val transformer = XstsTransformer(reader)
         val xsts = transformer.transform(targetName, true)
-        val serializedXsts = Serializer.serialize(xsts)
+        val serializedXsts = XstsSerializer.serialize(xsts)
 
         File("$targetDirectory/$targetName.xsts").writeText(serializedXsts)
     }