format code in :serialization-core

tuProlog · Sep 14, 2020 · 9009a60 · 9009a60
1 parent fdbfeac
commit 9009a60
Show file tree

Hide file tree

Showing 34 changed files with 140 additions and 80 deletions.
diff --git a/...lize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/DeobjectificationException.kt b/...lize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/DeobjectificationException.kt
@@ -2,4 +2,4 @@ package it.unibo.tuprolog.serialize
 
 import it.unibo.tuprolog.core.exception.TuPrologException
 
-class DeobjectificationException(`object`: Any) : TuPrologException("Error while deobjectifying $`object`")
+class DeobjectificationException(`object`: Any) : TuPrologException("Error while deobjectifying $`object`")
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Deobjectifier.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Deobjectifier.kt
@@ -8,4 +8,4 @@ interface Deobjectifier<T> {
 
     @JsName("deobjectifyMany")
     fun deobjectifyMany(`object`: Any): Iterable<T>
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Deserializer.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Deserializer.kt
@@ -11,4 +11,4 @@ interface Deserializer<T> {
 
     @JsName("deserializeMany")
     fun deserializeMany(string: String): Iterable<T>
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/MimeType.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/MimeType.kt
@@ -14,5 +14,4 @@ sealed class MimeType(
     object Yaml : MimeType("application", "yaml")
 
     object Xml : MimeType("application", "xml")
-
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Objectifier.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Objectifier.kt
@@ -17,4 +17,3 @@ interface Objectifier<T> {
     fun objectifyMany(values: Sequence<T>): Any =
         objectifyMany(values.asIterable())
 }
-
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/ObjectsUtils.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/ObjectsUtils.kt
@@ -4,4 +4,4 @@ expect object ObjectsUtils {
     fun parseAsObject(string: String, mimeType: MimeType): Any
 
     fun deeplyEqual(obj1: Any?, obj2: Any?): Boolean
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/SerializationException.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/SerializationException.kt
@@ -3,4 +3,4 @@ package it.unibo.tuprolog.serialize
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.core.exception.TuPrologException
 
-class SerializationException(term: Term) : TuPrologException("Error while serialising $term")
+class SerializationException(term: Term) : TuPrologException("Error while serialising $term")
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Serializer.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/Serializer.kt
@@ -19,4 +19,4 @@ interface Serializer<T> {
     @JsName("serializeManySequence")
     fun serializeMany(values: Sequence<T>): String =
         serializeMany(values.asIterable())
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermDeobjectifier.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermDeobjectifier.kt
@@ -11,4 +11,4 @@ interface TermDeobjectifier : Deobjectifier<Term> {
         val default: TermDeobjectifier
             get() = termDeobjectifier()
     }
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermDeserializer.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermDeserializer.kt
@@ -12,4 +12,4 @@ interface TermDeserializer : Deserializer<Term> {
             return termDeserializer(mimeType)
         }
     }
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermObjectifier.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermObjectifier.kt
@@ -14,4 +14,4 @@ interface TermObjectifier : Objectifier<Term>, TermVisitor<Any> {
         val default: TermObjectifier
             get() = termObjectifier()
     }
-}
+}
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermSerialization.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermSerialization.kt
@@ -10,4 +10,4 @@ expect fun termDeserializer(mimeType: MimeType): TermDeserializer
 
 expect fun termObjectifier(): TermObjectifier
 
-expect fun termDeobjectifier(): TermDeobjectifier
+expect fun termDeobjectifier(): TermDeobjectifier
diff --git a/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermSerializer.kt b/serialize-core/src/commonMain/kotlin/it/unibo/tuprolog/serialize/TermSerializer.kt
@@ -13,5 +13,4 @@ interface TermSerializer : Serializer<Term> {
             return termSerializer(mimeType)
         }
     }
-
-}
+}
diff --git a/serialize-core/src/commonTest/kotlin/it/unibo/tuprolog/serialize/TestTermDeserializer.kt b/serialize-core/src/commonTest/kotlin/it/unibo/tuprolog/serialize/TestTermDeserializer.kt
@@ -56,7 +56,6 @@ class TestTermDeserializer {
         deserializer.assertTermDeserializationWorks("\"other atom\"") {
             atomOf("other atom")
         }
-
     }
 
     @Test
