@@ -1008,20 +1008,20 @@ object Parsers {
1008
1008
else if (location == Location .InPattern ) refinedType()
1009
1009
else infixType()
1010
1010
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 .
1013
1013
*/
1014
1014
@ 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 {
1016
1016
case TypeBoundsTree (_, _) => Some (t)
1017
1017
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)
1020
1020
case _ => None
1021
1021
}
1022
1022
1023
1023
def rejectWildcard (t : Tree , fallbackTree : Tree ): Tree =
1024
- findWildcardType (t, false ) match {
1024
+ findNonValueTypeTree (t, false ) match {
1025
1025
case Some (wildcardTree) =>
1026
1026
syntaxError(UnboundWildcardType (), wildcardTree.pos)
1027
1027
fallbackTree
@@ -1036,7 +1036,7 @@ object Parsers {
1036
1036
rejectWildcard(t, fallbackTree)
1037
1037
1038
1038
def checkAndOrArgument (t : Tree ): Tree =
1039
- findWildcardType (t, true ) match {
1039
+ findNonValueTypeTree (t, true ) match {
1040
1040
case Some (typTree) =>
1041
1041
typTree match {
1042
1042
case typTree : TypeBoundsTree =>
0 commit comments