diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-12-20 13:19:19 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-12-20 13:19:19 +1000 |
| commit | 079e8dc61704a768792c6b210a5b0cd25522ee55 (patch) | |
| tree | 37154f37a745c9c7535cbe0a7f6cef486beb5870 /spec/04-basic-declarations-and-definitions.md | |
| parent | 56fb9172756d95ef903c36efcf54f1ae95c64b4b (diff) | |
| parent | 23548c4301e48cb69f05cd01ceba418dc9c36d6c (diff) | |
| download | scala-079e8dc61704a768792c6b210a5b0cd25522ee55.tar.gz scala-079e8dc61704a768792c6b210a5b0cd25522ee55.tar.bz2 scala-079e8dc61704a768792c6b210a5b0cd25522ee55.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20161220
Conflicts:
bincompat-backward.whitelist.conf
build.xml
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/library/scala/collection/immutable/NumericRange.scala
Diffstat (limited to 'spec/04-basic-declarations-and-definitions.md')
| -rw-r--r-- | spec/04-basic-declarations-and-definitions.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/04-basic-declarations-and-definitions.md b/spec/04-basic-declarations-and-definitions.md index 49ca80b124..53b34dedc5 100644 --- a/spec/04-basic-declarations-and-definitions.md +++ b/spec/04-basic-declarations-and-definitions.md @@ -404,7 +404,7 @@ function definitions. In this section we consider only type parameter definitions with lower bounds `>: $L$` and upper bounds `<: $U$` whereas a discussion of context bounds `: $U$` and view bounds `<% $U$` -is deferred to [here](07-implicit-parameters-and-views.html#context-bounds-and-view-bounds). +is deferred to [here](07-implicits.html#context-bounds-and-view-bounds). The most general form of a first-order type parameter is `$@a_1 \ldots @a_n$ $\pm$ $t$ >: $L$ <: $U$`. @@ -587,7 +587,7 @@ FunDef ::= FunSig [‘:’ Type] ‘=’ Expr FunSig ::= id [FunTypeParamClause] ParamClauses FunTypeParamClause ::= ‘[’ TypeParam {‘,’ TypeParam} ‘]’ ParamClauses ::= {ParamClause} [[nl] ‘(’ ‘implicit’ Params ‘)’] -ParamClause ::= [nl] ‘(’ [Params] ‘)’} +ParamClause ::= [nl] ‘(’ [Params] ‘)’ Params ::= Param {‘,’ Param} Param ::= {Annotation} id [‘:’ ParamType] [‘=’ Expr] ParamType ::= Type @@ -686,7 +686,7 @@ The by-name modifier is disallowed for parameters of classes that carry a `val` or `var` prefix, including parameters of case classes for which a `val` prefix is implicitly generated. The by-name modifier is also disallowed for -[implicit parameters](07-implicit-parameters-and-views.html#implicit-parameters). +[implicit parameters](07-implicits.html#implicit-parameters). ###### Example The declaration |