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/classes/argumentReorderingInDelegatingConstructorCall.txt
Vendored
+2 -2
View File
@@ -6,10 +6,10 @@ FILE /argumentReorderingInDelegatingConstructorCall.kt
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
SET_BACKING_FIELD y type=kotlin.Unit operator=null
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
EXPRESSION_BODY
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val y: kotlin.Int getter=null setter=null
PROPERTY public final val y: kotlin.Int
EXPRESSION_BODY
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
CLASS CLASS Test1
compiler/testData/ir/irText/classes/classMembers.txt
Vendored
+18 -18
View File
@@ -8,10 +8,10 @@ FILE /classMembers.kt
GET_VAR z type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
SET_BACKING_FIELD property type=kotlin.Unit operator=null
CONST Int type=kotlin.Int value='0'
PROPERTY public final val y: kotlin.Int getter=null setter=null
PROPERTY public final val y: kotlin.Int
EXPRESSION_BODY
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final var z: kotlin.Int getter=null setter=null
PROPERTY public final var z: kotlin.Int
EXPRESSION_BODY
GET_VAR z type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public constructor C()
@@ -20,25 +20,25 @@ FILE /classMembers.kt
x: CONST Int type=kotlin.Int value='0'
y: CONST Int type=kotlin.Int value='0'
z: CONST Int type=kotlin.Int value='0'
PROPERTY public final val property: kotlin.Int = 0 getter=null setter=null
PROPERTY public final val property: kotlin.Int = 0
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
PROPERTY public final val propertyWithGet: kotlin.Int getter=<get-propertyWithGet> setter=null
PROPERTY_GETTER public final fun <get-propertyWithGet>(): kotlin.Int property=propertyWithGet
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-propertyWithGet>
CONST Int type=kotlin.Int value='42'
PROPERTY public final var propertyWithGetAndSet: kotlin.Int getter=<get-propertyWithGetAndSet> setter=<set-propertyWithGetAndSet>
PROPERTY_GETTER public final fun <get-propertyWithGetAndSet>(): kotlin.Int property=propertyWithGetAndSet
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-propertyWithGetAndSet>
CALL .<get-z> type=kotlin.Int operator=GET_PROPERTY
PROPERTY public final val propertyWithGet: kotlin.Int
PROPERTY_GETTER public final fun <get-propertyWithGet>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-propertyWithGet>
CONST Int type=kotlin.Int value='42'
PROPERTY public final var propertyWithGetAndSet: kotlin.Int
PROPERTY_GETTER public final fun <get-propertyWithGetAndSet>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-propertyWithGetAndSet>
CALL .<get-z> type=kotlin.Int operator=GET_PROPERTY
$this: THIS public final class C type=C
PROPERTY_SETTER public final fun <set-propertyWithGetAndSet>(/*0*/ value: kotlin.Int): kotlin.Unit
BLOCK_BODY
CALL .<set-z> type=kotlin.Unit operator=EQ
$this: THIS public final class C type=C
PROPERTY_SETTER public final fun <set-propertyWithGetAndSet>(/*0*/ value: kotlin.Int): kotlin.Unit property=propertyWithGetAndSet
BLOCK_BODY
CALL .<set-z> type=kotlin.Unit operator=EQ
$this: THIS public final class C type=C
<set-?>: GET_VAR value type=kotlin.Int operator=null
<set-?>: GET_VAR value type=kotlin.Int operator=null
FUN public final fun function(): kotlin.Unit
BLOCK_BODY
CALL .println type=kotlin.Unit operator=null
compiler/testData/ir/irText/classes/dataClasses.txt
Vendored
+3 -3
View File
@@ -8,13 +8,13 @@ FILE /dataClasses.kt
GET_VAR y type=kotlin.String operator=INITIALIZE_PROPERTY_FROM_PARAMETER
SET_BACKING_FIELD z type=kotlin.Unit operator=null
GET_VAR z type=kotlin.Any operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
EXPRESSION_BODY
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val y: kotlin.String getter=null setter=null
PROPERTY public final val y: kotlin.String
EXPRESSION_BODY
GET_VAR y type=kotlin.String operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val z: kotlin.Any getter=null setter=null
PROPERTY public final val z: kotlin.Any
EXPRESSION_BODY
GET_VAR z type=kotlin.Any operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public final operator /*synthesized*/ fun component1(): kotlin.Int
compiler/testData/ir/irText/classes/initVal.txt
Vendored
+3 -3
View File
@@ -4,7 +4,7 @@ FILE /initVal.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 val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
EXPRESSION_BODY
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
CLASS CLASS TestInitValInClass
@@ -12,7 +12,7 @@ FILE /initVal.kt
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=null
CONST Int type=kotlin.Int value='0'
PROPERTY public final val x: kotlin.Int = 0 getter=null setter=null
PROPERTY public final val x: kotlin.Int = 0
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
CLASS CLASS TestInitValInInitBlock
@@ -21,4 +21,4 @@ FILE /initVal.kt
BLOCK type=kotlin.Unit operator=null
SET_BACKING_FIELD x type=kotlin.Unit operator=null
CONST Int type=kotlin.Int value='0'
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
compiler/testData/ir/irText/classes/initVar.txt
Vendored
+18 -18
View File
@@ -4,7 +4,7 @@ FILE /initVar.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
CLASS CLASS TestInitVarInClass
@@ -12,7 +12,7 @@ FILE /initVar.kt
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=null
CONST Int type=kotlin.Int value='0'
PROPERTY public final var x: kotlin.Int getter=null setter=null
PROPERTY public final var x: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
CLASS CLASS TestInitVarInInitBlock
@@ -22,41 +22,41 @@ FILE /initVar.kt
CALL .<set-x> type=kotlin.Unit operator=EQ
$this: THIS public final class TestInitVarInInitBlock type=TestInitVarInInitBlock
<set-?>: CONST Int type=kotlin.Int value='0'
PROPERTY public final var x: kotlin.Int getter=null setter=null
PROPERTY public final var x: kotlin.Int
CLASS CLASS TestInitVarWithCustomSetter
FUN public constructor TestInitVarWithCustomSetter()
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=null
CONST Int type=kotlin.Int value='0'
PROPERTY public final var x: kotlin.Int getter=null setter=<set-x>
PROPERTY public final var x: kotlin.Int
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
PROPERTY_SETTER public final fun <set-x>(/*0*/ value: kotlin.Int): kotlin.Unit property=x
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
PROPERTY_SETTER public final fun <set-x>(/*0*/ value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
CLASS CLASS TestInitVarWithCustomSetterWithExplicitCtor
nestedInitializers: BLOCK_BODY
BLOCK type=kotlin.Unit operator=null
CALL .<set-x> type=kotlin.Unit operator=EQ
$this: THIS public final class TestInitVarWithCustomSetterWithExplicitCtor type=TestInitVarWithCustomSetterWithExplicitCtor
value: CONST Int type=kotlin.Int value='0'
PROPERTY public final var x: kotlin.Int getter=null setter=<set-x>
PROPERTY_SETTER public final fun <set-x>(/*0*/ value: kotlin.Int): kotlin.Unit property=x
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
PROPERTY public final var x: kotlin.Int
PROPERTY_SETTER public final fun <set-x>(/*0*/ value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
FUN public constructor TestInitVarWithCustomSetterWithExplicitCtor()
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL Any
NESTED_INITIALIZERS_CALL classDescriptor=TestInitVarWithCustomSetterWithExplicitCtor
CLASS CLASS TestInitVarWithCustomSetterInCtor
nestedInitializers: BLOCK_BODY
PROPERTY public final var x: kotlin.Int getter=null setter=<set-x>
PROPERTY_SETTER public final fun <set-x>(/*0*/ value: kotlin.Int): kotlin.Unit property=x
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
PROPERTY public final var x: kotlin.Int
PROPERTY_SETTER public final fun <set-x>(/*0*/ value: kotlin.Int): kotlin.Unit
BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=EQ
GET_VAR value type=kotlin.Int operator=null
FUN public constructor TestInitVarWithCustomSetterInCtor()
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL Any
compiler/testData/ir/irText/classes/objectLiteralExpressions.txt
Vendored
+2 -2
View File
@@ -1,14 +1,14 @@
FILE /objectLiteralExpressions.kt
CLASS INTERFACE IFoo
FUN public abstract fun foo(): kotlin.Unit
PROPERTY public val test1: kotlin.Any getter=null setter=null
PROPERTY public val test1: kotlin.Any
EXPRESSION_BODY
BLOCK type=test1.<no name provided> operator=OBJECT_LITERAL
CLASS CLASS <no name provided>
FUN public constructor <no name provided>()
BLOCK_BODY
CALL .<init> type=test1.<no name provided> operator=OBJECT_LITERAL
PROPERTY public val test2: IFoo getter=null setter=null
PROPERTY public val test2: IFoo
EXPRESSION_BODY
BLOCK type=test2.<no name provided> operator=OBJECT_LITERAL
CLASS CLASS <no name provided>
compiler/testData/ir/irText/classes/primaryConstructor.txt
Vendored
+6 -6
View File
@@ -6,10 +6,10 @@ FILE /primaryConstructor.kt
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
SET_BACKING_FIELD y type=kotlin.Unit operator=null
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
EXPRESSION_BODY
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val y: kotlin.Int getter=null setter=null
PROPERTY public final val y: kotlin.Int
EXPRESSION_BODY
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
CLASS CLASS Test2
@@ -19,10 +19,10 @@ FILE /primaryConstructor.kt
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
SET_BACKING_FIELD x type=kotlin.Unit operator=null
GET_VAR x type=kotlin.Int operator=null
PROPERTY public final val y: kotlin.Int getter=null setter=null
PROPERTY public final val y: kotlin.Int
EXPRESSION_BODY
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
EXPRESSION_BODY
GET_VAR x type=kotlin.Int operator=null
CLASS CLASS Test3
@@ -33,7 +33,7 @@ FILE /primaryConstructor.kt
BLOCK type=kotlin.Unit operator=null
SET_BACKING_FIELD x type=kotlin.Unit operator=null
GET_VAR x type=kotlin.Int operator=null
PROPERTY public final val y: kotlin.Int getter=null setter=null
PROPERTY public final val y: kotlin.Int
EXPRESSION_BODY
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.txt
Vendored
+2 -2
View File
@@ -18,10 +18,10 @@ FILE /primaryConstructorWithSuperConstructorCall.kt
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
SET_BACKING_FIELD y type=kotlin.Unit operator=null
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
EXPRESSION_BODY
GET_VAR x type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
PROPERTY public final val y: kotlin.Int getter=null setter=null
PROPERTY public final val y: kotlin.Int
EXPRESSION_BODY
GET_VAR y type=kotlin.Int operator=INITIALIZE_PROPERTY_FROM_PARAMETER
FUN public constructor TestWithDelegatingConstructor(/*0*/ x: kotlin.Int)
compiler/testData/ir/irText/classes/qualifiedSuperCalls.txt
Vendored
+19 -19
View File
@@ -2,19 +2,19 @@ FILE /qualifiedSuperCalls.kt
CLASS INTERFACE ILeft
FUN public open fun foo(): kotlin.Unit
BLOCK_BODY
PROPERTY public open val bar: kotlin.Int getter=<get-bar> setter=null
PROPERTY_GETTER public open fun <get-bar>(): kotlin.Int property=bar
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CONST Int type=kotlin.Int value='1'
PROPERTY public open val bar: kotlin.Int
PROPERTY_GETTER public open fun <get-bar>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CONST Int type=kotlin.Int value='1'
CLASS INTERFACE IRight
FUN public open fun foo(): kotlin.Unit
BLOCK_BODY
PROPERTY public open val bar: kotlin.Int getter=<get-bar> setter=null
PROPERTY_GETTER public open fun <get-bar>(): kotlin.Int property=bar
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CONST Int type=kotlin.Int value='2'
PROPERTY public open val bar: kotlin.Int
PROPERTY_GETTER public open fun <get-bar>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CONST Int type=kotlin.Int value='2'
CLASS CLASS CBoth
FUN public constructor CBoth()
BLOCK_BODY
@@ -24,12 +24,12 @@ FILE /qualifiedSuperCalls.kt
$this: THIS public final class CBoth : ILeft, IRight type=ILeft
CALL .foo superQualifier=IRight type=kotlin.Unit operator=null
$this: THIS public final class CBoth : ILeft, IRight type=IRight
PROPERTY public open override /*2*/ val bar: kotlin.Int getter=<get-bar> setter=null
PROPERTY_GETTER public open override /*2*/ fun <get-bar>(): kotlin.Int property=bar
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CALL .plus type=kotlin.Int operator=PLUS
$this: CALL .<get-bar> superQualifier=ILeft type=kotlin.Int operator=GET_PROPERTY
$this: THIS public final class CBoth : ILeft, IRight type=ILeft
other: CALL .<get-bar> superQualifier=IRight type=kotlin.Int operator=GET_PROPERTY
$this: THIS public final class CBoth : ILeft, IRight type=IRight
PROPERTY public open override /*2*/ val bar: kotlin.Int
PROPERTY_GETTER public open override /*2*/ fun <get-bar>(): kotlin.Int
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CALL .plus type=kotlin.Int operator=PLUS
$this: CALL .<get-bar> superQualifier=ILeft type=kotlin.Int operator=GET_PROPERTY
$this: THIS public final class CBoth : ILeft, IRight type=ILeft
other: CALL .<get-bar> superQualifier=IRight type=kotlin.Int operator=GET_PROPERTY
$this: THIS public final class CBoth : ILeft, IRight type=IRight
compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.txt
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
nestedInitializers: BLOCK_BODY
SET_BACKING_FIELD x type=kotlin.Unit operator=null
CONST Int type=kotlin.Int value='0'
PROPERTY public final val x: kotlin.Int = 0 getter=null setter=null
PROPERTY public final val x: kotlin.Int = 0
EXPRESSION_BODY
CONST Int type=kotlin.Int value='0'
FUN public constructor TestProperty()
@@ -18,7 +18,7 @@ FILE /secondaryConstructorWithInitializersFromClassBody.kt
BLOCK type=kotlin.Unit operator=null
SET_BACKING_FIELD x type=kotlin.Unit operator=null
CONST Int type=kotlin.Int value='0'
PROPERTY public final val x: kotlin.Int getter=null setter=null
PROPERTY public final val x: kotlin.Int
FUN public constructor TestInitBlock()
BLOCK_BODY
DELEGATING_CONSTRUCTOR_CALL Base
compiler/testData/ir/irText/classes/superCalls.txt
Vendored
+7 -7
View File
@@ -6,7 +6,7 @@ FILE /superCalls.kt
CONST String type=kotlin.String value=''
FUN public open fun foo(): kotlin.Unit
BLOCK_BODY
PROPERTY public open val bar: kotlin.String = "" getter=null setter=null
PROPERTY public open val bar: kotlin.String = ""
EXPRESSION_BODY
CONST String type=kotlin.String value=''
CLASS CLASS Derived
@@ -17,9 +17,9 @@ FILE /superCalls.kt
BLOCK_BODY
CALL .foo superQualifier=Base type=kotlin.Unit operator=null
$this: THIS public final class Derived : Base type=Base
PROPERTY public open override /*1*/ val bar: kotlin.String getter=<get-bar> setter=null
PROPERTY_GETTER public open override /*1*/ fun <get-bar>(): kotlin.String property=bar
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CALL .<get-bar> superQualifier=Base type=kotlin.String operator=GET_PROPERTY
$this: THIS public final class Derived : Base type=Base
PROPERTY public open override /*1*/ val bar: kotlin.String
PROPERTY_GETTER public open override /*1*/ fun <get-bar>(): kotlin.String
BLOCK_BODY
RETURN type=kotlin.Nothing from=<get-bar>
CALL .<get-bar> superQualifier=Base type=kotlin.String operator=GET_PROPERTY
$this: THIS public final class Derived : Base type=Base