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

Remove toInt() from rendering IntValue

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-02-20 15:57:25 +04:00
parent a80114d720
commit 89d99d2848
35 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
+1 -1
View File
@@ -8,7 +8,7 @@ public open class ArithmeticExpressionInParam : java.lang.Object {
public abstract fun value(): kotlin.Int
}
test.ArithmeticExpressionInParam.Anno(value = 42.toInt(): kotlin.Int) public open class Class : java.lang.Object {
test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class : java.lang.Object {
public constructor Class()
}
}
compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public trait PrimitiveValueInParam : java.lang.Object {
test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1.toInt(): kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object {
test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object {
public constructor A()
}
compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public final class FinalFieldAsVal : java.lang.Object {
public constructor FinalFieldAsVal()
public final val f: kotlin.Int = 1.toInt()
public final val f: kotlin.Int = 1
}
compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal final class A {
internal class object <class-object-for-B> {
/*primary*/ private constructor <class-object-for-B>()
internal final val TEST: kotlin.Int = 1.toInt()
internal final val TEST: kotlin.Int = 1
internal final fun <get-TEST>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.txt
+1 -1
View File
@@ -18,7 +18,7 @@ internal final annotation class CharAnno : kotlin.Annotation {
internal final fun <get-value>(): kotlin.Char
}
test.IntAnno(value = 42.toInt(): kotlin.Int) test.ShortAnno(value = 42.toShort(): kotlin.Short) test.ByteAnno(value = 42.toByte(): kotlin.Byte) test.LongAnno(value = 42.toLong(): kotlin.Long) test.CharAnno(value = #65(A): kotlin.Char) test.BooleanAnno(value = false: kotlin.Boolean) test.FloatAnno(value = 3.14.toFloat(): kotlin.Float) test.DoubleAnno(value = 3.14.toDouble(): kotlin.Double) internal final class Class {
test.IntAnno(value = 42: kotlin.Int) test.ShortAnno(value = 42.toShort(): kotlin.Short) test.ByteAnno(value = 42.toByte(): kotlin.Byte) test.LongAnno(value = 42.toLong(): kotlin.Long) test.CharAnno(value = #65(A): kotlin.Char) test.BooleanAnno(value = false: kotlin.Boolean) test.FloatAnno(value = 3.14.toFloat(): kotlin.Float) test.DoubleAnno(value = 3.14.toDouble(): kotlin.Double) internal final class Class {
/*primary*/ public constructor Class()
}
compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.txt
+1 -1
View File
@@ -10,6 +10,6 @@ internal final annotation class Anno : kotlin.Annotation {
internal final fun <get-string>(): kotlin.String
}
test.Anno(double = 3.14.toDouble(): kotlin.Double, int = 42.toInt(): kotlin.Int, string = "OK": kotlin.String) internal final class Class {
test.Anno(double = 3.14.toDouble(): kotlin.Double, int = 42: kotlin.Int, string = "OK": kotlin.String) internal final class Class {
/*primary*/ public constructor Class()
}
compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int = 42.toInt()
test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int = 42
internal fun <get-bar>(): kotlin.Int
test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal fun foo(): kotlin.Unit
compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.txt
+5 -5
View File
@@ -2,12 +2,12 @@ package test
internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
/*primary*/ public constructor ConstructorTypeParamClassObjectConflict</*0*/ test>()
internal final val some: kotlin.Int = 12.toInt()
internal final val some: kotlin.Int = 12
internal final fun <get-some>(): kotlin.Int
internal class object <class-object-for-ConstructorTypeParamClassObjectConflict> {
/*primary*/ private constructor <class-object-for-ConstructorTypeParamClassObjectConflict>()
internal final val test: kotlin.Int = 12.toInt()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
}
@@ -34,7 +34,7 @@ internal final class TestClassObjectAndClassConflict {
internal class object <class-object-for-TestClassObjectAndClassConflict> {
/*primary*/ private constructor <class-object-for-TestClassObjectAndClassConflict>()
internal final val bla: kotlin.Int = 12.toInt()
internal final val bla: kotlin.Int = 12
internal final fun <get-bla>(): kotlin.Int
}
}
@@ -46,7 +46,7 @@ internal final class TestConstructorParamClassObjectConflict {
internal class object <class-object-for-TestConstructorParamClassObjectConflict> {
/*primary*/ private constructor <class-object-for-TestConstructorParamClassObjectConflict>()
internal final val test: kotlin.Int = 12.toInt()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
}
@@ -60,7 +60,7 @@ internal final class TestConstructorValClassObjectConflict {
internal class object <class-object-for-TestConstructorValClassObjectConflict> {
/*primary*/ private constructor <class-object-for-TestConstructorValClassObjectConflict>()
internal final val test: kotlin.Int = 12.toInt()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
internal val x: kotlin.Int = 5.toInt()
internal val x: kotlin.Int = 5
internal fun <get-x>(): kotlin.Int
public object Obj {
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.txt
+1 -1
View File
@@ -5,7 +5,7 @@ internal final class ClassObjectDeclaresProperty {
internal class object <class-object-for-ClassObjectDeclaresProperty> {
/*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
internal final val i: kotlin.Int = 1.toInt()
internal final val i: kotlin.Int = 1
internal final fun <get-i>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.txt
+2 -2
View File
@@ -2,12 +2,12 @@ package test
internal final class A {
/*primary*/ public constructor A()
internal final val other: kotlin.Int = 1.toInt()
internal final val other: kotlin.Int = 1
internal final fun <get-other>(): kotlin.Int
internal class object <class-object-for-A> {
/*primary*/ private constructor <class-object-for-A>()
internal final val some: kotlin.Int = 1.toInt()
internal final val some: kotlin.Int = 1
internal final fun <get-some>(): kotlin.Int
}
}
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.txt
+2 -2
View File
@@ -5,12 +5,12 @@ internal final class Test {
internal class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
public final val prop1: kotlin.Int = 10.toInt()
public final val prop1: kotlin.Int = 10
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int
public final fun <get-prop2>(): kotlin.Int
protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
public final val prop3: kotlin.Int = 12.toInt()
public final val prop3: kotlin.Int = 12
public final fun <get-prop3>(): kotlin.Int
internal final var prop4: kotlin.Int
internal final fun <get-prop4>(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.txt
+2 -2
View File
@@ -4,12 +4,12 @@ internal trait Test {
internal class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
public final val prop1: kotlin.Int = 10.toInt()
public final val prop1: kotlin.Int = 10
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int
public final fun <get-prop2>(): kotlin.Int
protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
public final val prop3: kotlin.Int = 12.toInt()
public final val prop3: kotlin.Int = 12
public final fun <get-prop3>(): kotlin.Int
internal final var prop4: kotlin.Int
internal final fun <get-prop4>(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/prop/ClassVal.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val aa: kotlin.Int = 1.toInt()
internal final val aa: kotlin.Int = 1
internal final fun <get-aa>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/prop/NsVal.txt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
internal val nsVal: kotlin.Int = 1.toInt()
internal val nsVal: kotlin.Int = 1
internal fun <get-nsVal>(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
internal open class BaseClass {
/*primary*/ public constructor BaseClass()
internal final val exactly: kotlin.Int = 17.toInt()
internal final val exactly: kotlin.Int = 17
internal final fun <get-exactly>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.txt
+3 -3
View File
@@ -2,14 +2,14 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val property1: kotlin.Int = 1.toInt()
internal final val property1: kotlin.Int = 1
internal final fun <get-property1>(): kotlin.Int
internal final val property2: kotlin.Int = 1.toInt()
internal final val property2: kotlin.Int = 1
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
protected final val property4: kotlin.String = ""
protected final fun <get-property4>(): kotlin.String
public final val property5: kotlin.Int = 1.toInt()
public final val property5: kotlin.Int = 1
public final fun <get-property5>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
+3 -3
View File
@@ -2,14 +2,14 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val property1: kotlin.Int = 1.toInt()
internal final val property1: kotlin.Int = 1
internal final fun <get-property1>(): kotlin.Int
internal final val property2: kotlin.Int = 1.toInt()
internal final val property2: kotlin.Int = 1
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
protected final val property4: kotlin.String = ""
protected final fun <get-property4>(): kotlin.String
public final val property5: kotlin.Int = 1.toInt()
public final val property5: kotlin.Int = 1
public final fun <get-property5>(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.txt
+1 -1
View File
@@ -14,7 +14,7 @@ internal final class B : test.A {
public open override /*1*/ var p: kotlin.Int
public open override /*1*/ fun <get-p>(): kotlin.Int
public open override /*1*/ fun <set-p>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
internal open override /*1*/ val v: kotlin.Int = 0.toInt()
internal open override /*1*/ val v: kotlin.Int = 0
internal open override /*1*/ fun <get-v>(): kotlin.Int
internal open override /*1*/ fun f(): kotlin.Int
}
compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.txt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
internal val x: kotlin.Int = 0.toInt()
internal val x: kotlin.Int = 0
internal fun <get-x>(): kotlin.Int
internal fun f(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.txt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
private val topLevelVal: kotlin.Int = 0.toInt()
private val topLevelVal: kotlin.Int = 0
private fun <get-topLevelVal>(): kotlin.Int