From ae3419879d00d45251ff3605531dc719d4c3bfa3 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 23 Apr 2014 15:57:26 +0400 Subject: [PATCH] Fix errors caused by new kotlin version --- eval4j/src/org/jetbrains/eval4j/interpreter.kt | 6 +++--- eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eval4j/src/org/jetbrains/eval4j/interpreter.kt b/eval4j/src/org/jetbrains/eval4j/interpreter.kt index 1b16ba3820a..4c0d48e3184 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreter.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreter.kt @@ -63,9 +63,9 @@ class SingleInstructionInterpreter(private val eval: Eval) : Interpreter( LCONST_0 -> long(0) LCONST_1 -> long(1) - FCONST_0 -> float(0.0) - FCONST_1 -> float(1.0) - FCONST_2 -> float(2.0) + FCONST_0 -> float(0.0f) + FCONST_1 -> float(1.0f) + FCONST_2 -> float(2.0f) DCONST_0 -> double(0.0) DCONST_1 -> double(1.0) diff --git a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt index 626a8c955f1..2abcb795094 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt @@ -12,7 +12,7 @@ import org.jetbrains.org.objectweb.asm.tree.TryCatchBlockNode import java.util.ArrayList trait InterpreterResult { - fun toString(): String + override fun toString(): String } class ExceptionThrown(val exception: Value): InterpreterResult { @@ -45,11 +45,11 @@ trait InterpretationEventHandler { } 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() { - fun toString(): String = "Thrown from evaluated code: $exception" + override fun toString(): String = "Thrown from evaluated code: $exception" } fun interpreterLoop(