Skip to content

Commit 86733b2

Browse files
b-studiosb-studios
committed
Replace all occurrences of Id, ident or Ident with id
To match the specs in https://github.com/lampepfl/dotty/blob/master/docs/syntax-summary.txt all occurences of Id, ident or Ident in comments have been replaced with the terminal `id`.
1 parent 58dc16b commit 86733b2

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ object Parsers {
504504
def selector(t: Tree): Tree =
505505
atPos(startOffset(t), in.offset) { Select(t, ident()) }
506506

507-
/** Selectors ::= ident { `.' ident()
507+
/** Selectors ::= id { `.' id }
508508
*
509509
* Accept `.' separated identifiers acting as a selectors on given tree `t`.
510510
* @param finish An alternative parse in case the next token is not an identifier.
@@ -515,7 +515,7 @@ object Parsers {
515515
if (t1 ne t) t1 else dotSelectors(selector(t), finish)
516516
}
517517

518-
/** DotSelectors ::= { `.' ident()
518+
/** DotSelectors ::= { `.' id }
519519
*
520520
* Accept `.' separated identifiers acting as a selectors on given tree `t`.
521521
* @param finish An alternative parse in case the token following a `.' is not an identifier.
@@ -528,9 +528,9 @@ object Parsers {
528528
private val id: Tree => Tree = x => x
529529

530530
/** Path ::= StableId
531-
* | [Ident `.'] this
531+
* | [id `.'] this
532532
*
533-
* @param thisOK If true, [Ident `.'] this is acceptable as the path.
533+
* @param thisOK If true, the path can end with the keyword `this`.
534534
* If false, another selection is required after the `this`.
535535
* @param finish An alternative parse in case the token following a `.' is not an identifier.
536536
* If the alternative does not apply, its tree argument is returned unchanged.
@@ -565,20 +565,20 @@ object Parsers {
565565
}
566566
}
567567

568-
/** MixinQualifier ::= `[' Id `]'
568+
/** MixinQualifier ::= `[' id `]'
569569
*/
570570
def mixinQualifierOpt(): Ident =
571571
if (in.token == LBRACKET) inBrackets(atPos(in.offset) { typeIdent() })
572572
else EmptyTypeIdent
573573

574-
/** StableId ::= Id
575-
* | Path `.' Id
574+
/** StableId ::= id
575+
* | Path `.' id
576576
* | [id '.'] super [`[' id `]']`.' id
577577
*/
578578
def stableId(): Tree =
579579
path(thisOK = false)
580580

581-
/** QualId ::= Id {`.' Id}
581+
/** QualId ::= id {`.' id}
582582
*/
583583
def qualId(): Tree =
584584
dotSelectors(termIdent())
@@ -773,7 +773,7 @@ object Parsers {
773773
else t
774774

775775
/** SimpleType ::= SimpleType TypeArgs
776-
* | SimpleType `#' Id
776+
* | SimpleType `#' id
777777
* | StableId
778778
* | Path `.' type
779779
* | `(' ArgTypes `)'
@@ -955,7 +955,7 @@ object Parsers {
955955
/** Expr ::= [`implicit'] FunParams `=>' Expr
956956
* | Expr1
957957
* FunParams ::= Bindings
958-
* | Id
958+
* | id
959959
* | `_'
960960
* ExprInParens ::= PostfixExpr `:' Type
961961
* | Expr
@@ -971,12 +971,12 @@ object Parsers {
971971
* | `throw' Expr
972972
* | `return' [Expr]
973973
* | ForExpr
974-
* | [SimpleExpr `.'] Id `=' Expr
974+
* | [SimpleExpr `.'] id `=' Expr
975975
* | SimpleExpr1 ArgumentExprs `=' Expr
976976
* | PostfixExpr [Ascription]
977977
* | PostfixExpr `match' `{' CaseClauses `}'
978978
* Bindings ::= `(' [Binding {`,' Binding}] `)'
979-
* Binding ::= (Id | `_') [`:' Type]
979+
* Binding ::= (id | `_') [`:' Type]
980980
* Ascription ::= `:' CompoundType
981981
* | `:' Annotation {Annotation}
982982
* | `:' `_' `*'
@@ -1120,7 +1120,7 @@ object Parsers {
11201120
}
11211121

11221122
/** FunParams ::= Bindings
1123-
* | Id
1123+
* | id
11241124
* | `_'
11251125
* Bindings ::= `(' [Binding {`,' Binding}] `)'
11261126
*/
@@ -1149,7 +1149,7 @@ object Parsers {
11491149
(atPos(start) { makeParameter(name, t, mods) }) :: Nil
11501150
}
11511151

1152-
/** Binding ::= (Id | `_') [`:' Type]
1152+
/** Binding ::= (id | `_') [`:' Type]
11531153
*/
11541154
def binding(mods: Modifiers): Tree =
11551155
atPos(in.offset) { makeParameter(bindingName(), typedOpt(), mods) }
@@ -1161,8 +1161,8 @@ object Parsers {
11611161
}
11621162
else ident()
11631163

1164-
/** Expr ::= implicit Id `=>' Expr
1165-
* BlockResult ::= implicit Id [`:' InfixType] `=>' Block // Scala2 only
1164+
/** Expr ::= implicit id `=>' Expr
1165+
* BlockResult ::= implicit id [`:' InfixType] `=>' Block // Scala2 only
11661166
*/
11671167
def implicitClosure(start: Int, location: Location.Value, implicitMods: Modifiers): Tree =
11681168
closureRest(start, location, funParams(implicitMods, location))
@@ -1173,9 +1173,9 @@ object Parsers {
11731173
Function(params, if (location == Location.InBlock) block() else expr())
11741174
}
11751175

1176-
/** PostfixExpr ::= InfixExpr [Id [nl]]
1176+
/** PostfixExpr ::= InfixExpr [id [nl]]
11771177
* InfixExpr ::= PrefixExpr
1178-
* | InfixExpr Id [nl] InfixExpr
1178+
* | InfixExpr id [nl] InfixExpr
11791179
*/
11801180
def postfixExpr(): Tree =
11811181
infixOps(prefixExpr(), canStartExpressionTokens, prefixExpr, maybePostfix = true)
@@ -1200,7 +1200,7 @@ object Parsers {
12001200
* | xmlLiteral
12011201
* | Path
12021202
* | `(' [ExprsInParens] `)'
1203-
* | SimpleExpr `.' Id
1203+
* | SimpleExpr `.' id
12041204
* | SimpleExpr (TypeArgs | NamedTypeArgs)
12051205
* | SimpleExpr1 ArgumentExprs
12061206
*/
@@ -1452,7 +1452,7 @@ object Parsers {
14521452
p
14531453
}
14541454

1455-
/** InfixPattern ::= SimplePattern {Id [nl] SimplePattern}
1455+
/** InfixPattern ::= SimplePattern {id [nl] SimplePattern}
14561456
*/
14571457
def infixPattern(): Tree =
14581458
infixOps(simplePattern(), canStartExpressionTokens, simplePattern, notAnOperator = nme.raw.BAR)
@@ -1464,8 +1464,8 @@ object Parsers {
14641464
* | SimplePattern1 [TypeArgs] [ArgumentPatterns]
14651465
* SimplePattern1 ::= Path
14661466
* | `{' Block `}'
1467-
* | SimplePattern1 `.' Id
1468-
* PatVar ::= Id
1467+
* | SimplePattern1 `.' id
1468+
* PatVar ::= id
14691469
* | `_'
14701470
*/
14711471
val simplePattern = () => in.token match {
@@ -1582,7 +1582,7 @@ object Parsers {
15821582
def addMod(mods: Modifiers, mod: Mod): Modifiers =
15831583
addFlag(mods, mod.flags).withAddedMod(mod)
15841584

1585-
/** AccessQualifier ::= "[" (Id | this) "]"
1585+
/** AccessQualifier ::= "[" (id | this) "]"
15861586
*/
15871587
def accessQualifierOpt(mods: Modifiers): Modifiers =
15881588
if (in.token == LBRACKET) {
@@ -1661,16 +1661,16 @@ object Parsers {
16611661

16621662
/** ClsTypeParamClause::= `[' ClsTypeParam {`,' ClsTypeParam} `]'
16631663
* ClsTypeParam ::= {Annotation} [{Modifier} type] [`+' | `-']
1664-
* Id [HkTypeParamClause] TypeParamBounds
1664+
* id [HkTypeParamClause] TypeParamBounds
16651665
*
16661666
* DefTypeParamClause::= `[' DefTypeParam {`,' DefTypeParam} `]'
1667-
* DefTypeParam ::= {Annotation} Id [HkTypeParamClause] TypeParamBounds
1667+
* DefTypeParam ::= {Annotation} id [HkTypeParamClause] TypeParamBounds
16681668
*
16691669
* TypTypeParamCaluse::= `[' TypTypeParam {`,' TypTypeParam} `]'
1670-
* TypTypeParam ::= {Annotation} Id [HkTypePamClause] TypeBounds
1670+
* TypTypeParam ::= {Annotation} id [HkTypePamClause] TypeBounds
16711671
*
16721672
* HkTypeParamClause ::= `[' HkTypeParam {`,' HkTypeParam} `]'
1673-
* HkTypeParam ::= {Annotation} ['+' | `-'] (Id[HkTypePamClause] | _') TypeBounds
1673+
* HkTypeParam ::= {Annotation} ['+' | `-'] (id [HkTypePamClause] | _') TypeBounds
16741674
*/
16751675
def typeParamClause(ownerKind: ParamOwner.Value): List[TypeDef] = inBrackets {
16761676
def typeParam(): TypeDef = {
@@ -1825,7 +1825,7 @@ object Parsers {
18251825
}
18261826
}
18271827

1828-
/** ImportExpr ::= StableId `.' (Id | `_' | ImportSelectors)
1828+
/** ImportExpr ::= StableId `.' (id | `_' | ImportSelectors)
18291829
*/
18301830
val importExpr = () => path(thisOK = false, handleImport) match {
18311831
case imp: Import =>
@@ -1859,7 +1859,7 @@ object Parsers {
18591859
}
18601860
}
18611861

1862-
/** ImportSelector ::= Id [`=>' Id | `=>' `_']
1862+
/** ImportSelector ::= id [`=>' id | `=>' `_']
18631863
*/
18641864
def importSelector(): Tree = {
18651865
val from = termIdentOrWildcard()
@@ -1904,9 +1904,9 @@ object Parsers {
19041904
}
19051905

19061906
/** PatDef ::= Pattern2 {`,' Pattern2} [`:' Type] `=' Expr
1907-
* VarDef ::= PatDef | Id {`,' Id} `:' Type `=' `_'
1908-
* ValDcl ::= Id {`,' Id} `:' Type
1909-
* VarDcl ::= Id {`,' Id} `:' Type
1907+
* VarDef ::= PatDef | id {`,' id} `:' Type `=' `_'
1908+
* ValDcl ::= id {`,' id} `:' Type
1909+
* VarDcl ::= id {`,' id} `:' Type
19101910
*/
19111911
def patDefOrDcl(start: Offset, mods: Modifiers, docstring: Option[Comment] = None): Tree = atPos(start, nameStart) {
19121912
val lhs = commaSeparated(pattern2)
@@ -2008,8 +2008,8 @@ object Parsers {
20082008
Block(stats, Literal(Constant(())))
20092009
}
20102010

2011-
/** TypeDef ::= type Id [TypeParamClause] `=' Type
2012-
* TypeDcl ::= type Id [TypeParamClause] TypeBounds
2011+
/** TypeDef ::= type id [TypeParamClause] `=' Type
2012+
* TypeDcl ::= type id [TypeParamClause] TypeBounds
20132013
*/
20142014
def typeDefOrDcl(start: Offset, mods: Modifiers, docstring: Option[Comment] = None): Tree = {
20152015
newLinesOpt()
@@ -2051,7 +2051,7 @@ object Parsers {
20512051
}
20522052
}
20532053

2054-
/** ClassDef ::= Id [ClsTypeParamClause]
2054+
/** ClassDef ::= id [ClsTypeParamClause]
20552055
* [ConstrMods] ClsParamClauses TemplateOpt
20562056
*/
20572057
def classDef(start: Offset, mods: Modifiers, docstring: Option[Comment]): TypeDef = atPos(start, nameStart) {
@@ -2079,7 +2079,7 @@ object Parsers {
20792079
mods
20802080
}
20812081

2082-
/** ObjectDef ::= Id TemplateOpt
2082+
/** ObjectDef ::= id TemplateOpt
20832083
*/
20842084
def objectDef(start: Offset, mods: Modifiers, docstring: Option[Comment] = None): ModuleDef = atPos(start, nameStart) {
20852085
val name = ident()

0 commit comments

Comments
 (0)