From 3bcdbee2bf6e7f180db6575d80fc5a4cbbd03267 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Mon, 12 May 2014 17:56:01 +0400 Subject: [PATCH] Removed LabelName class, used Name instead --- .../lang/resolve/lazy/LazyImportScope.java | 3 +- .../descriptors/AbstractLazyMemberScope.java | 3 +- .../resolve/scopes/WriteThroughScope.java | 3 +- .../BasicExpressionTypingVisitor.java | 5 +- .../ClosureExpressionsTypingVisitor.java | 3 +- .../lang/types/expressions/LabelResolver.java | 18 ++--- .../lazy/descriptors/LazyJavaMemberScope.kt | 3 +- .../jet/lang/resolve/name/LabelName.java | 65 ------------------- .../jetbrains/jet/lang/resolve/name/Name.java | 7 ++ .../resolve/scopes/AbstractScopeAdapter.java | 3 +- .../jet/lang/resolve/scopes/ChainedScope.java | 3 +- .../lang/resolve/scopes/FilteringScope.java | 3 +- .../scopes/InnerClassesScopeWrapper.java | 3 +- .../jet/lang/resolve/scopes/JetScope.java | 3 +- .../jet/lang/resolve/scopes/JetScopeImpl.java | 3 +- .../resolve/scopes/SubstitutingScope.java | 3 +- .../resolve/scopes/WritableScopeImpl.java | 15 ++--- .../jetbrains/jet/lang/types/ErrorUtils.java | 5 +- .../descriptors/DeserializedMemberScope.java | 3 +- 19 files changed, 40 insertions(+), 114 deletions(-) delete mode 100644 core/descriptors/src/org/jetbrains/jet/lang/resolve/name/LabelName.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java index 3b0eb0a3787..41a34ae2d0e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java @@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetImportDirective; import org.jetbrains.jet.lang.psi.JetImportList; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; @@ -311,7 +310,7 @@ public class LazyImportScope implements JetScope, LazyEntity { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { return Collections.emptyList(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java index 7d3f12cb6df..8b67617ffc3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java @@ -33,7 +33,6 @@ import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProvider; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; @@ -209,7 +208,7 @@ public abstract class AbstractLazyMemberScope getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { // A member scope has no labels return Collections.emptySet(); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java index 687c18a948e..2676f611895 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java @@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; @@ -47,7 +46,7 @@ public class WriteThroughScope extends WritableScopeWithImports { @Override @NotNull - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { checkMayRead(); return writableWorker.getDeclarationsByLabel(labelName); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index 738bc11d776..468111d1c06 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -53,7 +53,6 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; @@ -378,7 +377,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { String labelName = expression.getLabelName(); if (labelName != null) { LabelResolver.LabeledReceiverResolutionResult resolutionResult = context.labelResolver.resolveThisLabel( - expression.getInstanceReference(), expression.getTargetLabel(), context, new LabelName(labelName)); + expression.getInstanceReference(), expression.getTargetLabel(), context, Name.identifierForLabel(labelName)); if (onlyClassReceivers && resolutionResult.success()) { if (!isDeclaredInClass(resolutionResult.getReceiverParameterDescriptor())) { return LabelResolver.LabeledReceiverResolutionResult.labelResolutionSuccess(NO_RECEIVER_PARAMETER); @@ -750,7 +749,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { assert JetTokens.LABELS.contains(operationSign.getReferencedNameElementType()); String referencedName = operationSign.getReferencedName(); - context.labelResolver.enterLabeledElement(new LabelName(referencedName.substring(1)), baseExpression); + context.labelResolver.enterLabeledElement(Name.identifierForLabel(referencedName.substring(1)), baseExpression); // TODO : Some processing for the label? JetTypeInfo typeInfo = facade.getTypeInfo(baseExpression, context, isStatement); context.labelResolver.exitLabeledElement(baseExpression); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java index 9f032d4c9bc..5f88cc0a6b6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java @@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; @@ -106,7 +105,7 @@ public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor { Name callerName = getCallerName(expression); if (callerName != null) { - context.labelResolver.enterLabeledElement(new LabelName(callerName.asString()), expression); + context.labelResolver.enterLabeledElement(callerName, expression); } JetType expectedType = context.expectedType; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java index addbc9957fc..c4922868a84 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.name.LabelName; +import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; import java.util.HashMap; @@ -44,11 +44,11 @@ public class LabelResolver { return new LabelResolver(); } - private final Map> labeledElements = new HashMap>(); + private final Map> labeledElements = new HashMap>(); private LabelResolver() {} - public void enterLabeledElement(@NotNull LabelName labelName, @NotNull JetExpression labeledExpression) { + public void enterLabeledElement(@NotNull Name labelName, @NotNull JetExpression labeledExpression) { JetExpression cacheExpression = getCachingExpression(labeledExpression); if (cacheExpression != null) { Stack stack = labeledElements.get(labelName); @@ -64,8 +64,8 @@ public class LabelResolver { JetExpression cacheExpression = getCachingExpression(expression); // TODO : really suboptimal - for (Iterator>> mapIter = labeledElements.entrySet().iterator(); mapIter.hasNext(); ) { - Map.Entry> entry = mapIter.next(); + for (Iterator>> mapIter = labeledElements.entrySet().iterator(); mapIter.hasNext(); ) { + Map.Entry> entry = mapIter.next(); Stack stack = entry.getValue(); for (Iterator stackIter = stack.iterator(); stackIter.hasNext(); ) { JetElement recorded = stackIter.next(); @@ -89,7 +89,7 @@ public class LabelResolver { } @Nullable - private JetElement resolveControlLabel(@NotNull LabelName labelName, @NotNull JetSimpleNameExpression labelExpression, boolean reportUnresolved, ExpressionTypingContext context) { + private JetElement resolveControlLabel(@NotNull Name labelName, @NotNull JetSimpleNameExpression labelExpression, boolean reportUnresolved, ExpressionTypingContext context) { Collection declarationsByLabel = context.scope.getDeclarationsByLabel(labelName); int size = declarationsByLabel.size(); @@ -116,13 +116,13 @@ public class LabelResolver { public JetElement resolveLabel(JetLabelQualifiedExpression expression, ExpressionTypingContext context) { JetSimpleNameExpression labelElement = expression.getTargetLabel(); if (labelElement != null) { - LabelName labelName = new LabelName(expression.getLabelName()); + Name labelName = Name.identifierForLabel(expression.getLabelName()); return resolveControlLabel(labelName, labelElement, true, context); } return null; } - private JetElement resolveNamedLabel(@NotNull LabelName labelName, @NotNull JetSimpleNameExpression labelExpression, boolean reportUnresolved, ExpressionTypingContext context) { + private JetElement resolveNamedLabel(@NotNull Name labelName, @NotNull JetSimpleNameExpression labelExpression, boolean reportUnresolved, ExpressionTypingContext context) { Stack stack = labeledElements.get(labelName); if (stack == null || stack.isEmpty()) { if (reportUnresolved) { @@ -140,7 +140,7 @@ public class LabelResolver { } public LabeledReceiverResolutionResult resolveThisLabel(JetReferenceExpression thisReference, JetSimpleNameExpression targetLabel, - ExpressionTypingContext context, LabelName labelName) { + ExpressionTypingContext context, Name labelName) { Collection declarationsByLabel = context.scope.getDeclarationsByLabel(labelName); int size = declarationsByLabel.size(); assert targetLabel != null; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index e5eabab2f7d..329a7d84829 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.storage.NotNullLazyValue -import org.jetbrains.jet.lang.resolve.name.LabelName import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod @@ -333,7 +332,7 @@ public abstract class LazyJavaMemberScope( protected open fun getAllPropertyNames(): Collection = memberIndex().getAllFieldNames() override fun getLocalVariable(name: Name): VariableDescriptor? = null - override fun getDeclarationsByLabel(labelName: LabelName) = listOf() + override fun getDeclarationsByLabel(labelName: Name) = listOf() override fun getOwnDeclaredDescriptors() = getAllDescriptors() override fun getAllDescriptors() = _allDescriptors() diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/LabelName.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/LabelName.java deleted file mode 100644 index acf6332281d..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/LabelName.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.lang.resolve.name; - -import org.jetbrains.annotations.NotNull; - -public class LabelName { - - @NotNull - private final String name; - - public LabelName(@NotNull String name) { - if (name.startsWith("@")) { - // label may contain @, and may not contain - //throw new IllegalArgumentException("@ must be chopped: " + name); - } - - if (name.length() == 0) { - // label can be empty - //throw new IllegalStateException("label cannot be empty"); - } - - this.name = name; - } - - public String getName() { - return name; - } - - @Override - public String toString() { - return name; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - LabelName name1 = (LabelName) o; - - if (!name.equals(name1.name)) return false; - - return true; - } - - @Override - public int hashCode() { - return name.hashCode(); - } -} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java index ea8acace7a2..be16ec88016 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java @@ -68,6 +68,13 @@ public final class Name implements Comparable { return new Name(name, false); } + @NotNull + public static Name identifierForLabel(@NotNull String name) { + // might be empty ('@' label) + if (name.isEmpty()) return identifierNoValidate(name); + return identifier(name); + } + @NotNull public static Name special(@NotNull String name) { if (!name.startsWith("<")) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java index 70b6fa454b4..a5554111e38 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.scopes; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; @@ -74,7 +73,7 @@ public abstract class AbstractScopeAdapter implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { return getWorkerScope().getDeclarationsByLabel(labelName); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java index 5c2ea0734a8..ed45580869b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java @@ -21,7 +21,6 @@ import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; @@ -90,7 +89,7 @@ public class ChainedScope implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { ArrayList result = new ArrayList(); for (JetScope jetScope : scopeChain) { result.addAll(jetScope.getDeclarationsByLabel(labelName)); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java index 1b036d4898a..4e00f2a2483 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; @@ -91,7 +90,7 @@ public class FilteringScope implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { return Collections2.filter(workerScope.getDeclarationsByLabel(labelName), predicate); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java index 9ca0810b3b9..b8b42d731bb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; @@ -54,7 +53,7 @@ public class InnerClassesScopeWrapper extends AbstractScopeAdapter { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { return Collections2.filter(actualScope.getDeclarationsByLabel(labelName), IS_CLASS); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java index 85b15eddbbe..3a36583d432 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java @@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; @@ -72,7 +71,7 @@ public interface JetScope { @NotNull @ReadOnly - Collection getDeclarationsByLabel(@NotNull LabelName labelName); + Collection getDeclarationsByLabel(@NotNull Name labelName); /** * All visible descriptors from current scope. diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java index ed9512ff3ea..db74e479e92 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java @@ -20,7 +20,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; @@ -59,7 +58,7 @@ public abstract class JetScopeImpl implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { return Collections.emptyList(); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java index 9a53bdbbf5d..28a91f8db36 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.TypeSubstitutor; import org.jetbrains.jet.utils.Printer; @@ -123,7 +122,7 @@ public class SubstitutingScope implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { throw new UnsupportedOperationException(); // TODO } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java index a944d1a07b3..4be5948ab9f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java @@ -21,7 +21,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.utils.Printer; @@ -57,7 +56,7 @@ public class WritableScopeImpl extends WritableScopeWithImports { private Map packageAliases; @Nullable - private Map> labelsToDescriptors; + private Map> labelsToDescriptors; @Nullable private ReceiverParameterDescriptor implicitReceiver; @@ -140,20 +139,20 @@ public class WritableScopeImpl extends WritableScopeWithImports { } @NotNull - private Map> getLabelsToDescriptors() { + private Map> getLabelsToDescriptors() { if (labelsToDescriptors == null) { - labelsToDescriptors = new HashMap>(); + labelsToDescriptors = new HashMap>(); } return labelsToDescriptors; } @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { checkMayRead(); Collection superResult = super.getDeclarationsByLabel(labelName); - Map> labelsToDescriptors = getLabelsToDescriptors(); + Map> labelsToDescriptors = getLabelsToDescriptors(); List declarationDescriptors = labelsToDescriptors.get(labelName); if (declarationDescriptors == null) { return superResult; @@ -168,8 +167,8 @@ public class WritableScopeImpl extends WritableScopeWithImports { public void addLabeledDeclaration(@NotNull DeclarationDescriptor descriptor) { checkMayWrite(); - Map> labelsToDescriptors = getLabelsToDescriptors(); - LabelName name = new LabelName(descriptor.getName().asString()); + Map> labelsToDescriptors = getLabelsToDescriptors(); + Name name = descriptor.getName(); List declarationDescriptors = labelsToDescriptors.get(name); if (declarationDescriptors == null) { declarationDescriptors = new ArrayList(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java index b9c1dcca9d5..0cfa8147a3d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -25,7 +25,6 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.error.ErrorClassDescriptor; @@ -122,7 +121,7 @@ public class ErrorUtils { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { return Collections.emptyList(); } @@ -194,7 +193,7 @@ public class ErrorUtils { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { throw new IllegalStateException(); } diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java index 57837058237..1ed6a5f62d8 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.descriptors.serialization.DescriptorDeserializer; import org.jetbrains.jet.descriptors.serialization.Flags; import org.jetbrains.jet.descriptors.serialization.ProtoBuf; import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.storage.MemoizedFunctionToNotNull; @@ -185,7 +184,7 @@ public abstract class DeserializedMemberScope implements JetScope { @NotNull @Override - public Collection getDeclarationsByLabel(@NotNull LabelName labelName) { + public Collection getDeclarationsByLabel(@NotNull Name labelName) { return Collections.emptyList(); }