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

generate pseudocode for functions in local classes

Browse Source 
#KT-4405 In progress
 #KT-3501 Fixed
This commit is contained in:
Svetlana Isakova
2014-01-17 18:12:18 +04:00
parent f74fbf9f8b
commit 5ef320173c
9 changed files with 183 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/localClass.instructions
+113
View File
@@ -0,0 +1,113 @@
== f ==
fun f() {
class LocalClass() {
fun f() {
val x = ""
fun loc() {
val x3 = ""
}
}
}
}
---------------------
L0:
<START>
mark({ class LocalClass() { fun f() { val x = "" fun loc() { val x3 = "" } } } })
jmp?(L2) NEXT:[<END>, d(fun f() { val x = "" fun loc() { val x3 = "" } })]
d(fun f() { val x = "" fun loc() { val x3 = "" } }) NEXT:[<SINK>]
L1:
L2:
<END> NEXT:[<SINK>] PREV:[jmp?(L2)]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>, d(fun f() { val x = "" fun loc() { val x3 = "" } })]
L3:
<START>
mark({ val x = "" fun loc() { val x3 = "" } })
v(val x = "")
mark("")
r("")
w(x)
jmp?(L5) NEXT:[<END>, d(fun loc() { val x3 = "" })]
d(fun loc() { val x3 = "" }) NEXT:[<SINK>]
L4:
L5:
<END> NEXT:[<SINK>] PREV:[jmp?(L5)]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>, d(fun loc() { val x3 = "" })]
L6:
<START>
mark({ val x3 = "" })
v(val x3 = "")
mark("")
r("")
w(x3)
L7:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== f ==
fun f() {
val x = ""
fun loc() {
val x3 = ""
}
}
---------------------
L3:
<START>
mark({ val x = "" fun loc() { val x3 = "" } })
v(val x = "")
mark("")
r("")
w(x)
jmp?(L5) NEXT:[<END>, d(fun loc() { val x3 = "" })]
d(fun loc() { val x3 = "" }) NEXT:[<SINK>]
L4:
L5:
<END> NEXT:[<SINK>] PREV:[jmp?(L5)]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>, d(fun loc() { val x3 = "" })]
L6:
<START>
mark({ val x3 = "" })
v(val x3 = "")
mark("")
r("")
w(x3)
L7:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
== loc ==
fun loc() {
val x3 = ""
}
---------------------
L6:
<START>
mark({ val x3 = "" })
v(val x3 = "")
mark("")
r("")
w(x3)
L7:
<END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
=====================
compiler/testData/cfg/localClass.kt
+11
View File
@@ -0,0 +1,11 @@
fun f() {
class LocalClass() {
fun f() {
val x = ""
fun loc() {
val x3 = ""
}
}
}
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.kt
+9
View File
@@ -0,0 +1,9 @@
//KT-3501 Variable/parameter is highlighted as unused if it is used in member of local class
fun f(p: String) { // "p" is marked as unused
class LocalClass {
fun f() {
<!UNUSED_EXPRESSION!>p<!>
}
}
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.kt
+26
View File
@@ -0,0 +1,26 @@
package f
fun f() {
class LocalClass() {
{
val <!UNUSED_VARIABLE!>x1<!> = "" // ok: unused
fun loc1(): Int {
val <!UNUSED_VARIABLE!>x1_<!> = "" // ok: unused
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
}
fun f() {
val <!UNUSED_VARIABLE!>x2<!> = "" // error: should be UNUSED_VARIABLE
fun loc2(): Int {
val <!UNUSED_VARIABLE!>x2_<!> = "" // error: should be UNUSED_VARIABLE
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY, NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
}
val v: String
get() {
val <!UNUSED_VARIABLE!>x3<!> = "" // ok: unused
<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
}
}
compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.kt
+1 -1
View File
@@ -7,7 +7,7 @@ fun f() {
}
fun member() {
val x: MyClass = MyClass()
val <!UNUSED_VARIABLE!>x<!>: MyClass = MyClass()
}
}