From 4bdeaffa04ae1f8a9e709f7a58868b8c85b0818b Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Tue, 18 Sep 2012 18:18:55 +0400
Subject: [PATCH] use "JvmClassName.byFqNameWithoutInnerClasses" instead of
 "replace('.', '/')"

---
 .../src/org/jetbrains/jet/codegen/NamespaceCodegen.java       | 4 ++--
 .../jet/codegen/binding/CodegenAnnotatingVisitor.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
index fea22cdf3cf..3e6ea88f71b 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
@@ -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
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
index 0fa149521b3..977822ddbfc 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java
@@ -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();