diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-07-15 11:57:28 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-07-15 11:57:28 +0100 |
| commit | 15c67a851605262ef165279d99964ce8a53a45f5 (patch) | |
| tree | 80927551aede98f3bdbfc3acc40660916f90ffe0 /src/main/java/org/zwobble/couscous/ast/visitors | |
| parent | 0970f5a5074da34fffaea70f3b42d012edb501c5 (diff) | |
Remove StatementNodeMapper
Diffstat (limited to 'src/main/java/org/zwobble/couscous/ast/visitors')
| -rw-r--r-- | src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeMapper.java | 17 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeMapper.java | 13 |
2 files changed, 14 insertions, 16 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeMapper.java b/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeMapper.java index 0637c44..fedbd47 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeMapper.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/DynamicNodeMapper.java @@ -5,6 +5,7 @@ import org.zwobble.couscous.ast.Node; import java.util.HashMap; import java.util.Map; +import java.util.function.BiFunction; import java.util.function.Function; import static org.zwobble.couscous.util.ExtraMaps.entry; @@ -15,12 +16,22 @@ public class DynamicNodeMapper { // TODO: check return type -- at the very least, check the methods are consistent. public static <T, R> Function<Node, R> instantiate(T visitor, String methodName) { - Map.Entry<Class<?>, String> key = entry(visitor.getClass(), methodName); + Function<T, Function<Node, R>> builder = buildClassSupplier(visitor.getClass(), methodName); + return builder.apply(visitor); + } + + public static <T, R> BiFunction<Node, T, R> visitor(Class<T> clazz, String methodName) { + Function<T, Function<Node, R>> classSupplier = buildClassSupplier(clazz, methodName); + return (node, visitor) -> classSupplier.apply(visitor).apply(node); + } + + private static <T> Function buildClassSupplier(Class<?> visitorClass, String methodName) { + Map.Entry<Class<?>, String> key = entry(visitorClass, methodName); Function builder = VISITOR_BUILDERS.get(key); if (builder == null) { - builder = DynamicNodeVisitor.buildClassSupplier(visitor.getClass(), Function.class, methodName, MethodReturn.REFERENCE); + builder = DynamicNodeVisitor.buildClassSupplier(visitorClass, Function.class, methodName, MethodReturn.REFERENCE); VISITOR_BUILDERS.put(key, builder); } - return (Function<Node, R>) builder.apply(visitor); + return builder; } } diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeMapper.java b/src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeMapper.java deleted file mode 100644 index 5d88a60..0000000 --- a/src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.zwobble.couscous.ast.visitors; - -import org.zwobble.couscous.ast.*; - -public interface StatementNodeMapper<T> { - T visit(ReturnNode returnNode); - T visit(ThrowNode throwNode); - T visit(ExpressionStatementNode expressionStatement); - T visit(LocalVariableDeclarationNode localVariableDeclaration); - T visit(IfStatementNode ifStatement); - T visit(WhileNode whileLoop); - T visit(TryNode tryStatement); -} |
