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

Removed WritableScope.addClassifierAlias too

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-04-02 21:54:46 +03:00
parent 54ea6113d7
commit 5dbd23088f
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt
+1 -3
View File
@@ -35,9 +35,7 @@ public trait WritableScope : JetScope {
public fun addFunctionDescriptor(functionDescriptor: FunctionDescriptor) public fun addFunctionDescriptor(functionDescriptor: FunctionDescriptor)
public fun addClassifierDescriptor(classDescriptor: ClassifierDescriptor) public fun addClassifierDescriptor(classifierDescriptor: ClassifierDescriptor)
public fun addClassifierAlias(name: Name, classifierDescriptor: ClassifierDescriptor)
public fun importScope(imported: JetScope) public fun importScope(imported: JetScope)
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
+2 -7
View File
@@ -193,15 +193,10 @@ public class WritableScopeImpl(scope: JetScope,
return result return result
} }
override fun addClassifierDescriptor(classDescriptor: ClassifierDescriptor) { override fun addClassifierDescriptor(classifierDescriptor: ClassifierDescriptor) {
checkMayWrite()
addClassifierAlias(classDescriptor.getName(), classDescriptor)
}
override fun addClassifierAlias(name: Name, classifierDescriptor: ClassifierDescriptor) {
checkMayWrite() checkMayWrite()
val name = classifierDescriptor.getName()
checkForRedeclaration(name, classifierDescriptor) checkForRedeclaration(name, classifierDescriptor)
getVariableOrClassDescriptors().put(name, classifierDescriptor) getVariableOrClassDescriptors().put(name, classifierDescriptor)
explicitlyAddedDescriptors.add(classifierDescriptor) explicitlyAddedDescriptors.add(classifierDescriptor)
compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java
+4 -2
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor;
import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl;
import org.jetbrains.kotlin.di.InjectorForTests; import org.jetbrains.kotlin.di.InjectorForTests;
import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.BindingTraceContext;
import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.ImportPath;
@@ -614,8 +615,9 @@ public class JetTypeCheckerTest extends JetLiteFixture {
writableScope.importScope(module.getPackage(fqName).getMemberScope()); writableScope.importScope(module.getPackage(fqName).getMemberScope());
} }
else { else {
writableScope.addClassifierAlias(defaultImport.getImportedName(), Name shortName = fqName.shortName();
module.getPackage(fqName.parent()).getMemberScope().getClassifier(fqName.shortName())); assert shortName.equals(defaultImport.getImportedName());
writableScope.addClassifierDescriptor(module.getPackage(fqName.parent()).getMemberScope().getClassifier(shortName));
} }
} }
writableScope.importScope(module.getPackage(FqName.ROOT).getMemberScope()); writableScope.importScope(module.getPackage(FqName.ROOT).getMemberScope());