azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation errors fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-10-21 17:49:45 +04:00
parent a14eefcea3
commit d28c96837e
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.lang.cfg.pseudocode.instructions
import org.jetbrains.jet.lang.psi.JetElement
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.jet.utils.emptyOrSingletonList
public abstract class InstructionWithNext(
element: JetElement,
@@ -29,5 +29,5 @@ public abstract class InstructionWithNext(
}
override val nextInstructions: Collection<Instruction>
get() = ContainerUtil.createMaybeSingletonList(next)
get() = emptyOrSingletonList(next)
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt
+2 -2
View File
@@ -18,11 +18,11 @@ package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.cfg.Label
import java.util.Collections
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstructionImpl
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
import org.jetbrains.jet.utils.emptyOrSingletonList
public abstract class AbstractJumpInstruction(
element: JetElement,
@@ -45,5 +45,5 @@ public abstract class AbstractJumpInstruction(
}
override val nextInstructions: Collection<Instruction>
get() = Collections.singleton(resolvedTarget)
get() = emptyOrSingletonList(resolvedTarget)
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt
+2 -2
View File
@@ -20,11 +20,11 @@ import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.cfg.Label
import java.util.Arrays
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
import org.jetbrains.jet.utils.emptyOrSingletonList
public class ConditionalJumpInstruction(
element: JetElement,
@@ -51,7 +51,7 @@ public class ConditionalJumpInstruction(
get() = Arrays.asList(nextOnFalse, nextOnTrue)
override val inputValues: List<PseudoValue>
get() = ContainerUtil.createMaybeSingletonList(conditionValue)
get() = emptyOrSingletonList(conditionValue)
override fun accept(visitor: InstructionVisitor) {
visitor.visitConditionalJump(this)
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt
+2 -2
View File
@@ -21,13 +21,13 @@ import org.jetbrains.jet.lang.psi.JetElement
import org.jetbrains.jet.lang.cfg.Label
import com.google.common.collect.Maps
import com.google.common.collect.Lists
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstructionImpl
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
import org.jetbrains.jet.utils.emptyOrSingletonList
public class NondeterministicJumpInstruction(
element: JetElement,
@@ -60,7 +60,7 @@ public class NondeterministicJumpInstruction(
}
override val inputValues: List<PseudoValue>
get() = ContainerUtil.createMaybeSingletonList(inputValue)
get() = emptyOrSingletonList(inputValue)
override fun accept(visitor: InstructionVisitor) {
visitor.visitNondeterministicJump(this)