azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiler: cleanup 'public', property access syntax

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-01-07 17:57:35 +01:00
parent b72ea1ff07
commit 117a0d8b7b
488 changed files with 3147 additions and 3287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/Preprocessor.kt
+7 -7
View File
@@ -30,21 +30,21 @@ import java.io.IOException
public data class Profile(val name: String, val evaluator: Evaluator, val targetRoot: File)
data class Profile(val name: String, val evaluator: Evaluator, val targetRoot: File)
public fun createJvmProfile(targetRoot: File, version: Int): Profile = Profile("JVM$version", JvmPlatformEvaluator(version), File(targetRoot, "jvm$version"))
public fun createJsProfile(targetRoot: File): Profile = Profile("JS", JsPlatformEvaluator(), File(targetRoot, "js"))
fun createJvmProfile(targetRoot: File, version: Int): Profile = Profile("JVM$version", JvmPlatformEvaluator(version), File(targetRoot, "jvm$version"))
fun createJsProfile(targetRoot: File): Profile = Profile("JS", JsPlatformEvaluator(), File(targetRoot, "js"))
public val profileEvaluators: Map<String, () -> Evaluator> =
val profileEvaluators: Map<String, () -> Evaluator> =
listOf(6, 7, 8).toMapBy({ version -> "JVM$version" }, { version -> { JvmPlatformEvaluator(version) } }) + ("JS" to { JsPlatformEvaluator() })
public fun createProfile(name: String, targetRoot: File): Profile {
fun createProfile(name: String, targetRoot: File): Profile {
val (profileName, evaluator) = profileEvaluators.entries.firstOrNull { it.key.equals(name, ignoreCase = true) } ?: throw IllegalArgumentException("Profile with name '$name' is not supported")
return Profile(profileName, evaluator(), targetRoot)
}
public class Preprocessor(val logger: Logger = SystemOutLogger) {
class Preprocessor(val logger: Logger = SystemOutLogger) {
val fileType = KotlinFileType.INSTANCE
val jetPsiFactory: KtPsiFactory
@@ -70,7 +70,7 @@ public class Preprocessor(val logger: Logger = SystemOutLogger) {
override fun toString() = this.javaClass.simpleName
}
public fun processSources(sourceRoot: File, profile: Profile) {
fun processSources(sourceRoot: File, profile: Profile) {
processDirectorySingleEvaluator(sourceRoot, profile.targetRoot, profile.evaluator)
}
compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/logging.kt
+5 -5
View File
@@ -16,17 +16,17 @@
package org.jetbrains.kotlin.preprocessor
public interface Logger {
interface Logger {
fun debug(msg: CharSequence)
fun info(msg: CharSequence)
fun warn(msg: CharSequence)
fun error(msg: CharSequence)
}
public object SystemOutLogger : Logger {
object SystemOutLogger : Logger {
private fun out(level: String, msg: CharSequence) = println("[$level] $msg")
public var isDebugEnabled: Boolean = true
var isDebugEnabled: Boolean = true
override fun debug(msg: CharSequence) {
if (isDebugEnabled) out("DEBUG", msg)
}
@@ -35,9 +35,9 @@ public object SystemOutLogger : Logger {
override fun error(msg: CharSequence) = out("ERROR", msg)
}
public fun Logger.withPrefix(prefix: String): Logger = PrefixedLogger(prefix, this)
fun Logger.withPrefix(prefix: String): Logger = PrefixedLogger(prefix, this)
public class PrefixedLogger(val prefix: String, val logger: Logger) : Logger {
class PrefixedLogger(val prefix: String, val logger: Logger) : Logger {
private fun prefix(msg: CharSequence): CharSequence = StringBuilder().apply {
append(prefix)
append(": ")