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

ReadJavaBinaryClassTest: Any

Browse Source
This commit is contained in:
Stepan Koltsov
2012-01-18 11:56:14 +04:00
parent 3407f808f0
commit 5c6823a094
6 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
-1
View File
@@ -187,7 +187,6 @@ public class JavaTypeTransformer {
PrimitiveType primitiveType = jvmPrimitiveType.getPrimitiveType();
classDescriptorMap.put(jvmPrimitiveType.getWrapper().getFqName(), standardLibrary.getPrimitiveClassDescriptor(primitiveType));
}
//classDescriptorMap.put("java.lang.Object", standardLibrary.get
classDescriptorMap.put("java.lang.String", standardLibrary.getString());
}
return classDescriptorMap;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetTypeJetSignatureReader.java
+4
View File
@@ -74,6 +74,10 @@ public abstract class JetTypeJetSignatureReader extends JetSignatureExceptionsAd
String ourName = name.replace('/', '.');
this.classDescriptor = this.javaSemanticServices.getTypeTransformer().getPrimitiveWrappersClassDescriptorMap().get(ourName);
if (this.classDescriptor == null && ourName.equals("java.lang.Object")) {
this.classDescriptor = JetStandardClasses.getAny();
}
if (this.classDescriptor == null) {
this.classDescriptor = javaDescriptorResolver.resolveClass(ourName);