From ca877f14139ac6e4a0c99dddcab69f27d95150b4 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 3 Apr 2014 14:23:22 +0400 Subject: [PATCH] Use ASM5 --- eval4j/src/org/jetbrains/eval4j/interpreter.kt | 2 +- eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eval4j/src/org/jetbrains/eval4j/interpreter.kt b/eval4j/src/org/jetbrains/eval4j/interpreter.kt index 4c0d48e3184..f2954dd50de 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreter.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreter.kt @@ -37,7 +37,7 @@ trait Eval { fun invokeMethod(instance: Value, methodDesc: MethodDescription, arguments: List, invokespecial: Boolean = false): Value } -class SingleInstructionInterpreter(private val eval: Eval) : Interpreter(ASM4) { +class SingleInstructionInterpreter(private val eval: Eval) : Interpreter(ASM5) { override fun newValue(`type`: Type?): Value? { if (`type` == null) { return NOT_A_VALUE diff --git a/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt b/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt index 946d4084333..6b942ecfd20 100644 --- a/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt +++ b/eval4j/test/org/jetbrains/eval4j/test/suiteBuilder.kt @@ -24,10 +24,10 @@ fun buildTestSuite( val ownerClass = javaClass() val inputStream = ownerClass.getClassLoader()!!.getResourceAsStream(ownerClass.getInternalName() + ".class")!! - ClassReader(inputStream).accept(object : ClassVisitor(ASM4) { + ClassReader(inputStream).accept(object : ClassVisitor(ASM5) { override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { - return object : MethodNode(access, name, desc, signature, exceptions) { + return object : MethodNode(ASM5, access, name, desc, signature, exceptions) { override fun visitEnd() { val testCase = buildTestCase(ownerClass, this, create) if (testCase != null) {