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

In non-lazy mode, script classes are normal MutableClassDescriptors

Browse Source
This commit is contained in:
Andrey Breslav
2014-04-01 20:06:02 +04:00
parent 989079e4fc
commit 0f422df98f
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptorImpl.java
+10 -6
View File
@@ -30,7 +30,6 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
// SCRIPT: Script declaration descriptor // SCRIPT: Script declaration descriptor
@@ -48,7 +47,7 @@ public class ScriptDescriptorImpl extends DeclarationDescriptorNonRootImpl imple
KotlinBuiltIns.getInstance().getAnyType(), KotlinBuiltIns.getInstance().getAnyType(),
new ScriptReceiver(this)); new ScriptReceiver(this));
private final ClassDescriptorImpl classDescriptor; private final MutableClassDescriptor classDescriptor;
private final WritableScopeImpl classScope; private final WritableScopeImpl classScope;
private WritableScope scopeForBodyResolution; private WritableScope scopeForBodyResolution;
@@ -62,11 +61,16 @@ public class ScriptDescriptorImpl extends DeclarationDescriptorNonRootImpl imple
super(containingDeclaration, Annotations.EMPTY, NAME); super(containingDeclaration, Annotations.EMPTY, NAME);
this.priority = priority; this.priority = priority;
classDescriptor = new ClassDescriptorImpl(containingDeclaration, className, Modality.FINAL, classDescriptor = new MutableClassDescriptor(containingDeclaration, scriptScope, ClassKind.CLASS, false, className);
Collections.singleton(KotlinBuiltIns.getInstance().getAnyType())); classDescriptor.addSupertype(KotlinBuiltIns.getInstance().getAnyType());
classScope = new WritableScopeImpl(scriptScope, containingDeclaration, RedeclarationHandler.DO_NOTHING, "script members"); classDescriptor.setModality(Modality.FINAL);
classDescriptor.setVisibility(Visibilities.PUBLIC);
classDescriptor.setTypeParameterDescriptors(Collections.<TypeParameterDescriptor>emptyList());
classScope = new WritableScopeImpl(JetScope.EMPTY, classDescriptor, RedeclarationHandler.DO_NOTHING, "script members");
classScope.changeLockLevel(WritableScope.LockLevel.BOTH); classScope.changeLockLevel(WritableScope.LockLevel.BOTH);
classDescriptor.initialize(classScope, new HashSet<ConstructorDescriptor>(), null); classDescriptor.setScopeForMemberLookup(classScope);
classDescriptor.createTypeConstructor();
} }
public void initialize( public void initialize(