From c7f3b45abf221c432b3fbd7462741b00a9e10142 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 12 Jul 2016 18:12:27 +0200 Subject: Drop restriction to 2nd order hk types Allow hk type parameters to be higher kinded themselves. --- docs/SyntaxSummary.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/SyntaxSummary.txt b/docs/SyntaxSummary.txt index 45937fb54..6751c90e2 100644 --- a/docs/SyntaxSummary.txt +++ b/docs/SyntaxSummary.txt @@ -225,7 +225,8 @@ grammar. TypTypeParam ::= {Annotation} id [HkTypeParamClause] TypeBounds HkTypeParamClause ::= `[' HkTypeParam {`,' HkTypeParam} `]' - HkTypeParam ::= {Annotation} ['+' | `-'] (Id | `_') TypeBounds + HkTypeParam ::= {Annotation} ['+' | `-'] (Id[HkTypeParamClause] | `_') + TypeBounds ClsParamClauses ::= {ClsParamClause} [[nl] `(' `implicit' ClsParams `)'] ClsParamClause ::= [nl] `(' [ClsParams] ')' @@ -280,7 +281,7 @@ grammar. DefDcl ::= DefSig [`:' Type] DefDef(_, name, tparams, vparamss, tpe, EmptyTree) DefSig ::= id [DefTypeParamClause] DefParamClauses TypeDcl ::= id [TypTypeParamClause] ['=' Type] TypeDefTree(_, name, tparams, tpt) - | id [HkParamClause] TypeBounds TypeDefTree(_, name, tparams, bounds) + | id [HkTypeParamClause] TypeBounds TypeDefTree(_, name, tparams, bounds) Def ::= `val' PatDef | `var' VarDef -- cgit v1.2.3