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

Remove usages of isMultiFileNamespace

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-03-06 16:17:37 +04:00
parent faf994d872
commit d9739fb5bb
6 changed files with 119 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+5 -11
View File
@@ -194,7 +194,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
boolean isLocalOrAnonymousClass = isObjectLiteral ||
!(parentDescriptor instanceof NamespaceDescriptor || parentDescriptor instanceof ClassDescriptor);
if (isLocalOrAnonymousClass) {
String outerClassName = getOuterClassName(descriptor, typeMapper, bindingContext, state);
String outerClassName = getOuterClassName(descriptor, typeMapper, bindingContext);
FunctionDescriptor function = DescriptorUtils.getParentOfType(descriptor, FunctionDescriptor.class);
//Function descriptor could be null only for object literal in package namespace
@@ -214,22 +214,16 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
public static String getOuterClassName(
@NotNull ClassDescriptor classDescriptor,
@NotNull JetTypeMapper typeMapper,
@NotNull BindingContext bindingContext,
@NotNull GenerationState state
@NotNull BindingContext bindingContext
) {
ClassDescriptor container = DescriptorUtils.getParentOfType(classDescriptor, ClassDescriptor.class);
if (container != null) {
return typeMapper.mapType(container.getDefaultType(), JetTypeMapperMode.IMPL).getInternalName();
}
else {
NamespaceDescriptor namespaceDescriptor = DescriptorUtils.getParentOfType(classDescriptor, NamespaceDescriptor.class);
assert namespaceDescriptor != null : "Namespace descriptor should be present: " + classDescriptor.getName();
FqName namespaceQN = namespaceDescriptor.getFqName();
boolean isMultiFile = CodegenBinding.isMultiFileNamespace(state.getBindingContext(), namespaceQN);
return isMultiFile
? NamespaceCodegen.getNamespacePartInternalName(
BindingContextUtils.getContainingFile(bindingContext, classDescriptor))
: NamespaceCodegen.getJVMClassNameForKotlinNs(namespaceQN).getInternalName();
JetFile containingFile = BindingContextUtils.getContainingFile(bindingContext, classDescriptor);
assert containingFile != null : "Containing file should be present for " + classDescriptor;
return NamespaceCodegen.getNamespacePartInternalName(containingFile);
}
}