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

ModuleDescriptor knows its built-ins

Browse Source
This commit is contained in:
Andrey Breslav
2014-12-02 18:26:01 +03:00
parent 32d2a9cdb2
commit 80a32ee875
15 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt
+3
View File
@@ -21,6 +21,7 @@ import org.jetbrains.jet.lang.resolve.ImportPath
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.types.TypeSubstitutor
import org.jetbrains.jet.lang.descriptors.impl.PackageViewDescriptorImpl
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
public trait ModuleDescriptor : DeclarationDescriptor {
override fun getContainingDeclaration(): DeclarationDescriptor? = null
@@ -36,6 +37,8 @@ public trait ModuleDescriptor : DeclarationDescriptor {
public val platformToKotlinClassMap: PlatformToKotlinClassMap
public val builtIns: KotlinBuiltIns
public fun isFriend(other: ModuleDescriptor): Boolean
override fun substitute(substitutor: TypeSubstitutor): ModuleDescriptor {
core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt
+4
View File
@@ -25,6 +25,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
import kotlin.properties.Delegates
import java.util.LinkedHashSet
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
public class ModuleDescriptorImpl(
moduleName: Name,
@@ -95,4 +96,7 @@ public class ModuleDescriptorImpl(
assert(!isSealed, "Attempt to add friend module ${friend.id} to sealed module $id")
friendModules.add(friend)
}
override val builtIns: KotlinBuiltIns
get() = KotlinBuiltIns.getInstance()
}