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

More efficient LexicalScope.addImportScopes

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-26 22:27:36 +03:00
parent 55c2b71829
commit 79825fc1e6
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
+9 -11
View File
@@ -287,23 +287,21 @@ inline fun <T: Any> LexicalScope.findFirstFromImportingScopes(fetch: (ImportingS
return findFirstFromMeAndParent { if (it is ImportingScope) fetch(it) else null } return findFirstFromMeAndParent { if (it is ImportingScope) fetch(it) else null }
} }
//TODO: more efficient fun LexicalScope.addImportScopes(importScopes: List<ImportingScope>): LexicalScope {
fun LexicalScope.addImportScopes(importScopes: Collection<ImportingScope>): LexicalScope {
return importScopes.fold(this) { scope, importingScope -> scope.addImportScope(importingScope) }
}
fun LexicalScope.addImportScope(importScope: ImportingScope): LexicalScope {
assert(importScope.parent == null)
if (this is ImportingScope) { if (this is ImportingScope) {
return importScope.withParent(this) return chainImportingScopes(importScopes, this)!!
} }
else { else {
val lastNonImporting = parentsWithSelf.last { it !is ImportingScope } val lastNonImporting = parentsWithSelf.last { it !is ImportingScope }
val firstImporting = lastNonImporting.parent as ImportingScope? val firstImporting = lastNonImporting.parent as ImportingScope?
return LexicalScopeWrapper(this, importScope.withParent(firstImporting)) val newFirstImporting = chainImportingScopes(importScopes, firstImporting)
return LexicalScopeWrapper(this, newFirstImporting)
} }
} }
fun LexicalScope.addImportScope(importScope: ImportingScope): LexicalScope
= addImportScopes(listOf(importScope))
fun ImportingScope.withParent(newParent: ImportingScope?): ImportingScope { fun ImportingScope.withParent(newParent: ImportingScope?): ImportingScope {
// TODO: it's a hack for Repl // TODO: it's a hack for Repl
if (this is MemberScopeToImportingScopeAdapter) { if (this is MemberScopeToImportingScopeAdapter) {
@@ -337,9 +335,9 @@ private class LexicalScopeWrapper(val delegate: LexicalScope, val newImportingSc
} }
} }
fun chainImportingScopes(scopes: List<ImportingScope>): ImportingScope? { fun chainImportingScopes(scopes: List<ImportingScope>, tail: ImportingScope? = null): ImportingScope? {
return scopes.asReversed() return scopes.asReversed()
.fold<ImportingScope, ImportingScope?>(null) { current, scope -> .fold(tail) { current, scope ->
assert(scope.parent == null) assert(scope.parent == null)
scope.withParent(current) scope.withParent(current)
} }