azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved CompilerSpecialMode enum to compiler-tests, since it is now used only for creating test compiler configurations.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-07-05 18:14:16 +04:00
parent 97dfd74647
commit 2c58989a47
41 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.codegen.*;
import org.jetbrains.jet.compiler.PathManager;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.test.generator.Printer;
import java.io.File;
compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
+4 -6
View File
@@ -22,7 +22,6 @@ import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileBuiltins;
import org.jetbrains.jet.codegen.forTestCompile.ForTestPackJdkAnnotations;
import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.utils.PathUtil;
import org.junit.Test;
@@ -30,9 +29,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.IDEA;
import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.REGULAR;
import static org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode.STDLIB;
import static org.jetbrains.jet.CompilerSpecialMode.REGULAR;
import static org.jetbrains.jet.CompilerSpecialMode.STDLIB;
/**
* @author Stepan Koltsov
@@ -74,7 +72,7 @@ public class CompileCompilerDependenciesTest {
}
private static boolean includeJdkAnnotations(@NotNull CompilerSpecialMode mode) {
return mode == REGULAR || mode == STDLIB || mode == IDEA;
return mode == REGULAR || mode == STDLIB;
}
public static boolean includeKotlinRuntime(@NotNull CompilerSpecialMode mode) {
@@ -82,6 +80,6 @@ public class CompileCompilerDependenciesTest {
}
public static boolean includeJdk(@NotNull CompilerSpecialMode mode) {
return mode != IDEA;
return true;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java → compiler/tests/org/jetbrains/jet/CompilerSpecialMode.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java;
package org.jetbrains.jet;
/**
* @author Stepan Koltsov
compiler/tests/org/jetbrains/jet/JetLiteFixture.java
-1
View File
@@ -29,7 +29,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.junit.Assert;
import java.io.IOException;
compiler/tests/org/jetbrains/jet/JetTestUtils.java
-1
View File
@@ -43,7 +43,6 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.plugin.JetLanguage;
import org.jetbrains.jet.util.slicedmap.ReadOnlySlice;
import org.jetbrains.jet.util.slicedmap.SlicedMap;
compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.cfg.pseudocode.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.io.File;
import java.io.FileNotFoundException;
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTest.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.utils.ExceptionUtils;
import java.io.File;
compiler/tests/org/jetbrains/jet/codegen/AnnotationGenTest.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.codegen;
import jet.JetObject;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.annotation.*;
import java.lang.reflect.Constructor;
compiler/tests/org/jetbrains/jet/codegen/ArrayGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/BridgeMethodGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
public class BridgeMethodGenTest extends CodegenTestCase {
public void testBridgeMethod () throws Exception {
compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/ClosuresGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
/**
* @author max
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.parsing.JetParsingTest;
import org.objectweb.asm.Type;
compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
/**
* @author Stepan Koltsov
compiler/tests/org/jetbrains/jet/codegen/ExtensionFunctionsTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.codegen;
import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java
-1
View File
@@ -22,7 +22,6 @@ import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import java.util.Collections;
compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
/**
* Test correct code is generated for descriptors loaded as alt jdk headers
compiler/tests/org/jetbrains/jet/codegen/MultiFileGenTest.java
+1 -3
View File
@@ -16,9 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import java.lang.reflect.Method;
import org.jetbrains.jet.CompilerSpecialMode;
public class MultiFileGenTest extends CodegenTestCase {
@Override
compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.jet.codegen;
import jet.IntRange;
import jet.Tuple2;
import jet.Tuple4;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.awt.*;
import java.lang.reflect.InvocationTargetException;
compiler/tests/org/jetbrains/jet/codegen/ObjectGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
/**
* @author yole
compiler/tests/org/jetbrains/jet/codegen/PatternMatchingTest.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.codegen;
import jet.Tuple2;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
compiler/tests/org/jetbrains/jet/codegen/SafeRefTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
public class SafeRefTest extends CodegenTestCase {
@Override
compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/StringsTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/SuperGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
public class SuperGenTest extends CodegenTestCase {
compiler/tests/org/jetbrains/jet/codegen/TraitsTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
public class TraitsTest extends CodegenTestCase {
compiler/tests/org/jetbrains/jet/codegen/TupleGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
public class TupleGenTest extends CodegenTestCase {
public void testBasic() {
compiler/tests/org/jetbrains/jet/codegen/TypeInfoTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Method;
compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.name.FqName;
compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java
+1 -1
View File
@@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.name.Name;
compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java
+1 -1
View File
@@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.name.FqName;
compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
+1 -1
View File
@@ -34,7 +34,7 @@ import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.di.InjectorForJavaSemanticServices;
import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.utils.PathUtil;
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.junit.After;
import org.junit.BeforeClass;
compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTest.java
+1 -1
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.CompileCompilerDependenciesTest;
import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
import org.jetbrains.jet.cli.jvm.repl.ReplInterpreter;
import org.jetbrains.jet.config.CompilerConfiguration;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
compiler/tests/org/jetbrains/jet/resolve/DescriptorRendererTest.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetVisitorVoid;
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.io.IOException;
import java.util.ArrayList;
compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java
+1 -1
View File
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.jet.JetLiteFixture;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.CompilerSpecialMode;
import java.util.List;