From 7f672f807861890e066165c569d52e931fec0259 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 19 Feb 2015 12:42:50 +0300 Subject: [PATCH] Minor: remove redundant class objects from project code --- .../org/jetbrains/kotlin/load/java/lazy/resolvers.kt | 6 ++---- eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt | 11 ++++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt index 470a27cf674..7aa3da653be 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt @@ -33,10 +33,8 @@ trait LazyJavaClassResolver { } trait TypeParameterResolver { - class object { - object EMPTY : TypeParameterResolver { - override fun resolveTypeParameter(javaTypeParameter: JavaTypeParameter): TypeParameterDescriptor? = null - } + object EMPTY : TypeParameterResolver { + override fun resolveTypeParameter(javaTypeParameter: JavaTypeParameter): TypeParameterDescriptor? = null } fun resolveTypeParameter(javaTypeParameter: JavaTypeParameter): TypeParameterDescriptor? diff --git a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt index f0b540e40e4..cf8bcfaaaba 100644 --- a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt +++ b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt @@ -51,13 +51,10 @@ public class AbnormalTermination(public val message: String): InterpreterResult } public trait InterpretationEventHandler { - - class object { - object NONE : InterpretationEventHandler { - override fun instructionProcessed(insn: AbstractInsnNode): InterpreterResult? = null - override fun exceptionThrown(currentState: Frame, currentInsn: AbstractInsnNode, exception: Value): InterpreterResult? = null - override fun exceptionCaught(currentState: Frame, currentInsn: AbstractInsnNode, exception: Value): InterpreterResult? = null - } + object NONE : InterpretationEventHandler { + override fun instructionProcessed(insn: AbstractInsnNode): InterpreterResult? = null + override fun exceptionThrown(currentState: Frame, currentInsn: AbstractInsnNode, exception: Value): InterpreterResult? = null + override fun exceptionCaught(currentState: Frame, currentInsn: AbstractInsnNode, exception: Value): InterpreterResult? = null } // If a non-null value is returned, interpreter loop is terminated and that value is used as a result