From 9864b6188e202b023f5365ca8c875772db03a2cb Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Tue, 25 Feb 2020 17:21:28 +0100 Subject: Replace original with platformData in Documentables --- core/src/main/kotlin/model/Documentable.kt | 31 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt index 29792292..689b5c9d 100644 --- a/core/src/main/kotlin/model/Documentable.kt +++ b/core/src/main/kotlin/model/Documentable.kt @@ -14,7 +14,7 @@ abstract class Documentable { abstract val dri: DRI abstract val children: List abstract val documentation: PlatformDependent - abstract val original: PlatformDependent + abstract val platformData: List override fun toString(): String = "${javaClass.simpleName}($dri)" @@ -101,7 +101,7 @@ data class Module( override val name: String, override val packages: List, override val documentation: PlatformDependent, - override val original: PlatformDependent = PlatformDependent.empty(), + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Documentable(), WithPackages, WithExtraProperties { override val dri: DRI = DRI.topLevel @@ -118,7 +118,7 @@ data class Package( override val classlikes: List, override val packages: List, override val documentation: PlatformDependent, - override val original: PlatformDependent = PlatformDependent.empty(), + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Documentable(), WithScope, WithPackages, WithExtraProperties { override val name = dri.packageName.orEmpty() @@ -141,9 +141,9 @@ data class Class( override val generics: List, override val supertypes: PlatformDependent>, override val documentation: PlatformDependent, - override val original: PlatformDependent = PlatformDependent.empty(), override val modifier: WithAbstraction.Modifier, - override val extra: PropertyContainer + override val platformData: List, + override val extra: PropertyContainer = PropertyContainer.empty() ) : Classlike(), WithAbstraction, WithCompanion, WithConstructors, WithGenerics, WithExtraProperties { override val children: List get() = (functions + properties + classlikes + listOfNotNull(companion) + constructors) as List @@ -164,7 +164,7 @@ data class Enum( override val companion: Object?, override val constructors: List, override val supertypes: PlatformDependent>, - override val original: PlatformDependent = PlatformDependent.empty(), + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Classlike(), WithCompanion, WithConstructors, WithExtraProperties { override val children: List @@ -180,7 +180,7 @@ data class EnumEntry( override val functions: List, override val properties: List, override val classlikes: List, - override val original: PlatformDependent = PlatformDependent.empty(), + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Documentable(), WithScope, WithExtraProperties { override val children: List @@ -193,7 +193,6 @@ data class Function( override val dri: DRI, override val name: String, val isConstructor: Boolean, - val returnType: TypeWrapper?, val parameters: List, override val documentation: PlatformDependent, override val actual: PlatformDependent, @@ -201,8 +200,8 @@ data class Function( override val type: TypeWrapper, override val generics: List, override val receiver: Parameter?, - override val original: PlatformDependent = PlatformDependent.empty(), override val modifier: WithAbstraction.Modifier, + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Documentable(), Callable, WithGenerics, WithExtraProperties { override val children: List @@ -215,7 +214,6 @@ data class Interface( override val dri: DRI, override val name: String?, override val documentation: PlatformDependent, - override val original: PlatformDependent, override val actual: PlatformDependent, override val functions: List, override val properties: List, @@ -224,6 +222,7 @@ data class Interface( override val companion: Object?, override val generics: List, override val supertypes: PlatformDependent>, + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Classlike(), WithCompanion, WithGenerics, WithExtraProperties { override val children: List @@ -236,13 +235,13 @@ data class Object( override val name: String?, override val dri: DRI, override val documentation: PlatformDependent, - override val original: PlatformDependent, override val actual: PlatformDependent, override val functions: List, override val properties: List, override val classlikes: List, override val visibility: PlatformDependent, override val supertypes: PlatformDependent>, + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Classlike(), WithExtraProperties { override val children: List @@ -255,7 +254,6 @@ data class Annotation( override val name: String?, override val dri: DRI, override val documentation: PlatformDependent, - override val original: PlatformDependent, override val actual: PlatformDependent, override val functions: List, override val properties: List, @@ -263,6 +261,7 @@ data class Annotation( override val visibility: PlatformDependent, override val companion: Object?, override val constructors: List, + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Documentable(), WithScope, WithVisibility, WithCompanion, WithConstructors, WithExpectActual, WithExtraProperties { @@ -282,8 +281,8 @@ data class Property( override val type: TypeWrapper, override val receiver: Parameter?, val accessors: PlatformDependent, // TODO > extra - override val original: PlatformDependent = PlatformDependent.empty(), override val modifier: WithAbstraction.Modifier, + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Documentable(), Callable, WithExtraProperties { override val children: List @@ -298,7 +297,7 @@ data class Parameter( override val name: String?, override val documentation: PlatformDependent, val type: TypeWrapper, - override val original: PlatformDependent, + override val platformData: List, override val extra: PropertyContainer = PropertyContainer.empty() ) : Documentable(), WithExtraProperties { override val children: List @@ -311,9 +310,9 @@ data class TypeParameter( override val dri: DRI, override val name: String, override val documentation: PlatformDependent, - override val original: PlatformDependent = PlatformDependent.empty(), val bounds: List, - override val extra: PropertyContainer + override val platformData: List, + override val extra: PropertyContainer = PropertyContainer.empty() ): Documentable(), WithExtraProperties { override val children: List get() = emptyList() -- cgit