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

cleanup in JavaDescriptorResolver

Browse Source
This commit is contained in:
Stepan Koltsov
2012-04-08 23:23:59 +04:00
parent b0325f14ef
commit 09ddfb714e
4 changed files with 77 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+5 -5
View File
@@ -178,20 +178,20 @@ public class JetTypeMapper {
private String jvmClassNameForNamespace(NamespaceDescriptor namespace) {
FqName fqName = DescriptorUtils.getFQName(namespace).toSafe();
Boolean javaClassStatics = bindingContext.get(JavaBindingContext.NAMESPACE_IS_CLASS_STATICS, namespace);
JavaNamespaceKind javaNamespaceKind = bindingContext.get(JavaBindingContext.JAVA_NAMESPACE_KIND, namespace);
Boolean src = bindingContext.get(BindingContext.NAMESPACE_IS_SRC, namespace);
if (javaClassStatics == null && src == null) {
if (javaNamespaceKind == null && src == null) {
throw new IllegalStateException("unknown namespace origin: " + fqName);
}
boolean classStatics;
if (javaClassStatics != null) {
if (javaClassStatics.booleanValue() && src != null) {
if (javaNamespaceKind != null) {
if (javaNamespaceKind == JavaNamespaceKind.CLASS_STATICS && src != null) {
throw new IllegalStateException(
"conflicting namespace " + fqName + ": it is both java statics and from src");
}
classStatics = javaClassStatics.booleanValue();
classStatics = javaNamespaceKind == JavaNamespaceKind.CLASS_STATICS;
} else {
classStatics = false;
}