diff options
Diffstat (limited to 'src/reflect/scala')
| -rw-r--r-- | src/reflect/scala/reflect/api/Trees.scala | 25 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Trees.scala | 7 |
2 files changed, 25 insertions, 7 deletions
diff --git a/src/reflect/scala/reflect/api/Trees.scala b/src/reflect/scala/reflect/api/Trees.scala index ab39dce035..45d28e3e5a 100644 --- a/src/reflect/scala/reflect/api/Trees.scala +++ b/src/reflect/scala/reflect/api/Trees.scala @@ -237,7 +237,10 @@ trait Trees { self: Universe => trait TypTreeApi extends TreeApi { this: TypTree => } - /** A tree with a mutable symbol field, initialized to NoSymbol. + /** A tree that carries a symbol, e.g. by defining it (`DefTree`) or by referring to it (`RefTree`). + * Such trees start their life naked, returning `NoSymbol`, but after being typechecked without errors + * they hold non-empty symbols. + * * @group Trees * @template */ @@ -251,7 +254,7 @@ trait Trees { self: Universe => def symbol: Symbol } - /** A tree with a name - effectively, a DefTree or RefTree. + /** A tree that carries a name, e.g. by defining it (`DefTree`) or by referring to it (`RefTree`). * @group Trees * @template */ @@ -262,7 +265,7 @@ trait Trees { self: Universe => */ trait NameTreeApi extends TreeApi { this: NameTree => /** The underlying name. - * For example, the `<List>` part of `Ident("List": TermName)`. + * For example, the `List` part of `Ident(TermName("List"))`. */ def name: Name } @@ -280,7 +283,7 @@ trait Trees { self: Universe => */ trait RefTreeApi extends SymTreeApi with NameTreeApi { this: RefTree => /** The qualifier of the reference. - * For example, the `<scala>` part of `Select("scala": TermName, "List": TermName)`. + * For example, the `Ident(TermName("scala"))` part of `Select(Ident(TermName("scala")), TermName("List"))`. * `EmptyTree` for `Ident` instances. */ def qualifier: Tree @@ -303,7 +306,10 @@ trait Trees { self: Universe => def unapply(refTree: RefTree): Option[(Tree, Name)] } - /** A tree which defines a symbol-carrying entity. + /** A tree representing a symbol-defining entity: + * 1) A declaration or a definition (type, class, object, package, val, var, or def) + * 2) `Bind` that is used to represent binding occurrences in pattern matches + * 3) `LabelDef` that is used internally to represent while loops * @group Trees * @template */ @@ -699,7 +705,7 @@ trait Trees { self: Universe => def rhs: Tree } - /** Import selector + /** Import selector (not a tree, but a component of the `Import` tree) * * Representation of an imported name its optional rename and their optional positions * @@ -2489,6 +2495,11 @@ trait Trees { self: Universe => */ def Ident(tree: Tree, name: Name): Ident + /** Creates a `RefTree` node from the given components, having a given `tree` as a prototype. + * Having a tree as a prototype means that the tree's attachments, type and symbol will be copied into the result. + */ + def RefTree(tree: Tree, qualifier: Tree, selector: Name): RefTree + /** Creates a `ReferenceToBoxed` node from the given components, having a given `tree` as a prototype. * Having a tree as a prototype means that the tree's attachments, type and symbol will be copied into the result. */ @@ -2698,7 +2709,7 @@ trait Trees { self: Universe => */ protected def xtransform(transformer: Transformer, tree: Tree): Tree = throw new MatchError(tree) - /** The type of tree modifiers. + /** The type of tree modifiers (not a tree, but rather part of DefTrees). * @group Traversal */ type Modifiers >: Null <: AnyRef with ModifiersApi diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala index 4e09472fe6..3b84ef6aeb 100644 --- a/src/reflect/scala/reflect/internal/Trees.scala +++ b/src/reflect/scala/reflect/internal/Trees.scala @@ -676,6 +676,8 @@ trait Trees extends api.Trees { new Select(qualifier, selector).copyAttrs(tree) def Ident(tree: Tree, name: Name) = new Ident(name) copyAttrs tree + def RefTree(tree: Tree, qualifier: Tree, selector: Name) = + self.RefTree(qualifier, selector) copyAttrs tree def ReferenceToBoxed(tree: Tree, idt: Ident) = new ReferenceToBoxed(idt).copyAttrs(tree) def Literal(tree: Tree, value: Constant) = @@ -866,6 +868,11 @@ trait Trees extends api.Trees { if name0 == name => t case _ => treeCopy.Ident(tree, name) } + def RefTree(tree: Tree, qualifier: Tree, selector: Name) = tree match { + case t @ Select(qualifier0, selector0) + if (qualifier0 == qualifier) && (selector0 == selector) => t + case _ => treeCopy.RefTree(tree, qualifier, selector) + } def ReferenceToBoxed(tree: Tree, idt: Ident) = tree match { case t @ ReferenceToBoxed(idt0) if (idt0 == idt) => t |