From 8c62e80d2b31790a168187301d8aa2d60aca65de Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 19 Oct 2015 11:41:05 +0300 Subject: [PATCH] Minor. Use property instead of deprecated function in Operations map --- .../kotlin/resolve/constants/evaluate/OperationsMapGenerated.kt | 2 +- .../kotlin/generators/evaluate/GenerateOperationsMap.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/OperationsMapGenerated.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/OperationsMapGenerated.kt index a12e33a12a0..08b0f69511c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/OperationsMapGenerated.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/OperationsMapGenerated.kt @@ -98,7 +98,7 @@ internal val unaryOperations: HashMap, Pair a.unaryMinus() }, { a -> a.unaryMinus() }), unaryOperation(SHORT, "unaryPlus", { a -> a.unaryPlus() }, emptyUnaryFun), unaryOperation(SHORT, "toString", { a -> a.toString() }, emptyUnaryFun), - unaryOperation(STRING, "length", { a -> a.length() }, emptyUnaryFun), + unaryOperation(STRING, "length", { a -> a.length }, emptyUnaryFun), unaryOperation(STRING, "toString", { a -> a.toString() }, emptyUnaryFun) ) diff --git a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt index a9089349342..7050aa739ce 100644 --- a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt @@ -81,7 +81,7 @@ fun generate(): String { val unaryOperationsMapIterator = unaryOperationsMap.iterator() while (unaryOperationsMapIterator.hasNext()) { val (funcName, parameters, isFunction) = unaryOperationsMapIterator.next() - val parenthesesOrBlank = "()" //if (isFunction) "()" else "" + val parenthesesOrBlank = if (isFunction) "()" else "" p.println( "unaryOperation(", parameters.map { it.asString() }.joinToString(", "),