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

[FIR] Unify some special names to make code more uniform

Browse Source
This commit is contained in:
Roman Golyshev
2022-05-31 18:09:06 +04:00
parent 023def9d25
commit 01ce499bb2
20 changed files with 159 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.kt.txt
Vendored
+9 -9
View File
@@ -22,24 +22,24 @@ class C {
fun testVariable() {
var x: IntArray = foo()
{ // BLOCK
val <<array>>: IntArray = x
val <<index_0>>: Int = 0
<<array>>.set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).plus(other = 1))
val <array>: IntArray = x
val <index_0>: Int = 0
<array>.set(index = <index_0>, value = <array>.get(index = <index_0>).plus(other = 1))
}
}
fun testCall() {
{ // BLOCK
val <<array>>: IntArray = foo()
val <<index_0>>: Int = bar()
<<array>>.set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).times(other = 2))
val <array>: IntArray = foo()
val <index_0>: Int = bar()
<array>.set(index = <index_0>, value = <array>.get(index = <index_0>).times(other = 2))
}
}
fun testMember(c: C) {
val <array>: IntArray = c.<get-x>()
val <index0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>)
<array>.set(index = <index0>, value = <unary>.inc())
val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index_0>, value = <unary>.inc())
<unary> /*~> Unit */
}
compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.fir.kt.txt
Vendored
+3 -3
View File
@@ -10,8 +10,8 @@ interface IB {
fun IB.test(a: IA) {
{ // BLOCK
val <<array>>: IA = a
val <<index_0>>: String = ""
(<this>, <<array>>).set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).plus(other = 42))
val <array>: IA = a
val <index_0>: String = ""
(<this>, <array>).set(index = <index_0>, value = <array>.get(index = <index_0>).plus(other = 42))
}
}
compiler/testData/ir/irText/expressions/callableReferences/caoWithAdaptationForSam.fir.kt.txt
Vendored
+18 -18
View File
@@ -45,40 +45,40 @@ fun withVararg(vararg xs: Int): Int {
fun test1() {
{ // BLOCK
val <<array>>: A = A
val <<index_0>>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) {
val <array>: A = A
val <index_0>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) {
withVararg(xs = [p0])
}
<<array>>.set(i = <<index_0>> /*-> IFoo */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1))
<array>.set(i = <index_0> /*-> IFoo */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
}
}
fun test2() {
{ // BLOCK
val <<array>>: B = B
val <<index_0>>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) {
val <array>: B = B
val <index_0>: KFunction1<Int, Unit> = local fun withVararg(p0: Int) {
withVararg(xs = [p0])
}
<<array>>.set(i = <<index_0>> /*-> IFoo2 */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1))
<array>.set(i = <index_0> /*-> IFoo2 */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
}
}
fun test3(fn: Function1<Int, Unit>) {
{ // BLOCK
val <<array>>: A = A
val <<index_0>>: Function1<Int, Unit> = fn
<<array>>.set(i = <<index_0>> /*-> IFoo */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1))
val <array>: A = A
val <index_0>: Function1<Int, Unit> = fn
<array>.set(i = <index_0> /*-> IFoo */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
}
}
fun test4(fn: Function1<Int, Unit>) {
when {
fn is IFoo -> { // BLOCK
val <<array>>: A = A
val <<index_0>>: IFoo = fn /*as IFoo */
<<array>>.set(i = <<index_0>>, newValue = <<array>>.get(i = <<index_0>>).plus(other = 1))
val <array>: A = A
val <index_0>: IFoo = fn /*as IFoo */
<array>.set(i = <index_0>, newValue = <array>.get(i = <index_0>).plus(other = 1))
}
}
}
@@ -86,9 +86,9 @@ fun test4(fn: Function1<Int, Unit>) {
fun test5(a: Any) {
a as Function1<Int, Unit> /*~> Unit */
{ // BLOCK
val <<array>>: A = A
val <<index_0>>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */
<<array>>.set(i = <<index_0>> /*-> IFoo */, newValue = <<array>>.get(i = <<index_0>> /*-> IFoo */).plus(other = 1))
val <array>: A = A
val <index_0>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */
<array>.set(i = <index_0> /*-> IFoo */, newValue = <array>.get(i = <index_0> /*-> IFoo */).plus(other = 1))
}
}
@@ -96,8 +96,8 @@ fun test6(a: Any) {
a as Function1<Int, Unit> /*~> Unit */
a /*as Function1<Int, Unit> */ as IFoo /*~> Unit */
{ // BLOCK
val <<array>>: A = A
val <<index_0>>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */
<<array>>.set(i = <<index_0>>, newValue = <<array>>.get(i = <<index_0>>).plus(other = 1))
val <array>: A = A
val <index_0>: Function1<Int, Unit> = a /*as Function1<Int, Unit> */
<array>.set(i = <index_0>, newValue = <array>.get(i = <index_0>).plus(other = 1))
}
}
compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.kt.txt
Vendored
+3 -3
View File
@@ -43,13 +43,13 @@ object X1 {
fun test1(a: IntArray) {
var i: Int = 0
val <array>: IntArray = a
val <index0>: Int = { // BLOCK
val <index_0>: Int = { // BLOCK
val <unary>: Int = i
i = <unary>.inc()
<unary>
}
val <unary>: Int = <array>.get(index = <index0>)
<array>.set(index = <index0>, value = <unary>.inc())
val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index_0>, value = <unary>.inc())
<unary> /*~> Unit */
}
compiler/testData/ir/irText/expressions/incrementDecrement.fir.kt.txt
Vendored
+12 -12
View File
@@ -59,16 +59,16 @@ fun testPropPostfix() {
fun testArrayPrefix() {
val a1: Int = { // BLOCK
val <array>: IntArray = <get-arr>()
val <index0>: Int = 0
val <unary-result>: Int = <array>.get(index = <index0>).inc()
<array>.set(index = <index0>, value = <unary-result>)
val <index_0>: Int = 0
val <unary-result>: Int = <array>.get(index = <index_0>).inc()
<array>.set(index = <index_0>, value = <unary-result>)
<unary-result>
}
val a2: Int = { // BLOCK
val <array>: IntArray = <get-arr>()
val <index0>: Int = 0
val <unary-result>: Int = <array>.get(index = <index0>).dec()
<array>.set(index = <index0>, value = <unary-result>)
val <index_0>: Int = 0
val <unary-result>: Int = <array>.get(index = <index_0>).dec()
<array>.set(index = <index_0>, value = <unary-result>)
<unary-result>
}
}
@@ -76,16 +76,16 @@ fun testArrayPrefix() {
fun testArrayPostfix() {
val a1: Int = { // BLOCK
val <array>: IntArray = <get-arr>()
val <index0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>)
<array>.set(index = <index0>, value = <unary>.inc())
val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index_0>, value = <unary>.inc())
<unary>
}
val a2: Int = { // BLOCK
val <array>: IntArray = <get-arr>()
val <index0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>)
<array>.set(index = <index0>, value = <unary>.dec())
val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index_0>, value = <unary>.dec())
<unary>
}
}
compiler/testData/ir/irText/expressions/kt28456.fir.kt.txt
Vendored
+8 -8
View File
@@ -21,19 +21,19 @@ fun testSimpleAssignment(a: A) {
fun testPostfixIncrement(a: A): Int {
return { // BLOCK
val <array>: A = a
val <index0>: Int = 1
val <index1>: Int = 2
val <unary>: Int = <array>.get(xs = [<index0>, <index1>])
<array>.set(i = <index0>, j = <index1>, v = <unary>.inc())
val <index_0>: Int = 1
val <index_1>: Int = 2
val <unary>: Int = <array>.get(xs = [<index_0>, <index_1>])
<array>.set(i = <index_0>, j = <index_1>, v = <unary>.inc())
<unary>
}
}
fun testCompoundAssignment(a: A) {
{ // BLOCK
val <<array>>: A = a
val <<index_0>>: Int = 1
val <<index_1>>: Int = 2
<<array>>.set(i = <<index_0>>, j = <<index_1>>, v = <<array>>.get(xs = [<<index_0>>, <<index_1>>]).plus(other = 10))
val <array>: A = a
val <index_0>: Int = 1
val <index_1>: Int = 2
<array>.set(i = <index_0>, j = <index_1>, v = <array>.get(xs = [<index_0>, <index_1>]).plus(other = 10))
}
}
compiler/testData/ir/irText/expressions/kt28456b.fir.kt.txt
Vendored
+6 -6
View File
@@ -21,17 +21,17 @@ fun testSimpleAssignment(a: A) {
fun testPostfixIncrement(a: A): Int {
return { // BLOCK
val <array>: A = a
val <index0>: Int = 1
val <unary>: Int = <array>.get(i = <index0>)
<array>.set(i = <index0>, v = <unary>.inc())
val <index_0>: Int = 1
val <unary>: Int = <array>.get(i = <index_0>)
<array>.set(i = <index_0>, v = <unary>.inc())
<unary>
}
}
fun testCompoundAssignment(a: A) {
{ // BLOCK
val <<array>>: A = a
val <<index_0>>: Int = 1
<<array>>.set(i = <<index_0>>, v = <<array>>.get(i = <<index_0>>).plus(other = 10))
val <array>: A = a
val <index_0>: Int = 1
<array>.set(i = <index_0>, v = <array>.get(i = <index_0>).plus(other = 10))
}
}
compiler/testData/ir/irText/expressions/kt36956.fir.kt.txt
Vendored
+3 -3
View File
@@ -25,9 +25,9 @@ val aFloat: A<Float>
val aInt: Float
field = { // BLOCK
val <array>: A<Float> = <get-aFloat>()
val <index0>: Int = 1
val <unary>: Float = <array>.get(i = <index0>)
<array>.set(i = <index0>, v = <unary>.dec())
val <index_0>: Int = 1
val <unary>: Float = <array>.get(i = <index_0>)
<array>.set(i = <index_0>, v = <unary>.dec())
<unary>
}
get
compiler/testData/ir/irText/expressions/lambdaInCAO.fir.kt.txt
Vendored
+6 -6
View File
@@ -17,22 +17,22 @@ fun test1(a: Any) {
fun test2(a: Any) {
{ // BLOCK
val <<array>>: Any = a
val <<index_0>>: Function0<Unit> = local fun <anonymous>() {
val <array>: Any = a
val <index_0>: Function0<Unit> = local fun <anonymous>() {
return Unit
}
<<array>>.set(index = <<index_0>>, value = <<array>>.get(index = <<index_0>>).plus(other = 42))
<array>.set(index = <index_0>, value = <array>.get(index = <index_0>).plus(other = 42))
}
}
fun test3(a: Any) {
val <array>: Any = a
val <index0>: Function0<Unit> = local fun <anonymous>() {
val <index_0>: Function0<Unit> = local fun <anonymous>() {
return Unit
}
val <unary>: Int = <array>.get(index = <index0>)
<array>.set(index = <index0>, value = <unary>.inc())
val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index_0>, value = <unary>.inc())
<unary> /*~> Unit */
}
compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.kt.txt
Vendored
+3 -3
View File
@@ -55,9 +55,9 @@ fun testArrayAccess(nc: C?) {
EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null
else -> { // BLOCK
val <array>: Int = tmp2_safe_receiver.<get-p>()
val <index0>: Int = 0
val <unary>: Int = <array>.get(index = <index0>)
<array>.set(index = <index0>, value = <unary>.inc())
val <index_0>: Int = 0
val <unary>: Int = <array>.get(index = <index_0>)
<array>.set(index = <index_0>, value = <unary>.inc())
<unary>
}
}