Skip to content

Commit fbe97a9

Browse files
committed
Allow vals in using clauses of givens
1 parent 910c307 commit fbe97a9

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ object Parsers {
6262
case ExtensionFollow // extension clause, following extension parameter
6363

6464
def isClass = // owner is a class
65-
this == Class || this == CaseClass
65+
this == Class || this == CaseClass || this == Given
6666
def takesOnlyUsingClauses = // only using clauses allowed for this owner
6767
this == Given || this == ExtensionFollow
6868
def acceptsVariance =
@@ -3286,7 +3286,7 @@ object Parsers {
32863286
val isAbstractOwner = paramOwner == ParamOwner.Type || paramOwner == ParamOwner.TypeParam
32873287
val start = in.offset
32883288
var mods = annotsAsMods() | Param
3289-
if paramOwner == ParamOwner.Class || paramOwner == ParamOwner.CaseClass then
3289+
if paramOwner.isClass then
32903290
mods |= PrivateLocal
32913291
if isIdent(nme.raw.PLUS) && checkVarianceOK() then
32923292
mods |= Covariant
@@ -4006,6 +4006,14 @@ object Parsers {
40064006
val nameStart = in.offset
40074007
val name = if isIdent && followingIsGivenSig() then ident() else EmptyTermName
40084008

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+
40094017
val gdef =
40104018
val tparams = typeParamClauseOpt(ParamOwner.Given)
40114019
newLineOpt()
@@ -4027,16 +4035,17 @@ object Parsers {
40274035
mods1 |= Lazy
40284036
ValDef(name, parents.head, subExpr())
40294037
else
4030-
DefDef(name, joinParams(tparams, vparamss), parents.head, subExpr())
4038+
DefDef(name, adjustDefParams(joinParams(tparams, vparamss)), parents.head, subExpr())
40314039
else if (isStatSep || isStatSeqEnd) && parentsIsType then
40324040
if name.isEmpty then
40334041
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)
40354043
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)
40404049
val templ =
40414050
if isStatSep || isStatSeqEnd then Template(constr, parents, Nil, EmptyValDef, Nil)
40424051
else withTemplate(constr, parents)

0 commit comments

Comments
 (0)