diff options
| -rw-r--r-- | docs/SyntaxSummary.txt | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/parsing/JavaParsers.scala | 7 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/transform/TreeChecker.scala | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/docs/SyntaxSummary.txt b/docs/SyntaxSummary.txt index f07335d1d..6c83c71ab 100644 --- a/docs/SyntaxSummary.txt +++ b/docs/SyntaxSummary.txt @@ -105,7 +105,7 @@ grammar. WithType ::= AnnotType {`with' AnnotType} (deprecated) AnnotType ::= SimpleType {Annotation} Annotated(t, annot) SimpleType ::= SimpleType (TypeArgs | NamedTypeArgs) AppliedTypeTree(t, args) - | SimpleType `#' id SelectFromTypeTree(t, name) + | SimpleType `#' id Select(t, name) | StableId | Path `.' `type' SingletonTypeTree(p) | `(' ArgTypes ')' Tuple(ts) diff --git a/src/dotty/tools/dotc/parsing/JavaParsers.scala b/src/dotty/tools/dotc/parsing/JavaParsers.scala index a5418340a..ed7cf9e3f 100644 --- a/src/dotty/tools/dotc/parsing/JavaParsers.scala +++ b/src/dotty/tools/dotc/parsing/JavaParsers.scala @@ -281,11 +281,8 @@ object JavaParsers { if (in.token == FINAL) in.nextToken() if (in.token == IDENTIFIER) { var t = typeArgs(atPos(in.offset)(Ident(ident()))) - // typeSelect generates Select nodes is the lhs is an Ident or Select, - // SelectFromTypeTree otherwise. See #3567. - // Select nodes can be later - // converted in the typechecker to SelectFromTypeTree if the class - // turns out to be an instance inner class instead of a static inner class. + // typeSelect generates Select nodes if the lhs is an Ident or Select, + // For other nodes it always assumes that the selected item is a type. def typeSelect(t: Tree, name: Name) = t match { case Ident(_) | Select(_, _) => Select(t, name) case _ => Select(t, name.toTypeName) diff --git a/src/dotty/tools/dotc/transform/TreeChecker.scala b/src/dotty/tools/dotc/transform/TreeChecker.scala index 47d2395a0..7cd1267b8 100644 --- a/src/dotty/tools/dotc/transform/TreeChecker.scala +++ b/src/dotty/tools/dotc/transform/TreeChecker.scala @@ -200,7 +200,6 @@ class TreeChecker extends Phase with SymTransformer { def checkIdentNotJavaClass(tree: Tree)(implicit ctx: Context): Unit = tree match { // case tree: untpd.Ident => // case tree: untpd.Select => - // case tree: untpd.SelectFromTypeTree => // case tree: untpd.Bind => case vd : ValDef => assertIdentNotJavaClass(vd.forceIfLazy) |