From ccda1d2fbc0668272dd040edb38ca0f05e54e4ae Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Sep 2015 19:19:32 +0300 Subject: [PATCH] Rename hasInlineTo->inlinedTo Original commit: 21b6b41112ef4a0b88c8408afd7e3a905e31472b --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 752155826a1..37fbb257bf9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -117,7 +117,7 @@ public class IncrementalCacheImpl( val CLASS_TO_SOURCES = "class-to-sources.tab" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions.tab" - val HAS_INLINE_TO = "has-inline-to.tab" + val INLINED_TO = "inlined-to.tab" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } @@ -135,7 +135,7 @@ public class IncrementalCacheImpl( private val classToSourcesMap = ClassToSourcesMap(CLASS_TO_SOURCES.storageFile) private val dirtyOutputClassesMap = DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile) private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile) - private val hasInlineTo = InlineFunctionsFilesMap(HAS_INLINE_TO.storageFile) + private val inlinedTo = InlineFunctionsFilesMap(INLINED_TO.storageFile) private val maps = listOf(protoMap, constantsMap, @@ -143,7 +143,7 @@ public class IncrementalCacheImpl( packagePartMap, sourceToClassesMap, dirtyOutputClassesMap, - hasInlineTo) + inlinedTo) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() @@ -151,7 +151,7 @@ public class IncrementalCacheImpl( private val inlineRegistering = object : InlineRegistering { override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - hasInlineTo.add(fromPath, jvmSignature, toPath) + inlinedTo.add(fromPath, jvmSignature, toPath) } } @@ -195,7 +195,7 @@ public class IncrementalCacheImpl( val classFilePath = getClassFilePath(internalName) fun addFilesAffectedByChangedInlineFuns(cache: IncrementalCacheImpl) { - val targetFiles = functions.flatMap { cache.hasInlineTo[classFilePath, it] } + val targetFiles = functions.flatMap { cache.inlinedTo[classFilePath, it] } result.addAll(targetFiles) }