further refactorings to work around kotlin compiler bugs (nested classes & access to public fields in java classes) so we can extend the KotlinCompiler from Kotlin code to add new arguments and compiler plugins

2012-03-08 11:58:02 +00:00
parent 0c66d9db27
commit 562ba6b4de
2 changed files with 164 additions and 45 deletions
@@ -0,0 +1,158 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.jet.cli;
+
+import com.sampullara.cli.Argument;
+
+/**
+ * Command line arguments for the {@link KotlinCompiler}
+ */
+public class CompilerArguments {
+    @Argument(value = "output", description = "output directory")
+    public String outputDir;
+
+    @Argument(value = "docOutput", description = "KDoc output directory")
+    public String docOutputDir;
+
+    @Argument(value = "jar", description = "jar file name")
+    public String jar;
+
+    @Argument(value = "src", description = "source file or directory")
+    public String src;
+
+    @Argument(value = "module", description = "module to compile")
+    public String module;
+
+    @Argument(value = "classpath", description = "classpath to use when compiling")
+    public String classpath;
+
+    @Argument(value = "includeRuntime", description = "include Kotlin runtime in to resulting jar")
+    public boolean includeRuntime;
+
+    @Argument(value = "stdlib", description = "Path to the stdlib.jar")
+    public String stdlib;
+
+    @Argument(value = "help", alias = "h", description = "show help")
+    public boolean help;
+
+    @Argument(value = "stubs", description = "Compile stubs: ignore function bodies")
+    public boolean stubs;
+
+    @Argument(value = "tags", description = "Demarcate each compilation message (error, warning, etc) with an open and close tag")
+    public boolean tags;
+
+    @Argument(value = "transformNamesToJava", description = "Transform Kotlin file names to *.java. This option is needed for compiling kotlinized Java library headers")
+    public boolean transformNamesToJava;
+
+
+    public String getClasspath() {
+        return classpath;
+    }
+
+    public void setClasspath(String classpath) {
+        this.classpath = classpath;
+    }
+
+    public String getDocOutputDir() {
+        return docOutputDir;
+    }
+
+    public void setDocOutputDir(String docOutputDir) {
+        this.docOutputDir = docOutputDir;
+    }
+
+    public boolean isHelp() {
+        return help;
+    }
+
+    public void setHelp(boolean help) {
+        this.help = help;
+    }
+
+    public boolean isIncludeRuntime() {
+        return includeRuntime;
+    }
+
+    public void setIncludeRuntime(boolean includeRuntime) {
+        this.includeRuntime = includeRuntime;
+    }
+
+    public String getJar() {
+        return jar;
+    }
+
+    public void setJar(String jar) {
+        this.jar = jar;
+    }
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public String getOutputDir() {
+        return outputDir;
+    }
+
+    public void setOutputDir(String outputDir) {
+        this.outputDir = outputDir;
+    }
+
+    public String getSrc() {
+        return src;
+    }
+
+    public void setSrc(String src) {
+        this.src = src;
+    }
+
+    public String getStdlib() {
+        return stdlib;
+    }
+
+    public void setStdlib(String stdlib) {
+        this.stdlib = stdlib;
+    }
+
+    public boolean isStubs() {
+        return stubs;
+    }
+
+    public void setStubs(boolean stubs) {
+        this.stubs = stubs;
+    }
+
+    public boolean isTags() {
+        return tags;
+    }
+
+    public void setTags(boolean tags) {
+        this.tags = tags;
+    }
+
+    public boolean isTransformNamesToJava() {
+        return transformNamesToJava;
+    }
+
+    public void setTransformNamesToJava(boolean transformNamesToJava) {
+        this.transformNamesToJava = transformNamesToJava;
+    }
+}
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.cli;

 import com.sampullara.cli.Args;
-import com.sampullara.cli.Argument;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.compiler.*;

@@ -37,44 +36,6 @@ public class KotlinCompiler {
        }
    };

-    public static class Arguments {
-        @Argument(value = "output", description = "output directory")
-        public String outputDir;
-
-        @Argument(value = "docOutput", description = "KDoc output directory")
-        public String docOutputDir;
-
-        @Argument(value = "jar", description = "jar file name")
-        public String jar;
-
-        @Argument(value = "src", description = "source file or directory")
-        public String src;
-
-        @Argument(value = "module", description = "module to compile")
-        public String module;
-
-        @Argument(value = "classpath", description = "classpath to use when compiling")
-        public String classpath;
-
-        @Argument(value = "includeRuntime", description = "include Kotlin runtime in to resulting jar")
-        public boolean includeRuntime;
-
-        @Argument(value = "stdlib", description = "Path to the stdlib.jar")
-        public String stdlib;
-
-        @Argument(value = "help", alias = "h", description = "show help")
-        public boolean help;
-
-        @Argument(value = "stubs", description = "Compile stubs: ignore function bodies")
-        public boolean stubs;
-
-        @Argument(value = "tags", description = "Demarcate each compilation message (error, warning, etc) with an open and close tag")
-        public boolean tags;
-
-        @Argument(value = "transformNamesToJava", description = "Transform Kotlin file names to *.java. This option is needed for compiling kotlinized Java library headers")
-        public boolean transformNamesToJava;
-    }
-
    public static void main(String... args) {
        doMain(new KotlinCompiler(), args);
    }
@@ -100,7 +61,7 @@ public class KotlinCompiler {
    }

    public int exec(PrintStream errStream, String... args) {
-        Arguments arguments = createArguments();
+        CompilerArguments arguments = createArguments();
        if (!parseArguments(errStream, arguments, args)) {
            return 1;
        }
@@ -110,7 +71,7 @@ public class KotlinCompiler {
    /**
     * Executes the compiler on the parsed arguments
     */
-    public int exec(PrintStream errStream, Arguments arguments) {
+    public int exec(PrintStream errStream, CompilerArguments arguments) {
        if (arguments.help) {
            usage(errStream);
            return 0;
@@ -146,7 +107,7 @@ public class KotlinCompiler {
    /**
     * Returns true if the arguments can be parsed correctly
     */
-    protected boolean parseArguments(PrintStream errStream, Arguments arguments, String[] args) {
+    protected boolean parseArguments(PrintStream errStream, CompilerArguments arguments, String[] args) {
        try {
            Args.parse(arguments, args);
            return true;
@@ -168,15 +129,15 @@ public class KotlinCompiler {
    /**
     * Allow derived classes to add additional command line arguments
     */
-    protected Arguments createArguments() {
-        return new Arguments();
+    protected CompilerArguments createArguments() {
+        return new CompilerArguments();
    }

    /**
     * Strategy method to configure the environment, allowing compiler
     * based tools to customise their own plugins
     */
-    protected void configureEnvironment(CompileEnvironment environment, Arguments arguments, PrintStream errStream) {
+    protected void configureEnvironment(CompileEnvironment environment, CompilerArguments arguments, PrintStream errStream) {
        environment.setIgnoreErrors(false);
        environment.setErrorStream(errStream);