move support wrappers classes for primitives in it.unibo.tuprolog.sol…

…ve.primitive
tuProlog · Jun 11, 2020 · b8b1f42 · b8b1f42
1 parent 8a9e10c
commit b8b1f42
Show file tree

Hide file tree

Showing 46 changed files with 48 additions and 19 deletions.
diff --git a/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Throw.kt b/solve-classic/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Throw.kt
@@ -7,6 +7,7 @@ import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.exception.PrologError
 import it.unibo.tuprolog.solve.exception.TuPrologRuntimeException
 import it.unibo.tuprolog.solve.exception.error.MessageError
+import it.unibo.tuprolog.solve.primitive.UnaryPredicate
 
 object Throw : UnaryPredicate<ExecutionContext>("throw") {
     override fun uncheckedImplementation(request: Solve.Request<ExecutionContext>): Sequence<Solve.Response> =

diff --git a/...ve/stdlib/primitive/ArithmeticRelation.kt → ...log/solve/primitive/ArithmeticRelation.kt b/...ve/stdlib/primitive/ArithmeticRelation.kt → ...log/solve/primitive/ArithmeticRelation.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Term

diff --git a/...lib/primitive/BacktrackableSideEffect0.kt → ...lve/primitive/BacktrackableSideEffect0.kt b/...lib/primitive/BacktrackableSideEffect0.kt → ...lve/primitive/BacktrackableSideEffect0.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve

diff --git a/...lib/primitive/BacktrackableSideEffect1.kt → ...lve/primitive/BacktrackableSideEffect1.kt b/...lib/primitive/BacktrackableSideEffect1.kt → ...lve/primitive/BacktrackableSideEffect1.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext

diff --git a/.../solve/stdlib/primitive/BinaryRelation.kt → ...uprolog/solve/primitive/BinaryRelation.kt b/.../solve/stdlib/primitive/BinaryRelation.kt → ...uprolog/solve/primitive/BinaryRelation.kt
@@ -1,10 +1,9 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
-import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
 
 /** Base class to implement primitives that relate two [Term]s and provide a single response */
 abstract class BinaryRelation<E : ExecutionContext>(operator: String) : PrimitiveWrapper<E>(operator, 2) {

diff --git a/...mitive/NonBacktrackableTernaryRelation.kt → ...mitive/NonBacktrackableTernaryRelation.kt b/...mitive/NonBacktrackableTernaryRelation.kt → ...mitive/NonBacktrackableTernaryRelation.kt
@@ -1,9 +1,8 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
-import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
 
 /** Base class to implement primitives that relate tree [Term]s and are not back-trackable */
 abstract class NonBacktrackableTernaryRelation<E : ExecutionContext>(operator: String) : TernaryRelation<E>(operator) {

diff --git a/...ib/primitive/PredicateWithoutArguments.kt → ...ve/primitive/PredicateWithoutArguments.kt b/...ib/primitive/PredicateWithoutArguments.kt → ...ve/primitive/PredicateWithoutArguments.kt
@@ -1,7 +1,6 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
 
 /** A base class to implement predicates with zero argument */
 abstract class PredicateWithoutArguments<E : ExecutionContext>(operator: String) : PrimitiveWrapper<E>(operator, 0)
diff --git a/...log/solve/stdlib/primitive/SideEffect0.kt → ...o/tuprolog/solve/primitive/SideEffect0.kt b/...log/solve/stdlib/primitive/SideEffect0.kt → ...o/tuprolog/solve/primitive/SideEffect0.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve

diff --git a/...log/solve/stdlib/primitive/SideEffect1.kt → ...o/tuprolog/solve/primitive/SideEffect1.kt b/...log/solve/stdlib/primitive/SideEffect1.kt → ...o/tuprolog/solve/primitive/SideEffect1.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext

diff --git a/...og/solve/stdlib/primitive/TermRelation.kt → .../tuprolog/solve/primitive/TermRelation.kt b/...og/solve/stdlib/primitive/TermRelation.kt → .../tuprolog/solve/primitive/TermRelation.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.core.Term

diff --git a/...solve/stdlib/primitive/TernaryRelation.kt → ...prolog/solve/primitive/TernaryRelation.kt b/...solve/stdlib/primitive/TernaryRelation.kt → ...prolog/solve/primitive/TernaryRelation.kt
@@ -1,9 +1,8 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
-import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
 
 /** Base class to implement primitives that relate tree [Term]s */
 abstract class TernaryRelation<E : ExecutionContext>(operator: String) : PrimitiveWrapper<E>(operator, 3) {

diff --git a/...log/solve/stdlib/primitive/TypeEnsurer.kt → ...o/tuprolog/solve/primitive/TypeEnsurer.kt b/...log/solve/stdlib/primitive/TypeEnsurer.kt → ...o/tuprolog/solve/primitive/TypeEnsurer.kt
@@ -1,9 +1,8 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
-import it.unibo.tuprolog.solve.exception.TuPrologRuntimeException
 
 abstract class TypeEnsurer<E : ExecutionContext>(typeName: String) : UnaryPredicate<E>(typeName) {
     override fun uncheckedImplementation(request: Solve.Request<E>): Sequence<Solve.Response> = sequence {

diff --git a/...olog/solve/stdlib/primitive/TypeTester.kt → ...bo/tuprolog/solve/primitive/TypeTester.kt b/...olog/solve/stdlib/primitive/TypeTester.kt → ...bo/tuprolog/solve/primitive/TypeTester.kt
@@ -1,4 +1,4 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext

diff --git a/.../solve/stdlib/primitive/UnaryPredicate.kt → ...uprolog/solve/primitive/UnaryPredicate.kt b/.../solve/stdlib/primitive/UnaryPredicate.kt → ...uprolog/solve/primitive/UnaryPredicate.kt
@@ -1,7 +1,6 @@
-package it.unibo.tuprolog.solve.stdlib.primitive
+package it.unibo.tuprolog.solve.primitive
 
 import it.unibo.tuprolog.solve.ExecutionContext
-import it.unibo.tuprolog.solve.primitive.PrimitiveWrapper
 
 /** A base class to implement predicates with one argument */
 abstract class UnaryPredicate<E : ExecutionContext>(operator: String) : PrimitiveWrapper<E>(operator, 1)
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/ZeroaryPredicate.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/primitive/ZeroaryPredicate.kt
@@ -0,0 +1,3 @@
+package it.unibo.tuprolog.solve.primitive
+
+typealias ZeroaryPredicate<E> = PredicateWithoutArguments<E>
diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/AbstractAssert.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/AbstractAssert.kt
@@ -6,6 +6,7 @@ import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.SideEffect1
 
 abstract class AbstractAssert(suffix: String, private val before: Boolean) : SideEffect1<ExecutionContext>("assert$suffix") {
     override fun accept(request: Solve.Request<ExecutionContext>, term: Term): Solve.Response =

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticEqual.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticEqual.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.ArithmeticRelation
 
 /** Implementation of '=:='/2 predicate */
 object ArithmeticEqual : ArithmeticRelation<ExecutionContext>("=:=") {

diff --git a/...e/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThan.kt b/...e/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThan.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.ArithmeticRelation
 
 /** Implementation of '>'/2 predicate */
 object ArithmeticGreaterThan : ArithmeticRelation<ExecutionContext>(">") {

diff --git a/...monMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThanOrEqualTo.kt b/...monMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticGreaterThanOrEqualTo.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.ArithmeticRelation
 
 /** Implementation of '>='/2 predicate */
 object ArithmeticGreaterThanOrEqualTo : ArithmeticRelation<ExecutionContext>(">=") {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThan.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThan.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.ArithmeticRelation
 
 /** Implementation of '<'/2 predicate */
 object ArithmeticLowerThan : ArithmeticRelation<ExecutionContext>("<") {

diff --git a/...ommonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThanOrEqualTo.kt b/...ommonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticLowerThanOrEqualTo.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.ArithmeticRelation
 
 /** Implementation of '=<'/2 predicate */
 object ArithmeticLowerThanOrEqualTo : ArithmeticRelation<ExecutionContext>("=<") {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticNotEqual.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/ArithmeticNotEqual.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.ArithmeticRelation
 
 /** Implementation of '=\='/2 predicate */
 object ArithmeticNotEqual : ArithmeticRelation<ExecutionContext>("=\\=") {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Atom.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Atom.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Atom : TypeTester<ExecutionContext>("atom") {
     override fun testType(term: Term): Boolean = term is it.unibo.tuprolog.core.Atom

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Atomic.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Atomic.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 import it.unibo.tuprolog.core.Constant
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Atomic : TypeTester<ExecutionContext>("atomic") {
     override fun testType(term: Term): Boolean = term is Constant

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Callable.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Callable.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Callable : TypeTester<ExecutionContext>("callable") {
     override fun testType(term: Term): Boolean = term is Struct

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Compound.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Compound.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 import it.unibo.tuprolog.core.Struct
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Compound : TypeTester<ExecutionContext>("compound") {
     override fun testType(term: Term): Boolean =

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/EnsureExecutable.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/EnsureExecutable.kt
@@ -7,6 +7,7 @@ import it.unibo.tuprolog.solve.Signature
 import it.unibo.tuprolog.solve.exception.error.InstantiationError
 import it.unibo.tuprolog.solve.exception.error.TypeError
 import it.unibo.tuprolog.solve.extractSignature
+import it.unibo.tuprolog.solve.primitive.TypeEnsurer
 
 object EnsureExecutable : TypeEnsurer<ExecutionContext>("ensure_executable") {
     private fun ensurerVisitor(context: ExecutionContext, procedure: Signature): TermVisitor<Unit> =

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/FindAll.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/FindAll.kt
@@ -8,6 +8,7 @@ import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solution
 import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.exception.error.MetaError
+import it.unibo.tuprolog.solve.primitive.NonBacktrackableTernaryRelation
 import it.unibo.tuprolog.unify.Unificator.Companion.mguWith
 
 object FindAll : NonBacktrackableTernaryRelation<ExecutionContext>("findall") {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Float.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Float.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 import it.unibo.tuprolog.core.Real
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Float : TypeTester<ExecutionContext>("float") {
     override fun testType(term: Term): Boolean = term is Real

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Ground.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Ground.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Ground : TypeTester<ExecutionContext>("ground") {
     override fun testType(term: Term): Boolean = term.isGround

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Integer.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Integer.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Integer : TypeTester<ExecutionContext>("integer") {
     override fun testType(term: Term): Boolean = term is it.unibo.tuprolog.core.Integer

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Is.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Is.kt
@@ -5,6 +5,7 @@ import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.function.ArithmeticEvaluator
+import it.unibo.tuprolog.solve.primitive.TermRelation
 import it.unibo.tuprolog.unify.Unificator.Companion.mguWith
 
 /**

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Natural.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Natural.kt
@@ -6,6 +6,7 @@ import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.core.Var
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.UnaryPredicate
 import org.gciatto.kt.math.BigInteger
 
 // TODO doc

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/NewLine.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/NewLine.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.SideEffect0
 
 object NewLine : SideEffect0<ExecutionContext>("nl") {
     override fun accept(request: Solve.Request<ExecutionContext>): Solve.Response {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/NonVar.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/NonVar.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object NonVar : TypeTester<ExecutionContext>("nonvar") {
     override fun testType(term: Term): Boolean = term !is it.unibo.tuprolog.core.Var

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/NotUnifiableWith.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/NotUnifiableWith.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TermRelation
 import it.unibo.tuprolog.unify.Unificator.Companion.matches
 
 /** Implementation of '\='/2 predicate */

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Number.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Number.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 import it.unibo.tuprolog.core.Numeric
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Number : TypeTester<ExecutionContext>("number") {
     override fun testType(term: Term): Boolean = term is Numeric

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Retract.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Retract.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.*
 import it.unibo.tuprolog.core.Var
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.BacktrackableSideEffect1
 import it.unibo.tuprolog.theory.RetractResult
 import it.unibo.tuprolog.unify.Unificator.Companion.mguWith
 

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermIdentical.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermIdentical.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TermRelation
 
 /** Implementation of '=='/2 predicate */
 object TermIdentical : TermRelation.WithoutSideEffects<ExecutionContext>("==") {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermNotIdentical.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TermNotIdentical.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TermRelation
 
 /** Implementation of `'\=='/2` predicate */
 object TermNotIdentical : TermRelation.WithoutSideEffects<ExecutionContext>("\\==") {

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/UnifiesWith.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/UnifiesWith.kt
@@ -3,6 +3,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 import it.unibo.tuprolog.core.Substitution
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TermRelation
 import it.unibo.tuprolog.unify.Unificator.Companion.mguWith
 
 /** Implementation of '='/2 predicate */

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Var.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Var.kt
@@ -2,6 +2,7 @@ package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
+import it.unibo.tuprolog.solve.primitive.TypeTester
 
 object Var : TypeTester<ExecutionContext>("var") {
     override fun testType(term: Term): Boolean = term is it.unibo.tuprolog.core.Var

diff --git a/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Write.kt b/solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/Write.kt
@@ -4,6 +4,7 @@ import it.unibo.tuprolog.core.Atom
 import it.unibo.tuprolog.core.Term
 import it.unibo.tuprolog.solve.ExecutionContext
 import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.SideEffect1
 
 object Write : SideEffect1<ExecutionContext>("write") {
     override fun accept(request: Solve.Request<ExecutionContext>, term: Term): Solve.Response {

diff --git a/...c/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TypeTestingPrimitivesTest.kt b/...c/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/TypeTestingPrimitivesTest.kt
@@ -1,6 +1,7 @@
 package it.unibo.tuprolog.solve.stdlib.primitive
 
 import it.unibo.tuprolog.solve.Solve
+import it.unibo.tuprolog.solve.primitive.UnaryPredicate
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.TypeTestingUtils.assertCorrectResponse
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.TypeTestingUtils.atomQueryToResult
 import it.unibo.tuprolog.solve.stdlib.primitive.testutils.TypeTestingUtils.atomicQueryToResult

diff --git a/...c/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/ArithmeticUtils.kt b/...c/commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/ArithmeticUtils.kt
@@ -10,6 +10,7 @@ import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.exception.TuPrologRuntimeException
 import it.unibo.tuprolog.solve.exception.error.EvaluationError
 import it.unibo.tuprolog.solve.exception.error.InstantiationError
+import it.unibo.tuprolog.solve.primitive.ArithmeticRelation
 import kotlin.reflect.KClass
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue

diff --git a/.../commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/TypeTestingUtils.kt b/.../commonTest/kotlin/it/unibo/tuprolog/solve/stdlib/primitive/testutils/TypeTestingUtils.kt
@@ -8,6 +8,7 @@ import it.unibo.tuprolog.solve.Solve
 import it.unibo.tuprolog.solve.exception.TuPrologRuntimeException
 import it.unibo.tuprolog.solve.exception.error.InstantiationError
 import it.unibo.tuprolog.solve.exception.error.TypeError
+import it.unibo.tuprolog.solve.primitive.UnaryPredicate
 import it.unibo.tuprolog.solve.stdlib.primitive.*
 import it.unibo.tuprolog.utils.squared
 import kotlin.collections.List
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package it.unibo.tuprolog.solve.primitive

		typealias ZeroaryPredicate<E> = PredicateWithoutArguments<E>