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

Fix WhenChecker after enum property type change

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-11-19 15:38:19 +04:00
parent c39a4dc57a
commit 8d501bd7f4
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/WhenChecker.java
+27 -4
View File
@@ -17,9 +17,11 @@
package org.jetbrains.jet.lang.cfg;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassKind;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.VariableDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingTrace;
@@ -65,15 +67,22 @@ public class WhenChecker {
return isExhaust && notEmpty;
}
private static boolean containsEnumEntryCase(@NotNull JetWhenExpression whenExpression, @NotNull ClassDescriptor enumEntry, @NotNull BindingTrace trace) {
private static boolean containsEnumEntryCase(
@NotNull JetWhenExpression whenExpression,
@NotNull ClassDescriptor enumEntry,
@NotNull BindingTrace trace
) {
assert enumEntry.getKind() == ClassKind.ENUM_ENTRY;
for (JetWhenEntry whenEntry : whenExpression.getEntries()) {
for (JetWhenCondition condition : whenEntry.getConditions()) {
if (condition instanceof JetWhenConditionWithExpression) {
JetExpression patternExpression = ((JetWhenConditionWithExpression) condition).getExpression();
JetType type = trace.get(BindingContext.EXPRESSION_TYPE, patternExpression);
if (type == null) continue;
if (type.getConstructor().getDeclarationDescriptor() == enumEntry) {
JetSimpleNameExpression reference = getReference(patternExpression);
if (reference == null) continue;
DeclarationDescriptor target = trace.get(BindingContext.REFERENCE_TARGET, reference);
if (target == null) continue;
ClassDescriptor classDescriptor = trace.get(BindingContext.OBJECT_DECLARATION_CLASS, (VariableDescriptor) target);
if (classDescriptor == enumEntry) {
return true;
}
}
@@ -81,4 +90,18 @@ public class WhenChecker {
}
return false;
}
@Nullable
private static JetSimpleNameExpression getReference(@Nullable JetExpression expression) {
if (expression == null) {
return null;
}
if (expression instanceof JetSimpleNameExpression) {
return (JetSimpleNameExpression) expression;
}
if (expression instanceof JetQualifiedExpression) {
return getReference(((JetQualifiedExpression) expression).getSelectorExpression());
}
return null;
}
}