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

Fix errors caused by new kotlin version

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-04-23 15:57:26 +04:00
parent 32132a8b3e
commit ae3419879d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eval4j/src/org/jetbrains/eval4j/interpreter.kt
+3 -3
View File
@@ -63,9 +63,9 @@ class SingleInstructionInterpreter(private val eval: Eval) : Interpreter<Value>(
LCONST_0 -> long(0) LCONST_0 -> long(0)
LCONST_1 -> long(1) LCONST_1 -> long(1)
FCONST_0 -> float(0.0) FCONST_0 -> float(0.0f)
FCONST_1 -> float(1.0) FCONST_1 -> float(1.0f)
FCONST_2 -> float(2.0) FCONST_2 -> float(2.0f)
DCONST_0 -> double(0.0) DCONST_0 -> double(0.0)
DCONST_1 -> double(1.0) DCONST_1 -> double(1.0)
eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
+3 -3
View File
@@ -12,7 +12,7 @@ import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode
import java.util.ArrayList import java.util.ArrayList
trait InterpreterResult { trait InterpreterResult {
fun toString(): String override fun toString(): String
} }
class ExceptionThrown(val exception: Value): InterpreterResult { class ExceptionThrown(val exception: Value): InterpreterResult {
@@ -45,11 +45,11 @@ trait InterpretationEventHandler {
} }
class ThrownFromEvalException(cause: Throwable): RuntimeException(cause) { class ThrownFromEvalException(cause: Throwable): RuntimeException(cause) {
fun toString(): String = "Thrown by evaluator: ${getCause()}" override fun toString(): String = "Thrown by evaluator: ${getCause()}"
} }
class ThrownFromEvaluatedCodeException(val exception: Value): RuntimeException() { class ThrownFromEvaluatedCodeException(val exception: Value): RuntimeException() {
fun toString(): String = "Thrown from evaluated code: $exception" override fun toString(): String = "Thrown from evaluated code: $exception"
} }
fun interpreterLoop( fun interpreterLoop(