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

map the remaining primitive PSI types to ASM

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-04-07 16:25:54 +02:00
parent 6cbd5ab457
commit 365c9af59e
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+17 -2
View File
@@ -344,7 +344,7 @@ public class ExpressionCodegen extends JetVisitor {
}
}
private String getMethodDescriptor(PsiMethod method) {
private static String getMethodDescriptor(PsiMethod method) {
Type returnType = psiTypeToAsm(method.getReturnType());
PsiParameter[] parameters = method.getParameterList().getParameters();
Type[] parameterTypes = new Type[parameters.length];
@@ -354,7 +354,7 @@ public class ExpressionCodegen extends JetVisitor {
return Type.getMethodDescriptor(returnType, parameterTypes);
}
private Type psiTypeToAsm(PsiType type) {
private static Type psiTypeToAsm(PsiType type) {
if (type instanceof PsiPrimitiveType) {
if (type == PsiType.VOID) {
return Type.VOID_TYPE;
@@ -368,6 +368,21 @@ public class ExpressionCodegen extends JetVisitor {
if (type == PsiType.BOOLEAN) {
return Type.BOOLEAN_TYPE;
}
if (type == PsiType.BYTE) {
return Type.BYTE_TYPE;
}
if (type == PsiType.SHORT) {
return Type.SHORT_TYPE;
}
if (type == PsiType.CHAR) {
return Type.CHAR_TYPE;
}
if (type == PsiType.FLOAT) {
return Type.FLOAT_TYPE;
}
if (type == PsiType.DOUBLE) {
return Type.DOUBLE_TYPE;
}
}
if (type instanceof PsiClassType) {
PsiClass psiClass = ((PsiClassType) type).resolve();
idea/src/org/jetbrains/jet/codegen/JetTypeMapper.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class JetTypeMapper {
if (jetType.equals(TypeUtils.makeNullable(standardLibrary.getBooleanType()))) {
return Type.getObjectType("java/lang/Boolean");
}
if (jetType.equals(standardLibrary.getStringType())) {
if (jetType.equals(standardLibrary.getStringType()) || jetType.equals(standardLibrary.getNullableStringType())) {
return Type.getType(String.class);
}
idea/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+6
View File
@@ -308,6 +308,12 @@ public class NamespaceGenTest extends LightCodeInsightFixtureTestCase {
binOpTest("fun foo(a: Double, b: Double): Boolean = a == b", 1.0, 2.0, false);
}
public void testDoubleToJava() throws Exception {
loadText("fun foo(d: Double): String? = Double.toString(d)");
final Method main = generateFunction();
assertEquals("1.0", main.invoke(null, 1.0));
}
private void binOpTest(final String text, final Object arg1, final Object arg2, final Object expected) throws Exception {
loadText(text);
System.out.println(generateToText());