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

Minor refactoring -- rename some classes and variables.

Browse Source
This commit is contained in:
Zalim Bashorov
2013-10-24 13:13:17 +04:00
parent 3f4cd455e2
commit da718af8b7
18 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ide-compiler-runner/src/org/jetbrains/jet/compiler/AdditionalCompilerSettings.java → ide-compiler-runner/src/org/jetbrains/jet/compiler/CompilerSettings.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.compiler;
import org.jetbrains.annotations.NotNull;
public class AdditionalCompilerSettings {
public class CompilerSettings {
private static final String DEFAULT_ADDITIONAL_ARGUMENTS = "-version -printArgs";
@NotNull
ide-compiler-runner/src/org/jetbrains/jet/compiler/SettingConstants.java
+4 -4
View File
@@ -21,10 +21,10 @@ import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_D
public class SettingConstants {
private SettingConstants() {}
public static final String KOTLIN_COMMON_COMPILER_SETTINGS_SECTION = "KotlinCommonCompilerSettings";
public static final String KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION = "Kotlin2JsCompilerSettings";
public static final String KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION = "Kotlin2JvmCompilerSettings";
public static final String KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION = "KotlinAdditionalCompilerSettings";
public static final String KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION = "KotlinCommonCompilerArguments";
public static final String KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION = "Kotlin2JsCompilerArguments";
public static final String KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION = "Kotlin2JvmCompilerArguments";
public static final String KOTLIN_COMPILER_SETTINGS_SECTION = "KotlinCompilerSettings";
public static final String KOTLIN_COMPILER_SETTINGS_FILE = "kotlinc.xml";
public static final String KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + KOTLIN_COMPILER_SETTINGS_FILE;
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java
+9 -9
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.cli.common.messages.MessageCollectorUtil;
import org.jetbrains.jet.compiler.AdditionalCompilerSettings;
import org.jetbrains.jet.compiler.CompilerSettings;
import java.io.File;
import java.io.PrintStream;
@@ -45,23 +45,23 @@ public class KotlinCompilerRunner {
public static void runK2JvmCompiler(
CommonCompilerArguments commonArguments,
K2JVMCompilerArguments k2jvmArguments,
AdditionalCompilerSettings additionalSettings,
CompilerSettings compilerSettings,
MessageCollector messageCollector,
CompilerEnvironment environment,
File moduleFile,
OutputItemsCollector collector
) {
K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments);
setupK2JvmSettings(moduleFile, arguments);
setupK2JvmArguments(moduleFile, arguments);
runCompiler(K2JVM_COMPILER, arguments, additionalSettings.getAdditionalArguments(),
runCompiler(K2JVM_COMPILER, arguments, compilerSettings.getAdditionalArguments(),
DEFAULT_K2JVM_ARGUMENTS, messageCollector, collector, environment);
}
public static void runK2JsCompiler(
CommonCompilerArguments commonArguments,
K2JSCompilerArguments k2jsArguments,
AdditionalCompilerSettings additionalSettings,
CompilerSettings compilerSettings,
MessageCollector messageCollector,
CompilerEnvironment environment,
OutputItemsCollector collector,
@@ -70,9 +70,9 @@ public class KotlinCompilerRunner {
File outputFile
) {
K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments);
setupK2JsSettings(outputFile, sourceFiles, libraryFiles, arguments);
setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments);
runCompiler(K2JS_COMPILER, arguments, additionalSettings.getAdditionalArguments(),
runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(),
DEFAULT_K2JS_ARGUMENTS, messageCollector, collector, environment);
}
@@ -135,7 +135,7 @@ public class KotlinCompilerRunner {
settings.verbose = true;
}
private static void setupK2JvmSettings(
private static void setupK2JvmArguments(
File moduleFile,
K2JVMCompilerArguments settings
) {
@@ -149,7 +149,7 @@ public class KotlinCompilerRunner {
settings.noJdk = true;
}
private static void setupK2JsSettings(
private static void setupK2JsArguments(
File outputFile,
List<File> sourceFiles,
List<String> libraryFiles,