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

replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-11 19:37:38 +02:00
parent 25959fefdc
commit 9975bb8935
704 changed files with 1684 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/sam/Comparator.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T!, T!) -> kotlin.Int): test.Comparator<T>
public trait Comparator</*0*/ T> {
public interface Comparator</*0*/ T> {
public abstract fun compare(/*0*/ p0: T!, /*1*/ p1: T!): kotlin.Int
}
compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File!, kotlin.String!) -> kotlin.Boolean): test.FilenameFilter
public trait FilenameFilter {
public interface FilenameFilter {
public abstract fun accept(/*0*/ p0: java.io.File!, /*1*/ p1: kotlin.String!): kotlin.Boolean
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> GenericInterfaceParameterWithSelfBound(/*0*/ function: (T!) -> T!): test.GenericInterfaceParameterWithSelfBound<T>
public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> {
public interface GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> {
public abstract fun method(/*0*/ p0: T!): T!
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<(out) A!>!, B!) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : kotlin.Cloneable!
public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> where A : kotlin.Cloneable! {
public interface GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> where A : kotlin.Cloneable! {
public abstract fun method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public trait GenericMethodParameters {
public interface GenericMethodParameters {
public abstract fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
public trait InterfaceWithObjectMethod {
public interface InterfaceWithObjectMethod {
}
compiler/testData/loadJava/compiledJava/sam/Nested.txt
+6 -6
View File
@@ -1,18 +1,18 @@
package test
public trait Nested {
public interface Nested {
public trait Deeper1 {
public interface Deeper1 {
public trait Runnable {
public interface Runnable {
public abstract fun run(): kotlin.Unit
public abstract fun run2(): kotlin.Unit
}
}
public trait Deeper2 {
public interface Deeper2 {
public trait Runnable {
public interface Runnable {
public abstract fun run(): kotlin.Unit
}
@@ -20,7 +20,7 @@ public trait Nested {
public final /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Deeper2.Runnable
}
public trait Runnable {
public interface Runnable {
public abstract fun run(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/Runnable.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Runnable
public trait Runnable {
public interface Runnable {
public abstract fun run(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+4 -4
View File
@@ -1,16 +1,16 @@
package test
public trait SamSubinterfaceOfTwo {
public interface SamSubinterfaceOfTwo {
public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String!> {
public interface Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String!> {
public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String!
}
public trait Super1 {
public interface Super1 {
public abstract fun f(): kotlin.CharSequence!
}
public trait Super2</*0*/ T> {
public interface Super2</*0*/ T> {
public abstract fun f(): T!
}
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun SamSubinterfaceOverridding(/*0*/ function: () -> kotlin.Unit): test.SamSubinterfaceOverridding
public trait SamSubinterfaceOverridding : java.lang.Runnable {
public interface SamSubinterfaceOverridding : java.lang.Runnable {
public abstract override /*1*/ fun run(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Int): test.SubstitutedSamInterface
public trait SubstitutedSamInterface : java.util.Comparator<kotlin.String!> {
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
}
compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (test.SubstitutedSamInterfaceSubclassOfBuiltin!) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin
public trait SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable<test.SubstitutedSamInterfaceSubclassOfBuiltin!> {
public interface SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable<test.SubstitutedSamInterfaceSubclassOfBuiltin!> {
public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin!): kotlin.Int
}
compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.VarargParameter
public trait VarargParameter {
public interface VarargParameter {
public abstract fun f(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait DeepSamLoop {
public interface DeepSamLoop {
public trait Bar {
public interface Bar {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar!) -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo!): kotlin.Unit
}
public trait Foo {
public interface Foo {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo!) -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.txt
+1 -1
View File
@@ -5,7 +5,7 @@ public open class PrivateSamAdapter {
private final /*synthesized*/ fun samAdapter(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
private open fun samAdapter(/*0*/ p0: test.PrivateSamAdapter.SamInterface!): kotlin.Unit
private trait SamInterface {
private interface SamInterface {
public abstract fun foo(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter!) -> kotlin.Unit): test.SelfAsParameter
public trait SelfAsParameter {
public interface SelfAsParameter {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter!) -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.SelfAsParameter!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
+3 -3
View File
@@ -1,14 +1,14 @@
package test
public trait AdapterDoesntOverrideDeclaration {
public interface AdapterDoesntOverrideDeclaration {
public trait Sub : test.AdapterDoesntOverrideDeclaration.Super {
public interface Sub : test.AdapterDoesntOverrideDeclaration.Super {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
+3 -3
View File
@@ -1,14 +1,14 @@
package test
public trait InheritedAdapterAndDeclaration {
public interface InheritedAdapterAndDeclaration {
public trait Sub : test.InheritedAdapterAndDeclaration.Super {
public interface Sub : test.InheritedAdapterAndDeclaration.Super {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super {
public interface Super {
public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
+3 -3
View File
@@ -1,15 +1,15 @@
package test
public trait InheritedAmbiguousAdapters {
public interface InheritedAmbiguousAdapters {
public trait Sub : test.InheritedAmbiguousAdapters.Super {
public interface Sub : test.InheritedAmbiguousAdapters.Super {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super {
public interface Super {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
+3 -3
View File
@@ -1,15 +1,15 @@
package test
public trait InheritedAndOverriddenAmbiguousAdapters {
public interface InheritedAndOverriddenAmbiguousAdapters {
public trait Sub : test.InheritedAndOverriddenAmbiguousAdapters.Super {
public interface Sub : test.InheritedAndOverriddenAmbiguousAdapters.Super {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super {
public interface Super {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public trait InheritedOverridden {
public interface InheritedOverridden {
public open class Sub : test.InheritedOverridden.Super {
public constructor Sub()
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public trait InheritedOverriddenAdapter {
public interface InheritedOverriddenAdapter {
public open class Sub : test.InheritedOverriddenAdapter.Super {
public constructor Sub()
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
+4 -4
View File
@@ -1,18 +1,18 @@
package test
public trait InheritedSameAdapters {
public interface InheritedSameAdapters {
public trait Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 {
public interface Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 {
public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super1 {
public interface Super1 {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super2 {
public interface Super2 {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
+5 -5
View File
@@ -1,23 +1,23 @@
package test
public trait InheritedSameAdaptersWithSubstitution {
public interface InheritedSameAdaptersWithSubstitution {
public trait Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted {
public interface Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted {
public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!): kotlin.Unit
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
}
public trait Super1 {
public interface Super1 {
public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
}
public trait Super2</*0*/ T> {
public interface Super2</*0*/ T> {
public final /*synthesized*/ fun foo(/*0*/ p0: ((T!, T!) -> kotlin.Int)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.util.Comparator<T!>!): kotlin.Unit
}
public trait Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2<kotlin.String!> {
public interface Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2<kotlin.String!> {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String!, kotlin.String!) -> kotlin.Int)!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
+3 -3
View File
@@ -1,13 +1,13 @@
package test
public trait InheritedSimple {
public interface InheritedSimple {
public trait Sub : test.InheritedSimple.Super {
public interface Sub : test.InheritedSimple.Super {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super {
public interface Super {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
+3 -3
View File
@@ -1,14 +1,14 @@
package test
public trait OverriddenAmbiguousAdapters {
public interface OverriddenAmbiguousAdapters {
public trait Sub : test.OverriddenAmbiguousAdapters.Super {
public interface Sub : test.OverriddenAmbiguousAdapters.Super {
public abstract override /*2*/ fun foo(/*0*/ p0: (() -> kotlin.Unit!)!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super {
public interface Super {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit