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

use "JvmClassName.byFqNameWithoutInnerClasses" instead of "replace('.', '/')"

Browse Source
This commit is contained in:
Svetlana Isakova
2012-09-18 18:18:55 +04:00
parent 618f1b377b
commit 4bdeaffa04
2 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/NamespaceCodegen.java
+2 -2
View File
@@ -157,7 +157,7 @@ public class NamespaceCodegen extends GenerationStateAware {
if (k > 0) {
PsiFile containingFile = file.getContainingFile();
String namespaceInternalName = name.child(Name.identifier(JvmAbi.PACKAGE_CLASS)).getFqName().replace('.', '/');
String namespaceInternalName = JvmClassName.byFqNameWithoutInnerClasses(name.child(Name.identifier(JvmAbi.PACKAGE_CLASS))).getInternalName();
String className = getMultiFileNamespaceInternalName(namespaceInternalName, containingFile);
ClassBuilder builder = state.getFactory().forNamespacepart(className);
@@ -287,7 +287,7 @@ public class NamespaceCodegen extends GenerationStateAware {
return JvmClassName.byInternalName(JvmAbi.PACKAGE_CLASS);
}
return JvmClassName.byInternalName(fqName.getFqName().replace('.', '/') + "/" + JvmAbi.PACKAGE_CLASS);
return JvmClassName.byFqNameWithoutInnerClasses(fqName.child(Name.identifier(JvmAbi.PACKAGE_CLASS)));
}
@NotNull
compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
+1 -1
View File
@@ -115,7 +115,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid {
nameStack.push(classNameForScriptPsi(bindingContext, file.getScript()).getInternalName());
}
else {
nameStack.push(JetPsiUtil.getFQName(file).getFqName().replace('.', '/'));
nameStack.push(JvmClassName.byFqNameWithoutInnerClasses(JetPsiUtil.getFQName(file)).getInternalName());
}
file.acceptChildren(this);
nameStack.pop();