From bbfc91caf379a07198bfa352023524c0b54e1bb0 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 29 Mar 2016 19:56:41 +0100 Subject: Add support for reading vararg method invocations --- .../java/org/zwobble/couscous/ast/ArrayNode.java | 70 ++++++++++++++++++++++ .../org/zwobble/couscous/ast/ExpressionNode.java | 5 ++ .../java/org/zwobble/couscous/ast/LiteralNode.java | 4 +- src/main/java/org/zwobble/couscous/ast/Node.java | 6 ++ .../couscous/ast/structure/NodeStructure.java | 5 ++ .../ast/visitors/ExpressionNodeMapper.java | 2 +- .../zwobble/couscous/ast/visitors/NodeMapper.java | 1 + .../ast/visitors/NodeMapperWithDefault.java | 7 ++- .../couscous/ast/visitors/NodeTransformer.java | 5 ++ .../zwobble/couscous/ast/visitors/NodeVisitor.java | 1 + 10 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/zwobble/couscous/ast/ArrayNode.java (limited to 'src/main/java/org/zwobble/couscous/ast') diff --git a/src/main/java/org/zwobble/couscous/ast/ArrayNode.java b/src/main/java/org/zwobble/couscous/ast/ArrayNode.java new file mode 100644 index 0000000..ac4c284 --- /dev/null +++ b/src/main/java/org/zwobble/couscous/ast/ArrayNode.java @@ -0,0 +1,70 @@ +package org.zwobble.couscous.ast; + +import org.zwobble.couscous.ast.visitors.ExpressionNodeMapper; +import org.zwobble.couscous.ast.visitors.NodeTransformer; +import org.zwobble.couscous.types.Type; +import org.zwobble.couscous.types.Types; + +import java.util.List; + +public class ArrayNode implements ExpressionNode { + public static ArrayNode array(Type elementType, List expressions) { + return new ArrayNode(elementType, expressions); + } + + private final Type elementType; + private final List elements; + + public ArrayNode(Type elementType, List elements) { + this.elementType = elementType; + this.elements = elements; + } + + public List getElements() { + return elements; + } + + @Override + public Type getType() { + return Types.array(elementType); + } + + @Override + public T accept(ExpressionNodeMapper visitor) { + return visitor.visit(this); + } + + @Override + public ExpressionNode transform(NodeTransformer transformer) { + return new ArrayNode( + transformer.transform(elementType), + transformer.transformExpressions(elements)); + } + + @Override + public String toString() { + return "ArrayNode(" + + "elementType=" + elementType + + ", elements=" + elements + + ')'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + ArrayNode arrayNode = (ArrayNode) o; + + if (!elementType.equals(arrayNode.elementType)) return false; + return elements.equals(arrayNode.elements); + + } + + @Override + public int hashCode() { + int result = elementType.hashCode(); + result = 31 * result + elements.hashCode(); + return result; + } +} diff --git a/src/main/java/org/zwobble/couscous/ast/ExpressionNode.java b/src/main/java/org/zwobble/couscous/ast/ExpressionNode.java index 817078f..37bd436 100644 --- a/src/main/java/org/zwobble/couscous/ast/ExpressionNode.java +++ b/src/main/java/org/zwobble/couscous/ast/ExpressionNode.java @@ -27,6 +27,11 @@ public interface ExpressionNode extends Node { return visitor.visit(reference); } + @Override + public T visit(ArrayNode array) { + return visitor.visit(array); + } + @Override public T visit(AssignmentNode assignment) { return visitor.visit(assignment); diff --git a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java index 46a141e..d1be23f 100644 --- a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java +++ b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java @@ -32,11 +32,11 @@ public class LiteralNode implements ExpressionNode { public static LiteralNode literal(ScalarType type) { return literal(value(type)); } - + public static LiteralNode of(PrimitiveValue value, Type type) { return new LiteralNode(value, type); } - + private final PrimitiveValue value; private final Type type; diff --git a/src/main/java/org/zwobble/couscous/ast/Node.java b/src/main/java/org/zwobble/couscous/ast/Node.java index a055488..4f21904 100644 --- a/src/main/java/org/zwobble/couscous/ast/Node.java +++ b/src/main/java/org/zwobble/couscous/ast/Node.java @@ -24,6 +24,12 @@ public interface Node { return null; } + @Override + public Void visit(ArrayNode array) { + visitor.visit(array); + return null; + } + @Override public Void visit(AssignmentNode assignment) { visitor.visit(assignment); diff --git a/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java b/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java index f1f37a6..ed5b474 100644 --- a/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java +++ b/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java @@ -46,6 +46,11 @@ public class NodeStructure { return Stream.empty(); } + @Override + public Stream visit(ArrayNode array) { + return array.getElements().stream(); + } + @Override public Stream visit(AssignmentNode assignment) { return Stream.of(assignment.getValue(), assignment.getTarget()); diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/ExpressionNodeMapper.java b/src/main/java/org/zwobble/couscous/ast/visitors/ExpressionNodeMapper.java index 2836a22..2c8ed24 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/ExpressionNodeMapper.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/ExpressionNodeMapper.java @@ -6,6 +6,7 @@ public interface ExpressionNodeMapper { T visit(LiteralNode literal); T visit(VariableReferenceNode variableReference); T visit(ThisReferenceNode reference); + T visit(ArrayNode array); T visit(AssignmentNode assignment); T visit(TernaryConditionalNode ternaryConditional); T visit(MethodCallNode methodCall); @@ -14,5 +15,4 @@ public interface ExpressionNodeMapper { T visit(FieldAccessNode fieldAccess); T visit(TypeCoercionNode typeCoercion); T visit(CastNode cast); - } diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java index 338d8d2..3596896 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java @@ -6,6 +6,7 @@ public interface NodeMapper { T visit(LiteralNode literal); T visit(VariableReferenceNode variableReference); T visit(ThisReferenceNode reference); + T visit(ArrayNode array); T visit(AssignmentNode assignment); T visit(TernaryConditionalNode ternaryConditional); T visit(MethodCallNode methodCall); diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java index bcb74d5..b3285ba 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java @@ -23,7 +23,12 @@ public class NodeMapperWithDefault implements NodeMapper { public T visit(ThisReferenceNode reference) { return defaultValue; } - + + @Override + public T visit(ArrayNode array) { + return defaultValue; + } + @Override public T visit(AssignmentNode assignment) { return defaultValue; 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 393bd7e..710ef99 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java @@ -44,6 +44,11 @@ public class NodeTransformer { return transformExpression(reference); } + @Override + public Node visit(ArrayNode array) { + return transformExpression(array); + } + @Override public Node visit(AssignmentNode assignment) { return transformExpression(assignment); diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java index 28c38fc..c70d662 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java @@ -6,6 +6,7 @@ public interface NodeVisitor { void visit(LiteralNode literal); void visit(VariableReferenceNode variableReference); void visit(ThisReferenceNode reference); + void visit(ArrayNode array); void visit(AssignmentNode assignment); void visit(TernaryConditionalNode ternaryConditional); void visit(MethodCallNode methodCall); -- cgit v1.2.3