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

Serializing information about star projections

Browse Source
This commit is contained in:
Andrey Breslav
2015-02-02 19:51:44 +03:00
parent fecf6f9fdf
commit 0f0f205248
26 changed files with 144 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
+2 -2
View File
@@ -3,8 +3,8 @@ package test
public trait RawTypeWithUpperBound {
public trait Bar {
public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo<out kotlin.CharSequence!>!): kotlin.Unit
public abstract fun g(/*0*/ p0: kotlin.(Mutable)List<test.RawTypeWithUpperBound.Foo<out kotlin.CharSequence!>!>!): kotlin.Unit
public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo<*>!): kotlin.Unit
public abstract fun g(/*0*/ p0: kotlin.(Mutable)List<test.RawTypeWithUpperBound.Foo<*>!>!): kotlin.Unit
}
public trait Foo</*0*/ T : kotlin.CharSequence!> {
compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
+3 -3
View File
@@ -4,11 +4,11 @@ public open class ClassObjectArrayInParam {
public constructor ClassObjectArrayInParam()
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ vararg value: java.lang.Class<out kotlin.Any?> /*kotlin.Array<out java.lang.Class<out kotlin.Any?>>*/)
public abstract fun value(): kotlin.Array<java.lang.Class<out kotlin.Any?>>
public constructor Anno(/*0*/ vararg value: java.lang.Class<*> /*kotlin.Array<out java.lang.Class<*>>*/)
public abstract fun value(): kotlin.Array<java.lang.Class<*>>
}
test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<out java.lang.Class<out kotlin.Any?>>) public open class Nested {
test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<out java.lang.Class<*>>) public open class Nested {
public constructor Nested()
}
}
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
+2 -2
View File
@@ -4,8 +4,8 @@ public open class ClassObjectInParam {
public constructor ClassObjectInParam()
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: java.lang.Class<out kotlin.Any?>)
public abstract fun value(): java.lang.Class<out kotlin.Any?>
public constructor Anno(/*0*/ value: java.lang.Class<*>)
public abstract fun value(): java.lang.Class<*>
}
test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested {
compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public final class StarProjection {
public constructor StarProjection()
public final fun foo(): test.StarProjection.MyClass<out kotlin.CharSequence!>!
public final fun foo(): test.StarProjection.MyClass<*>!
public trait MyClass</*0*/ T : kotlin.CharSequence!> {
}
compiler/testData/loadJava/compiledJava/rendering/Rendering.txt
+4 -4
View File
@@ -42,16 +42,16 @@ public open class Rendering {
}
public/*package*/ trait H_Raw {
public abstract fun foo1(/*0*/ p0: (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)): kotlin.Unit
public abstract fun foo2(/*0*/ p0: test.Rendering.D_SuperG<out kotlin.Any?>!): kotlin.Unit
public abstract fun foo1(/*0*/ p0: kotlin.(Mutable)List<*>!): kotlin.Unit
public abstract fun foo2(/*0*/ p0: test.Rendering.D_SuperG<*>!): kotlin.Unit
}
public/*package*/ trait I_Wildcard {
public abstract fun foo1(/*0*/ p0: (kotlin.MutableList<out kotlin.String!>..kotlin.List<kotlin.String!>?)): kotlin.Unit
public abstract fun foo2(/*0*/ p0: kotlin.(Mutable)List<in kotlin.String!>!): kotlin.Unit
public abstract fun foo3(/*0*/ p0: (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)): kotlin.Unit
public abstract fun foo3(/*0*/ p0: kotlin.(Mutable)List<*>!): kotlin.Unit
public abstract fun foo4(/*0*/ p0: test.Rendering.D_SuperG<out kotlin.String!>!): kotlin.Unit
public abstract fun foo5(/*0*/ p0: test.Rendering.D_SuperG<in kotlin.String!>!): kotlin.Unit
public abstract fun foo6(/*0*/ p0: test.Rendering.D_SuperG<out kotlin.Any?>!): kotlin.Unit
public abstract fun foo6(/*0*/ p0: test.Rendering.D_SuperG<*>!): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
+1 -1
View File
@@ -8,5 +8,5 @@ public open class NonTrivialFunctionType {
public open fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
public final /*synthesized*/ fun wildcardBound(/*0*/ p0: ((kotlin.CharSequence!, kotlin.CharSequence!) -> kotlin.Int)!): kotlin.Unit
public open fun wildcardBound(/*0*/ p0: java.util.Comparator<in kotlin.CharSequence!>!): kotlin.Unit
public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator<out kotlin.Any?>!): kotlin.Unit
public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator<*>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class RawSuperType {
public constructor RawSuperType()
public open inner class Derived : test.RawSuperType.Super<kotlin.Any?> {
public open inner class Derived : test.RawSuperType.Super<*> {
public constructor Derived()
public open override /*1*/ fun dummy(): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!): kotlin.Unit
compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+7 -7
View File
@@ -4,23 +4,23 @@ public trait SubclassWithRawType {
public trait Sub : test.SubclassWithRawType.Super {
public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun array2(): kotlin.Array<(out) (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
public abstract override /*1*/ fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<*>!>!
public abstract override /*1*/ fun boundWildcard1(): (kotlin.MutableList<out kotlin.(Mutable)List<kotlin.String!>!>..kotlin.List<kotlin.(Mutable)List<kotlin.String!>!>?)
public abstract override /*1*/ fun boundWildcard2(): kotlin.(Mutable)List<in (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
public abstract override /*1*/ fun simple1(): kotlin.(Mutable)List<kotlin.String!>!
public abstract override /*1*/ fun simple2(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
public abstract override /*1*/ fun simple3(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract override /*1*/ fun wildcard(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract override /*1*/ fun simple3(): kotlin.(Mutable)List<*>!
public abstract override /*1*/ fun wildcard(): kotlin.(Mutable)List<*>!
}
public trait Super {
public abstract fun array1(): kotlin.Array<(out) (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>!
public abstract fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<*>!>!
public abstract fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
public abstract fun boundWildcard1(): (kotlin.MutableList<out (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>..kotlin.List<(kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)>?)
public abstract fun boundWildcard2(): kotlin.(Mutable)List<in kotlin.(Mutable)List<kotlin.String!>!>!
public abstract fun simple1(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract fun simple2(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract fun simple1(): kotlin.(Mutable)List<*>!
public abstract fun simple2(): kotlin.(Mutable)List<*>!
public abstract fun simple3(): kotlin.(Mutable)List<kotlin.String!>!
public abstract fun wildcard(): (kotlin.MutableList<out kotlin.Any?>..kotlin.List<kotlin.Any?>?)
public abstract fun wildcard(): kotlin.(Mutable)List<*>!
}
}