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

assert special name is not used to build FQ name

Browse Source
This commit is contained in:
Stepan Koltsov
2012-06-02 02:18:29 +04:00
parent 139e376f7c
commit fc6c57e17a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+3 -3
View File
@@ -303,7 +303,7 @@ public class JetTypeMapper {
return getFQName(descriptor.getContainingDeclaration()); return getFQName(descriptor.getContainingDeclaration());
} }
if (descriptor.getContainingDeclaration() instanceof ModuleDescriptor) { if (descriptor.getContainingDeclaration() instanceof ModuleDescriptor || descriptor instanceof ScriptDescriptor) {
return ""; return "";
} }
@@ -341,11 +341,11 @@ public class JetTypeMapper {
if (container != null) { if (container != null) {
String baseName = getFQName(container); String baseName = getFQName(container);
if (!baseName.isEmpty()) { if (!baseName.isEmpty()) {
return baseName + (container instanceof NamespaceDescriptor ? "/" : "$") + name; return baseName + (container instanceof NamespaceDescriptor ? "/" : "$") + name.getIdentifier();
} }
} }
return name.getName(); return name.getIdentifier();
} }
private static ClassDescriptor getContainingClass(DeclarationDescriptor descriptor) { private static ClassDescriptor getContainingClass(DeclarationDescriptor descriptor) {