diff options
author | Paul Phillips <paulp@improving.org> | 2012-12-03 10:18:39 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-12-03 10:18:39 -0800 |
commit | fd57069a3a49de1757a518b573a0cd8cb98bbbd5 (patch) | |
tree | f41a6988237b01d02ea76d085343351cf07f7b4e /src/compiler | |
parent | f16f4ab157293ac6860d4b00578b983c90b8fc62 (diff) | |
parent | d55840e07586ceb11c18ad4c75f4bc726d03aeb6 (diff) | |
download | scala-fd57069a3a49de1757a518b573a0cd8cb98bbbd5.tar.gz scala-fd57069a3a49de1757a518b573a0cd8cb98bbbd5.tar.bz2 scala-fd57069a3a49de1757a518b573a0cd8cb98bbbd5.zip |
Merge pull request #1682 from paulp/assert-about-qualifier
Asserts about Tree qualifiers.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/Trees.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala index ed73464c93..296d55fec5 100644 --- a/src/compiler/scala/tools/nsc/ast/Trees.scala +++ b/src/compiler/scala/tools/nsc/ast/Trees.scala @@ -56,7 +56,7 @@ trait Trees extends scala.reflect.internal.Trees { self: Global => * The class `C` is stored as a tree attachment. */ case class InjectDerivedValue(arg: Tree) - extends SymTree + extends SymTree with TermTree class PostfixSelect(qual: Tree, name: Name) extends Select(qual, name) diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index a2a45d0684..074fcabec8 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -1933,7 +1933,7 @@ self => case _ => } val typeAppliedTree = in.token match { - case LBRACKET => atPos(start, in.offset)(TypeApply(convertToTypeId(t), typeArgs())) + case LBRACKET => atPos(start, in.offset)(AppliedTypeTree(convertToTypeId(t), typeArgs())) case _ => t } in.token match { |