From e31806e2b5cac77f2604470366ac38d776bff238 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 29 Apr 2016 15:23:31 +0300 Subject: [PATCH] Code cleanup: redundant modality (minor) --- .../src/org.jetbrains.kotlin.preprocessor/Evaluator.kt | 2 +- .../src/org/jetbrains/kotlin/util/PerformanceCounter.kt | 6 +++--- .../kotlin/js/translate/callTranslator/CallTranslator.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Evaluator.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Evaluator.kt index dd81d9b4e25..428ff377824 100644 --- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Evaluator.kt +++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Evaluator.kt @@ -21,7 +21,7 @@ interface Evaluator : (List) -> Boolean interface PlatformEvaluator : Evaluator { override fun invoke(conditions: List): Boolean = evaluate(conditions.filterIsInstance()) - open fun evaluate(conditions: List): Boolean + fun evaluate(conditions: List): Boolean = conditions.isEmpty() || conditions.any { match(it) } fun match(platformCondition: Conditional.PlatformVersion): Boolean diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt index 3cd16a10c34..f1e5d47810a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt @@ -83,11 +83,11 @@ abstract class PerformanceCounter protected constructor(val name: String) { } } - final fun increment() { + fun increment() { count++ } - final fun time(block: () -> T): T { + fun time(block: () -> T): T { count++ if (!enabled) return block() @@ -105,7 +105,7 @@ abstract class PerformanceCounter protected constructor(val name: String) { totalTimeNanos = 0 } - protected final fun incrementTime(delta: Long) { + protected fun incrementTime(delta: Long) { totalTimeNanos += delta } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt index a8837c1e578..1e00b48f228 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt @@ -165,7 +165,7 @@ abstract class CallCase { protected open fun I.bothReceivers(): JsExpression = unsupported() - final fun translate(callInfo: I): JsExpression { + fun translate(callInfo: I): JsExpression { val result = if (callInfo.dispatchReceiver == null) { if (callInfo.extensionReceiver == null) callInfo.noReceivers()