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

JS: drop support of old library format

Browse Source
This commit is contained in:
Alexey Andreev
2017-01-30 19:24:42 +03:00
parent 82320bdf7d
commit 7192529733
37 changed files with 143 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt
+5 -5
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer
import org.jetbrains.kotlin.js.translate.context.TranslationContext
import org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator
import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getExternalModuleName
import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getModuleName
import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
import org.jetbrains.kotlin.resolve.inline.InlineStrategy
import org.jetbrains.kotlin.utils.JsLibraryUtils
@@ -68,7 +68,7 @@ class FunctionReader(private val context: TranslationContext) {
val config = context.config as LibrarySourcesConfig
val libs = config.libraries.map { File(it) }
JsLibraryUtils.traverseJsLibraries(libs) { fileContent, path ->
JsLibraryUtils.traverseJsLibraries(libs) { fileContent, _ ->
var current = 0
while (true) {
@@ -113,9 +113,9 @@ class FunctionReader(private val context: TranslationContext) {
}
operator fun contains(descriptor: CallableDescriptor): Boolean {
val moduleName = getExternalModuleName(descriptor)
val moduleName = getModuleName(descriptor)
val currentModuleName = context.config.moduleId
return currentModuleName != moduleName && moduleName != null && moduleName in moduleNameToInfo.keys()
return currentModuleName != moduleName && moduleName in moduleNameToInfo.keys()
}
operator fun get(descriptor: CallableDescriptor): JsFunction = functionCache.get(descriptor)
@@ -123,7 +123,7 @@ class FunctionReader(private val context: TranslationContext) {
private fun readFunction(descriptor: CallableDescriptor): JsFunction? {
if (descriptor !in this) return null
val moduleName = getExternalModuleName(descriptor)
val moduleName = getModuleName(descriptor)
for (info in moduleNameToInfo[moduleName]) {
val function = readFunctionFromSource(descriptor, info)