Skip to content

Commit 2c81f27

Browse files
CopilotGarciat
andcommitted
Move HKT types from api to api.hkt package
Co-authored-by: Garciat <118277+Garciat@users.noreply.github.com>
1 parent 7b2207a commit 2c81f27

6 files changed

Lines changed: 11 additions & 13 deletions

File tree

src/main/java/com/garciat/typeclasses/Main.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import static com.garciat.typeclasses.impl.Functions.flip;
77
import static java.util.function.Function.identity;
88

9-
import com.garciat.typeclasses.api.Kind;
10-
import com.garciat.typeclasses.api.Kind.KArr;
11-
import com.garciat.typeclasses.api.Kind.KStar;
12-
import com.garciat.typeclasses.api.TApp;
13-
import com.garciat.typeclasses.api.TPar;
14-
import com.garciat.typeclasses.api.TagBase;
159
import com.garciat.typeclasses.api.TypeClass;
10+
import com.garciat.typeclasses.api.hkt.Kind;
11+
import com.garciat.typeclasses.api.hkt.Kind.KArr;
12+
import com.garciat.typeclasses.api.hkt.Kind.KStar;
13+
import com.garciat.typeclasses.api.hkt.TApp;
14+
import com.garciat.typeclasses.api.hkt.TPar;
15+
import com.garciat.typeclasses.api.hkt.TagBase;
1616
import com.garciat.typeclasses.impl.Lists;
1717
import com.garciat.typeclasses.impl.Maps;
1818
import java.lang.reflect.GenericArrayType;
@@ -40,9 +40,6 @@ public final class Main {
4040
private Main() {}
4141
}
4242

43-
// ==== Type System ====
44-
// Kind, TApp, TPar, TagBase are now in com.garciat.typeclasses.api package
45-
4643
// Internal type parsing
4744
sealed interface ParsedType {
4845
record Var(TypeVariable<?> java) implements ParsedType {}

src/main/java/com/garciat/typeclasses/api/Kind.java renamed to src/main/java/com/garciat/typeclasses/api/hkt/Kind.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.garciat.typeclasses.api;
1+
package com.garciat.typeclasses.api.hkt;
22

33
public interface Kind<K extends Kind.Base> {
44
sealed interface Base permits KStar, KArr {}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
package com.garciat.typeclasses.api;
1+
package com.garciat.typeclasses.api.hkt;
22

33
public interface TApp<Tag extends Kind<Kind.KArr<Kind.KStar>>, A> extends Kind<Kind.KStar> {}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.garciat.typeclasses.api;
1+
package com.garciat.typeclasses.api.hkt;
22

33
public interface TPar<Tag extends Kind<Kind.KArr<Kind.KArr<Kind.KStar>>>, A>
44
extends Kind<Kind.KArr<Kind.KStar>> {}

src/main/java/com/garciat/typeclasses/api/TagBase.java renamed to src/main/java/com/garciat/typeclasses/api/hkt/TagBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
package com.garciat.typeclasses.api;
1+
package com.garciat.typeclasses.api.hkt;
22

33
public abstract class TagBase<K extends Kind.Base> implements Kind<K> {}

src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module com.garciat.typeclasses {
22
exports com.garciat.typeclasses.api;
3+
exports com.garciat.typeclasses.api.hkt;
34
exports com.garciat.typeclasses;
45
}

0 commit comments

Comments
 (0)