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

check super type qualifier

Browse Source 
even if super resolve is unsuccessful
This commit is contained in:
Svetlana Isakova
2012-11-14 22:41:41 +04:00
parent 126f5e1668
commit c4428496bd
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+13 -5
View File
@@ -481,19 +481,19 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
@Override @Override
public JetTypeInfo visitSuperExpression(JetSuperExpression expression, ExpressionTypingContext context) { public JetTypeInfo visitSuperExpression(JetSuperExpression expression, ExpressionTypingContext context) {
LabelResolver.LabeledReceiverResolutionResult resolutionResult = resolveToReceiver(expression, context, true);
if (!context.namespacesAllowed) { if (!context.namespacesAllowed) {
context.trace.report(SUPER_IS_NOT_AN_EXPRESSION.on(expression, expression.getText())); context.trace.report(SUPER_IS_NOT_AN_EXPRESSION.on(expression, expression.getText()));
return JetTypeInfo.create(null, context.dataFlowInfo); return errorInSuper(expression, context);
} }
LabelResolver.LabeledReceiverResolutionResult resolutionResult = resolveToReceiver(expression, context, true);
switch (resolutionResult.getCode()) { switch (resolutionResult.getCode()) {
case LABEL_RESOLUTION_ERROR: case LABEL_RESOLUTION_ERROR:
// The error is already reported // The error is already reported
return JetTypeInfo.create(null, context.dataFlowInfo); return errorInSuper(expression, context);
case NO_THIS: case NO_THIS:
context.trace.report(SUPER_NOT_AVAILABLE.on(expression)); context.trace.report(SUPER_NOT_AVAILABLE.on(expression));
return JetTypeInfo.create(null, context.dataFlowInfo); return errorInSuper(expression, context);
case SUCCESS: case SUCCESS:
JetType result = checkPossiblyQualifiedSuper(expression, context, resolutionResult.getReceiverParameterDescriptor()); JetType result = checkPossiblyQualifiedSuper(expression, context, resolutionResult.getReceiverParameterDescriptor());
if (result != null) { if (result != null) {
@@ -504,6 +504,14 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
throw new IllegalStateException("Unknown code: " + resolutionResult.getCode()); throw new IllegalStateException("Unknown code: " + resolutionResult.getCode());
} }
private JetTypeInfo errorInSuper(JetSuperExpression expression, ExpressionTypingContext context) {
JetTypeReference superTypeQualifier = expression.getSuperTypeQualifier();
if (superTypeQualifier != null) {
context.expressionTypingServices.getTypeResolver().resolveType(context.scope, superTypeQualifier, context.trace, true);
}
return JetTypeInfo.create(null, context.dataFlowInfo);
}
private JetType checkPossiblyQualifiedSuper( private JetType checkPossiblyQualifiedSuper(
JetSuperExpression expression, JetSuperExpression expression,
ExpressionTypingContext context, ExpressionTypingContext context,
compiler/testData/diagnostics/tests/thisAndSuper/Super.kt
+4 -4
View File
@@ -11,7 +11,7 @@ class A<E>() : C(), T {
fun test() { fun test() {
<!SUPER_IS_NOT_AN_EXPRESSION!>super<!> <!SUPER_IS_NOT_AN_EXPRESSION!>super<!>
<!SUPER_IS_NOT_AN_EXPRESSION!>super<<!DEBUG_INFO_MISSING_UNRESOLVED!>T<!>><!> <!SUPER_IS_NOT_AN_EXPRESSION!>super<T><!>
<!AMBIGUOUS_SUPER!>super<!>.foo() <!AMBIGUOUS_SUPER!>super<!>.foo()
super<T>.foo() super<T>.foo()
super<C>.bar() super<C>.bar()
@@ -23,8 +23,8 @@ class A<E>() : C(), T {
super<<!SYNTAX!><!>>.foo() super<<!SYNTAX!><!>>.foo()
super<<!NOT_A_SUPERTYPE!>() -> Unit<!>>.foo() super<<!NOT_A_SUPERTYPE!>() -> Unit<!>>.foo()
super<<!NOT_A_SUPERTYPE!>Unit<!>>.foo() super<<!NOT_A_SUPERTYPE!>Unit<!>>.foo()
<!DEBUG_INFO_MISSING_UNRESOLVED!>super<!><<!DEBUG_INFO_MISSING_UNRESOLVED!>T<!>><!UNRESOLVED_REFERENCE!>@B<!>.foo() <!DEBUG_INFO_MISSING_UNRESOLVED!>super<!><T><!UNRESOLVED_REFERENCE!>@B<!>.foo()
<!DEBUG_INFO_MISSING_UNRESOLVED!>super<!><<!DEBUG_INFO_MISSING_UNRESOLVED!>C<!>><!UNRESOLVED_REFERENCE!>@B<!>.bar() <!DEBUG_INFO_MISSING_UNRESOLVED!>super<!><C><!UNRESOLVED_REFERENCE!>@B<!>.bar()
} }
class B : T { class B : T {
@@ -37,7 +37,7 @@ class A<E>() : C(), T {
super<<!NOT_A_SUPERTYPE!>C<!>>@B.foo() super<<!NOT_A_SUPERTYPE!>C<!>>@B.foo()
super.foo() super.foo()
<!SUPER_IS_NOT_AN_EXPRESSION!>super<!> <!SUPER_IS_NOT_AN_EXPRESSION!>super<!>
<!SUPER_IS_NOT_AN_EXPRESSION!>super<<!DEBUG_INFO_MISSING_UNRESOLVED!>T<!>><!> <!SUPER_IS_NOT_AN_EXPRESSION!>super<T><!>
} }
} }
} }
compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun foo() { fun foo() {
<!SUPER_IS_NOT_AN_EXPRESSION!>super<!> <!SUPER_IS_NOT_AN_EXPRESSION!>super<!>
<!SUPER_NOT_AVAILABLE!>super<!>.foo() <!SUPER_NOT_AVAILABLE!>super<!>.foo()
<!SUPER_NOT_AVAILABLE!>super<<!DEBUG_INFO_MISSING_UNRESOLVED!>Nothing<!>><!>.foo() <!SUPER_NOT_AVAILABLE!>super<Nothing><!>.foo()
} }