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

A command-line argument to transform file names to *.java

Browse Source
This commit is contained in:
Andrey Breslav
2012-01-30 22:01:27 +04:00
parent 73100134f9
commit 5595e55ab9
10 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+1
View File
@@ -73,6 +73,7 @@
<arg value="-output"/>
<arg value="${output}/classes/jdk-headers"/>
<arg value="-ignoreErrors"/>
<arg value="-transformNamesToJava"/>
</java>
</target>
compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+1 -2
View File
@@ -11,7 +11,6 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
import org.jetbrains.jet.lang.psi.JetElement;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFunctionLiteralExpression;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverDescriptor;
@@ -112,7 +111,7 @@ public class ClosureCodegen extends ObjectOrClosureCodegen {
funClass,
new String[0]
);
cv.visitSource(fun.getContainingFile().getName(), null);
cv.visitSource(state.transformFileName(fun.getContainingFile().getName()), null);
generateBridge(name, funDescriptor, fun, cv);
compiler/backend/src/org/jetbrains/jet/codegen/GenerationState.java
+13
View File
@@ -10,6 +10,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.util.containers.Stack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.codegen.intrinsics.IntrinsicMethods;
import org.jetbrains.jet.compiler.FileNameTransformer;
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
@@ -33,11 +34,18 @@ public class GenerationState {
private final JetStandardLibrary standardLibrary;
private final IntrinsicMethods intrinsics;
private final FileNameTransformer fileNameTransformer;
public GenerationState(Project project, ClassBuilderFactory builderFactory) {
this(project, builderFactory, FileNameTransformer.IDENTITY);
}
public GenerationState(Project project, ClassBuilderFactory builderFactory, FileNameTransformer fileNameTransformer) {
this.project = project;
this.standardLibrary = JetStandardLibrary.getJetStandardLibrary(project);
this.factory = new ClassFileFactory(builderFactory, this);
this.intrinsics = new IntrinsicMethods(project, standardLibrary);
this.fileNameTransformer = fileNameTransformer;
}
@NotNull
@@ -186,4 +194,9 @@ public class GenerationState {
return answer.toString();
}
@NotNull
public String transformFileName(@NotNull String fileName) {
return fileNameTransformer.transformFileName(fileName);
}
}
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -2
View File
@@ -14,7 +14,6 @@ import org.jetbrains.jet.lang.types.TypeProjection;
import org.jetbrains.jet.lexer.JetTokens;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.commons.InstructionAdapter;
import org.objectweb.asm.commons.Method;
@@ -91,7 +90,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
signature.getSuperclassName(),
signature.getInterfaces().toArray(new String[0])
);
v.visitSource(myClass.getContainingFile().getName(), null);
v.visitSource(state.transformFileName(myClass.getContainingFile().getName()), null);
ClassDescriptor container = getContainingClassDescriptor(descriptor);
if(container != null) {
compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class NamespaceCodegen {
new String[0]
);
// TODO figure something out for a namespace that spans multiple files
v.visitSource(sourceFile.getName(), null);
v.visitSource(state.transformFileName(sourceFile.getName()), null);
}
public void generate(JetFile file) {
compiler/backend/src/org/jetbrains/jet/codegen/TraitImplBodyCodegen.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class TraitImplBodyCodegen extends ClassBodyCodegen {
"java/lang/Object",
new String[0]
);
v.visitSource(myClass.getContainingFile().getName(), null);
v.visitSource(state.transformFileName(myClass.getContainingFile().getName()), null);
}
private String jvmName() {
compiler/backend/src/org/jetbrains/jet/compiler/FileNameTransformer.java
+19
View File
@@ -0,0 +1,19 @@
package org.jetbrains.jet.compiler;
import org.jetbrains.annotations.NotNull;
/**
* @author abreslav
*/
public interface FileNameTransformer {
FileNameTransformer IDENTITY = new FileNameTransformer() {
@NotNull
@Override
public String transformFileName(@NotNull String fileName) {
return fileName;
}
};
@NotNull
String transformFileName(@NotNull String fileName);
}
compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java
+14 -1
View File
@@ -2,8 +2,10 @@ 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.CompileEnvironment;
import org.jetbrains.jet.compiler.CompileEnvironmentException;
import org.jetbrains.jet.compiler.FileNameTransformer;
import java.io.PrintStream;
@@ -13,6 +15,14 @@ import java.io.PrintStream;
*/
@SuppressWarnings("UseOfSystemOutOrSystemErr")
public class KotlinCompiler {
private static final FileNameTransformer ANY_EXTENSION_TO_JAVA = new FileNameTransformer() {
@NotNull
@Override
public String transformFileName(@NotNull String fileName) {
return fileName.replaceFirst("\\.\\w+$", ".java");
}
};
private KotlinCompiler() {
}
@@ -40,6 +50,9 @@ public class KotlinCompiler {
@Argument(value = "ignoreErrors", description = "Emit byte code even if there are compilation errors (not recommended)")
public boolean ignoreErrors;
@Argument(value = "transformNamesToJava", description = "Transform Kotlin file names to *.java. This option is needed for compiling kotlinized Java library headers")
public boolean transformNamesToJava;
}
private static void usage(PrintStream target) {
@@ -79,7 +92,7 @@ public class KotlinCompiler {
return 0;
}
CompileEnvironment environment = new CompileEnvironment();
CompileEnvironment environment = new CompileEnvironment(arguments.transformNamesToJava ? ANY_EXTENSION_TO_JAVA : FileNameTransformer.IDENTITY);
environment.setIgnoreErrors(arguments.ignoreErrors);
if (arguments.stdlib != null) {
compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java
+8 -2
View File
@@ -35,17 +35,23 @@ public class CompileEnvironment {
private JetCoreEnvironment myEnvironment;
private final Disposable myRootDisposable;
private PrintStream myErrorStream = System.out;
private final FileNameTransformer myFileNameTransformer;
private URL myStdlib;
private boolean ignoreErrors = false;
public CompileEnvironment() {
this(FileNameTransformer.IDENTITY);
}
public CompileEnvironment(FileNameTransformer fileNameTransformer) {
myRootDisposable = new Disposable() {
@Override
public void dispose() {
}
};
myEnvironment = new JetCoreEnvironment(myRootDisposable);
myFileNameTransformer = fileNameTransformer;
}
public void setErrorStream(PrintStream errorStream) {
@@ -148,7 +154,7 @@ public class CompileEnvironment {
}
public List<Module> loadModuleScript(String moduleFile) {
CompileSession scriptCompileSession = new CompileSession(myEnvironment);
CompileSession scriptCompileSession = new CompileSession(myEnvironment, myFileNameTransformer);
scriptCompileSession.addSources(moduleFile);
ensureRuntime();
@@ -289,7 +295,7 @@ public class CompileEnvironment {
}
public boolean compileBunchOfSources(String sourceFileOrDir, String jar, String outputDir, boolean includeRuntime) {
CompileSession session = new CompileSession(myEnvironment);
CompileSession session = new CompileSession(myEnvironment, myFileNameTransformer);
session.addSources(sourceFileOrDir);
String mainClass = null;
compiler/cli/src/org/jetbrains/jet/compiler/CompileSession.java
+8 -2
View File
@@ -29,6 +29,7 @@ public class CompileSession {
private final JetCoreEnvironment myEnvironment;
private final List<JetFile> mySourceFiles = new ArrayList<JetFile>();
private final List<JetFile> myLibrarySourceFiles = new ArrayList<JetFile>();
private final FileNameTransformer myFileNameTransformer;
private List<String> myErrors = new ArrayList<String>();
public BindingContext getMyBindingContext() {
@@ -38,7 +39,12 @@ public class CompileSession {
private BindingContext myBindingContext;
public CompileSession(JetCoreEnvironment environment) {
this(environment, FileNameTransformer.IDENTITY);
}
public CompileSession(JetCoreEnvironment environment, FileNameTransformer fileNameTransformer) {
myEnvironment = environment;
myFileNameTransformer = fileNameTransformer;
}
public void addSources(String path) {
@@ -115,13 +121,13 @@ public class CompileSession {
@NotNull
public ClassFileFactory generate() {
GenerationState generationState = new GenerationState(myEnvironment.getProject(), ClassBuilderFactory.BINARIES);
GenerationState generationState = new GenerationState(myEnvironment.getProject(), ClassBuilderFactory.BINARIES, myFileNameTransformer);
generationState.compileCorrectFiles(myBindingContext, mySourceFiles);
return generationState.getFactory();
}
public String generateText() {
GenerationState generationState = new GenerationState(myEnvironment.getProject(), ClassBuilderFactory.TEXT);
GenerationState generationState = new GenerationState(myEnvironment.getProject(), ClassBuilderFactory.TEXT, myFileNameTransformer);
generationState.compileCorrectFiles(myBindingContext, mySourceFiles);
return generationState.createText();
}