From 1b30f0988be1f5490e644eb1751d408d966feda4 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Fri, 19 May 2017 12:49:45 +0300
Subject: [PATCH] Renamed SplitScheme to SplitLibraryScheme.

---
 .../src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt   | 2 +-
 .../jetbrains/kotlin/backend/konan/library/KonanLibrary.kt  | 6 +++---
 .../kotlin/backend/konan/library/MetadataGenerator.kt       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
index 5460a405179..15176fa7023 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
@@ -44,9 +44,9 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
         }
 
     internal val libraries: List<KonanLibraryReader> by lazy {
-        // Here we have chosen a particular KonanLibraryReader implementation
         val currentAbiVersion = configuration.get(KonanConfigKeys.ABI_VERSION)!!
         val target = targetManager.currentName
+        // Here we have chosen a particular KonanLibraryReader implementation.
         libraryNames.map{it -> SplitLibraryReader(it, currentAbiVersion, target)}
     }
 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt
index ff2714e8908..d654ed882d7 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibrary.kt
@@ -62,7 +62,7 @@ abstract open class FileBasedLibraryReader(
 }
 
 // This scheme describes the Konan Library (klib) layout.
-interface SplitScheme {
+interface SplitLibraryScheme {
     val libDir: File
     val target: String?
         // This is a default implementation. Can't make it an assignment.
@@ -90,7 +90,7 @@ interface SplitScheme {
 class SplitLibraryReader(override val libDir: File, currentAbiVersion: Int,
         override val target: String) : 
       FileBasedLibraryReader(libDir, currentAbiVersion, SplitMetadataReader(libDir)), 
-      SplitScheme  {
+      SplitLibraryScheme  {
 
     public constructor(path: String, currentAbiVersion: Int, target: String) : 
         this(File(path), currentAbiVersion, target) 
@@ -145,7 +145,7 @@ abstract class FileBasedLibraryWriter (
 }
 
 class SplitLibraryWriter(override val libDir: File, override val target: String?, 
-    val nopack: Boolean = false): FileBasedLibraryWriter(libDir), SplitScheme {
+    val nopack: Boolean = false): FileBasedLibraryWriter(libDir), SplitLibraryScheme {
 
     public constructor(path: String, target: String, nopack: Boolean): 
         this(File(path), target, nopack)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt
index 083a03be1ac..9705e9f6353 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/MetadataGenerator.kt
@@ -26,7 +26,7 @@ interface MetadataReader {
     fun loadSerializedPackageFragment(fqName: String): String
 }
 
-class SplitMetadataReader(override val libDir: File) : MetadataReader, SplitScheme {
+class SplitMetadataReader(override val libDir: File) : MetadataReader, SplitLibraryScheme {
 
     override fun loadSerializedModule(currentAbiVersion: Int): NamedModuleData {
         val header = Properties()
@@ -47,7 +47,7 @@ class SplitMetadataReader(override val libDir: File) : MetadataReader, SplitSche
         = packageFile(fqName).readText()
 }
 
-internal class SplitMetadataGenerator(override val libDir: File): SplitScheme {
+internal class SplitMetadataGenerator(override val libDir: File): SplitLibraryScheme {
 
     fun addLinkData(linkData: LinkData) {