@@ -96,7 +95,8 @@ class TestTermDeserializer {
     fun testListDeserializationInYAML() {
         val deserializer: TermDeserializer = TermDeserializer.of(MimeType.Yaml)
         assertEquals(MimeType.Yaml, deserializer.mimeType)
-        val actual = """
+        val actual =
+            """
                 |list:
                 |- hello
                 |- 1
@@ -120,7 +120,8 @@ class TestTermDeserializer {
     fun testSetDeserializationInYAML() {
         val deserializer: TermDeserializer = TermDeserializer.of(MimeType.Yaml)
         assertEquals(MimeType.Yaml, deserializer.mimeType)
-        val actual = """
+        val actual =
+            """
                 |set:
                 |- "hello"
                 |- 1
@@ -142,7 +143,9 @@ class TestTermDeserializer {
 
         deserializer.assertTermDeserializationWorks("{\"fun\":\"f\",\"args\":[\"prova 2\",{\"real\":3.0},{\"list\":[\"qua ci va una lista\",true]}]}") {
             structOf(
-                "f", atomOf("prova 2"), realOf(3.0),
+                "f",
+                atomOf("prova 2"),
+                realOf(3.0),
                 listOf(atomOf("qua ci va una lista"), truthOf(true))
             )
         }
@@ -152,7 +155,8 @@ class TestTermDeserializer {
     fun testStructDeserializationInYAML() {
         val deserializer: TermDeserializer = TermDeserializer.of(MimeType.Yaml)
         assertEquals(MimeType.Yaml, deserializer.mimeType)
-        var actual = """
+        var actual =
+            """
                 |fun: f
                 |args:
                 |- hello
@@ -162,7 +166,8 @@ class TestTermDeserializer {
             structOf("f", atomOf("hello"), numOf(2))
         }
 
-        actual = """
+        actual =
+            """
                 |fun: "f"
                 |args:
                 |- "prova 2"
@@ -173,7 +178,9 @@ class TestTermDeserializer {
                 """.trimMargin()
         deserializer.assertTermDeserializationWorks(actual) {
             structOf(
-                "f", atomOf("prova 2"), realOf(3.0),
+                "f",
+                atomOf("prova 2"),
+                realOf(3.0),
                 listOf(atomOf("qua ci va una lista"), truthOf(true))
             )
         }
@@ -196,7 +203,8 @@ class TestTermDeserializer {
 
         assertEquals(MimeType.Yaml, deserializer.mimeType)
 
-        val actual = """
+        val actual =
+            """
                 |var: "X"
                 """.trimMargin()
         deserializer.assertTermDeserializationWorks(actual) {
@@ -227,4 +235,4 @@ class TestTermDeserializer {
             truthOf(false)
         }
     }
-}
+}
diff --git a/serialize-core/src/commonTest/kotlin/it/unibo/tuprolog/serialize/TestTermSerializer.kt b/serialize-core/src/commonTest/kotlin/it/unibo/tuprolog/serialize/TestTermSerializer.kt
@@ -91,7 +91,8 @@ class TestTermSerializer {
 
         assertEquals(MimeType.Yaml, serializer.mimeType)
 
-        var expected = """
+        var expected =
+            """
                 |list:
                 |- hello
                 |- false
@@ -100,7 +101,8 @@ class TestTermSerializer {
             listOf(atomOf("hello"), truthOf(false))
         }
 
-        expected = """
+        expected =
+            """
                 |list:
                 |- hello
                 |- 1
@@ -146,7 +148,8 @@ class TestTermSerializer {
 
         assertEquals(MimeType.Yaml, serializer.mimeType)
 
-        var expected = """
+        var expected =
+            """
                 |set:
                 |- hello
                 |- false
@@ -155,7 +158,8 @@ class TestTermSerializer {
             setOf(atomOf("hello"), truthOf(false))
         }
 
-        expected = """
+        expected =
+            """
                 |set:
                 |- hello
                 |- 1
@@ -181,7 +185,8 @@ class TestTermSerializer {
 
         assertEquals(MimeType.Yaml, serializer.mimeType)
 
-        val expected = """
+        val expected =
+            """
                 |fun: f
                 |args:
                 |- hello
@@ -228,7 +233,6 @@ class TestTermSerializer {
         val serializer: TermSerializer = TermSerializer.of(MimeType.Json)
         assertEquals(MimeType.Json, serializer.mimeType)
 
-
         serializer.assertTermSerializationWorks("{\"var\":\"Y\"}") {
             varOf("Y")
         }
@@ -243,12 +247,13 @@ class TestTermSerializer {
         val serializer: TermSerializer = TermSerializer.of(MimeType.Yaml)
         assertEquals(MimeType.Yaml, serializer.mimeType)
 
-        val expected = """
+        val expected =
+            """
                 |var: "Y"
                 """.trimMargin()
 
         serializer.assertTermSerializationWorks(expected) {
             varOf("Y")
         }
     }
-}
+}
diff --git a/serialize-core/src/commonTest/kotlin/it/unibo/tuprolog/serialize/TestUtils.kt b/serialize-core/src/commonTest/kotlin/it/unibo/tuprolog/serialize/TestUtils.kt
@@ -1,6 +1,7 @@
 package it.unibo.tuprolog.serialize
 
-import it.unibo.tuprolog.core.*
+import it.unibo.tuprolog.core.Scope
+import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.serialize.ObjectsUtils.deeplyEqual
 import it.unibo.tuprolog.serialize.ObjectsUtils.parseAsObject
 
@@ -10,13 +11,15 @@ import it.unibo.tuprolog.serialize.ObjectsUtils.parseAsObject
 fun <T : Term> Serializer<T>.assertSerializationWorks(expected: String, actual: T) {
     val expectedObj = parseAsObject(expected, mimeType)
     val actualObj = TermObjectifier.default.objectify(actual)
-    kotlin.test.assertTrue("""
+    kotlin.test.assertTrue(
+        """
         |Expected:
         |   $expectedObj
         |got instead:
         |   $actualObj
         |
-    """.trimMargin()) { deeplyEqual(expectedObj, actualObj) }
+    """.trimMargin()
+    ) { deeplyEqual(expectedObj, actualObj) }
 }
 
 /**
@@ -42,13 +45,15 @@ fun Serializer<Term>.assertTermSerializationWorks(expected: String, actualGenera
  */
 fun <T : Term> Deserializer<T>.assertDeserializationWorks(expected: T, actual: String) {
     val deserialized = deserialize(actual)
-    kotlin.test.assertTrue("""
+    kotlin.test.assertTrue(
+        """
         |Expected:
         |   $expected
         |got:
         |   $deserialized
         |
-    """.trimMargin()) { expected.equals(deserialized, false) }
+    """.trimMargin()
+    ) { expected.equals(deserialized, false) }
 }
 
 /**
@@ -67,4 +72,4 @@ fun <T : Term> Deserializer<T>.assertDeserializationWorks(expected: T, actual: S
  */
 fun Deserializer<Term>.assertTermDeserializationWorks(actual: String, expectedGenerator: Scope.() -> Term) {
     assertDeserializationWorks(Scope.empty().expectedGenerator(), actual)
-}
+}
diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeobjectifier.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeobjectifier.kt
@@ -85,24 +85,31 @@ internal class JsTermDeobjectifier : TermDeobjectifier {
 
     private fun deobjectifyTuple(value: dynamic): Term {
         val items = value["tuple"] as? Array<*> ?: throw DeobjectificationException(value)
-        return scope.tupleOf(items.map {
-            deobjectify(it ?: throw DeobjectificationException(value))
-        })
+        return scope.tupleOf(
+            items.map {
+                deobjectify(it ?: throw DeobjectificationException(value))
+            }
+        )
     }
 
     private fun deobjectifySet(value: dynamic): Term {
         val items = value["set"] as? Array<*> ?: throw DeobjectificationException(value)
-        return scope.setOf(items.map {
-            deobjectify(it ?: throw DeobjectificationException(value))
-        })
+        return scope.setOf(
+            items.map {
+                deobjectify(it ?: throw DeobjectificationException(value))
+            }
+        )
     }
 
     private fun deobjectifyStructure(value: dynamic): Term {
         val name = value["fun"] as? String ?: throw DeobjectificationException(value)
         val args = value["args"] as? Array<*> ?: throw DeobjectificationException(value)
-        return scope.structOf(name, args.map {
-            deobjectify(it ?: throw DeobjectificationException(value))
-        })
+        return scope.structOf(
+            name,
+            args.map {
+                deobjectify(it ?: throw DeobjectificationException(value))
+            }
+        )
     }
 
     private fun deobjectifyVariable(value: dynamic): Term {
@@ -125,5 +132,4 @@ internal class JsTermDeobjectifier : TermDeobjectifier {
     private fun deobjectifyNumber(value: dynamic): Term {
         return scope.numOf(value.toString())
     }
-
-}
+}
diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeserializer.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermDeserializer.kt
@@ -15,4 +15,4 @@ internal class JsTermDeserializer(override val mimeType: MimeType) : TermDeseria
             is MimeType.Json -> JSON.parse(string)
             is MimeType.Yaml -> YAML.parse(string)
         } as Any
-}
+}
diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermObjectifier.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermObjectifier.kt
@@ -1,6 +1,22 @@
 package it.unibo.tuprolog.serialize
 
-import it.unibo.tuprolog.core.*
+import it.unibo.tuprolog.core.Atom
+import it.unibo.tuprolog.core.Cons
+import it.unibo.tuprolog.core.Directive
+import it.unibo.tuprolog.core.EmptyList
+import it.unibo.tuprolog.core.EmptySet
+import it.unibo.tuprolog.core.Fact
+import it.unibo.tuprolog.core.Indicator
+import it.unibo.tuprolog.core.Integer
+import it.unibo.tuprolog.core.List
+import it.unibo.tuprolog.core.Real
+import it.unibo.tuprolog.core.Rule
+import it.unibo.tuprolog.core.Set
+import it.unibo.tuprolog.core.Struct
+import it.unibo.tuprolog.core.Term
+import it.unibo.tuprolog.core.Truth
+import it.unibo.tuprolog.core.Tuple
+import it.unibo.tuprolog.core.Var
 
 internal class JsTermObjectifier : TermObjectifier {
     override fun defaultValue(term: Term): Any {
@@ -107,4 +123,4 @@ internal class JsTermObjectifier : TermObjectifier {
         jsObject(
             "body" to term.body.accept(this)
         )
-}
+}
diff --git a/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermSerializer.kt b/serialize-core/src/jsMain/kotlin/it/unibo/tuprolog/serialize/JsTermSerializer.kt
@@ -18,4 +18,4 @@ internal class JsTermSerializer(override val mimeType: MimeType) : TermSerialize
             is MimeType.Json -> JSON.stringify(objectified)
             is MimeType.Yaml -> YAML.stringify(objectified)
         }
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ package it.unibo.tuprolog.serialize

		import it.unibo.tuprolog.core.exception.TuPrologException

		class DeobjectificationException(`object`: Any) : TuPrologException("Error while deobjectifying $`object`")
		class DeobjectificationException(`object`: Any) : TuPrologException("Error while deobjectifying $`object`")
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ interface Deobjectifier<T> { @@
         @JsName("deobjectifyMany")
         fun deobjectifyMany(`object`: Any): Iterable<T>
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,3 @@ interface Objectifier<T> {
		fun objectifyMany(values: Sequence<T>): Any =
		objectifyMany(values.asIterable())
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ expect fun termDeserializer(mimeType: MimeType): TermDeserializer

		expect fun termObjectifier(): TermObjectifier

		expect fun termDeobjectifier(): TermDeobjectifier
		expect fun termDeobjectifier(): TermDeobjectifier