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

KT-2752: refactor support of modules and root packages

Browse Source
This commit is contained in:
Alexey Andreev
2016-06-22 14:43:28 +03:00
parent c657716ae0
commit c14795f66d
4 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/naming/FQNGenerator.kt
+6 -6
View File
@@ -27,24 +27,24 @@ import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject
import java.util.*
class FQNGenerator {
private val cache: MutableMap<DeclarationDescriptor, FQNPart> = WeakHashMap()
private val cache: MutableMap<DeclarationDescriptor, FQNPart?> = WeakHashMap()
fun generate(descriptor: DeclarationDescriptor) = cache.getOrPut(descriptor) { generateCacheMiss(descriptor.original) }
private fun generateCacheMiss(descriptor: DeclarationDescriptor): FQNPart {
private fun generateCacheMiss(descriptor: DeclarationDescriptor): FQNPart? {
// Members of companion objects of classes are treated as static members of these classes
if (isNativeObject(descriptor) && isCompanionObject(descriptor)) {
return generate(descriptor.containingDeclaration!!)
}
when (descriptor) {
is ModuleDescriptor -> return FQNPart(listOf(descriptor.name.asString()), true, descriptor, descriptor)
is ModuleDescriptor -> return null
is PackageFragmentDescriptor -> {
return if (!descriptor.name.isSpecial) {
FQNPart(descriptor.fqName.pathSegments().map { it.asString() }, true, descriptor,
descriptor.containingDeclaration)
FQNPart(descriptor.fqName.pathSegments().map { it.asString() }, true, descriptor, descriptor.containingDeclaration)
}
else {
generate(descriptor.containingDeclaration)
null
}
}
is FakeCallableDescriptorForObject -> return generate(descriptor.getReferencedDescriptor())
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNameClashChecker.kt
+4 -4
View File
@@ -46,7 +46,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
}
private fun checkDescriptor(descriptor: DeclarationDescriptor, declaration: KtDeclaration, diagnosticHolder: DiagnosticSink) {
val fqn = fqnGenerator.generate(descriptor)
val fqn = fqnGenerator.generate(descriptor)!!
if (fqn.shared && fqn.scope is ClassOrPackageFragmentDescriptor && isOpaque(fqn.descriptor)) {
val scope = getScope(fqn.scope)
val name = fqn.names.last()
@@ -66,7 +66,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
.mapNotNull { it as? CallableMemberDescriptor }
.filter { it.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE }
for (override in fakeOverrides) {
val overrideFqn = fqnGenerator.generate(override)
val overrideFqn = fqnGenerator.generate(override)!!
val scope = getScope(overrideFqn.scope)
val name = overrideFqn.names.last()
val existing = scope[name]
@@ -114,7 +114,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
}
}
val fqn = fqnGenerator.generate(descriptor)
val fqn = fqnGenerator.generate(descriptor) ?: return
if (fqn.shared && isOpaque(fqn.descriptor)) {
target[fqn.names.last()] = fqn.descriptor
(fqn.descriptor as? CallableMemberDescriptor)?.let { checkOverrideClashes(it, target) }
@@ -125,7 +125,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
var overridden = descriptor.overriddenDescriptors
while (overridden.isNotEmpty()) {
for (overridenDescriptor in overridden) {
val overriddenFqn = fqnGenerator.generate(overridenDescriptor)
val overriddenFqn = fqnGenerator.generate(overridenDescriptor)!!
if (overriddenFqn.shared) {
val existing = target[overriddenFqn.names.last()]
if (existing != null) {
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
+31 -27
View File
@@ -222,7 +222,7 @@ public final class StaticContext {
@NotNull
private JsExpression buildQualifiedExpression(@NotNull DeclarationDescriptor descriptor) {
FQNPart part = fqnGenerator.generate(descriptor);
if (part.getDescriptor() instanceof ModuleDescriptor) {
if (part == null) {
ModuleDescriptor module = DescriptorUtils.getContainingModule(descriptor);
if (currentModule == module) {
return pureFqn(Namer.getRootPackageName(), null);
@@ -232,37 +232,36 @@ public final class StaticContext {
return result != null ? result : JsAstUtils.pureFqn(rootScope.declareName(Namer.getRootPackageName()), null);
}
}
JsExpression expression;
List<JsName> partNames;
if (standardClasses.isStandardObject(part.getDescriptor())) {
expression = Namer.kotlinObject();
partNames = Collections.singletonList(standardClasses.getStandardObjectName(part.getDescriptor()));
}
else if (isLibraryObject(part.getDescriptor())) {
expression = Namer.kotlinObject();
partNames = getNameForFQNPart(part);
}
else if (isNative(part.getDescriptor()) && !isNativeObject(part.getScope())) {
expression = null;
partNames = getNameForFQNPart(part);
}
else {
JsExpression expression;
List<JsName> partNames;
if (standardClasses.isStandardObject(part.getDescriptor())) {
expression = Namer.kotlinObject();
partNames = Collections.singletonList(standardClasses.getStandardObjectName(part.getDescriptor()));
}
else if (isLibraryObject(part.getDescriptor())) {
expression = Namer.kotlinObject();
partNames = getNameForFQNPart(part);
}
else if (isNative(part.getDescriptor()) && !isNativeObject(part.getScope())) {
if (part.getDescriptor() instanceof CallableDescriptor && part.getScope() instanceof FunctionDescriptor) {
expression = null;
partNames = getNameForFQNPart(part);
}
else {
if (part.getDescriptor() instanceof CallableDescriptor && part.getScope() instanceof FunctionDescriptor) {
expression = null;
}
else {
expression = getQualifiedExpression(part.getScope());
}
partNames = getNameForFQNPart(part);
expression = getQualifiedExpression(part.getScope());
}
for (JsName partName : partNames) {
expression = new JsNameRef(partName, expression);
applySideEffects(expression, part.getDescriptor());
}
assert expression != null : "Since partNames is not empty, expression must be non-null";
return expression;
partNames = getNameForFQNPart(part);
}
for (JsName partName : partNames) {
expression = new JsNameRef(partName, expression);
applySideEffects(expression, part.getDescriptor());
}
assert expression != null : "Since partNames is not empty, expression must be non-null";
return expression;
}
private static boolean isNative(DeclarationDescriptor descriptor) {
@@ -284,7 +283,11 @@ public final class StaticContext {
@NotNull
public JsName getNameForDescriptor(@NotNull DeclarationDescriptor descriptor) {
return getNameForFQNPart(fqnGenerator.generate(descriptor)).get(0);
FQNPart fqn = fqnGenerator.generate(descriptor);
if (fqn == null) {
throw new IllegalArgumentException("Can't generate name for root declarations: " + descriptor);
}
return getNameForFQNPart(fqn).get(0);
}
@NotNull
@@ -293,6 +296,7 @@ public final class StaticContext {
if (name == null) {
FQNPart fqn = fqnGenerator.generate(property);
assert fqn != null : "Properties are non-root declarations: " + property;
assert fqn.getNames().size() == 1 : "Private names must always consist of exactly one name";
JsScope scope = getScopeForDescriptor(fqn.getScope());
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt
+1 -1
View File
@@ -170,7 +170,7 @@ class UsageTracker(
// Append 'closure$' prefix to avoid name clash between closure and member fields in case of local classes
else -> {
val mangled = FQNGenerator().generate(this).names.last()
val mangled = FQNGenerator().generate(this)!!.names.last()
"closure\$$mangled"
}
}