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

FIR Java types: add Kotlin/Java mapping & mutability enhancements

Browse Source 
Related to KT-29937
This commit is contained in:
Mikhail Glukhikh
2019-02-28 11:34:18 +03:00
parent e7ac88d326
commit 6c79b184c0
23 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class WrongProjectionKind : R|java/lang/Object| {
public open operator function copy(from: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|, to: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|): R|ft<java/util/List<ft<java/lang/Number, java/lang/Number?>>, java/util/List<ft<java/lang/Number, java/lang/Number?>>>|
public open operator function copy(from: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|, to: R|kotlin/Array<ft<java/lang/Number, java/lang/Number?>>|): R|ft<kotlin/collections/MutableList<ft<java/lang/Number, java/lang/Number?>>, kotlin/collections/List<ft<java/lang/Number, java/lang/Number?>>>|
}
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class WrongReturnTypeStructure : R|java/lang/Object| {
public open operator function foo(a: R|ft<java/lang/String, java/lang/String?>|!, b: R|ft<java/util/List<ft<java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>, java/util/List<ft<java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>>|): R|ft<java/lang/String, java/lang/String?>|!
public open operator function foo(a: R|ft<java/lang/String, java/lang/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, kotlin/collections/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, kotlin/collections/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>>|): R|ft<java/lang/String, java/lang/String?>|!
}
compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public open class WrongValueParameterStructure1 : R|java/lang/Object| {
public open operator function foo(a: R|ft<java/lang/String, java/lang/String?>|!, b: R|ft<java/util/List<ft<java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>, java/util/List<ft<java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, java/util/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>>|): R|ft<java/lang/String, java/lang/String?>|!
public open operator function foo(a: R|ft<java/lang/String, java/lang/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, kotlin/collections/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>, kotlin/collections/Map.Entry<ft<java/lang/String, java/lang/String?>, ft<java/lang/String, java/lang/String?>>>>>|): R|ft<java/lang/String, java/lang/String?>|!
}