@@ -319,9 +319,6 @@ ClsTypeParamClause::= ‘[’ ClsTypeParam {‘,’ ClsTypeParam} ‘]’
319
319
ClsTypeParam ::= {Annotation} [‘+’ | ‘-’] TypeDef(Modifiers, name, tparams, bounds)
320
320
id [HkTypeParamClause] TypeParamBounds Bound(below, above, context)
321
321
322
- DefTypeParamClause::= [nl] ‘[’ DefTypeParam {‘,’ DefTypeParam} ‘]’
323
- DefTypeParam ::= {Annotation} id [HkTypeParamClause] TypeParamBounds
324
-
325
322
TypTypeParamClause::= ‘[’ TypTypeParam {‘,’ TypTypeParam} ‘]’
326
323
TypTypeParam ::= {Annotation} id [HkTypeParamClause] TypeBounds
327
324
@@ -335,20 +332,24 @@ ClsParamClause ::= [nl] ‘(’ ClsParams ‘)’
335
332
ClsParams ::= ClsParam {‘,’ ClsParam}
336
333
ClsParam ::= {Annotation} ValDef(mods, id, tpe, expr) -- point of mods on val/var
337
334
[{Modifier} (‘val’ | ‘var’) | ‘inline’] Param
338
- Param ::= id ‘:’ ParamType [‘=’ Expr]
339
335
340
336
DefParamClauses ::= DefParamClause { DefParamClause }
341
337
DefParamClause ::= DefTypeParamClause
342
338
| DefTermParamClause
343
339
| UsingParamClause
344
- DefTermParamClause::= [nl] ‘(’ [DefTermParams] ‘)’
345
- UsingParamClause ::= [nl] ‘(’ ‘using’ (DefTermParams | FunArgTypes) ‘)’
346
- DefTermParams ::= DefTermParam {‘,’ DefTermParam}
347
- DefTermParam ::= {Annotation} [‘inline’] Param ValDef(mods, id, tpe, expr) -- point of mods at id.
348
340
TypelessClauses ::= TypelessClause {TypelessClause}
349
341
TypelessClause ::= DefTermParamClause
350
342
| UsingParamClause
343
+
344
+ DefTypeParamClause::= [nl] ‘[’ DefTypeParam {‘,’ DefTypeParam} ‘]’
345
+ DefTypeParam ::= {Annotation} id [HkTypeParamClause] TypeParamBounds
346
+ DefTermParamClause::= [nl] ‘(’ [DefTermParams] ‘)’
347
+ UsingParamClause ::= [nl] ‘(’ ‘using’ (DefTermParams | FunArgTypes) ‘)’
351
348
DefImplicitClause ::= [nl] ‘(’ ‘implicit’ DefTermParams ‘)’
349
+
350
+ DefTermParams ::= DefTermParam {‘,’ DefTermParam}
351
+ DefTermParam ::= {Annotation} [‘inline’] Param ValDef(mods, id, tpe, expr) -- point of mods at id.
352
+ Param ::= id ‘:’ ParamType [‘=’ Expr]
352
353
```
353
354
354
355
### Bindings and Imports
0 commit comments