Adjust descriptor renderer to latest parsing changes

- `constructor` keyword expected in primary constructor with non-empty modifier list
- annotation list should be preceeded by '@'
This commit is contained in:
Denis Zharkov
2015-05-18 16:18:55 +03:00
parent dd14b36921
commit 5297b4974f
31 changed files with 45 additions and 44 deletions
@@ -3,8 +3,8 @@
package test
kotlin.data dependency.A dependency.B dependency.C internal final class Annotations public () {
kotlin.inline dependency.A dependency.B dependency.C internal final val p: [dependency.B] kotlin.Int /* compiled code */
kotlin.data dependency.A dependency.B dependency.C internal final class Annotations public constructor() {
kotlin.inline dependency.A dependency.B dependency.C internal final val p: @[dependency.B] kotlin.Int /* compiled code */
kotlin.inline dependency.A dependency.B dependency.C internal final fun f(dependency.A dependency.B dependency.C kotlin.deprecated i: [dependency.A] kotlin.Int): kotlin.Unit { /* compiled code */ }
kotlin.inline dependency.A dependency.B dependency.C internal final fun f(dependency.A dependency.B dependency.C kotlin.deprecated i: @[dependency.A] kotlin.Int): kotlin.Unit { /* compiled code */ }
}
@@ -3,6 +3,6 @@
package test
internal final class AnnotationsOnPrimaryCtr [dependency.A dependency.B dependency.C] private () {
internal final class AnnotationsOnPrimaryCtr @[dependency.A dependency.B dependency.C] private constructor() {
}
@@ -3,7 +3,7 @@
package test
internal final class ClassWithClassObject public () {
internal final class ClassWithClassObject public constructor() {
internal companion object {
internal final val a: test.A /* compiled code */
@@ -3,6 +3,6 @@
package test
public final class DependencyOnNestedClasses public () : dependency.D.Nested {
public final class DependencyOnNestedClasses public constructor() : dependency.D.Nested {
internal final fun f(nc: dependency.D.Companion.NestedInClassObject, i: dependency.D.Inner, ii: dependency.D.Inner.Inner, nn: dependency.D.Nested.Nested): dependency.D.Nested { /* compiled code */ }
}
@@ -3,7 +3,7 @@
package test
internal final enum class Enum private () : kotlin.Enum<test.Enum> {
internal final enum class Enum private constructor() : kotlin.Enum<test.Enum> {
A
B
@@ -3,7 +3,7 @@
package test
internal abstract class FlexibleTypes public () {
internal abstract class FlexibleTypes public constructor() {
internal abstract val p: kotlin.Int /* platform type */
internal abstract fun collection(): kotlin.List<kotlin.Int> /* platform type */
@@ -3,7 +3,7 @@
package test
internal final class FunctionTypes public () {
internal final class FunctionTypes public constructor() {
public final fun <A> (A.(A) -> A)?.bar(): kotlin.Unit { /* compiled code */ }
public final fun <IP, R, P1> ((IP) -> R).compose(f: (P1) -> IP): (P1) -> R { /* compiled code */ }
@@ -3,25 +3,25 @@
package test
internal final class NestedClasses public () {
internal final class NestedClasses public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ }
public final inner class Inner public () {
public final inner class Inner public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ }
private final inner class II public () {
private final inner class II public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ }
}
}
private final class Nested public () {
private final class Nested public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ }
internal final inner class NI public () {
internal final inner class NI public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ }
}
public final class NN public () {
public final class NN public constructor() {
internal final fun f(): kotlin.Unit { /* compiled code */ }
}
}
@@ -3,7 +3,7 @@
package test
internal final class SecondaryConstructors public (x: kotlin.Boolean) {
internal final class SecondaryConstructors public constructor(x: kotlin.Boolean) {
test.anno public constructor(x: kotlin.String) { /* compiled code */ }
private constructor(x: kotlin.Int) { /* compiled code */ }
@@ -3,7 +3,7 @@
package test
internal abstract class SimpleClass public () : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.List<kotlin.String> {
internal abstract class SimpleClass public constructor() : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.List<kotlin.String> {
internal final val a: dependency.A /* compiled code */
public final var b: dependency.B /* compiled code */