Minor: Replace deprecated function call

This commit is contained in:
Alexey Sedunov
2014-06-24 19:46:48 +04:00
parent fa73c5825e
commit e73ee4bbd6
4 changed files with 6 additions and 6 deletions
@@ -41,13 +41,13 @@ public data class AllSubtypes(val upperBound: JetType): TypePredicate {
public data class ForAllTypes(val typeSets: List<TypePredicate>): TypePredicate {
override fun invoke(typeToCheck: JetType): Boolean = typeSets.all { it(typeToCheck) }
override fun toString(): String = "AND{${typeSets.makeString(", ")}}"
override fun toString(): String = "AND{${typeSets.joinToString(", ")}}"
}
public data class ForSomeType(val typeSets: List<TypePredicate>): TypePredicate {
override fun invoke(typeToCheck: JetType): Boolean = typeSets.any { it(typeToCheck) }
override fun toString(): String = "OR{${typeSets.makeString(", ")}}"
override fun toString(): String = "OR{${typeSets.joinToString(", ")}}"
}
public object AllTypes : TypePredicate {
@@ -68,7 +68,7 @@ public class ReadValueInstruction private (
}
override fun toString(): String {
val inVal = if (receiverValues.empty) "" else "|${receiverValues.keySet().makeString()}"
val inVal = if (receiverValues.empty) "" else "|${receiverValues.keySet().joinToString()}"
return "r(${render(element)}$inVal) -> $outputValue"
}
@@ -113,7 +113,7 @@ public class WriteValueInstruction(
override fun toString(): String {
val lhs = (lValue as? JetNamedDeclaration)?.getName() ?: render(lValue)
return "w($lhs|${inputValues.makeString(", ")})"
return "w($lhs|${inputValues.joinToString(", ")})"
}
override fun createCopy(): InstructionImpl =
@@ -40,7 +40,7 @@ public abstract class OperationInstruction protected(
protected fun renderInstruction(name: String, desc: String): String =
"$name($desc" +
(if (inputValues.notEmpty) "|${inputValues.makeString(", ")})" else ")") +
(if (inputValues.notEmpty) "|${inputValues.joinToString(", ")})" else ")") +
(if (resultValue != null) " -> $resultValue" else "")
protected fun setResult(value: PseudoValue?): OperationInstruction {
@@ -72,7 +72,7 @@ public class NondeterministicJumpInstruction(
override fun toString(): String {
val inVal = if (inputValue != null) "|$inputValue" else ""
val labels = targetLabels.map { it.getName() }.makeString(", ")
val labels = targetLabels.map { it.getName() }.joinToString(", ")
return "jmp?($labels$inVal)"
}