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

KT-1306123.lng or 123.sht is not good name

Browse Source
This commit is contained in:
Andrey Breslav
2012-02-20 21:42:13 +04:00
parent 5eb483b7a7
commit bff62484b1
68 changed files with 233 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/j2k.iml
+1
View File
@@ -8,6 +8,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
<orderEntry type="module" module-name="frontend" />
</component>
</module>
j2k/src/org/jetbrains/jet/j2k/Converter.java
+18 -16
View File
@@ -26,12 +26,14 @@ import org.jetbrains.jet.j2k.ast.Class;
import org.jetbrains.jet.j2k.ast.Enum;
import org.jetbrains.jet.j2k.util.AstUtil;
import org.jetbrains.jet.j2k.visitors.*;
import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
import java.util.*;
import static org.jetbrains.jet.j2k.ConverterUtil.countWritingAccesses;
import static org.jetbrains.jet.j2k.ConverterUtil.createMainFunction;
import static org.jetbrains.jet.j2k.visitors.TypeVisitor.*;
import static org.jetbrains.jet.lang.types.expressions.OperatorConventions.*;
/**
* @author ignatov
@@ -328,8 +330,8 @@ public class Converter {
final String typeToKotlin = f.getType().toKotlin();
if (typeToKotlin.equals("Boolean")) return "false";
if (typeToKotlin.equals("Char")) return "' '";
if (typeToKotlin.equals("Double")) return "0.dbl";
if (typeToKotlin.equals("Float")) return "0.flt";
if (typeToKotlin.equals("Double")) return "0." + OperatorConventions.DOUBLE;
if (typeToKotlin.equals("Float")) return "0." + OperatorConventions.FLOAT;
return "0";
}
}
@@ -780,21 +782,21 @@ public class Converter {
@NotNull
private static String getPrimitiveTypeConversion(@NotNull String type) {
Map<String, String> conversions = new HashMap<String, String>();
conversions.put("byte", "byt");
conversions.put("short", "sht");
conversions.put("int", "int");
conversions.put("long", "lng");
conversions.put("float", "flt");
conversions.put("double", "dbl");
conversions.put("char", "chr");
conversions.put("byte", BYTE);
conversions.put("short", SHORT);
conversions.put("int", INT);
conversions.put("long", LONG);
conversions.put("float", FLOAT);
conversions.put("double", DOUBLE);
conversions.put("char", CHAR);
conversions.put(JAVA_LANG_BYTE, "byt");
conversions.put(JAVA_LANG_SHORT, "sht");
conversions.put(JAVA_LANG_INTEGER, "int");
conversions.put(JAVA_LANG_LONG, "lng");
conversions.put(JAVA_LANG_FLOAT, "flt");
conversions.put(JAVA_LANG_DOUBLE, "dbl");
conversions.put(JAVA_LANG_CHARACTER, "chr");
conversions.put(JAVA_LANG_BYTE, BYTE);
conversions.put(JAVA_LANG_SHORT, SHORT);
conversions.put(JAVA_LANG_INTEGER, INT);
conversions.put(JAVA_LANG_LONG, LONG);
conversions.put(JAVA_LANG_FLOAT, FLOAT);
conversions.put(JAVA_LANG_DOUBLE, DOUBLE);
conversions.put(JAVA_LANG_CHARACTER, CHAR);
if (conversions.containsKey(type)) {
return "." + conversions.get(type);
j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.java
+3 -2
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.j2k.ast;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.j2k.util.AstUtil;
import org.jetbrains.jet.lang.types.expressions.OperatorConventions;
import java.util.*;
@@ -75,8 +76,8 @@ public class ArrayInitializerExpression extends Expression {
@NotNull
private static String getConversion(@NotNull final String afterReplace) {
if (afterReplace.contains("double")) return DOT + "dbl";
if (afterReplace.contains("float")) return DOT + "flt";
if (afterReplace.contains("double")) return DOT + OperatorConventions.DOUBLE;
if (afterReplace.contains("float")) return DOT + OperatorConventions.FLOAT;
return "";
}
j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
+1 -1
View File
@@ -208,7 +208,7 @@ public class ExpressionVisitor extends StatementVisitor {
text = text.replace("D", "").replace("d", "");
}
if (canonicalTypeStr.equals("float") || canonicalTypeStr.equals(JAVA_LANG_FLOAT)) {
text = text.replace("F", "").replace("f", "") + "." + "flt";
text = text.replace("F", "").replace("f", "") + "." + "float";
}
if (canonicalTypeStr.equals("long") || canonicalTypeStr.equals(JAVA_LANG_LONG)) {
text = text.replace("L", "").replace("l", "");
j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt
+1 -1
View File
@@ -1,4 +1,4 @@
var a : Double = 0
var b : Double = 0
var c : Double = 0
var ds : DoubleArray? = doubleArray((a).dbl, (b).dbl, (c).dbl)
var ds : DoubleArray? = doubleArray((a).double, (b).double, (c).double)
j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt
+4 -4
View File
@@ -1,8 +1,8 @@
public open class Test(_myName : String?, _a : Boolean, _b : Double, _c : Float, _d : Long, _e : Int, _f : Short, _g : Char) {
private val myName : String?
private var a : Boolean = false
private var b : Double = 0.dbl
private var c : Float = 0.flt
private var b : Double = 0.double
private var c : Float = 0.float
private var d : Long = 0
private var e : Int = 0
private var f : Short = 0
@@ -19,11 +19,11 @@ g = _g
}
class object {
open public fun init() : Test {
val __ = Test(null, false, 0.dbl, 0.flt, 0, 0, 0, ' ')
val __ = Test(null, false, 0.double, 0.float, 0, 0, 0, ' ')
return __
}
open public fun init(name : String?) : Test {
val __ = Test(foo(name), false, 0.dbl, 0.flt, 0, 0, 0, ' ')
val __ = Test(foo(name), false, 0.double, 0.flat, 0, 0, 0, ' ')
return __
}
open fun foo(n : String?) : String? {
j2k/tests/testData/ast/issues/file/kt-820-field.kt
+1 -1
View File
@@ -8,5 +8,5 @@ var myContainer : Container? = Container()
}
}
open class Test() {
var b : Byte = One.myContainer?.myInt.sure().byt
var b : Byte = One.myContainer?.myInt.sure().byte
}
j2k/tests/testData/ast/issues/file/kt-820.kt
+1 -1
View File
@@ -9,6 +9,6 @@ var myContainer : Container? = Container()
}
open class Test() {
open fun test() : Unit {
var b : Byte = One.myContainer?.myInt.sure().byt
var b : Byte = One.myContainer?.myInt.sure().byte
}
}
j2k/tests/testData/ast/literalExpression/file/endsWithDFL.kt
+4 -4
View File
@@ -2,17 +2,17 @@ open class Test() {
open fun test() : Unit {
var l1 : Long = 10
var d1 : Double = 10.0
var f1 : Float = 10.0.flt
var f1 : Float = 10.0.float
var l2 : Long = 10
var d2 : Double = 10.0
var f2 : Float = 10.0.flt
var f2 : Float = 10.0.float
}
open fun testBoxed() : Unit {
var l1 : Long? = 10
var d1 : Double? = 10.0
var f1 : Float? = 10.0.flt
var f1 : Float? = 10.0.float
var l2 : Long? = 10
var d2 : Double? = 10.0
var f2 : Float? = 10.0.flt
var f2 : Float? = 10.0.float
}
}