jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-04 15:51:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move SAM constructors to synthetic scope

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2017-05-04 02:20:14 +03:00
parent 429f0e4f68
commit 7541a3754d
100 changed files with 18 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/testData/loadJava/compiledJava/sam/Comparator.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun </*0*/ T : kotlin.Any!> Comparator(/*0*/ function: (T!, T!) -> kotlin.Int): test.Comparator<T>
public interface Comparator</*0*/ T : kotlin.Any!> {
public abstract fun compare(/*0*/ p0: T!, /*1*/ p1: T!): kotlin.Int
}

2
compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File!, kotlin.String!) -> kotlin.Boolean): test.FilenameFilter
public interface FilenameFilter {
public abstract fun accept(/*0*/ p0: java.io.File!, /*1*/ p1: kotlin.String!): kotlin.Boolean
}

2
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> GenericInterfaceParameterWithSelfBound(/*0*/ function: (T!) -> T!): test.GenericInterfaceParameterWithSelfBound<T>
public interface GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> {
public abstract fun method(/*0*/ p0: T!): T!
}

2
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<(out) A!>!, B!) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : kotlin.Cloneable!
public interface GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> where A : kotlin.Cloneable! {
public abstract fun method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
}

6
compiler/testData/loadJava/compiledJava/sam/Nested.txt vendored
View File

@@ -15,15 +15,9 @@ public interface Nested {
public interface Runnable {
public abstract fun run(): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Deeper2.Runnable
}
public interface Runnable {
public abstract fun run(): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Runnable
}

2
compiler/testData/loadJava/compiledJava/sam/Runnable.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Runnable
public interface Runnable {
public abstract fun run(): kotlin.Unit
}

5
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt vendored
View File

@@ -13,9 +13,4 @@ public interface SamSubinterfaceOfTwo {
public interface Super2</*0*/ T : kotlin.Any!> {
public abstract fun f(): T!
}
// Static members
public final /*synthesized*/ fun Sub(/*0*/ function: () -> kotlin.String!): test.SamSubinterfaceOfTwo.Sub
public final /*synthesized*/ fun Super1(/*0*/ function: () -> kotlin.CharSequence!): test.SamSubinterfaceOfTwo.Super1
public final /*synthesized*/ fun </*0*/ T : kotlin.Any!> Super2(/*0*/ function: () -> T!): test.SamSubinterfaceOfTwo.Super2<T>
}

2
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun SamSubinterfaceOverridding(/*0*/ function: () -> kotlin.Unit): test.SamSubinterfaceOverridding
public interface SamSubinterfaceOverridding : java.lang.Runnable {
public abstract override /*1*/ fun run(): kotlin.Unit
}

2
compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Int): test.SubstitutedSamInterface
public interface SubstitutedSamInterface : java.util.Comparator<kotlin.String!> {
public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.String!): kotlin.Int
}

2
compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (other: test.SubstitutedSamInterfaceSubclassOfBuiltin!) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin
public interface SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable<test.SubstitutedSamInterfaceSubclassOfBuiltin!> {
public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin!): kotlin.Int
}

2
compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.VarargParameter
public interface VarargParameter {
public abstract fun f(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}

4
compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt vendored
View File

@@ -9,8 +9,4 @@ public interface DeepSamLoop {
public interface Foo {
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo!) -> kotlin.Unit): test.DeepSamLoop.Bar
public final /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar!) -> kotlin.Unit): test.DeepSamLoop.Foo
}

3
compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.txt vendored
View File

@@ -7,7 +7,4 @@ public open class PrivateSamAdapter {
private interface SamInterface {
public abstract fun foo(): kotlin.Unit
}
// Static members
private final /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.PrivateSamAdapter.SamInterface
}

2
compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt vendored
View File

@@ -1,7 +1,5 @@
package test
public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter!) -> kotlin.Unit): test.SelfAsParameter
public interface SelfAsParameter {
public abstract fun foo(/*0*/ p0: test.SelfAsParameter!): kotlin.Unit
}

3
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt vendored
View File

@@ -10,7 +10,4 @@ public interface AdapterDoesntOverrideDeclaration {
public interface Super {
public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Super(/*0*/ function: ((() -> kotlin.Unit!)!) -> kotlin.Unit): test.AdapterDoesntOverrideDeclaration.Super
}

5
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt vendored
View File

@@ -13,9 +13,4 @@ public interface InheritedSameAdapters {
public interface Super2 {
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Sub
public final /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Super1
public final /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSameAdapters.Super2
}

6
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt vendored
View File

@@ -17,10 +17,4 @@ public interface InheritedSameAdaptersWithSubstitution {
public interface Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2<kotlin.String!> {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Sub
public final /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super1
public final /*synthesized*/ fun </*0*/ T : kotlin.Any!> Super2(/*0*/ function: (java.util.Comparator<T!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2<T>
public final /*synthesized*/ fun Super2Substituted(/*0*/ function: (java.util.Comparator<kotlin.String!>!) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2Substituted
}

4
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt vendored
View File

@@ -9,8 +9,4 @@ public interface InheritedSimple {
public interface Super {
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Sub
public final /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Super
}