KT-156 Fix the this<Super> syntax

In progress: super<List> must work, but currently it does not, only super<List<Foo>> works, where Foo is ignored.
This commit is contained in:
Andrey Breslav
2011-10-19 19:24:46 +04:00
parent 84951d2585
commit 79ee5cd606
38 changed files with 742 additions and 486 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ internal class Example<X, T : Comparable<X>>(protected val x : Foo<X, T>, y : So
class
: modifiers ("class" | "trait") SimpleName
typeParameters?
modifiers ("(" primaryConstructorParameter{","} ")")?
modifiers ("(" functionParameter{","} ")")?
(":" annotations delegationSpecifier{","})?
typeConstraints
(classBody? | enumClassBody)
+4 -3
View File
@@ -16,7 +16,7 @@ h3. Precedence
| |Elvis|{{?:}} |
| |Named checks|{{in}}, {{\!in}}, {{is}}, {{\!is}} |
| |Comparison|{{<}}, {{>}}, {{<=}}, {{>=}} |
| |Equality|{{==}}, {{\!==}}, {{===}}, {{\!===}} |
| |Equality|{{==}}, {{\!==}}|
| |Conjunction|{{&&}}|
| |Disjunction|{{\|\|}}|
| |Arrow|{{\->}}|
@@ -113,7 +113,8 @@ atomicExpression
: literalConstant
: functionLiteral
: tupleLiteral
: "this" label? ("<" type ">")?
: "this" label?
: "super" ("<" type ">")? label?
: if
: when
: try
@@ -184,7 +185,7 @@ comparisonOperation
;
equalityOperation
: "!=" : "==" : "===" : "!=="
: "!=" : "=="
;
assignmentOperator