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

proper environment when compiling special things

Browse Source 
* do not include anything when compiling builtins
* do not include kotlin-runtime and jdk-headers when compiling jdk-headers
This commit is contained in:
Stepan Koltsov
2012-03-30 03:54:58 +04:00
parent 3ee7bcee25
commit 2c4094f4d4
22 changed files with 154 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/DefaultModuleConfiguration.java
+12 -5
View File
@@ -38,14 +38,16 @@ public class DefaultModuleConfiguration implements ModuleConfiguration {
public static final ImportPath[] DEFAULT_JET_IMPORTS = new ImportPath[] {
new ImportPath("kotlin.*"), new ImportPath("kotlin.io.*"), new ImportPath("jet.*"), };
private Project project;
private final Project project;
private final boolean extendBuiltins;
public static DefaultModuleConfiguration createStandardConfiguration(Project project) {
return new DefaultModuleConfiguration(project);
public static DefaultModuleConfiguration createStandardConfiguration(Project project, boolean extendBuiltins) {
return new DefaultModuleConfiguration(project, extendBuiltins);
}
private DefaultModuleConfiguration(Project project) {
private DefaultModuleConfiguration(@NotNull Project project, boolean extendBuiltins) {
this.project = project;
this.extendBuiltins = extendBuiltins;
}
@Override
@@ -58,7 +60,12 @@ public class DefaultModuleConfiguration implements ModuleConfiguration {
@Override
public void extendNamespaceScope(@NotNull BindingTrace trace, @NotNull NamespaceDescriptor namespaceDescriptor, @NotNull WritableScope namespaceMemberScope) {
if (DescriptorUtils.getFQName(namespaceDescriptor).equals(JetStandardClasses.STANDARD_CLASSES_FQNAME.toUnsafe())) {
namespaceMemberScope.importScope(JetStandardLibrary.getInstance().getLibraryScope());
if (!extendBuiltins) {
namespaceMemberScope.importScope(JetStandardClasses.STANDARD_CLASSES);
} else {
namespaceMemberScope.importScope(JetStandardLibrary.getInstance().getLibraryScope());
}
}
}
}
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/JetStandardClasses.java
+1 -1
View File
@@ -235,7 +235,7 @@ public class JetStandardClasses {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@NotNull
/*package*/ static final JetScope STANDARD_CLASSES;
public static final JetScope STANDARD_CLASSES;
static {
WritableScope writableScope = new WritableScopeImpl(JetScope.EMPTY, STANDARD_CLASSES_NAMESPACE, RedeclarationHandler.DO_NOTHING).setDebugName("JetStandardClasses.STANDARD_CLASSES");