From 95b4ec2058d0b4ea540914177a3c6c5ac3a59d06 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 17 Apr 2014 15:16:03 +0400 Subject: [PATCH] Drop ReturnInstruction --- .../cfg/pseudocode/ReturnInstruction.java | 20 ------------------- .../pseudocode/ReturnNoValueInstruction.java | 2 +- .../pseudocode/ReturnValueInstruction.java | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnInstruction.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnInstruction.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnInstruction.java deleted file mode 100644 index efd798823f3..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnInstruction.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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 interface ReturnInstruction extends Instruction, JetElementInstruction { -} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnNoValueInstruction.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnNoValueInstruction.java index 952f9f43dda..4854e9f4bc6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnNoValueInstruction.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnNoValueInstruction.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.cfg.Label; import org.jetbrains.jet.lang.psi.JetElement; -public class ReturnNoValueInstruction extends AbstractJumpInstruction implements ReturnInstruction { +public class ReturnNoValueInstruction extends AbstractJumpInstruction { public ReturnNoValueInstruction(@NotNull JetElement element, LexicalScope lexicalScope, Label targetLabel) { super(element, targetLabel, lexicalScope); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnValueInstruction.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnValueInstruction.java index 79c81909bda..05a76fd2ac9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnValueInstruction.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReturnValueInstruction.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.cfg.Label; import org.jetbrains.jet.lang.psi.JetExpression; -public class ReturnValueInstruction extends AbstractJumpInstruction implements ReturnInstruction { +public class ReturnValueInstruction extends AbstractJumpInstruction { public ReturnValueInstruction( @NotNull JetExpression returnExpression, @NotNull LexicalScope lexicalScope,