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

FIR tree: support const expressions (adds IR dependency) #KT-24023 Fixed

Browse Source 
Also support generic tree elements in FIR visitor generator
This commit is contained in:
Mikhail Glukhikh
2018-04-26 16:59:00 +03:00
parent 18ea86cfb4
commit 7aba441234
20 changed files with 301 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/testData/resolve/multifile/Annotations.1.kt
Vendored
+3 -1
View File
@@ -7,4 +7,6 @@ annotation class WithInt(val value: Int)
annotation class WithString(val s: String)
annotation class Complex(val wi: WithInt, val ws: WithString)
annotation class Complex(val wi: WithInt, val ws: WithString)
annotation class VeryComplex(val f: Float, val d: Double, val b: Boolean, val l: Long, val n: Int?)
compiler/fir/resolve/testData/resolve/multifile/Annotations.kt
Vendored
+1
View File
@@ -25,4 +25,5 @@ class Second(val y: Char) : @WithInt(0) First() {
}
@WithInt(24)
@VeryComplex(3.14f, 6.67e-11, false, 123456789012345L, null)
typealias Third = @Simple Second
compiler/fir/resolve/testData/resolve/multifile/Annotations.txt
Vendored
+6 -6
View File
@@ -1,16 +1,16 @@
FILE: Annotations.kt
@FILE:R|annotations/Simple|()
@R|annotations/WithInt|(STUB) public abstract class First {
@R|annotations/WithInt|(Int(42)) public abstract class First {
public constructor(): super<R|kotlin/Any|>()
@R|annotations/Simple|() public abstract function foo(@R|annotations/WithString|(STUB) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
@R|annotations/Simple|() public abstract function foo(@R|annotations/WithString|(String(abc)) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
@R|annotations/Complex|(STUB, STUB) public abstract property v(val): R|kotlin/String|
public get(): R|kotlin/String|
}
@R|annotations/WithString|(STUB) public final class Second : @R|annotations/WithInt|(STUB) R|test/First| {
public constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(STUB) R|test/First|>()
@R|annotations/WithString|(String(xyz)) public final class Second : @R|annotations/WithInt|(Int(0)) R|test/First| {
public constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(Int(0)) R|test/First|>()
public final property y(val): R|kotlin/Char|
public get(): R|kotlin/Char|
@@ -23,7 +23,7 @@ FILE: Annotations.kt
STUB
}
@R|annotations/WithString|(STUB) public constructor(): this<R|test/Second|>()
@R|annotations/WithString|(String(constructor)) public constructor(): this<R|test/Second|>()
}
@R|annotations/WithInt|(STUB) @R|annotations/WithInt|(STUB) public final typealias Third = @R|annotations/Simple|() R|test/Second|
@R|annotations/WithInt|(Int(24)) @R|annotations/VeryComplex|(Float(3.14), Double(6.67E-11), Boolean(false), Long(123456789012345), Null(null)) @R|annotations/WithInt|(Int(24)) @R|annotations/VeryComplex|(Float(3.14), Double(6.67E-11), Boolean(false), Long(123456789012345), Null(null)) public final typealias Third = @R|annotations/Simple|() R|test/Second|