aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2024-03-02 14:56:39 +0000
committerMichael Williamson <mike@zwobble.org>2024-03-02 14:56:39 +0000
commit6613798d28510f1240eee12c120a1f6482351c74 (patch)
tree3c5e0ec3afd8639bd5278b295f50766b09f2dfc0 /src/main/java
parentffe44975d9c6ad0cd9c1e870bf4beb669ca69b62 (diff)
Introduce effect arg
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java8
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java21
-rw-r--r--src/main/java/org/shedlang/compiler/types/Effect.java2
-rw-r--r--src/main/java/org/shedlang/compiler/types/EffectArg.java8
-rw-r--r--src/main/java/org/shedlang/compiler/types/FunctionType.java2
-rw-r--r--src/main/java/org/shedlang/compiler/types/TypeArg.java2
-rw-r--r--src/main/java/org/shedlang/compiler/types/TypeLevelArg.java4
-rw-r--r--src/main/java/org/shedlang/compiler/types/TypeLevelValue.java2
-rw-r--r--src/main/java/org/shedlang/compiler/types/TypeSubstitution.java3
9 files changed, 40 insertions, 12 deletions
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 8d325d0f..cff54be0 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -73,8 +73,12 @@ public class TypeChecker {
var typeLevelArgs = receiverType.typeLevelParams()
.map(typeLevelParams ->
typeLevelParams.stream()
- // TODO: handle effect params
- .map(param -> new TypeArg((TypeParam) param))
+ .<TypeLevelArg>map(param -> switch (param) {
+ case EffectParam effectParam ->
+ new EffectArg(effectParam);
+ case TypeParam typeParam ->
+ new TypeArg(typeParam);
+ })
.toList()
);
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
index 0456317c..f1145d5a 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeCheckerSubTyping.java
@@ -7,9 +7,10 @@ import org.shedlang.compiler.typechecker.errors.UnexpectedTypeError;
import org.shedlang.compiler.typechecker.typesets.TypeSets;
import org.shedlang.compiler.types.*;
import org.shedlang.compiler.util.P;
-import org.shedlang.compiler.util.PCollectors;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -40,10 +41,18 @@ public class TypeCheckerSubTyping {
}
}
- static Constraints constraints(List<TypeArg> typeLevelArgs, TypeInfos typeInfos) {
- var typeBounds = typeLevelArgs.stream()
- .map(typeLevelArg -> Map.entry(typeLevelArg, TypeBounds.EMPTY))
- .collect(PCollectors.toOrderedPMap());
+ static Constraints constraints(List<TypeLevelArg> typeLevelArgs, TypeInfos typeInfos) {
+ var typeBounds = P.<TypeArg, TypeBounds>orderedPMap();
+
+ for (var typeLevelArg : typeLevelArgs) {
+ switch (typeLevelArg) {
+ case EffectArg effectArg -> {
+ }
+ case TypeArg typeArg -> {
+ typeBounds = typeBounds.plus(typeArg, TypeBounds.EMPTY);
+ }
+ }
+ }
return new Constraints(typeBounds, typeInfos);
}
diff --git a/src/main/java/org/shedlang/compiler/types/Effect.java b/src/main/java/org/shedlang/compiler/types/Effect.java
index cb47c81f..c1a3d408 100644
--- a/src/main/java/org/shedlang/compiler/types/Effect.java
+++ b/src/main/java/org/shedlang/compiler/types/Effect.java
@@ -1,4 +1,4 @@
package org.shedlang.compiler.types;
-public sealed interface Effect extends TypeLevelValue permits EffectParam, EffectUnion, IoEffect, NoneEffect, UserDefinedEffect {
+public sealed interface Effect extends TypeLevelValue permits EffectArg, EffectParam, EffectUnion, IoEffect, NoneEffect, UserDefinedEffect {
}
diff --git a/src/main/java/org/shedlang/compiler/types/EffectArg.java b/src/main/java/org/shedlang/compiler/types/EffectArg.java
new file mode 100644
index 00000000..822ca149
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/types/EffectArg.java
@@ -0,0 +1,8 @@
+package org.shedlang.compiler.types;
+
+public record EffectArg(EffectParam param) implements Effect, TypeLevelArg {
+ @Override
+ public String describe() {
+ return param.name();
+ }
+}
diff --git a/src/main/java/org/shedlang/compiler/types/FunctionType.java b/src/main/java/org/shedlang/compiler/types/FunctionType.java
index fbc17df7..14a885f7 100644
--- a/src/main/java/org/shedlang/compiler/types/FunctionType.java
+++ b/src/main/java/org/shedlang/compiler/types/FunctionType.java
@@ -78,7 +78,7 @@ public record FunctionType(
);
}
- public FunctionType applyTypeLevelArgs(List<TypeArg> typeArgs) {
+ public FunctionType applyTypeLevelArgs(List<TypeLevelArg> typeArgs) {
var typeSubstitutionMap = TypeSubstitutionMap.from(
this.typeLevelParams.orElseThrow(),
typeArgs
diff --git a/src/main/java/org/shedlang/compiler/types/TypeArg.java b/src/main/java/org/shedlang/compiler/types/TypeArg.java
index cbf80b3d..1018aadc 100644
--- a/src/main/java/org/shedlang/compiler/types/TypeArg.java
+++ b/src/main/java/org/shedlang/compiler/types/TypeArg.java
@@ -1,6 +1,6 @@
package org.shedlang.compiler.types;
-public record TypeArg(TypeParam param) implements Type {
+public record TypeArg(TypeParam param) implements Type, TypeLevelArg {
@Override
public String describe() {
return param.name();
diff --git a/src/main/java/org/shedlang/compiler/types/TypeLevelArg.java b/src/main/java/org/shedlang/compiler/types/TypeLevelArg.java
new file mode 100644
index 00000000..11b5c244
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/types/TypeLevelArg.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.types;
+
+public sealed interface TypeLevelArg extends TypeLevelValue permits EffectArg, TypeArg {
+}
diff --git a/src/main/java/org/shedlang/compiler/types/TypeLevelValue.java b/src/main/java/org/shedlang/compiler/types/TypeLevelValue.java
index f250c05c..41aec408 100644
--- a/src/main/java/org/shedlang/compiler/types/TypeLevelValue.java
+++ b/src/main/java/org/shedlang/compiler/types/TypeLevelValue.java
@@ -1,5 +1,5 @@
package org.shedlang.compiler.types;
-public sealed interface TypeLevelValue permits Effect, Type, TypeConstructor, TypeLevelParam {
+public sealed interface TypeLevelValue permits Effect, Type, TypeConstructor, TypeLevelArg, TypeLevelParam {
String describe();
}
diff --git a/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java b/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java
index 7bb79124..1aca81c7 100644
--- a/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java
+++ b/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java
@@ -8,6 +8,9 @@ public class TypeSubstitution {
public static Effect substituteEffect(Effect effect, TypeSubstitutionMap map) {
return switch (effect) {
+ case EffectArg effectArg ->
+ effect;
+
case EffectParam effectParam ->
map.substituteEffect(effectParam);