From aef2c372e19dbb8db4e8704a2ded0d43a39ce789 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Jul 2012 15:07:21 +0400 Subject: [PATCH] Inlined the only usage of CompilerSpecialMode.isStubs(). --- .../jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 3 ++- .../jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index a03709e5c15..97e6f51c65b 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -36,6 +36,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiUtil; +import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; @@ -258,7 +259,7 @@ public class KotlinToJVMBytecodeCompiler { @Nullable public static GenerationState analyzeAndGenerate(K2JVMCompileEnvironmentConfiguration configuration) { - return analyzeAndGenerate(configuration, configuration.getEnvironment().getCompilerSpecialMode().isStubs()); + return analyzeAndGenerate(configuration, configuration.getEnvironment().getCompilerSpecialMode() == CompilerSpecialMode.BUILTINS); } @Nullable diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java index b1314bbcc31..b880a96a43e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java @@ -27,8 +27,4 @@ public enum CompilerSpecialMode { IDEA, JS, ; - - public boolean isStubs() { - return this == BUILTINS || this == JDK_HEADERS; - } }