jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-05-08 15:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly apply SAM conversions in superclass constructor calls

Browse Source 
#KT-5452 Fixed
This commit is contained in:
Dmitry Jemerov
2015-03-25 15:13:47 +01:00
parent da9fe7d9a9
commit 827d9d48c1
16 changed files with 117 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/testData/codegen/boxAgainstJava/sam/adapters/localClass.java Normal file
View File

@@ -0,0 +1,11 @@
class JavaClass {
private Runnable r;
public JavaClass(Runnable r) {
this.r = r;
}
public void run() {
r.run();
}
}

8
compiler/testData/codegen/boxAgainstJava/sam/adapters/localClass.kt Normal file
View File

@@ -0,0 +1,8 @@
var status: String = "fail" // global property to avoid issues with accessing closure from local class (KT-4174)
fun box(): String {
class C() : JavaClass({status = "OK"}) {}
C().run()
return status
}

11
compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructor.java Normal file
View File

@@ -0,0 +1,11 @@
class JavaClass {
private Runnable r;
public JavaClass(Runnable r) {
this.r = r;
}
public void run() {
r.run();
}
}

6
compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructor.kt Normal file
View File

@@ -0,0 +1,6 @@
fun box(): String {
var v = "FAIL"
val x = object : JavaClass({-> v = "OK"}) {}
x.run()
return v
}

11
compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructorWithFnValue.java Normal file
View File

@@ -0,0 +1,11 @@
class JavaClass {
private Runnable r;
public JavaClass(Runnable r) {
this.r = r;
}
public void run() {
r.run();
}
}

7
compiler/testData/codegen/boxAgainstJava/sam/adapters/localObjectConstructorWithFnValue.kt Normal file
View File

@@ -0,0 +1,7 @@
fun box(): String {
var v = "FAIL"
val f = {-> v = "OK"}
val x = object : JavaClass(f) {}
x.run()
return v
}

5
compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.java Normal file
View File

@@ -0,0 +1,5 @@
class JavaClass {
JavaClass(Runnable r) {
if (r != null) r.run();
}
}

9
compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructorWithClosure.kt Normal file
View File

@@ -0,0 +1,9 @@
var status: String = "fail" // global property to avoid issues with accessing closure from local class (KT-4174)
class KotlinClass(): JavaClass({status="OK"}) {
}
fun box(): String {
KotlinClass()
return status
}