From 7c2b2dcc6a7cd364c8c4ff6f941e3a8621c386da Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 21 Jul 2015 14:45:59 +0200 Subject: [PATCH] code cleanup: backend-common, cli modules --- .../jetbrains/kotlin/backend/common/bridges/bridges.kt | 2 +- .../org/jetbrains/kotlin/backend/common/output/output.kt | 4 ++-- .../kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt | 9 ++++----- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 4 +--- .../jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt index a72d3af11d9..5732c64cd87 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.backend.common.bridges import org.jetbrains.kotlin.utils.DFS import java.util.HashSet -public trait FunctionHandle { +public interface FunctionHandle { public val isDeclaration: Boolean public val isAbstract: Boolean diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt index b14b6392dd2..ad1d0b2c733 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.backend.common.output import java.io.File -public trait OutputFileCollection { +public interface OutputFileCollection { public fun get(relativePath: String): OutputFile? public fun asList(): List } @@ -28,7 +28,7 @@ public class SimpleOutputFileCollection(private val outputFiles: List = outputFiles } -public trait OutputFile { +public interface OutputFile { public val relativePath: String public val sourceFiles: List public fun asByteArray(): ByteArray diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt index e47b4e2fa9c..7f6b1a750e5 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmDependenciesIndex.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.name.FqName import java.util.ArrayList import java.util.EnumSet import java.util.HashMap -import kotlin.properties.Delegates public data class JavaRoot(public val file: VirtualFile, public val type: JavaRoot.RootType) { public enum class RootType { @@ -43,7 +42,7 @@ public data class JavaRoot(public val file: VirtualFile, public val type: JavaRo public class JvmDependenciesIndex(_roots: List) { //these fields are computed based on _roots passed to constructor which are filled in later - private val roots: List by Delegates.lazy { _roots.toList() } + private val roots: List by lazy { _roots.toList() } private val maxIndex: Int get() = roots.size() @@ -61,7 +60,7 @@ public class JvmDependenciesIndex(_roots: List) { } // root "Cache" object corresponds to DefaultPackage which exists in every root - private val rootCache: Cache by Delegates.lazy { + private val rootCache: Cache by lazy { with(Cache()) { roots.indices.forEach { rootIndices.add(it) @@ -236,12 +235,12 @@ public class JvmDependenciesIndex(_roots: List) { override val acceptedRootTypes: Set ) : SearchRequest - private trait SearchRequest { + private interface SearchRequest { val packageFqName: FqName val acceptedRootTypes: Set } - private trait SearchResult { + private interface SearchResult { class Found(val packageDirectory: VirtualFile, val root: JavaRoot) : SearchResult object NotFound : SearchResult diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index bfd8906bf25..147c0d9c4f0 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -69,7 +69,6 @@ import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration -import org.jetbrains.kotlin.config.KotlinSourceRoot import org.jetbrains.kotlin.config.kotlinSourceRoots import org.jetbrains.kotlin.extensions.ExternalDeclarationsProvider import org.jetbrains.kotlin.idea.JetFileType @@ -88,7 +87,6 @@ import java.io.File import java.util.ArrayList import java.util.Comparator import kotlin.platform.platformStatic -import kotlin.properties.Delegates public class KotlinCoreEnvironment private constructor( parentDisposable: Disposable, @@ -161,7 +159,7 @@ public class KotlinCoreEnvironment private constructor( public val project: Project get() = projectEnvironment.getProject() - public val sourceLinesOfCode: Int by Delegates.lazy { countLinesOfCode(sourceFiles) } + public val sourceLinesOfCode: Int by lazy { countLinesOfCode(sourceFiles) } public fun countLinesOfCode(sourceFiles: List): Int = sourceFiles.sumBy { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt index 30bad668fbd..4bc18d7e2f9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt @@ -25,7 +25,7 @@ public data class JvmClasspathRoot(public override val file: File): JvmContentRo public data class JavaSourceRoot(public override val file: File): JvmContentRoot -public trait JvmContentRoot : ContentRoot { +public interface JvmContentRoot : ContentRoot { public val file: File }