From bf193128af596fd85b0cb52b0074a8a9abadbc20 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 14 Jul 2016 17:52:58 +0100 Subject: Remove AssignableExpressionVisitor --- .../org/zwobble/couscous/ast/AssignableExpressionNode.java | 3 --- src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java | 10 ++-------- .../java/org/zwobble/couscous/ast/VariableReferenceNode.java | 6 ------ .../couscous/ast/visitors/AssignableExpressionNodeVisitor.java | 9 --------- 4 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 src/main/java/org/zwobble/couscous/ast/visitors/AssignableExpressionNodeVisitor.java (limited to 'src/main/java/org/zwobble/couscous/ast') diff --git a/src/main/java/org/zwobble/couscous/ast/AssignableExpressionNode.java b/src/main/java/org/zwobble/couscous/ast/AssignableExpressionNode.java index eba641f..cc83de9 100644 --- a/src/main/java/org/zwobble/couscous/ast/AssignableExpressionNode.java +++ b/src/main/java/org/zwobble/couscous/ast/AssignableExpressionNode.java @@ -1,7 +1,4 @@ package org.zwobble.couscous.ast; -import org.zwobble.couscous.ast.visitors.AssignableExpressionNodeVisitor; - public interface AssignableExpressionNode extends ExpressionNode { - void accept(AssignableExpressionNodeVisitor mapper); } diff --git a/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java b/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java index a6ef2dd..e4c422f 100644 --- a/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java +++ b/src/main/java/org/zwobble/couscous/ast/FieldAccessNode.java @@ -1,10 +1,9 @@ package org.zwobble.couscous.ast; -import org.zwobble.couscous.types.ScalarType; -import org.zwobble.couscous.types.Type; -import org.zwobble.couscous.ast.visitors.AssignableExpressionNodeVisitor; import org.zwobble.couscous.ast.visitors.ExpressionNodeMapper; import org.zwobble.couscous.ast.visitors.NodeTransformer; +import org.zwobble.couscous.types.ScalarType; +import org.zwobble.couscous.types.Type; import org.zwobble.couscous.util.ExtraIterables; import static org.zwobble.couscous.ast.InstanceReceiver.instanceReceiver; @@ -84,11 +83,6 @@ public class FieldAccessNode implements AssignableExpressionNode { transformer.transform(type)); } - @Override - public void accept(AssignableExpressionNodeVisitor mapper) { - mapper.visit(this); - } - @Override public String toString() { return "FieldAccessNode(left=" + left + ", fieldName=" + fieldName diff --git a/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java b/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java index 2fb65ef..96f2fdf 100644 --- a/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java +++ b/src/main/java/org/zwobble/couscous/ast/VariableReferenceNode.java @@ -2,7 +2,6 @@ package org.zwobble.couscous.ast; import org.zwobble.couscous.ast.identifiers.Identifier; import org.zwobble.couscous.types.Type; -import org.zwobble.couscous.ast.visitors.AssignableExpressionNodeVisitor; import org.zwobble.couscous.ast.visitors.ExpressionNodeMapper; import org.zwobble.couscous.ast.visitors.NodeTransformer; import org.zwobble.couscous.util.ExtraIterables; @@ -40,11 +39,6 @@ public class VariableReferenceNode implements AssignableExpressionNode, Referenc return referent.getType(); } - @Override - public void accept(AssignableExpressionNodeVisitor mapper) { - mapper.visit(this); - } - @Override public T accept(Visitor visitor) { return visitor.visit(this); diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/AssignableExpressionNodeVisitor.java b/src/main/java/org/zwobble/couscous/ast/visitors/AssignableExpressionNodeVisitor.java deleted file mode 100644 index 57cb105..0000000 --- a/src/main/java/org/zwobble/couscous/ast/visitors/AssignableExpressionNodeVisitor.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.zwobble.couscous.ast.visitors; - -import org.zwobble.couscous.ast.FieldAccessNode; -import org.zwobble.couscous.ast.VariableReferenceNode; - -public interface AssignableExpressionNodeVisitor { - void visit(VariableReferenceNode reference); - void visit(FieldAccessNode fieldAccess); -} -- cgit v1.2.3