From f8194a41c600ebd6a06277f056c728a65f1327ed Mon Sep 17 00:00:00 2001 From: Błażej Kardyś Date: Mon, 24 Feb 2020 18:12:08 +0100 Subject: Unpacking unnecessarily PlatformDependanted values --- core/src/main/kotlin/model/Documentable.kt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/main/kotlin/model/Documentable.kt b/core/src/main/kotlin/model/Documentable.kt index 54983467..fbf163b0 100644 --- a/core/src/main/kotlin/model/Documentable.kt +++ b/core/src/main/kotlin/model/Documentable.kt @@ -60,11 +60,11 @@ interface WithVisibility { } interface WithType { - val type: PlatformDependent + val type: TypeWrapper } interface WithAbstraction { - val modifier: PlatformDependent + val modifier: Modifier enum class Modifier { Abstract, Open, Final } @@ -83,7 +83,7 @@ interface WithGenerics { } interface Callable : WithVisibility, WithType, WithAbstraction, WithExpectActual { - val receiver: PlatformDependent + val receiver: Parameter? } abstract class Classlike : Documentable(), WithScope, WithVisibility, WithExpectActual { @@ -129,7 +129,7 @@ class Class( override val supertypes: PlatformDependent>, override val documentation: PlatformDependent, override val original: PlatformDependent = PlatformDependent.empty(), - override val modifier: PlatformDependent + override val modifier: WithAbstraction.Modifier ) : Classlike(), WithAbstraction, WithCompanion, WithConstructors, WithGenerics { override val children: List get() = (functions + properties + classlikes + listOfNotNull(companion) + constructors) as List @@ -176,11 +176,11 @@ class Function( override val documentation: PlatformDependent, override val actual: PlatformDependent, override val visibility: PlatformDependent, - override val type: PlatformDependent, + override val type: TypeWrapper, override val generics: PlatformDependent, - override val receiver: PlatformDependent, + override val receiver: Parameter?, override val original: PlatformDependent = PlatformDependent.empty(), - override val modifier: PlatformDependent + override val modifier: WithAbstraction.Modifier ) : Documentable(), Callable, WithGenerics { override val children: List get() = parameters @@ -243,11 +243,11 @@ class Property( override val documentation: PlatformDependent, override val actual: PlatformDependent, override val visibility: PlatformDependent, - override val type: PlatformDependent, - override val receiver: PlatformDependent, + override val type: TypeWrapper, + override val receiver: Parameter?, val accessors: PlatformDependent, // TODO > extra override val original: PlatformDependent = PlatformDependent.empty(), - override val modifier: PlatformDependent + override val modifier: WithAbstraction.Modifier ) : Documentable(), Callable { override val children: List get() = emptyList() -- cgit