@@ -715,15 +715,13 @@ object Parsers {
715
715
/** Type ::= [FunArgMods] FunArgTypes `=>' Type
716
716
* | HkTypeParamClause `->' Type
717
717
* | InfixType
718
- * FunArgMods ::= `implicit' FunArgMods
719
- * | `unused' FunArgMods
720
718
* FunArgTypes ::= InfixType
721
719
* | `(' [ FunArgType {`,' FunArgType } ] `)'
722
720
* | '(' TypedFunParam {',' TypedFunParam } ')'
723
721
*/
724
722
def typ (): Tree = {
725
723
val start = in.offset
726
- val imods = allFunctionMods (EmptyModifiers )
724
+ val imods = funArgMods (EmptyModifiers )
727
725
def functionRest (params : List [Tree ]): Tree =
728
726
atPos(start, accept(ARROW )) {
729
727
val t = typ()
@@ -1066,7 +1064,7 @@ object Parsers {
1066
1064
def expr (location : Location .Value ): Tree = {
1067
1065
val start = in.offset
1068
1066
if (in.token == IMPLICIT || in.token == UNUSED ) {
1069
- val imods = allFunctionMods (EmptyModifiers )
1067
+ val imods = funArgMods (EmptyModifiers )
1070
1068
implicitClosure(start, location, imods)
1071
1069
} else {
1072
1070
val saved = placeholderParams
@@ -1728,12 +1726,15 @@ object Parsers {
1728
1726
normalize(loop(start))
1729
1727
}
1730
1728
1731
- def allFunctionMods (imods : Modifiers , doIfImplicit : () => Unit = () => ()): Modifiers = {
1729
+ /** FunArgMods ::= `implicit' FunArgMods
1730
+ * | `unused' FunArgMods
1731
+ */
1732
+ def funArgMods (imods : Modifiers , doIfImplicit : () => Unit = () => ()): Modifiers = {
1732
1733
if (in.token == IMPLICIT ) {
1733
1734
doIfImplicit()
1734
- allFunctionMods (addMod(imods, atPos(accept(IMPLICIT )) { Mod .Implicit () }), doIfImplicit)
1735
+ funArgMods (addMod(imods, atPos(accept(IMPLICIT )) { Mod .Implicit () }), doIfImplicit)
1735
1736
} else if (in.token == UNUSED )
1736
- allFunctionMods (addMod(imods, atPos(accept(UNUSED )) { Mod .Unused () }), doIfImplicit)
1737
+ funArgMods (addMod(imods, atPos(accept(UNUSED )) { Mod .Unused () }), doIfImplicit)
1737
1738
else imods
1738
1739
}
1739
1740
@@ -1882,7 +1883,7 @@ object Parsers {
1882
1883
if (in.token == RPAREN ) Nil
1883
1884
else {
1884
1885
if (in.token == IMPLICIT || in.token == UNUSED )
1885
- imods = allFunctionMods (imods, () => implicitOffset = in.offset)
1886
+ imods = funArgMods (imods, () => implicitOffset = in.offset)
1886
1887
commaSeparated(() => param())
1887
1888
}
1888
1889
}
@@ -2478,7 +2479,7 @@ object Parsers {
2478
2479
else if (isDefIntro(localModifierTokens))
2479
2480
if (in.token == IMPLICIT || in.token == UNUSED ) {
2480
2481
val start = in.offset
2481
- var imods = allFunctionMods (EmptyModifiers )
2482
+ var imods = funArgMods (EmptyModifiers )
2482
2483
if (isBindingIntro) stats += implicitClosure(start, Location .InBlock , imods)
2483
2484
else stats +++= localDef(start, imods)
2484
2485
} else {
0 commit comments