DescriptorRendererImpl now writes 'inner' for inner classes

#KT-1174 In Progress
This commit is contained in:
Alexander Udalov
2012-12-03 21:56:05 +04:00
parent 0b51a6cae0
commit 65716431c4
22 changed files with 48 additions and 39 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public open class InnerClass() : java.lang.Object() {
public open class Inner() : java.lang.Object()
public inner open class Inner() : java.lang.Object()
}
+1 -1
View File
@@ -3,7 +3,7 @@ package test
public open class InnerClass : java.lang.Object {
public constructor InnerClass()
public open class Inner : java.lang.Object {
public open inner class Inner : java.lang.Object {
public constructor Inner()
}
}
@@ -1,5 +1,5 @@
package test
public open class InnerClassReferencesOuterTP<P>() : java.lang.Object() {
public open class Inner<Q : P>() : java.lang.Object()
public open inner class Inner<Q : P>() : java.lang.Object()
}
@@ -3,7 +3,7 @@ package test
public open class InnerClassReferencesOuterTP</*0*/ P> : java.lang.Object {
public constructor InnerClassReferencesOuterTP</*0*/ P>()
public open class Inner</*0*/ Q : P> : java.lang.Object {
public open inner class Inner</*0*/ Q : P> : java.lang.Object {
public constructor Inner</*0*/ Q : P>()
}
}
@@ -1,10 +1,10 @@
package test
public open class InnerClassesInGeneric<P, Q>() : java.lang.Object() {
public open class Inner() : java.lang.Object() {
public open inner class Inner() : java.lang.Object() {
}
public open class Inner2() : Inner() {
public open inner class Inner2() : Inner() {
public open fun iterator() : jet.MutableIterator<P>? {
throw UnsupportedOperationException()
}
@@ -3,11 +3,11 @@ package test
public open class InnerClassesInGeneric</*0*/ P, /*1*/ Q> : java.lang.Object {
public constructor InnerClassesInGeneric</*0*/ P, /*1*/ Q>()
public open class Inner : java.lang.Object {
public open inner class Inner : java.lang.Object {
public constructor Inner()
}
public open class Inner2 : test.InnerClassesInGeneric.Inner {
public open inner class Inner2 : test.InnerClassesInGeneric.Inner {
public constructor Inner2()
public open fun iterator() : jet.MutableIterator<P>?
}
@@ -1,7 +1,7 @@
package test
public class MethodReferencesOuterClassTP<P>() : java.lang.Object() {
public class Inner() : java.lang.Object() {
public inner class Inner() : java.lang.Object() {
public fun f<Q : P>() {}
}
}
@@ -3,7 +3,7 @@ package test
public final class MethodReferencesOuterClassTP</*0*/ P> : java.lang.Object {
public constructor MethodReferencesOuterClassTP</*0*/ P>()
public final class Inner : java.lang.Object {
public final inner class Inner : java.lang.Object {
public constructor Inner()
public final fun </*0*/ Q : P> f() : Unit
}