From a84da2bb0c57832870550182ec30a1fe5da8d9e8 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 16 Jul 2015 19:37:48 +0300
Subject: [PATCH] Minor: move utilities closer to their only usage

---
 .../constants/evaluate/ConstantExpressionEvaluator.kt  | 10 ++++++++++
 .../kotlin/resolve/constants/CompileTimeConstant.kt    | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
index 61c8f108a95..1fdccda7bff 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
@@ -531,6 +531,16 @@ private class ConstantExpressionEvaluatorVisitor(private val trace: BindingTrace
             else -> factory.createLongValue(value)
         }.wrap(parameters)
     }
+
+    private fun <T> ConstantValue<T>.wrap(parameters: CompileTimeConstant.Parameters): TypedCompileTimeConstant<T>
+            = TypedCompileTimeConstant(this, parameters)
+
+    private fun <T> ConstantValue<T>.wrap(
+            canBeUsedInAnnotation: Boolean =  this !is NullValue,
+            isPure: Boolean = false,
+            usesVariableAsConstant: Boolean = false
+    ): TypedCompileTimeConstant<T>
+            = wrap(CompileTimeConstant.Parameters(canBeUsedInAnnotation, isPure, usesVariableAsConstant))
 }
 
 private fun hasLongSuffix(text: String) = text.endsWith('l') || text.endsWith('L')
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt
index 7769ae1ab53..c81dfbe4400 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.kt
@@ -55,16 +55,6 @@ public class TypedCompileTimeConstant<out T>(
     override fun toConstantValue(expectedType: JetType): ConstantValue<T> = constantValue
 }
 
-public fun <T> ConstantValue<T>.wrap(parameters: CompileTimeConstant.Parameters): TypedCompileTimeConstant<T>
-        = TypedCompileTimeConstant(this, parameters)
-
-public fun <T> ConstantValue<T>.wrap(
-        canBeUsedInAnnotation: Boolean =  this !is NullValue,
-        isPure: Boolean = false,
-        usesVariableAsConstant: Boolean = false
-): TypedCompileTimeConstant<T>
-        = wrap(CompileTimeConstant.Parameters(canBeUsedInAnnotation, isPure, usesVariableAsConstant))
-
 public class IntegerValueTypeConstant(
         private val value: Number,
         override val parameters: CompileTimeConstant.Parameters