File tree Expand file tree Collapse file tree 3 files changed +3
-7
lines changed Expand file tree Collapse file tree 3 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -105,7 +105,7 @@ grammar.
105
105
WithType ::= AnnotType {`with' AnnotType} (deprecated)
106
106
AnnotType ::= SimpleType {Annotation} Annotated(t, annot)
107
107
SimpleType ::= SimpleType (TypeArgs | NamedTypeArgs) AppliedTypeTree(t, args)
108
- | SimpleType `#' id SelectFromTypeTree (t, name)
108
+ | SimpleType `#' id Select (t, name)
109
109
| StableId
110
110
| Path `.' `type' SingletonTypeTree(p)
111
111
| `(' ArgTypes ')' Tuple(ts)
Original file line number Diff line number Diff line change @@ -281,11 +281,8 @@ object JavaParsers {
281
281
if (in.token == FINAL ) in.nextToken()
282
282
if (in.token == IDENTIFIER ) {
283
283
var t = typeArgs(atPos(in.offset)(Ident (ident())))
284
- // typeSelect generates Select nodes is the lhs is an Ident or Select,
285
- // SelectFromTypeTree otherwise. See #3567.
286
- // Select nodes can be later
287
- // converted in the typechecker to SelectFromTypeTree if the class
288
- // turns out to be an instance inner class instead of a static inner class.
284
+ // typeSelect generates Select nodes if the lhs is an Ident or Select,
285
+ // For other nodes it always assumes that the selected item is a type.
289
286
def typeSelect (t : Tree , name : Name ) = t match {
290
287
case Ident (_) | Select (_, _) => Select (t, name)
291
288
case _ => Select (t, name.toTypeName)
Original file line number Diff line number Diff line change @@ -200,7 +200,6 @@ class TreeChecker extends Phase with SymTransformer {
200
200
def checkIdentNotJavaClass (tree : Tree )(implicit ctx : Context ): Unit = tree match {
201
201
// case tree: untpd.Ident =>
202
202
// case tree: untpd.Select =>
203
- // case tree: untpd.SelectFromTypeTree =>
204
203
// case tree: untpd.Bind =>
205
204
case vd : ValDef =>
206
205
assertIdentNotJavaClass(vd.forceIfLazy)
You can’t perform that action at this time.
0 commit comments