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

Drop CompilerMessageLocation.NO_LOCATION, use null everywhere instead

Browse Source
This commit is contained in:
Alexander Udalov
2017-03-31 20:39:22 +03:00
parent 861d9a1620
commit cb4d2994a3
12 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt
+6 -9
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cli.common.messages
import java.io.Serializable
data class CompilerMessageLocation private constructor(
val path: String?,
val path: String,
val line: Int,
val column: Int,
val lineContent: String?
@@ -28,16 +28,13 @@ data class CompilerMessageLocation private constructor(
path + (if (line != -1 || column != -1) " ($line:$column)" else "")
companion object {
@JvmField
val NO_LOCATION: CompilerMessageLocation = create(null)
@JvmStatic
fun create(path: String?): CompilerMessageLocation? =
create(path, -1, -1, null)
@JvmStatic
fun create(path: String?): CompilerMessageLocation =
CompilerMessageLocation(path, -1, -1, null)
@JvmStatic
fun create(path: String?, line: Int, column: Int, lineContent: String?): CompilerMessageLocation =
if (path == null) NO_LOCATION else CompilerMessageLocation(path, line, column, lineContent)
fun create(path: String?, line: Int, column: Int, lineContent: String?): CompilerMessageLocation? =
if (path == null) null else CompilerMessageLocation(path, line, column, lineContent)
private val serialVersionUID: Long = 8228357578L
}
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmScriptEngineBase.kt
+1 -3
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.cli.common.repl
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
import java.io.Reader
import java.util.concurrent.locks.ReentrantReadWriteLock
import javax.script.*
@@ -109,6 +108,5 @@ abstract class KotlinJsr223JvmScriptEngineBase(protected val myFactory: ScriptEn
}
private fun ReplCompileResult.Error.locationString() =
if (location == CompilerMessageLocation.NO_LOCATION) ""
if (location == null) ""
else " at ${location.line}:${location.column}"
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/ReplApi.kt
+5 -8
View File
@@ -62,9 +62,8 @@ sealed class ReplCheckResult : Serializable {
class Incomplete : ReplCheckResult()
class Error(val message: String,
val location: CompilerMessageLocation = CompilerMessageLocation.NO_LOCATION) : ReplCheckResult() {
override fun toString(): String = "Error(message = \"$message\""
class Error(val message: String, val location: CompilerMessageLocation? = null) : ReplCheckResult() {
override fun toString(): String = "Error(message = \"$message\")"
}
companion object {
@@ -88,8 +87,7 @@ sealed class ReplCompileResult : Serializable {
class Incomplete : ReplCompileResult()
class Error(val message: String,
val location: CompilerMessageLocation = CompilerMessageLocation.NO_LOCATION) : ReplCompileResult() {
class Error(val message: String, val location: CompilerMessageLocation? = null) : ReplCompileResult() {
override fun toString(): String = "Error(message = \"$message\""
}
@@ -125,8 +123,7 @@ sealed class ReplEvalResult : Serializable {
sealed class Error(val message: String) : ReplEvalResult() {
class Runtime(message: String, val cause: Exception? = null) : Error(message)
class CompileTime(message: String,
val location: CompilerMessageLocation = CompilerMessageLocation.NO_LOCATION) : Error(message)
class CompileTime(message: String, val location: CompilerMessageLocation? = null) : Error(message)
override fun toString(): String = "${this::class.simpleName}Error(message = \"$message\""
}
@@ -183,4 +180,4 @@ enum class ReplRepeatingMode {
interface InvokeWrapper {
operator fun <T> invoke(body: () -> T): T // e.g. for capturing io
}
}