Skip to content

Commit bb224fb

Browse files
committed
Eliminate SelectFromTypeTree from docs
1 parent 9ede238 commit bb224fb

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

docs/SyntaxSummary.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ grammar.
105105
WithType ::= AnnotType {`with' AnnotType} (deprecated)
106106
AnnotType ::= SimpleType {Annotation} Annotated(t, annot)
107107
SimpleType ::= SimpleType (TypeArgs | NamedTypeArgs) AppliedTypeTree(t, args)
108-
| SimpleType `#' id SelectFromTypeTree(t, name)
108+
| SimpleType `#' id Select(t, name)
109109
| StableId
110110
| Path `.' `type' SingletonTypeTree(p)
111111
| `(' ArgTypes ')' Tuple(ts)

src/dotty/tools/dotc/parsing/JavaParsers.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,8 @@ object JavaParsers {
281281
if (in.token == FINAL) in.nextToken()
282282
if (in.token == IDENTIFIER) {
283283
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.
289286
def typeSelect(t: Tree, name: Name) = t match {
290287
case Ident(_) | Select(_, _) => Select(t, name)
291288
case _ => Select(t, name.toTypeName)

src/dotty/tools/dotc/transform/TreeChecker.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ class TreeChecker extends Phase with SymTransformer {
200200
def checkIdentNotJavaClass(tree: Tree)(implicit ctx: Context): Unit = tree match {
201201
// case tree: untpd.Ident =>
202202
// case tree: untpd.Select =>
203-
// case tree: untpd.SelectFromTypeTree =>
204203
// case tree: untpd.Bind =>
205204
case vd : ValDef =>
206205
assertIdentNotJavaClass(vd.forceIfLazy)

0 commit comments

Comments
 (0)