From bc06840e00425db342bc5a021c0900d9e63b71f0 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 15 Jul 2016 14:23:47 +0100 Subject: Split switch handling off to desugar step --- .../java/org/zwobble/couscous/ast/NodeTypes.java | 2 + .../java/org/zwobble/couscous/ast/Operations.java | 6 +++ .../zwobble/couscous/ast/sugar/SwitchCaseNode.java | 36 +++++++++++++++- .../org/zwobble/couscous/ast/sugar/SwitchNode.java | 48 ++++++++++++++++++++++ .../couscous/ast/visitors/NodeTransformer.java | 28 ++++++++++--- 5 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java (limited to 'src/main/java/org/zwobble/couscous/ast') diff --git a/src/main/java/org/zwobble/couscous/ast/NodeTypes.java b/src/main/java/org/zwobble/couscous/ast/NodeTypes.java index a82cd1c..86703ff 100644 --- a/src/main/java/org/zwobble/couscous/ast/NodeTypes.java +++ b/src/main/java/org/zwobble/couscous/ast/NodeTypes.java @@ -30,6 +30,8 @@ public class NodeTypes { public static final int OPERATION = 10021; public static final int RETURN = 10022; public static final int STATIC_RECEIVER = 10023; + public static final int SWITCH = 10032; + public static final int SWITCH_CASE = 10033; public static final int TERNARY_CONDITIONAL = 10024; public static final int THIS_REFERENCE = 10025; public static final int THROW = 10026; diff --git a/src/main/java/org/zwobble/couscous/ast/Operations.java b/src/main/java/org/zwobble/couscous/ast/Operations.java index 0ef9b88..308d070 100644 --- a/src/main/java/org/zwobble/couscous/ast/Operations.java +++ b/src/main/java/org/zwobble/couscous/ast/Operations.java @@ -4,7 +4,9 @@ import org.zwobble.couscous.types.ScalarType; import org.zwobble.couscous.types.Types; import org.zwobble.couscous.values.InternalCouscousValue; +import static org.zwobble.couscous.ast.MethodCallNode.methodCall; import static org.zwobble.couscous.ast.MethodCallNode.staticMethodCall; +import static org.zwobble.couscous.ast.TypeCoercionNode.coerce; import static org.zwobble.couscous.ast.TypeCoercionNode.typeCoercion; import static org.zwobble.couscous.util.ExtraLists.list; @@ -94,4 +96,8 @@ public class Operations { public static ExpressionNode instanceOf(ExpressionNode value, ScalarType type) { return new InstanceOfNode(value, type); } + + public static ExpressionNode methodEquals(ExpressionNode left, ExpressionNode right) { + return methodCall(left, "equals", list(coerce(right, Types.OBJECT)), Types.BOOLEAN); + } } diff --git a/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java index 534f244..3aa9bdc 100644 --- a/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java +++ b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchCaseNode.java @@ -1,12 +1,25 @@ package org.zwobble.couscous.ast.sugar; +import com.google.common.collect.Iterables; import org.zwobble.couscous.ast.ExpressionNode; +import org.zwobble.couscous.ast.Node; +import org.zwobble.couscous.ast.NodeTypes; import org.zwobble.couscous.ast.StatementNode; +import org.zwobble.couscous.ast.visitors.NodeTransformer; +import org.zwobble.couscous.util.ExtraIterables; import java.util.List; import java.util.Optional; -public class SwitchCaseNode { +public class SwitchCaseNode implements Node { + public static SwitchCaseNode switchCase(ExpressionNode value, List statements) { + return switchCase(Optional.of(value), statements); + } + + public static SwitchCaseNode switchCase(List statements) { + return switchCase(Optional.empty(), statements); + } + public static SwitchCaseNode switchCase(Optional value, List statements) { return new SwitchCaseNode(value, statements); } @@ -30,4 +43,25 @@ public class SwitchCaseNode { public List getStatements() { return statements; } + + @Override + public int type() { + return NodeTypes.SWITCH_CASE; + } + + @Override + public Iterable childNodes() { + return Iterables.concat( + ExtraIterables.iterable(value), + statements + ); + } + + @Override + public SwitchCaseNode transform(NodeTransformer transformer) { + return new SwitchCaseNode( + value.map(transformer::transformExpression), + transformer.transformStatements(statements) + ); + } } diff --git a/src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java new file mode 100644 index 0000000..8e1e226 --- /dev/null +++ b/src/main/java/org/zwobble/couscous/ast/sugar/SwitchNode.java @@ -0,0 +1,48 @@ +package org.zwobble.couscous.ast.sugar; + +import org.zwobble.couscous.ast.ExpressionNode; +import org.zwobble.couscous.ast.Node; +import org.zwobble.couscous.ast.NodeTypes; +import org.zwobble.couscous.ast.StatementNode; +import org.zwobble.couscous.ast.visitors.NodeTransformer; + +import java.util.List; + +import static org.zwobble.couscous.util.ExtraIterables.lazyCons; +import static org.zwobble.couscous.util.ExtraLists.eagerMap; + +public class SwitchNode implements StatementNode { + private final ExpressionNode value; + private final List cases; + + public SwitchNode(ExpressionNode value, List cases) { + this.value = value; + this.cases = cases; + } + + public ExpressionNode getValue() { + return value; + } + + public List getCases() { + return cases; + } + + @Override + public int type() { + return NodeTypes.SWITCH; + } + + @Override + public Iterable childNodes() { + return lazyCons(value, cases); + } + + @Override + public StatementNode transform(NodeTransformer transformer) { + return new SwitchNode( + transformer.transformExpression(value), + eagerMap(cases, caseNode -> caseNode.transform(transformer)) + ); + } +} diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java index 721ed8e..78bd6ef 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import static org.zwobble.couscous.util.ExtraLists.eagerMap; +import static org.zwobble.couscous.util.ExtraLists.*; public class NodeTransformer { public static NodeTransformer replaceExpressions(Map replacements) { @@ -29,6 +29,7 @@ public class NodeTransformer { } public static class Builder { + private Function>> transformStatement = statement -> Optional.empty(); private Function> transformExpression = expression -> Optional.empty(); private Function transformType = type -> type; private Function transformMethodName = MethodSignature::getName; @@ -41,6 +42,13 @@ public class NodeTransformer { return this; } + public Builder transformStatement( + Function>> transformStatement) + { + this.transformStatement = transformStatement; + return this; + } + public Builder transformType( Function transformType) { @@ -59,22 +67,31 @@ public class NodeTransformer { } public NodeTransformer build() { - return new NodeTransformer(transformExpression, transformType, transformMethodName, transformFieldName); + return new NodeTransformer( + transformExpression, + transformStatement, + transformType, + transformMethodName, + transformFieldName + ); } } private final Function> transformExpression; + private final Function>> transformStatement; private final Function transformType; private final Function transformMethodName; private final Function transformFieldName; private NodeTransformer( Function> transformExpression, + Function>> transformStatement, Function transformType, Function transformMethodName, Function transformFieldName) { this.transformExpression = transformExpression; + this.transformStatement = transformStatement; this.transformType = transformType; this.transformMethodName = transformMethodName; this.transformFieldName = transformFieldName; @@ -121,8 +138,9 @@ public class NodeTransformer { return VariableDeclaration.var(declaration.getId(), declaration.getName(), transform(declaration.getType())); } - public final StatementNode transformStatement(StatementNode statement) { - return statement.transform(this); + public final Iterable transformStatement(StatementNode statement) { + return transformStatement.apply(statement) + .orElseGet(() -> list(statement.transform(this))); } public FormalTypeParameterNode transformFormalTypeParameter(FormalTypeParameterNode typeParameter) { @@ -178,7 +196,7 @@ public class NodeTransformer { } public List transformStatements(List body) { - return transformList(body, this::transformStatement); + return eagerFlatMap(body, this::transformStatement); } public List transformExpressions(List expressions) { -- cgit v1.2.3