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

fix tests after recent refactoring

Browse Source
This commit is contained in:
Stepan Koltsov
2012-04-08 05:39:46 +04:00
parent 7aeded2522
commit 7be3d247f9
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironment.java
+4 -4
View File
@@ -85,7 +85,7 @@ public class CompileEnvironment {
public void dispose() { public void dispose() {
} }
}; };
environment = new JetCoreEnvironment(rootDisposable, mode == CompilerSpecialMode.REGULAR); environment = new JetCoreEnvironment(rootDisposable, mode.includeJdkHeaders());
this.messageRenderer = messageRenderer; this.messageRenderer = messageRenderer;
} }
@@ -282,7 +282,7 @@ public class CompileEnvironment {
public ClassFileFactory compileModule(Module moduleBuilder, String directory) { public ClassFileFactory compileModule(Module moduleBuilder, String directory) {
CompileSession moduleCompileSession = newCompileSession(); CompileSession moduleCompileSession = newCompileSession();
moduleCompileSession.setStubs(mode != CompilerSpecialMode.REGULAR); moduleCompileSession.setStubs(mode.isStubs());
if (moduleBuilder.getSourceFiles().isEmpty()) { if (moduleBuilder.getSourceFiles().isEmpty()) {
throw new CompileEnvironmentException("No source files where defined"); throw new CompileEnvironmentException("No source files where defined");
@@ -403,7 +403,7 @@ public class CompileEnvironment {
public boolean compileBunchOfSources(String sourceFileOrDir, String jar, String outputDir, boolean includeRuntime) { public boolean compileBunchOfSources(String sourceFileOrDir, String jar, String outputDir, boolean includeRuntime) {
CompileSession session = newCompileSession(); CompileSession session = newCompileSession();
session.setStubs(mode != CompilerSpecialMode.REGULAR); session.setStubs(mode.isStubs());
session.addSources(sourceFileOrDir); session.addSources(sourceFileOrDir);
@@ -412,7 +412,7 @@ public class CompileEnvironment {
public boolean compileBunchOfSourceDirectories(List<String> sources, String jar, String outputDir, boolean includeRuntime) { public boolean compileBunchOfSourceDirectories(List<String> sources, String jar, String outputDir, boolean includeRuntime) {
CompileSession session = newCompileSession(); CompileSession session = newCompileSession();
session.setStubs(mode != CompilerSpecialMode.REGULAR); session.setStubs(mode.isStubs());
for (String source : sources) { for (String source : sources) {
session.addSources(source); session.addSources(source);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
+4
View File
@@ -29,4 +29,8 @@ public enum CompilerSpecialMode {
public boolean includeJdkHeaders() { public boolean includeJdkHeaders() {
return this == REGULAR || this == STDLIB; return this == REGULAR || this == STDLIB;
} }
public boolean isStubs() {
return this == BUILTINS || this == JDK_HEADERS;
}
} }