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

Merge branch 'decompiler'

Browse Source 
Conflicts:
	compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
	compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
	compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
This commit is contained in:
Evgeny Gerashchenko
2012-03-14 14:50:04 +04:00
parent fe26a1de9e 6a8dfc555e
commit af9f00c177
40 changed files with 1034 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+3 -2
View File
@@ -23,6 +23,7 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.FqName;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Type;
@@ -144,8 +145,8 @@ public class NamespaceCodegen {
}
String name = fqName.getFqName().replace('.', '/');
if(name.startsWith("<java_root>")) {
name = name.substring("<java_root>".length() + 1, name.length());
if (name.startsWith(JavaDescriptorResolver.JAVA_ROOT)) {
name = name.substring(JavaDescriptorResolver.JAVA_ROOT.length() + 1, name.length());
}
if (namespace) {
name += "/" + JvmAbi.PACKAGE_CLASS;