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

Property accessors are now children of IrProperty.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-08-31 12:52:36 +03:00
committed by Dmitry Petrov
parent ed68b3ecd0
commit 917e7bffbd
39 changed files with 222 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/expressions/arrayAccess.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE /arrayAccess.kt
PROPERTY public val p: kotlin.Int = 0 getter=null setter=null
PROPERTY public val p: kotlin.Int = 0
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
FUN public fun foo(): kotlin.Int
compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.txt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ FILE /arrayAugmentedAssignment1.kt
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=null
GET_VAR x type=kotlin.IntArray operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val x: kotlin.IntArray getter=null setter=null
PROPERTY public final val x: kotlin.IntArray
EXPRESSION_BODY
GET_VAR x type=kotlin.IntArray operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public fun testVariable(): kotlin.Unit
compiler/testData/ir/irText/expressions/assignments.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ FILE /assignments.kt
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=null
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final var x: kotlin.Int getter=null setter=null
PROPERTY public final var x: kotlin.Int
EXPRESSION_BODY
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public fun test1(): kotlin.Unit
compiler/testData/ir/irText/expressions/augmentedAssignment1.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE /augmentedAssignment1.kt
PROPERTY public var p: kotlin.Int getter=null setter=null
PROPERTY public var p: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
FUN public fun testVariable(): kotlin.Unit
compiler/testData/ir/irText/expressions/augmentedAssignment2.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ FILE /augmentedAssignment2.kt
BLOCK_BODY
FUN public operator fun A.modAssign(/*0*/ s: kotlin.String): kotlin.Unit
BLOCK_BODY
PROPERTY public val p: A getter=null setter=null
PROPERTY public val p: A
EXPRESSION_BODY
CALL .<init> type=A operator=null
FUN public fun testVariable(): kotlin.Unit
compiler/testData/ir/irText/expressions/elvis.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE /elvis.kt
PROPERTY public val p: kotlin.Any? = null getter=null setter=null
PROPERTY public val p: kotlin.Any? = null
EXPRESSION_BODY
CONST Null type=kotlin.Nothing? value='null'
FUN public fun foo(): kotlin.Any?
compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.txt
Vendored
+5 -5
View File
@@ -1,9 +1,9 @@
FILE /extensionPropertyGetterCall.kt
PROPERTY public val kotlin.String.okext: kotlin.String getter=<get-okext> setter=null
PROPERTY_GETTER public fun kotlin.String.<get-okext>(): kotlin.String property=okext
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-okext>
CONST String type=kotlin.String value='OK'
PROPERTY public val kotlin.String.okext: kotlin.String
PROPERTY_GETTER public fun kotlin.String.<get-okext>(): kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-okext>
CONST String type=kotlin.String value='OK'
FUN public fun kotlin.String.test5(): kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from=test5
compiler/testData/ir/irText/expressions/field.txt
Vendored
+12 -12
View File
@@ -1,17 +1,17 @@
FILE /field.kt
PROPERTY public var testSimple: kotlin.Int getter=null setter=<set-testSimple>
PROPERTY public var testSimple: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
PROPERTY_SETTER public fun <set-testSimple>(/*0*/ value: kotlin.Int): kotlin.Unit property=testSimple
BLOCK_BODY
SET_BACKING_FIELD testSimple type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
PROPERTY public var testAugmented: kotlin.Int getter=null setter=<set-testAugmented>
PROPERTY_SETTER public fun <set-testSimple>(/*0*/ value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD testSimple type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
PROPERTY public var testAugmented: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
PROPERTY_SETTER public fun <set-testAugmented>(/*0*/ value: kotlin.Int): kotlin.Unit property=testAugmented
BLOCK_BODY
SET_BACKING_FIELD testAugmented type=kotlin.Unit operator=PLUSEQ
CALL .plus type=kotlin.Int operator=PLUSEQ
$this: GET_BACKING_FIELD testAugmented type=kotlin.Int operator=PLUSEQ
other: GET_VAR value type=kotlin.Int operator=null
PROPERTY_SETTER public fun <set-testAugmented>(/*0*/ value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD testAugmented type=kotlin.Unit operator=PLUSEQ
CALL .plus type=kotlin.Int operator=PLUSEQ
$this: GET_BACKING_FIELD testAugmented type=kotlin.Int operator=PLUSEQ
other: GET_VAR value type=kotlin.Int operator=null
compiler/testData/ir/irText/expressions/forWithImplicitReceivers.txt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ FILE /forWithImplicitReceivers.kt
BLOCK_BODY
SET_BACKING_FIELD value type=kotlin.Unit operator=null
GET_VAR value type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final var value: kotlin.Int getter=null setter=null
PROPERTY public final var value: kotlin.Int
EXPRESSION_BODY
GET_VAR value type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
CLASS INTERFACE IReceiver
compiler/testData/ir/irText/expressions/incrementDecrement.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
FILE /incrementDecrement.kt
PROPERTY public var p: kotlin.Int getter=null setter=null
PROPERTY public var p: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
PROPERTY public val arr: kotlin.IntArray getter=null setter=null
PROPERTY public val arr: kotlin.IntArray
EXPRESSION_BODY
CALL .intArrayOf type=kotlin.IntArray operator=null
elements: VARARG type=IntArray varargElementType=Int
compiler/testData/ir/irText/expressions/jvmStaticFieldReference.txt
Vendored
+16 -16
View File
@@ -5,21 +5,21 @@ FILE /jvmStaticFieldReference.kt
$this: TYPE_OP operator=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
CALL .<get-out> type=java.io.PrintStream! operator=GET_PROPERTY
p0: CONST String type=kotlin.String value='testFun'
PROPERTY public var testProp: kotlin.Any getter=<get-testProp> setter=<set-testProp>
PROPERTY_GETTER public fun <get-testProp>(): kotlin.Any property=testProp
BLOCK_BODY
CALL .println type=kotlin.Unit operator=null
$this: TYPE_OP operator=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
CALL .<get-out> type=java.io.PrintStream! operator=GET_PROPERTY
p0: CONST String type=kotlin.String value='testProp/get'
RETURN type=kotlin.Nothing from=<get-testProp>
CONST Int type=kotlin.Int value='42'
PROPERTY_SETTER public fun <set-testProp>(/*0*/ value: kotlin.Any): kotlin.Unit property=testProp
BLOCK_BODY
CALL .println type=kotlin.Unit operator=null
$this: TYPE_OP operator=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
CALL .<get-out> type=java.io.PrintStream! operator=GET_PROPERTY
p0: CONST String type=kotlin.String value='testProp/set'
PROPERTY public var testProp: kotlin.Any
PROPERTY_GETTER public fun <get-testProp>(): kotlin.Any
BLOCK_BODY
CALL .println type=kotlin.Unit operator=null
$this: TYPE_OP operator=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
CALL .<get-out> type=java.io.PrintStream! operator=GET_PROPERTY
p0: CONST String type=kotlin.String value='testProp/get'
RETURN type=kotlin.Nothing from=<get-testProp>
CONST Int type=kotlin.Int value='42'
PROPERTY_SETTER public fun <set-testProp>(/*0*/ value: kotlin.Any): kotlin.Unit
BLOCK_BODY
CALL .println type=kotlin.Unit operator=null
$this: TYPE_OP operator=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
CALL .<get-out> type=java.io.PrintStream! operator=GET_PROPERTY
p0: CONST String type=kotlin.String value='testProp/set'
CLASS CLASS TestClass
FUN public constructor TestClass()
BLOCK_BODY
@@ -36,7 +36,7 @@ FILE /jvmStaticFieldReference.kt
$this: TYPE_OP operator=IMPLICIT_NOTNULL typeOperand=java.io.PrintStream
CALL .<get-out> type=java.io.PrintStream! operator=GET_PROPERTY
p0: CONST String type=kotlin.String value='TestClass/init'
PROPERTY public final val test: kotlin.Int getter=null setter=null
PROPERTY public final val test: kotlin.Int
EXPRESSION_BODY
WHEN type=kotlin.Int operator=WHEN
else: BLOCK type=kotlin.Int operator=null
compiler/testData/ir/irText/expressions/literals.txt
Vendored
+13 -13
View File
@@ -1,40 +1,40 @@
FILE /literals.kt
PROPERTY public val test1: kotlin.Int = 1 getter=null setter=null
PROPERTY public val test1: kotlin.Int = 1
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
PROPERTY public val test2: kotlin.Int = -1 getter=null setter=null
PROPERTY public val test2: kotlin.Int = -1
EXPRESSION_BODY
CONST Int type=kotlin.Int value='-1'
PROPERTY public val test3: kotlin.Boolean = true getter=null setter=null
PROPERTY public val test3: kotlin.Boolean = true
EXPRESSION_BODY
CONST Boolean type=kotlin.Boolean value='true'
PROPERTY public val test4: kotlin.Boolean = false getter=null setter=null
PROPERTY public val test4: kotlin.Boolean = false
EXPRESSION_BODY
CONST Boolean type=kotlin.Boolean value='false'
PROPERTY public val test5: kotlin.String = "abc" getter=null setter=null
PROPERTY public val test5: kotlin.String = "abc"
EXPRESSION_BODY
CONST String type=kotlin.String value='abc'
PROPERTY public val test6: kotlin.Nothing? = null getter=null setter=null
PROPERTY public val test6: kotlin.Nothing? = null
EXPRESSION_BODY
CONST Null type=kotlin.Nothing? value='null'
PROPERTY public val test7: kotlin.Long = 1.toLong() getter=null setter=null
PROPERTY public val test7: kotlin.Long = 1.toLong()
EXPRESSION_BODY
CONST Long type=kotlin.Long value='1'
PROPERTY public val test8: kotlin.Long = -1.toLong() getter=null setter=null
PROPERTY public val test8: kotlin.Long = -1.toLong()
EXPRESSION_BODY
CONST Long type=kotlin.Long value='-1'
PROPERTY public val test9: kotlin.Double = 1.0.toDouble() getter=null setter=null
PROPERTY public val test9: kotlin.Double = 1.0.toDouble()
EXPRESSION_BODY
CONST Double type=kotlin.Double value='1.0'
PROPERTY public val test10: kotlin.Double = -1.0.toDouble() getter=null setter=null
PROPERTY public val test10: kotlin.Double = -1.0.toDouble()
EXPRESSION_BODY
CONST Double type=kotlin.Double value='-1.0'
PROPERTY public val test11: kotlin.Float = 1.0.toFloat() getter=null setter=null
PROPERTY public val test11: kotlin.Float = 1.0.toFloat()
EXPRESSION_BODY
CONST Float type=kotlin.Float value='1.0'
PROPERTY public val test12: kotlin.Float = -1.0.toFloat() getter=null setter=null
PROPERTY public val test12: kotlin.Float = -1.0.toFloat()
EXPRESSION_BODY
CONST Float type=kotlin.Float value='-1.0'
PROPERTY public val test13: kotlin.Char = \u0061 ('a') getter=null setter=null
PROPERTY public val test13: kotlin.Char = \u0061 ('a')
EXPRESSION_BODY
CONST Char type=kotlin.Char value='a'
compiler/testData/ir/irText/expressions/references.txt
Vendored
+12 -12
View File
@@ -1,15 +1,15 @@
FILE /references.kt
PROPERTY public val ok: kotlin.String = "OK" getter=null setter=null
PROPERTY public val ok: kotlin.String = "OK"
EXPRESSION_BODY
CONST String type=kotlin.String value='OK'
PROPERTY public val ok2: kotlin.String = "OK" getter=null setter=null
PROPERTY public val ok2: kotlin.String = "OK"
EXPRESSION_BODY
CALL .<get-ok> type=kotlin.String operator=GET_PROPERTY
PROPERTY public val ok3: kotlin.String getter=<get-ok3> setter=null
PROPERTY_GETTER public fun <get-ok3>(): kotlin.String property=ok3
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-ok3>
CONST String type=kotlin.String value='OK'
PROPERTY public val ok3: kotlin.String
PROPERTY_GETTER public fun <get-ok3>(): kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-ok3>
CONST String type=kotlin.String value='OK'
FUN public fun test1(): kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from=test1
@@ -28,11 +28,11 @@ FILE /references.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from=test4
CALL .<get-ok3> type=kotlin.String operator=GET_PROPERTY
PROPERTY public val kotlin.String.okext: kotlin.String getter=<get-okext> setter=null
PROPERTY_GETTER public fun kotlin.String.<get-okext>(): kotlin.String property=okext
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-okext>
CONST String type=kotlin.String value='OK'
PROPERTY public val kotlin.String.okext: kotlin.String
PROPERTY_GETTER public fun kotlin.String.<get-okext>(): kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-okext>
CONST String type=kotlin.String value='OK'
FUN public fun kotlin.String.test5(): kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from=test5
compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.txt
Vendored
+7 -7
View File
@@ -2,13 +2,13 @@ FILE /safeCallWithIncrementDecrement.kt
CLASS CLASS C
FUN public constructor C()
BLOCK_BODY
PROPERTY public var test.C?.p: kotlin.Int getter=<get-p> setter=<set-p>
PROPERTY_GETTER public fun test.C?.<get-p>(): kotlin.Int property=p
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-p>
CONST Int type=kotlin.Int value='42'
PROPERTY_SETTER public fun test.C?.<set-p>(/*0*/ value: kotlin.Int): kotlin.Unit property=p
BLOCK_BODY
PROPERTY public var test.C?.p: kotlin.Int
PROPERTY_GETTER public fun test.C?.<get-p>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-p>
CONST Int type=kotlin.Int value='42'
PROPERTY_SETTER public fun test.C?.<set-p>(/*0*/ value: kotlin.Int): kotlin.Unit
BLOCK_BODY
FUN public operator fun kotlin.Int?.inc(): kotlin.Int?
BLOCK_BODY
RETURN type=kotlin.Nothing from=inc
compiler/testData/ir/irText/expressions/safeCalls.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ FILE /safeCalls.kt
BLOCK_BODY
SET_BACKING_FIELD value type=kotlin.Unit operator=null
GET_VAR value type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final var value: kotlin.Int getter=null setter=null
PROPERTY public final var value: kotlin.Int
EXPRESSION_BODY
GET_VAR value type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
CLASS INTERFACE IHost
compiler/testData/ir/irText/expressions/smoke.txt
Vendored
+14 -14
View File
@@ -3,21 +3,21 @@ FILE /smoke.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from=testFun
CONST String type=kotlin.String value='OK'
PROPERTY public val testSimpleVal: kotlin.Int = 1 getter=null setter=null
PROPERTY public val testSimpleVal: kotlin.Int = 1
EXPRESSION_BODY
CONST Int type=kotlin.Int value='1'
PROPERTY public val testValWithGetter: kotlin.Int getter=<get-testValWithGetter> setter=null
PROPERTY_GETTER public fun <get-testValWithGetter>(): kotlin.Int property=testValWithGetter
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-testValWithGetter>
CONST Int type=kotlin.Int value='42'
PROPERTY public var testSimpleVar: kotlin.Int getter=null setter=null
PROPERTY public val testValWithGetter: kotlin.Int
PROPERTY_GETTER public fun <get-testValWithGetter>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-testValWithGetter>
CONST Int type=kotlin.Int value='42'
PROPERTY public var testSimpleVar: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='2'
PROPERTY public var testVarWithAccessors: kotlin.Int getter=<get-testVarWithAccessors> setter=<set-testVarWithAccessors>
PROPERTY_GETTER public fun <get-testVarWithAccessors>(): kotlin.Int property=testVarWithAccessors
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-testVarWithAccessors>
CONST Int type=kotlin.Int value='42'
PROPERTY_SETTER public fun <set-testVarWithAccessors>(/*0*/ v: kotlin.Int): kotlin.Unit property=testVarWithAccessors
BLOCK_BODY
PROPERTY public var testVarWithAccessors: kotlin.Int
PROPERTY_GETTER public fun <get-testVarWithAccessors>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-testVarWithAccessors>
CONST Int type=kotlin.Int value='42'
PROPERTY_SETTER public fun <set-testVarWithAccessors>(/*0*/ v: kotlin.Int): kotlin.Unit
BLOCK_BODY
compiler/testData/ir/irText/expressions/stringTemplates.txt
Vendored
+6 -6
View File
@@ -3,21 +3,21 @@ FILE /stringTemplates.kt
BLOCK_BODY
RETURN type=kotlin.Nothing from=foo
CONST String type=kotlin.String value=''
PROPERTY public val test1: kotlin.String = "" getter=null setter=null
PROPERTY public val test1: kotlin.String = ""
EXPRESSION_BODY
CONST String type=kotlin.String value=''
PROPERTY public val test2: kotlin.String = "abc" getter=null setter=null
PROPERTY public val test2: kotlin.String = "abc"
EXPRESSION_BODY
CONST String type=kotlin.String value='abc'
PROPERTY public val test3: kotlin.String = "" getter=null setter=null
PROPERTY public val test3: kotlin.String = ""
EXPRESSION_BODY
CONST String type=kotlin.String value=''
PROPERTY public val test4: kotlin.String = "abc" getter=null setter=null
PROPERTY public val test4: kotlin.String = "abc"
EXPRESSION_BODY
CONST String type=kotlin.String value='abc'
PROPERTY public val test5: kotlin.String = "
abc
" getter=null setter=null
"
EXPRESSION_BODY
STRING_CONCATENATION type=kotlin.String
CONST String type=kotlin.String value='
@@ -25,7 +25,7 @@ abc
CONST String type=kotlin.String value='abc'
CONST String type=kotlin.String value='
'
PROPERTY public val test6: kotlin.String getter=null setter=null
PROPERTY public val test6: kotlin.String
EXPRESSION_BODY
STRING_CONCATENATION type=kotlin.String
CALL .<get-test1> type=kotlin.String operator=GET_PROPERTY
compiler/testData/ir/irText/expressions/values.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ FILE /values.kt
CLASS OBJECT A
FUN private constructor A()
BLOCK_BODY
PROPERTY public val a: kotlin.Int = 0 getter=null setter=null
PROPERTY public val a: kotlin.Int = 0
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
CLASS CLASS Z
compiler/testData/ir/irText/expressions/vararg.txt
Vendored
+3 -3
View File
@@ -1,15 +1,15 @@
FILE /vararg.kt
PROPERTY public val test1: kotlin.Array<kotlin.String> getter=null setter=null
PROPERTY public val test1: kotlin.Array<kotlin.String>
EXPRESSION_BODY
CALL .arrayOf type=kotlin.Array<kotlin.String> operator=null
PROPERTY public val test2: kotlin.Array<kotlin.String> getter=null setter=null
PROPERTY public val test2: kotlin.Array<kotlin.String>
EXPRESSION_BODY
CALL .arrayOf type=kotlin.Array<kotlin.String> operator=null
elements: VARARG type=Array<out String> varargElementType=String
CONST String type=kotlin.String value='1'
CONST String type=kotlin.String value='2'
CONST String type=kotlin.String value='3'
PROPERTY public val test3: kotlin.Array<kotlin.String> getter=null setter=null
PROPERTY public val test3: kotlin.Array<kotlin.String>
EXPRESSION_BODY
CALL .arrayOf type=kotlin.Array<kotlin.String> operator=null
elements: VARARG type=Array<out String> varargElementType=String