Добавлен ResultVisitor

src/com/annimon/ownlang/parser/ast/ArrayExpression.java

@@ -31,6 +31,11 @@ public final class ArrayExpression implements Expression {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return elements.toString();

src/com/annimon/ownlang/parser/ast/AssignmentExpression.java

@@ -39,6 +39,11 @@ public final class AssignmentExpression implements Expression, Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         final String op = (operation == null) ? "" : operation.toString();

src/com/annimon/ownlang/parser/ast/BinaryExpression.java

@@ -455,6 +455,11 @@ public final class BinaryExpression implements Expression {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("%s %s %s", expr1, operation, expr2);

src/com/annimon/ownlang/parser/ast/BlockStatement.java

@@ -31,6 +31,11 @@ public final class BlockStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         final StringBuilder result = new StringBuilder();

src/com/annimon/ownlang/parser/ast/BreakStatement.java

@@ -16,6 +16,11 @@ public final class BreakStatement extends RuntimeException implements Statement
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "break";

src/com/annimon/ownlang/parser/ast/ConditionalExpression.java

@@ -86,6 +86,11 @@ public final class ConditionalExpression implements Expression {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("%s %s %s", expr1, operation.getName(), expr2);

src/com/annimon/ownlang/parser/ast/ContainerAccessExpression.java

@@ -101,6 +101,11 @@ public final class ContainerAccessExpression implements Expression, Accessible {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return variable + indices;

src/com/annimon/ownlang/parser/ast/ContinueStatement.java

@@ -16,6 +16,11 @@ public final class ContinueStatement extends RuntimeException implements Stateme
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "continue";

src/com/annimon/ownlang/parser/ast/DestructuringAssignmentStatement.java

@@ -63,6 +63,11 @@ public final class DestructuringAssignmentStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return variables.toString();

src/com/annimon/ownlang/parser/ast/DoWhileStatement.java

@@ -33,6 +33,11 @@ public final class DoWhileStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "do " + statement + " while " + condition;

src/com/annimon/ownlang/parser/ast/ExprStatement.java

@@ -23,6 +23,11 @@ public final class ExprStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return expr.toString();

src/com/annimon/ownlang/parser/ast/ForStatement.java

@@ -36,6 +36,11 @@ public final class ForStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "for " + initialization + ", " + termination + ", " + increment + " " + statement;

src/com/annimon/ownlang/parser/ast/ForeachArrayStatement.java

@@ -44,6 +44,11 @@ public final class ForeachArrayStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("for %s : %s %s", variable, container, body);

src/com/annimon/ownlang/parser/ast/ForeachMapStatement.java

@@ -51,6 +51,11 @@ public final class ForeachMapStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("for %s, %s : %s %s", key, value, container, body);

src/com/annimon/ownlang/parser/ast/FunctionDefineStatement.java

@@ -29,6 +29,11 @@ public final class FunctionDefineStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("def %s%s %s", name, arguments, body);

src/com/annimon/ownlang/parser/ast/FunctionReferenceExpression.java

@@ -24,6 +24,11 @@ public final class FunctionReferenceExpression implements Expression {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "::" + name;

src/com/annimon/ownlang/parser/ast/FunctionalExpression.java

@@ -71,6 +71,11 @@ public final class FunctionalExpression implements Expression, Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return functionExpr + "(" + arguments.toString() + ")";

src/com/annimon/ownlang/parser/ast/IfStatement.java

@@ -30,6 +30,11 @@ public final class IfStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         final StringBuilder result = new StringBuilder();

src/com/annimon/ownlang/parser/ast/IncludeStatement.java

@@ -49,6 +49,11 @@ public final class IncludeStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "include " + expression;

src/com/annimon/ownlang/parser/ast/MapExpression.java

@@ -31,6 +31,11 @@ public final class MapExpression implements Expression {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return elements.toString();

src/com/annimon/ownlang/parser/ast/MatchExpression.java

@@ -168,6 +168,11 @@ public final class MatchExpression implements Expression, Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();

src/com/annimon/ownlang/parser/ast/Node.java

@@ -7,4 +7,6 @@ package com.annimon.ownlang.parser.ast;
 public interface Node {
     
     void accept(Visitor visitor);
+
+    <R, T> R accept(ResultVisitor<R, T> visitor, T input);
 }

src/com/annimon/ownlang/parser/ast/PrintStatement.java

@@ -24,6 +24,11 @@ public final class PrintStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "print " + expression;

src/com/annimon/ownlang/parser/ast/PrintlnStatement.java

@@ -24,6 +24,11 @@ public final class PrintlnStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "println " + expression;

src/com/annimon/ownlang/parser/ast/ResultVisitor.java

@@ -0,0 +1,41 @@
+package com.annimon.ownlang.parser.ast;
+
+/**
+ *
+ * @author aNNiMON
+ * @param <R> the result type
+ * @param <T> the type if the input
+ */
+public interface ResultVisitor<R, T> {
+    
+    R visit(ArrayExpression s, T t);
+    R visit(AssignmentExpression s, T t);
+    R visit(BinaryExpression s, T t);
+    R visit(BlockStatement s, T t);
+    R visit(BreakStatement s, T t);
+    R visit(ConditionalExpression s, T t);
+    R visit(ContainerAccessExpression s, T t);
+    R visit(ContinueStatement s, T t);
+    R visit(DoWhileStatement s, T t);
+    R visit(DestructuringAssignmentStatement s, T t);
+    R visit(ForStatement s, T t);
+    R visit(ForeachArrayStatement s, T t);
+    R visit(ForeachMapStatement s, T t);
+    R visit(FunctionDefineStatement s, T t);
+    R visit(FunctionReferenceExpression s, T t);
+    R visit(ExprStatement s, T t);
+    R visit(FunctionalExpression s, T t);
+    R visit(IfStatement s, T t);
+    R visit(IncludeStatement s, T t);
+    R visit(MapExpression s, T t);
+    R visit(MatchExpression s, T t);
+    R visit(PrintStatement s, T t);
+    R visit(PrintlnStatement s, T t);
+    R visit(ReturnStatement s, T t);
+    R visit(TernaryExpression s, T t);
+    R visit(UnaryExpression s, T t);
+    R visit(ValueExpression s, T t);
+    R visit(VariableExpression s, T t);
+    R visit(WhileStatement s, T t);
+    R visit(UseStatement s, T t);
+}

src/com/annimon/ownlang/parser/ast/ReturnStatement.java

@@ -30,6 +30,11 @@ public final class ReturnStatement extends RuntimeException implements Statement
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "return " + expression;

src/com/annimon/ownlang/parser/ast/TernaryExpression.java

@@ -31,6 +31,11 @@ public final class TernaryExpression implements Expression {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("%s ? %s : %s", condition, trueExpr, falseExpr);

src/com/annimon/ownlang/parser/ast/UnaryExpression.java

@@ -157,6 +157,11 @@ public final class UnaryExpression implements Expression, Statement {
         visitor.visit(this);
     }
     
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+    
     @Override
     public String toString() {
         switch (operation) {

src/com/annimon/ownlang/parser/ast/UseStatement.java

@@ -32,6 +32,11 @@ public final class UseStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "use " + expression;

src/com/annimon/ownlang/parser/ast/ValueExpression.java

@@ -40,6 +40,11 @@ public final class ValueExpression implements Expression {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return value.asString();

src/com/annimon/ownlang/parser/ast/VariableExpression.java

@@ -38,6 +38,11 @@ public final class VariableExpression implements Expression, Accessible {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return name;

src/com/annimon/ownlang/parser/ast/WhileStatement.java

@@ -32,6 +32,11 @@ public final class WhileStatement implements Statement {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "while " + condition + " " + statement;