azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor, remove useless code and fix warnings

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-14 14:13:47 +03:00
parent 949144e0c0
commit 296512ffc4
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/builtins/functions/BuiltInFictitiousFunctionClassFactory.kt
+5 -8
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.builtins.functions package org.jetbrains.kotlin.builtins.functions
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor.Kind import org.jetbrains.kotlin.builtins.functions.FunctionClassDescriptor.Kind
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -24,7 +23,6 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.deserialization.ClassDescriptorFactory import org.jetbrains.kotlin.serialization.deserialization.ClassDescriptorFactory
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
import kotlin.platform.platformStatic
/** /**
* Produces descriptors representing the fictitious classes for function types, such as kotlin.Function1 or kotlin.reflect.KFunction2. * Produces descriptors representing the fictitious classes for function types, such as kotlin.Function1 or kotlin.reflect.KFunction2.
@@ -37,9 +35,8 @@ public class BuiltInFictitiousFunctionClassFactory(
private data class KindWithArity(val kind: Kind, val arity: Int) private data class KindWithArity(val kind: Kind, val arity: Int)
companion object { companion object {
platformStatic public fun parseClassName(className: String, packageFqName: FqName): KindWithArity? { @JvmStatic
// There is no functions in kotlin.annotation package public fun parseClassName(className: String, packageFqName: FqName): KindWithArity? {
if (packageFqName == KotlinBuiltIns.ANNOTATION_PACKAGE_FQ_NAME) return null
val kind = FunctionClassDescriptor.Kind.byPackage(packageFqName) ?: return null val kind = FunctionClassDescriptor.Kind.byPackage(packageFqName) ?: return null
val prefix = kind.classNamePrefix val prefix = kind.classNamePrefix
@@ -65,12 +62,12 @@ public class BuiltInFictitiousFunctionClassFactory(
} }
override fun createClass(classId: ClassId): ClassDescriptor? { override fun createClass(classId: ClassId): ClassDescriptor? {
if (classId.isLocal() || classId.isNestedClass()) return null if (classId.isLocal || classId.isNestedClass) return null
val className = classId.getRelativeClassName().asString() val className = classId.relativeClassName.asString()
if ("Function" !in className) return null // An optimization if ("Function" !in className) return null // An optimization
val packageFqName = classId.getPackageFqName() val packageFqName = classId.packageFqName
val (kind, arity) = parseClassName(className, packageFqName) ?: return null val (kind, arity) = parseClassName(className, packageFqName) ?: return null
val containingPackageFragment = module.getPackage(packageFqName).fragments.single() val containingPackageFragment = module.getPackage(packageFqName).fragments.single()