implementation classes for Cursor in it.unibo.tuprolog.utils.impl

tuProlog · May 5, 2020 · 7a4ddbc · 7a4ddbc
1 parent f56eb1b
commit 7a4ddbc
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 7 deletions.
diff --git a/core/src/commonMain/kotlin/it/unibo/tuprolog/utils/Cursor.kt b/core/src/commonMain/kotlin/it/unibo/tuprolog/utils/Cursor.kt
@@ -1,5 +1,8 @@
 package it.unibo.tuprolog.utils
 
+import it.unibo.tuprolog.utils.impl.ConjunctionCursor
+import it.unibo.tuprolog.utils.impl.EmptyCursor
+import it.unibo.tuprolog.utils.impl.MapperCursor
 import kotlin.js.JsName
 import kotlin.jvm.JvmStatic
 

diff --git a/core/src/commonMain/kotlin/it/unibo/tuprolog/utils/CursorExtensions.kt b/core/src/commonMain/kotlin/it/unibo/tuprolog/utils/CursorExtensions.kt
@@ -2,6 +2,9 @@
 
 package it.unibo.tuprolog.utils
 
+import it.unibo.tuprolog.utils.impl.ConjunctionCursor
+import it.unibo.tuprolog.utils.impl.EmptyCursor
+import it.unibo.tuprolog.utils.impl.LazyCursor
 import kotlin.jvm.JvmName
 
 

diff --git a/...it/unibo/tuprolog/utils/AbstractCursor.kt → ...ibo/tuprolog/utils/impl/AbstractCursor.kt b/...it/unibo/tuprolog/utils/AbstractCursor.kt → ...ibo/tuprolog/utils/impl/AbstractCursor.kt
@@ -1,4 +1,6 @@
-package it.unibo.tuprolog.utils
+package it.unibo.tuprolog.utils.impl
+
+import it.unibo.tuprolog.utils.Cursor
 
 internal abstract class AbstractCursor<T> : Cursor<T> {
     override fun toString(): String {

diff --git a/...unibo/tuprolog/utils/ConjunctionCursor.kt → .../tuprolog/utils/impl/ConjunctionCursor.kt b/...unibo/tuprolog/utils/ConjunctionCursor.kt → .../tuprolog/utils/impl/ConjunctionCursor.kt
@@ -1,11 +1,16 @@
-package it.unibo.tuprolog.utils
+package it.unibo.tuprolog.utils.impl
+
+import it.unibo.tuprolog.utils.Cursor
 
 internal data class ConjunctionCursor<T>(val first: Cursor<out T>, val second: Cursor<out T>) : AbstractCursor<T>() {
     override val isOver: Boolean
         get() = first.isOver && second.isOver
 
     override val next: Cursor<out T>
-        get() = if (first.hasNext) ConjunctionCursor(first.next, second) else second
+        get() = if (first.hasNext) ConjunctionCursor(
+            first.next,
+            second
+        ) else second
 
     override val current: T?
         get() = if (first.hasNext) first.current else second.current

diff --git a/...in/it/unibo/tuprolog/utils/EmptyCursor.kt → .../unibo/tuprolog/utils/impl/EmptyCursor.kt b/...in/it/unibo/tuprolog/utils/EmptyCursor.kt → .../unibo/tuprolog/utils/impl/EmptyCursor.kt
@@ -1,4 +1,6 @@
-package it.unibo.tuprolog.utils
+package it.unibo.tuprolog.utils.impl
+
+import it.unibo.tuprolog.utils.Cursor
 
 internal object EmptyCursor : AbstractCursor<Nothing>() {
     override val next: Cursor<Nothing>

diff --git a/...lin/it/unibo/tuprolog/utils/LazyCursor.kt → ...t/unibo/tuprolog/utils/impl/LazyCursor.kt b/...lin/it/unibo/tuprolog/utils/LazyCursor.kt → ...t/unibo/tuprolog/utils/impl/LazyCursor.kt
@@ -1,4 +1,6 @@
-package it.unibo.tuprolog.utils
+package it.unibo.tuprolog.utils.impl
+
+import it.unibo.tuprolog.utils.Cursor
 
 internal data class LazyCursor<T>(val iterator: Iterator<T>) : AbstractCursor<T>() {
 

diff --git a/...n/it/unibo/tuprolog/utils/MapperCursor.kt → ...unibo/tuprolog/utils/impl/MapperCursor.kt b/...n/it/unibo/tuprolog/utils/MapperCursor.kt → ...unibo/tuprolog/utils/impl/MapperCursor.kt
@@ -1,4 +1,6 @@
-package it.unibo.tuprolog.utils
+package it.unibo.tuprolog.utils.impl
+
+import it.unibo.tuprolog.utils.Cursor
 
 internal data class MapperCursor<T, R>(val wrapped: Cursor<out T>, val mapper: (T) -> R) : AbstractCursor<R>() {
     override val next: Cursor<out R> by lazy {

diff --git a/.../it/unibo/tuprolog/utils/NonLastCursor.kt → ...nibo/tuprolog/utils/impl/NonLastCursor.kt b/.../it/unibo/tuprolog/utils/NonLastCursor.kt → ...nibo/tuprolog/utils/impl/NonLastCursor.kt
@@ -1,4 +1,7 @@
-package it.unibo.tuprolog.utils
+package it.unibo.tuprolog.utils.impl
+
+import it.unibo.tuprolog.utils.Cursor
+import it.unibo.tuprolog.utils.toCursor
 
 internal data class NonLastCursor<T>(val iterator: Iterator<T>) : AbstractCursor<T>() {