Skip to content

Commit 35f09c4

Browse files
committed
Review feedback: findWildcardType -> findNonValueTypeTree
1 parent 7f3a0cf commit 35f09c4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,20 +1008,20 @@ object Parsers {
10081008
else if (location == Location.InPattern) refinedType()
10091009
else infixType()
10101010

1011-
/** Checks whether `t` is a wildcard type.
1012-
* If it is, returns the [[Position]] where the wildcard occurs.
1011+
/** Checks whether `t` represents a non-value type (wildcard types, or ByNameTypeTree).
1012+
* If it is, returns the [[Tree]] which immediately represents the non-value type.
10131013
*/
10141014
@tailrec
1015-
private final def findWildcardType(t: Tree, alsoNonValue: Boolean): Option[Tree] = t match {
1015+
private final def findNonValueTypeTree(t: Tree, alsoNonValue: Boolean): Option[Tree] = t match {
10161016
case TypeBoundsTree(_, _) => Some(t)
10171017
case ByNameTypeTree(_) if alsoNonValue => Some(t)
1018-
case Parens(t1) => findWildcardType(t1, alsoNonValue)
1019-
case Annotated(t1, _) => findWildcardType(t1, alsoNonValue)
1018+
case Parens(t1) => findNonValueTypeTree(t1, alsoNonValue)
1019+
case Annotated(t1, _) => findNonValueTypeTree(t1, alsoNonValue)
10201020
case _ => None
10211021
}
10221022

10231023
def rejectWildcard(t: Tree, fallbackTree: Tree): Tree =
1024-
findWildcardType(t, false) match {
1024+
findNonValueTypeTree(t, false) match {
10251025
case Some(wildcardTree) =>
10261026
syntaxError(UnboundWildcardType(), wildcardTree.pos)
10271027
fallbackTree
@@ -1036,7 +1036,7 @@ object Parsers {
10361036
rejectWildcard(t, fallbackTree)
10371037

10381038
def checkAndOrArgument(t: Tree): Tree =
1039-
findWildcardType(t, true) match {
1039+
findNonValueTypeTree(t, true) match {
10401040
case Some(typTree) =>
10411041
typTree match {
10421042
case typTree: TypeBoundsTree =>

0 commit comments

Comments
 (0)