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

FIR type enhancement: make J2K mapping and changed handling more exact

Browse Source 
Related to KT-29937
This commit is contained in:
Mikhail Glukhikh
2019-02-28 14:39:13 +03:00
parent 9bb2278fd4
commit 7563a98999
40 changed files with 91 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/sam/Comparator.fir.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
<T> public abstract interface Comparator : R|java/lang/Object| {
public abstract operator function compare(o1: R|ft<T, T?>|!, o2: R|ft<T, T?>|!): R|kotlin/Int|
public abstract operator function equals(obj: R|ft<java/lang/Object, java/lang/Object?>|!): R|kotlin/Boolean|
public abstract operator function equals(obj: R|ft<kotlin/Any, kotlin/Any?>|!): R|kotlin/Boolean|
}
compiler/testData/loadJava/compiledJava/sam/FilenameFilter.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface FilenameFilter : R|java/lang/Object| {
public abstract operator function accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<java/lang/String, java/lang/String?>|!): R|kotlin/Boolean|
public abstract operator function accept(dir: R|ft<java/io/File, java/io/File?>|!, name: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Boolean|
}
compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public abstract interface InterfaceWithObjectMethod : R|java/lang/Object| {
public abstract operator function toString(): R|ft<java/lang/String, java/lang/String?>|!
public abstract operator function toString(): R|ft<kotlin/String, kotlin/String?>|!
}
compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
public open class NonTrivialFunctionType : R|java/lang/Object| {
public open operator function foo(filenameFilter: R|ft<java/io/FilenameFilter, java/io/FilenameFilter?>|!): R|kotlin/Unit|
public open operator function foo(comparator: R|ft<java/util/Comparator<ft<java/lang/String, java/lang/String?>>, java/util/Comparator<ft<java/lang/String, java/lang/String?>>>|): R|kotlin/Unit|
public open operator function foo(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
public open operator function wildcardUnbound(comparator: R|ft<java/util/Comparator<*>, java/util/Comparator<*>?>|!): R|kotlin/Unit|
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
<T> public open class TypeParameterOfClass : R|java/lang/Object| {
public open operator function foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>>|): R|kotlin/Unit|
public open operator function foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
}