aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-11-05 20:55:55 +0000
committerMichael Williamson <mike@zwobble.org>2023-11-05 20:55:55 +0000
commit075b43b9d0283b80ecfd19bc37c380406a8c27bc (patch)
treed62003527aa777b1a0f1f2e1aa599d27b0dbeeab /src/main/java
parentf5dc163e766e389ddec4f5bbe4620c583391cfec (diff)
Rename handlers to handlerFields
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/ast/typed/TypedTryNode.java2
-rw-r--r--src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java12
-rw-r--r--src/main/java/org/shedlang/compiler/parser/Parser.java4
-rw-r--r--src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java2
4 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/org/shedlang/compiler/ast/typed/TypedTryNode.java b/src/main/java/org/shedlang/compiler/ast/typed/TypedTryNode.java
index 2c8034be..dd782a50 100644
--- a/src/main/java/org/shedlang/compiler/ast/typed/TypedTryNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/typed/TypedTryNode.java
@@ -9,7 +9,7 @@ import java.util.List;
public record TypedTryNode(
TypedBlockNode body,
TypedTypeLevelExpressionNode<Effect> handledEffect,
- List<TypedFunctionDefinitionNode> handlers,
+ List<TypedFunctionDefinitionNode> handlerFields,
Source source
) implements TypedExpressionNode {
@Override
diff --git a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java
index 50a5a2c2..c89aff2a 100644
--- a/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java
+++ b/src/main/java/org/shedlang/compiler/ast/untyped/UntypedTryNode.java
@@ -10,7 +10,7 @@ import java.util.List;
public record UntypedTryNode(
UntypedBlockNode body,
UntypedTypeLevelExpressionNode handledEffect,
- List<UntypedFunctionDefinitionNode> handlers,
+ List<UntypedFunctionDefinitionNode> handlerFields,
Source source
) implements UntypedExpressionNode {
public static Builder builder() {
@@ -24,13 +24,13 @@ public record UntypedTryNode(
public record Builder(
PVector<UntypedFunctionStatementNode> body,
UntypedTypeLevelExpressionNode handledEffect,
- PVector<UntypedFunctionDefinitionNode> handlers
+ PVector<UntypedFunctionDefinitionNode> handlerFields
) {
public UntypedTryNode build() {
return new UntypedTryNode(
new UntypedBlockNode(body, Sources.NULL),
handledEffect,
- handlers,
+ handlerFields,
Sources.NULL
);
}
@@ -39,7 +39,7 @@ public record UntypedTryNode(
return new Builder(
this.body.plus(statement),
this.handledEffect,
- this.handlers
+ this.handlerFields
);
}
@@ -47,7 +47,7 @@ public record UntypedTryNode(
return new Builder(
this.body,
handledEffect,
- this.handlers
+ this.handlerFields
);
}
@@ -55,7 +55,7 @@ public record UntypedTryNode(
return new Builder(
this.body,
this.handledEffect,
- this.handlers.plus(handlerField)
+ this.handlerFields.plus(handlerField)
);
}
}
diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index 5010ee13..b858534e 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -1095,7 +1095,7 @@ public class Parser {
tokens.skip(TokenType.SYMBOL_BRACE_OPEN);
- var handlers = parseMany(
+ var handlerFields = parseMany(
() -> tokens.isNext(TokenType.SYMBOL_BRACE_CLOSE),
() -> parseFunctionDefinition(tokens),
() -> true
@@ -1106,7 +1106,7 @@ public class Parser {
var end = tokens.position();
var source = start.to(end);
- return new UntypedTryNode(body, handledEffect, handlers, source);
+ return new UntypedTryNode(body, handledEffect, handlerFields, source);
}
private static UntypedExpressionNode parseTuple(
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 03c60c93..90d68238 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -1625,7 +1625,7 @@ public class TypeChecker {
var handledFieldNames = new HashSet<String>();
var typedHandlerFields = new ArrayList<TypedFunctionDefinitionNode>();
- for (var untypedHandlerField : untyped.handlers()) {
+ for (var untypedHandlerField : untyped.handlerFields()) {
handledFieldNames.add(untypedHandlerField.name());
var effectFieldType = effectInfo.fields()