InstructionVisitorWithResult introduced

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ConditionalJumpInstruction.java

@@ -59,10 +59,15 @@ public class ConditionalJumpInstruction extends AbstractJumpInstruction {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitConditionalJump(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitConditionalJump(this);
+    }
+
     @Override
     public String toString() {
         String instr = onTrue ? "jt" : "jf";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/Instruction.java

@@ -33,6 +33,7 @@ public interface Instruction {
     Collection<Instruction> getNextInstructions();
 
     void accept(@NotNull InstructionVisitor visitor);
+    <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor);
 
     @NotNull
     Collection<Instruction> getCopies();

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/InstructionVisitorWithResult.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.cfg.pseudocode;
+
+public abstract class InstructionVisitorWithResult<R> {
+    public abstract R visitInstruction(Instruction instruction);
+
+    public R visitReadValue(ReadValueInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitLocalFunctionDeclarationInstruction(LocalFunctionDeclarationInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitVariableDeclarationInstruction(VariableDeclarationInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitUnconditionalJump(UnconditionalJumpInstruction instruction) {
+        return visitJump(instruction);
+    }
+
+    public R visitConditionalJump(ConditionalJumpInstruction instruction) {
+        return visitJump(instruction);
+    }
+
+    public R visitReturnValue(ReturnValueInstruction instruction) {
+        return visitJump(instruction);
+    }
+
+    public R visitReturnNoValue(ReturnNoValueInstruction instruction) {
+        return visitJump(instruction);
+    }
+
+    public R visitThrowExceptionInstruction(ThrowExceptionInstruction instruction) {
+        return visitJump(instruction);
+    }
+
+    public R visitNondeterministicJump(NondeterministicJumpInstruction instruction) {
+        return visitInstruction(instruction);
+    }
+
+    public R visitUnsupportedElementInstruction(UnsupportedElementInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitSubroutineExit(SubroutineExitInstruction instruction) {
+        return visitInstruction(instruction);
+    }
+
+    public R visitSubroutineSink(SubroutineSinkInstruction instruction) {
+        return visitInstruction(instruction);
+    }
+
+    public R visitJump(AbstractJumpInstruction instruction) {
+        return visitInstruction(instruction);
+    }
+
+    public R visitInstructionWithNext(InstructionWithNext instruction) {
+        return visitInstruction(instruction);
+    }
+
+    public R visitSubroutineEnter(SubroutineEnterInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitWriteValue(WriteValueInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitLoadUnitValue(LoadUnitValueInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitCallInstruction(CallInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitCompilationErrorInstruction(CompilationErrorInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+    public R visitMarkInstruction(MarkInstruction instruction) {
+        return visitInstructionWithNext(instruction);
+    }
+
+}

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LoadUnitValueInstruction.java

@@ -30,6 +30,11 @@ public class LoadUnitValueInstruction extends InstructionWithNext {
         visitor.visitLoadUnitValue(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitLoadUnitValue(this);
+    }
+
     @Override
     public String toString() {
         return "read (Unit)";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalFunctionDeclarationInstruction.java

@@ -53,10 +53,15 @@ public class LocalFunctionDeclarationInstruction extends InstructionWithNext {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitLocalFunctionDeclarationInstruction(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitLocalFunctionDeclarationInstruction(this);
+    }
+
     @Override
     public String toString() {
         return "d" + "(" + render(element) + ")";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/NondeterministicJumpInstruction.java

@@ -58,10 +58,15 @@ public class NondeterministicJumpInstruction extends InstructionImpl{
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitNondeterministicJump(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitNondeterministicJump(this);
+    }
+
     @NotNull
     @Override
     public Collection<Instruction> getNextInstructions() {

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReadValueInstruction.java

@@ -26,10 +26,15 @@ public class ReadValueInstruction extends InstructionWithNext {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitReadValue(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitReadValue(this);
+    }
+
     @Override
     public String toString() {
         return "r(" + render(element) + ")";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnNoValueInstruction.java

@@ -40,6 +40,11 @@ public class ReturnNoValueInstruction extends AbstractJumpInstruction implements
         visitor.visitReturnNoValue(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitReturnNoValue(this);
+    }
+
     @Override
     public String toString() {
         return "ret " + getTargetLabel();

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnValueInstruction.java

@@ -35,6 +35,11 @@ public class ReturnValueInstruction extends AbstractJumpInstruction implements R
         visitor.visitReturnValue(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitReturnValue(this);
+    }
+
     @Override
     public String toString() {
         return "ret(*) " + getTargetLabel();

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/SubroutineEnterInstruction.java

@@ -32,10 +32,15 @@ public class SubroutineEnterInstruction extends InstructionWithNext {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitSubroutineEnter(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitSubroutineEnter(this);
+    }
+
     @Override
     public String toString() {
         return "<START>";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/SubroutineExitInstruction.java

@@ -48,10 +48,15 @@ public class SubroutineExitInstruction extends InstructionImpl {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitSubroutineExit(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitSubroutineExit(this);
+    }
+
     @Override
     public String toString() {
         return debugLabel;

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/SubroutineSinkInstruction.java

@@ -42,10 +42,15 @@ public class SubroutineSinkInstruction extends InstructionImpl {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitSubroutineSink(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitSubroutineSink(this);
+    }
+
     @Override
     public String toString() {
         return debugLabel;

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ThrowExceptionInstruction.java

@@ -41,10 +41,15 @@ public class ThrowExceptionInstruction extends AbstractJumpInstruction implement
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitThrowExceptionInstruction(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitThrowExceptionInstruction(this);
+    }
+
     @Override
     protected AbstractJumpInstruction createCopy(@NotNull Label newLabel) {
         return new ThrowExceptionInstruction(expression, newLabel);

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/UnconditionalJumpInstruction.java

@@ -27,10 +27,15 @@ public class UnconditionalJumpInstruction extends AbstractJumpInstruction {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitUnconditionalJump(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitUnconditionalJump(this);
+    }
+
     @Override
     public String toString() {
         return "jmp(" + getTargetLabel().getName() + ")";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/UnsupportedElementInstruction.java

@@ -26,10 +26,15 @@ public class UnsupportedElementInstruction extends InstructionWithNext {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitUnsupportedElementInstruction(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitUnsupportedElementInstruction(this);
+    }
+
     @Override
     public String toString() {
         return "unsupported(" + element + " : " + render(element) + ")";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/VariableDeclarationInstruction.java

@@ -35,10 +35,15 @@ public class VariableDeclarationInstruction extends InstructionWithNext {
     }
 
     @Override
-    public void accept(InstructionVisitor visitor) {
+    public void accept(@NotNull InstructionVisitor visitor) {
         visitor.visitVariableDeclarationInstruction(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitVariableDeclarationInstruction(this);
+    }
+
     @Override
     public String toString() {
         return "v(" + render(element) + ")";

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/WriteValueInstruction.java

@@ -39,6 +39,11 @@ public class WriteValueInstruction extends InstructionWithNext {
         visitor.visitWriteValue(this);
     }
 
+    @Override
+    public <R> R accept(@NotNull InstructionVisitorWithResult<R> visitor) {
+        return visitor.visitWriteValue(this);
+    }
+
     @Override
     public String toString() {
         if (lValue instanceof JetNamedDeclaration) {

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions.kt

@@ -29,6 +29,10 @@ class CallInstruction(
         visitor.visitCallInstruction(this)
     }
 
+    override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R? {
+        return visitor.visitCallInstruction(this)
+    }
+
     override fun createCopy() = CallInstruction(element, resolvedCall)
 
     override fun toString() = "call(${render(element)}, ${resolvedCall.getResultingDescriptor()!!.getName()})"
@@ -43,6 +47,10 @@ class CompilationErrorInstruction(
         visitor.visitCompilationErrorInstruction(this)
     }
 
+    override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R? {
+        return visitor.visitCompilationErrorInstruction(this)
+    }
+
     override fun createCopy() = CompilationErrorInstruction(element, message)
 
     override fun toString() = "error(${render(element)}, $message)"
@@ -59,6 +67,10 @@ class MarkInstruction(
         visitor.visitMarkInstruction(this)
     }
 
+    override fun <R> accept(visitor: InstructionVisitorWithResult<R>): R? {
+        return visitor.visitMarkInstruction(this)
+    }
+
     override fun createCopy() = MarkInstruction(element)
 
     override fun toString() = "mark(${render(element)})"