Move Memo inside a package

.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: Build with Gradle
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+
+    - name: Build with Gradle
+      run: ./gradlew build
+

src/main/kotlin/io/vexel/kobold/lexer/Lexer.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.lexer
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.Token
 import io.vexel.kobold.lexer.dsl.IgnoredToken
 import io.vexel.kobold.lexer.dsl.NothingToken

src/main/kotlin/io/vexel/kobold/lexer/LexerDSL.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.lexer
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.lexer.dsl.*
 import io.vexel.kobold.lexer.rules.LexerRule
 

src/main/kotlin/io/vexel/kobold/lexer/dsl/OneOrMoreOperator.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.lexer.dsl
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.matchers.Concatenation
 import io.vexel.kobold.matchers.Matcher
 import io.vexel.kobold.matchers.NonTerminal

src/main/kotlin/io/vexel/kobold/lexer/dsl/ZeroOrMoreOperator.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.lexer.dsl
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.matchers.*
 
 interface ZeroOrMoreOperatorDSL {

src/main/kotlin/io/vexel/kobold/matchers/MatcherMemo.kt

@@ -1,8 +1,7 @@
+package io.vexel.kobold.matchers
+
 import io.vexel.kobold.Accepted
 import io.vexel.kobold.Result
-import io.vexel.kobold.matchers.NonTerminal
-import io.vexel.kobold.matchers.State
-import io.vexel.kobold.matchers.Tokens
 
 class MatcherMemo {
     private val states = hashMapOf<Parameters, State>()

src/main/kotlin/io/vexel/kobold/matchers/NonTerminal.kt

@@ -1,6 +1,5 @@
 package io.vexel.kobold.matchers
 
-import MatcherMemo
 import io.vexel.kobold.*
 
 class NonTerminal(private val memo: MatcherMemo, private val producer: ((List<Symbol>) -> Symbol)? = null) : Matcher {

src/main/kotlin/io/vexel/kobold/parser/ParserDSL.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.parser
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.matchers.Empty
 import io.vexel.kobold.parser.dsl.*
 

src/main/kotlin/io/vexel/kobold/parser/dsl/NonTerminalOperators.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.parser.dsl
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.Symbol
 import io.vexel.kobold.matchers.Matcher
 import io.vexel.kobold.matchers.NonTerminal

src/main/kotlin/io/vexel/kobold/parser/dsl/OneOrMoreOperator.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.parser.dsl
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.Token
 import io.vexel.kobold.matchers.*
 

src/main/kotlin/io/vexel/kobold/parser/dsl/ZeroOrMoreOperator.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.parser.dsl
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.Token
 import io.vexel.kobold.matchers.*
 

src/test/kotlin/io/vexel/kobold/test/matchers/NonTerminal should.kt

@@ -1,6 +1,6 @@
 package io.vexel.kobold.test.matchers
 
-import MatcherMemo
+import io.vexel.kobold.matchers.MatcherMemo
 import io.vexel.kobold.Accepted
 import io.vexel.kobold.Rejected
 import io.vexel.kobold.Token