Move KFunctionN classes to package "kotlin.reflect"

compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt

@@ -30,9 +30,8 @@ public class ReflectionTypes(private val module: ModuleDescriptor) {
     private val kotlinReflect: JetScope by Delegates.lazy {
         // TODO: handle errors gracefully (error types)
         val kotlin = module.getPackage(FqName("kotlin")) ?: error("Package kotlin not found in $module")
-        // TODO: move K*FunctionN under kotlin.reflect.*
-        // val reflect = kotlin.getMemberScope().getPackage(Name.identifier("reflect")) ?: error("Package reflect not found in $kotlin")
-        kotlin.getMemberScope()
+        val reflect = kotlin.getMemberScope().getPackage(Name.identifier("reflect")) ?: error("Package reflect not found in $kotlin")
+        reflect.getMemberScope()
     }
 
     fun find(className: String): ClassDescriptor {

core/reflection/src/kotlin/reflect/KExtensionFunctions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package kotlin
+package kotlin.reflect
 
 public trait KExtensionFunction0<in T, out R> : ExtensionFunction0<T, R>
 public trait KExtensionFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>

core/reflection/src/kotlin/reflect/KFunctions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package kotlin
+package kotlin.reflect
 
 public trait KFunction0<out R> : Function0<R>
 public trait KFunction1<in P1, out R> : Function1<P1, R>

core/reflection/src/kotlin/reflect/KMemberFunctions.kt

@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package kotlin
+package kotlin.reflect
 
 public trait KMemberFunction0<in T, out R> : ExtensionFunction0<T, R>
 public trait KMemberFunction1<in T, in P1, out R> : ExtensionFunction1<T, P1, R>

generators/src/org/jetbrains/jet/generators/builtins/functions.kt

@@ -33,7 +33,7 @@ enum class FunctionKind(
     K_MEMBER_FUNCTION : FunctionKind("KMemberFunction", true, "ExtensionFunction")
     K_EXTENSION_FUNCTION : FunctionKind("KExtensionFunction", true, "ExtensionFunction")
 
-    fun getFileName() = classNamePrefix + "s.kt"
+    fun getFileName() = (if (isReflection()) "reflect/" else "") + classNamePrefix + "s.kt"
     fun getImplFileName() = (if (isReflection()) "reflect/" else "") + classNamePrefix + "sImpl.kt"
     fun getClassName(i: Int) = classNamePrefix + i
     fun getImplClassName(i: Int) = classNamePrefix + "Impl" + i
@@ -43,6 +43,8 @@ enum class FunctionKind(
 }
 
 abstract class GenerateFunctionsBase(out: PrintWriter, val kind: FunctionKind): BuiltInsSourceGenerator(out) {
+    override fun getPackage() = if (kind.isReflection()) "kotlin.reflect" else "kotlin"
+
     fun generateTypeParameters(i: Int, variance: Boolean) {
         out.print("<")
         if (kind.hasReceiverParameter) {
@@ -102,11 +104,6 @@ class GenerateFunctions(out: PrintWriter, kind: FunctionKind) : GenerateFunction
 }
 
 class GenerateFunctionsImpl(out: PrintWriter, kind: FunctionKind) : GenerateFunctionsBase(out, kind) {
-    override fun getPackage() = when (kind) {
-        FUNCTION, EXTENSION_FUNCTION -> "kotlin"
-        K_FUNCTION, K_MEMBER_FUNCTION, K_EXTENSION_FUNCTION -> "kotlin.reflect"
-    }
-
     override fun generateBody() {
         out.println("import java.io.Serializable")
         out.println()