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

Infrastructure change: module descriptor now knows its platform kind & its sources kind

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-12-09 16:47:27 +03:00
parent d32ab9d4d6
commit 57da92b862
11 changed files with 108 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
+8 -8
View File
@@ -27,10 +27,7 @@ import org.jetbrains.kotlin.container.ComponentProvider
import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.context.ProjectContext
import org.jetbrains.kotlin.context.withModule
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
import org.jetbrains.kotlin.descriptors.PackagePartProvider
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.impl.LazyModuleDependencies
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.name.FqName
@@ -56,7 +53,7 @@ abstract class ResolverForProject<M : ModuleInfo> {
abstract val name: String
abstract val allModules: Collection<M>
override fun toString() = "$name"
override fun toString() = name
}
class EmptyResolverForProject<M : ModuleInfo> : ResolverForProject<M>() {
@@ -160,8 +157,10 @@ abstract class AnalyzerFacade<in P : PlatformAnalysisParameters> {
targetEnvironment: TargetEnvironment = CompilerEnvironment,
builtIns: KotlinBuiltIns = DefaultBuiltIns.Instance,
delegateResolver: ResolverForProject<M> = EmptyResolverForProject(),
packagePartProviderFactory: (M, ModuleContent) -> PackagePartProvider = { module, content -> PackagePartProvider.Empty },
firstDependency: M? = null
packagePartProviderFactory: (M, ModuleContent) -> PackagePartProvider = { _, _ -> PackagePartProvider.Empty },
firstDependency: M? = null,
modulePlatforms: (M) -> PlatformKind = { PlatformKind.DEFAULT },
moduleSources: (M) -> SourceKind = { SourceKind.NONE }
): ResolverForProject<M> {
val storageManager = projectContext.storageManager
fun createResolverForProject(): ResolverForProjectImpl<M> {
@@ -169,7 +168,8 @@ abstract class AnalyzerFacade<in P : PlatformAnalysisParameters> {
modules.forEach {
module ->
descriptorByModule[module] =
ModuleDescriptorImpl(module.name, storageManager, builtIns, module.capabilities)
ModuleDescriptorImpl(module.name, storageManager, builtIns,
modulePlatforms(module), moduleSources(module), module.capabilities)
}
return ResolverForProjectImpl(debugName, descriptorByModule, delegateResolver)
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/TargetPlatform.kt
+6
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.resolve
import org.jetbrains.kotlin.container.StorageComponentContainer
import org.jetbrains.kotlin.container.composeContainer
import org.jetbrains.kotlin.container.useInstance
import org.jetbrains.kotlin.descriptors.PlatformKind
import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap
import org.jetbrains.kotlin.resolve.calls.checkers.*
import org.jetbrains.kotlin.resolve.calls.results.TypeSpecificityComparator
@@ -34,6 +35,8 @@ abstract class TargetPlatform(val platformName: String) {
abstract val platformConfigurator: PlatformConfigurator
abstract val defaultImports: List<ImportPath>
abstract val kind: PlatformKind
object Default : TargetPlatform("Default") {
override val defaultImports: List<ImportPath> = ArrayList<ImportPath>().apply {
add(ImportPath("kotlin.*"))
@@ -55,6 +58,9 @@ abstract class TargetPlatform(val platformName: String) {
container.useInstance(TypeSpecificityComparator.NONE)
}
}
override val kind: PlatformKind
get() = PlatformKind.DEFAULT
}
}