Reflection: add KClassifier, KTypeParameter, KTypeParameter.name

The ability to obtain classifier from types is going to be added later

core/builtins/src/kotlin/reflect/KClass.kt

@@ -24,7 +24,7 @@ package kotlin.reflect
  *
  * @param T the type of the class.
  */
-public interface KClass<T : Any> : KDeclarationContainer, KAnnotatedElement {
+public interface KClass<T : Any> : KDeclarationContainer, KAnnotatedElement, KClassifier {
     /**
      * The simple name of the class as it was declared in the source code,
      * or `null` if the class has no name (if, for example, it is an anonymous object literal).

core/builtins/src/kotlin/reflect/KClassifier.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.reflect
+
+/**
+ * A classifier is either a class, or a type parameter, or a type alias.
+ *
+ * TODO: improve doc
+ */
+public interface KClassifier

core/builtins/src/kotlin/reflect/KTypeParameter.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.reflect
+
+/**
+ * Represents a declaration of a type parameter of a class or a callable.
+ * See the [Kotlin language documentation](http://kotlinlang.org/docs/reference/generics.html#generics)
+ * for more information.
+ */
+public interface KTypeParameter : KClassifier {
+    /**
+     * The name of this type parameter as it was declared in the source code.
+     */
+    public val name: String
+}

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt

@@ -32,7 +32,8 @@ import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KotlinReflectionInternalError
 
-internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclarationContainerImpl(), KClass<T>, KAnnotatedElementImpl {
+internal class KClassImpl<T : Any>(override val jClass: Class<T>) :
+        KDeclarationContainerImpl(), KClass<T>, KClassifierImpl, KAnnotatedElementImpl {
     private val descriptor_ = ReflectProperties.lazySoft {
         val classId = classId
 
@@ -43,7 +44,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
         descriptor ?: reportUnresolvedClass()
     }
 
-    val descriptor: ClassDescriptor
+    override val descriptor: ClassDescriptor
         get() = descriptor_()
 
     override val annotated: Annotated get() = descriptor

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassifierImpl.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.reflect.jvm.internal
+
+import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
+
+internal interface KClassifierImpl {
+    val descriptor: ClassifierDescriptor
+}

core/reflection.jvm/src/kotlin/reflect/jvm/internal/KTypeParameterImpl.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlin.reflect.jvm.internal
+
+import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
+import kotlin.reflect.KTypeParameter
+
+internal class KTypeParameterImpl(override val descriptor: TypeParameterDescriptor) : KTypeParameter, KClassifierImpl {
+    override val name: String
+        get() = descriptor.name.asString()
+}