Skip to content

Commit bb2d3ae

Browse files
committed
refactor: reorganize packages
1 parent 671bf7b commit bb2d3ae

File tree

16 files changed

+21
-29
lines changed

16 files changed

+21
-29
lines changed

src/main/scala/io/github/kelvindev15/prolog/core/Constant.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.kelvindev15.prolog.core
22

33
import io.github.kelvindev15.prolog.core.Struct.quoteIfFunctorIsMalformed
4-
import io.github.kelvindev15.prolog.utils.TermVisitor
4+
import io.github.kelvindev15.prolog.visitors.TermVisitor
55

66
/** A Prolog Constant, either numeric or an atom */
77
trait Constant extends Term:

src/main/scala/io/github/kelvindev15/prolog/core/Goals.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.github.kelvindev15.prolog.core
33
import io.github.kelvindev15.prolog.core.Constant.Atom
44
import io.github.kelvindev15.prolog.core.Prolog.Functors
55
import io.github.kelvindev15.prolog.core.RecursiveStruct.BinaryRecursiveStruct
6-
import io.github.kelvindev15.prolog.utils.TermVisitor
6+
import io.github.kelvindev15.prolog.visitors.TermVisitor
77

88
object Goals:
99
/** Represents a conjunction of goals. */

src/main/scala/io/github/kelvindev15/prolog/core/RecursiveStruct.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.kelvindev15.prolog.core
22

3-
import io.github.kelvindev15.prolog.utils.BinaryToFlatVisitor
3+
import io.github.kelvindev15.prolog.visitors.BinaryToFlatVisitor
44

55
/** A Prolog [[Struct]] that is also recursive. */
66
trait RecursiveStruct extends Struct:

src/main/scala/io/github/kelvindev15/prolog/core/Struct.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.github.kelvindev15.prolog.core.Constant.Atom
44
import io.github.kelvindev15.prolog.core.Goals.Conjunction
55
import io.github.kelvindev15.prolog.core.Prolog.Functors.CLAUSE
66
import io.github.kelvindev15.prolog.core.Prolog.{Functors, Syntax}
7-
import io.github.kelvindev15.prolog.utils.TermVisitor
7+
import io.github.kelvindev15.prolog.visitors.TermVisitor
88

99
/** A Prolog compound term */
1010
trait Struct extends Term:

src/main/scala/io/github/kelvindev15/prolog/core/Term.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package io.github.kelvindev15.prolog.core
22

3-
import io.github.kelvindev15.prolog.utils.{
4-
TermConvertible,
5-
TermVisitor,
6-
ToStringTermVisitor
7-
}
3+
import io.github.kelvindev15.prolog.utils.TermConvertible
4+
import io.github.kelvindev15.prolog.visitors.{TermVisitor, ToStringTermVisitor}
85

96
/** A trait to visit a Term like object. */
107
trait Visitable:

src/main/scala/io/github/kelvindev15/prolog/core/Variable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.kelvindev15.prolog.core
22

33
import io.github.kelvindev15.prolog.core.Prolog.Syntax.VariableRegex
4-
import io.github.kelvindev15.prolog.utils.TermVisitor
4+
import io.github.kelvindev15.prolog.visitors.TermVisitor
55

66
/** A Prolog variable */
77
trait Variable extends Term:

src/main/scala/io/github/kelvindev15/prolog/solver/tuprolog/visitors/To2PKtTermVisitor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.github.kelvindev15.prolog.core.PrologList.Cons
66
import io.github.kelvindev15.prolog.core.RecursiveStruct.BinaryRecursiveStruct
77
import io.github.kelvindev15.prolog.core.Struct.{Clause, Directive, Fact, Rule}
88
import io.github.kelvindev15.prolog.solver.tuprolog.TuPrologFactoryMethods.*
9-
import io.github.kelvindev15.prolog.utils.TermVisitor
9+
import io.github.kelvindev15.prolog.visitors.TermVisitor
1010
import it.unibo.tuprolog.core.{Scope as KScope, Term as KTerm}
1111

1212
/** Converts a tuProlog [[Term]] hierarchy to a [[Term]] hierarchy. Creates a

src/main/scala/io/github/kelvindev15/prolog/visitors/BinaryToFlatVisitor.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.kelvindev15.prolog.utils
1+
package io.github.kelvindev15.prolog.visitors
22

33
import io.github.kelvindev15.prolog.core.RecursiveStruct.BinaryRecursiveStruct
44
import io.github.kelvindev15.prolog.core.RecursiveStruct.BinaryRecursiveStruct.Tuple

src/main/scala/io/github/kelvindev15/prolog/visitors/ToStringTermVisitor.scala

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
package io.github.kelvindev15.prolog.utils
1+
package io.github.kelvindev15.prolog.visitors
2+
23
import io.github.kelvindev15.prolog.core.Goals.{Conjunction, Disjunction}
34
import io.github.kelvindev15.prolog.core.RecursiveStruct.BinaryRecursiveStruct
45
import io.github.kelvindev15.prolog.core.Struct.Clause
5-
import io.github.kelvindev15.prolog.core.{
6-
Constant,
7-
PrologList,
8-
RecursiveStruct,
9-
Struct,
10-
Variable
11-
}
6+
import io.github.kelvindev15.prolog.core.*
127

138
class ToStringTermVisitor extends TermVisitor[String]:
149

src/test/scala/io/github/kelvindev15/prolog/core/TestRules.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.github.kelvindev15.prolog.core
22

33
import io.github.kelvindev15.prolog.core.Constant.Atom
44
import io.github.kelvindev15.prolog.core.Struct.Rule
5-
import io.github.kelvindev15.prolog.utils.BinaryToFlatVisitor
5+
import io.github.kelvindev15.prolog.visitors.BinaryToFlatVisitor
66
import org.scalatest.flatspec.AnyFlatSpec
77
import org.scalatest.matchers.should.Matchers
88

0 commit comments

Comments
 (0)