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

Pass arguments to the compiler as String[] instead of Object (instanceof CommonCompilerArguments).

Browse Source
This commit is contained in:
Zalim Bashorov
2013-10-23 16:06:46 +04:00
parent 604be8e0c1
commit 22dde719de
4 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/com/sampullara/cli/ArgumentUtils.java → compiler/cli/cli-common/src/com/sampullara/cli/ArgumentUtils.java
+14 -8
View File
@@ -20,22 +20,28 @@ import com.intellij.util.containers.ComparatorUtil;
import org.jetbrains.annotations.NotNull;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
public class ArgumentUtils {
private ArgumentUtils() {}
@NotNull
public static <T> String convertArgumentsToString(T arguments, T defaultArguments) {
StringBuilder result = new StringBuilder();
convertArgumentsToString(arguments, defaultArguments, arguments.getClass(), result);
return result.toString();
public static <T> List<String> convertArgumentsToStringList(@NotNull T arguments, @NotNull T defaultArguments) {
List<String> result = new ArrayList<String>();
convertArgumentsToStringList(arguments, defaultArguments, result);
return result;
}
public static <T> void convertArgumentsToString(T arguments, T defaultArguments, Class clazz, StringBuilder result) {
public static <T> void convertArgumentsToStringList(@NotNull T arguments, @NotNull T defaultArguments, @NotNull List<String> result) {
convertArgumentsToStringList(arguments, defaultArguments, arguments.getClass(), result);
}
private static <T> void convertArgumentsToStringList(T arguments, T defaultArguments, Class clazz, List<String> result) {
Class superClazz = clazz.getSuperclass();
if (superClazz != null) {
convertArgumentsToString(arguments, defaultArguments, superClazz, result);
convertArgumentsToStringList(arguments, defaultArguments, superClazz, result);
}
for (Field field : clazz.getDeclaredFields()) {
@@ -60,11 +66,11 @@ public class ArgumentUtils {
name = Args.getName(argument, field);
}
result.append("-").append(name).append(" ");
result.add(argument.prefix() + name);
Class<?> fieldType = field.getType();
if (fieldType != boolean.class && fieldType != Boolean.class) {
result.append(value).append(" ");
result.add(value.toString());
}
}
}
compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+6 -3
View File
@@ -189,11 +189,14 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
@NotNull MessageRenderer messageRenderer
) {
if (arguments.printArgs) {
String freeArgs = StringUtil.join(arguments.freeArgs, "");
String argumentsAsString = ArgumentUtils.convertArgumentsToString(arguments, createArguments());
String freeArgs = StringUtil.join(arguments.freeArgs, " ");
List<String> argumentsAsList = ArgumentUtils.convertArgumentsToStringList(arguments, createArguments());
String argumentsAsString = StringUtil.join(argumentsAsList, " ");
String printArgsMessage = messageRenderer.render(CompilerMessageSeverity.INFO,
"Invoking compiler " + getClass().getName() +
" with arguments " + argumentsAsString + freeArgs,
" with arguments " + argumentsAsString + " " + freeArgs,
CompilerMessageLocation.NO_LOCATION);
errStream.println(printArgsMessage);
}