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

Resolve control label locally when label name clashes with fun name

Browse Source 
#KT-5354 Fixed
 #KT-15085 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2017-04-17 16:17:10 +03:00
parent 1c3f546319
commit 6a352bccb6
9 changed files with 162 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt
+20 -22
View File
@@ -102,31 +102,29 @@ object LabelResolver {
val labelName = expression.getLabelNameAsName()
if (labelElement == null || labelName == null) return null
val element = resolveNamedLabel(labelName, labelElement, context.trace)
if (element != null) return element
val declarationsByLabel = context.scope.getDeclarationsByLabel(labelName)
val size = declarationsByLabel.size
if (size > 1) {
BindingContextUtils.reportAmbiguousLabel(context.trace, labelElement, declarationsByLabel)
return null
}
if (size == 0) {
val element = resolveNamedLabel(labelName, labelElement, context.trace)
if (element == null) {
when (declarationsByLabel.size) {
0 -> {
context.trace.report(UNRESOLVED_REFERENCE.on(labelElement, labelElement))
return null
}
return element
}
val declarationDescriptor = declarationsByLabel.iterator().next()
if (declarationDescriptor is FunctionDescriptor || declarationDescriptor is ClassDescriptor) {
val element = DescriptorToSourceUtils.descriptorToDeclaration(declarationDescriptor)
if (element is KtElement) {
context.trace.record(LABEL_TARGET, labelElement, element)
return element
1 -> {
val declarationDescriptor = declarationsByLabel.single()
if (declarationDescriptor is FunctionDescriptor || declarationDescriptor is ClassDescriptor) {
val declarationElement = DescriptorToSourceUtils.descriptorToDeclaration(declarationDescriptor)
if (declarationElement is KtElement) {
context.trace.record(LABEL_TARGET, labelElement, declarationElement)
return declarationElement
}
}
}
else -> {
BindingContextUtils.reportAmbiguousLabel(context.trace, labelElement, declarationsByLabel)
return null
}
}
else {
throw UnsupportedOperationException(declarationDescriptor.javaClass.toString()) // TODO
}
return null
@@ -144,7 +142,7 @@ object LabelResolver {
trace.report(LABEL_NAME_CLASH.on(labelExpression))
}
return list.single().also { trace.record(LABEL_TARGET, labelExpression, it) }
return list.first().also { trace.record(LABEL_TARGET, labelExpression, it) }
}
fun resolveThisOrSuperLabel(