From 671634c7c24ba8596e9b983eb01243fa666613fb Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Fri, 8 Jun 2012 17:57:03 +0400 Subject: [PATCH] rename poison to used --- .../jet/codegen/GenerationState.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java index 6bba71c3690..18ee8ee8978 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java @@ -19,11 +19,8 @@ */ package org.jetbrains.jet.codegen; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalyzeExhaust; @@ -31,7 +28,6 @@ import org.jetbrains.jet.di.InjectorForJvmCodegen; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; @@ -58,7 +54,7 @@ public class GenerationState { private final ClassBuilderMode classBuilderMode; - private boolean poisoned = false; + private boolean used = false; // out parameter private Method scriptConstructorMethod; @@ -80,11 +76,12 @@ public class GenerationState { this.files, project, compilerSpecialMode, builderFactory.getClassBuilderMode(), this, builderFactory); } - private void poison() { - if (poisoned) { - throw new IllegalStateException("already poisoned"); + private void markUsed() { + if (used) { + throw new IllegalStateException( + GenerationState.class + " cannot be used more than once"); } - poisoned = true; + used = true; } @NotNull @@ -139,7 +136,7 @@ public class GenerationState { } public void compileCorrectFiles(@NotNull CompilationErrorHandler errorHandler) { - poison(); + markUsed(); for (JetFile file : this.files) { if (file.isScript()) { @@ -165,7 +162,7 @@ public class GenerationState { @NotNull JvmClassName className, @NotNull List> earlierScripts, @NotNull CompilationErrorHandler errorHandler) { - poison(); + markUsed(); injector.getScriptCodegen().registerEarlierScripts(earlierScripts);