@@ -62,7 +62,7 @@ object Parsers {
62
62
case ExtensionFollow // extension clause, following extension parameter
63
63
64
64
def isClass = // owner is a class
65
- this == Class || this == CaseClass
65
+ this == Class || this == CaseClass || this == Given
66
66
def takesOnlyUsingClauses = // only using clauses allowed for this owner
67
67
this == Given || this == ExtensionFollow
68
68
def acceptsVariance =
@@ -3286,7 +3286,7 @@ object Parsers {
3286
3286
val isAbstractOwner = paramOwner == ParamOwner .Type || paramOwner == ParamOwner .TypeParam
3287
3287
val start = in.offset
3288
3288
var mods = annotsAsMods() | Param
3289
- if paramOwner == ParamOwner . Class || paramOwner == ParamOwner . CaseClass then
3289
+ if paramOwner.isClass then
3290
3290
mods |= PrivateLocal
3291
3291
if isIdent(nme.raw.PLUS ) && checkVarianceOK() then
3292
3292
mods |= Covariant
@@ -4006,6 +4006,14 @@ object Parsers {
4006
4006
val nameStart = in.offset
4007
4007
val name = if isIdent && followingIsGivenSig() then ident() else EmptyTermName
4008
4008
4009
+ // TODO Change syntax description
4010
+ def adjustDefParams (paramss : List [ParamClause ]): List [ParamClause ] =
4011
+ paramss.nestedMap: param =>
4012
+ if ! param.mods.isAllOf(PrivateLocal ) then
4013
+ syntaxError(em " method parameter ${param.name} may not be `a val` " , param.span)
4014
+ param.withMods(param.mods &~ (AccessFlags | ParamAccessor | Mutable ) | Param )
4015
+ .asInstanceOf [List [ParamClause ]]
4016
+
4009
4017
val gdef =
4010
4018
val tparams = typeParamClauseOpt(ParamOwner .Given )
4011
4019
newLineOpt()
@@ -4027,16 +4035,17 @@ object Parsers {
4027
4035
mods1 |= Lazy
4028
4036
ValDef (name, parents.head, subExpr())
4029
4037
else
4030
- DefDef (name, joinParams(tparams, vparamss), parents.head, subExpr())
4038
+ DefDef (name, adjustDefParams( joinParams(tparams, vparamss) ), parents.head, subExpr())
4031
4039
else if (isStatSep || isStatSeqEnd) && parentsIsType then
4032
4040
if name.isEmpty then
4033
4041
syntaxError(em " anonymous given cannot be abstract " )
4034
- DefDef (name, joinParams(tparams, vparamss), parents.head, EmptyTree )
4042
+ DefDef (name, adjustDefParams( joinParams(tparams, vparamss) ), parents.head, EmptyTree )
4035
4043
else
4036
- val tparams1 = tparams.map(tparam => tparam.withMods(tparam.mods | PrivateLocal ))
4037
- val vparamss1 = vparamss.map(_.map(vparam =>
4038
- vparam.withMods(vparam.mods &~ Param | ParamAccessor | Protected )))
4039
- val constr = makeConstructor(tparams1, vparamss1)
4044
+ val vparamss1 = vparamss.nestedMap: vparam =>
4045
+ if vparam.mods.is(Private )
4046
+ then vparam.withMods(vparam.mods &~ PrivateLocal | Protected )
4047
+ else vparam
4048
+ val constr = makeConstructor(tparams, vparamss1)
4040
4049
val templ =
4041
4050
if isStatSep || isStatSeqEnd then Template (constr, parents, Nil , EmptyValDef , Nil )
4042
4051
else withTemplate(constr, parents)
0 commit comments