diff options
| author | Martin Odersky <odersky@gmail.com> | 2011-03-14 11:43:13 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2011-03-14 11:43:13 +0000 |
| commit | 13c59adf9fbff0e99ffa9f8e30f5dc05e0c1ee4d (patch) | |
| tree | 17de4b40b057cf9ac6cc11e42a652a711928e9ae /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | |
| parent | 1f3c58a818feb7c2887ceebb079ce992aa677c0d (diff) | |
| download | scala-13c59adf9fbff0e99ffa9f8e30f5dc05e0c1ee4d.tar.gz scala-13c59adf9fbff0e99ffa9f8e30f5dc05e0c1ee4d.tar.bz2 scala-13c59adf9fbff0e99ffa9f8e30f5dc05e0c1ee4d.zip | |
Changed Super to fix #4300
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index ed92afe5de..cc515d957a 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -376,7 +376,7 @@ self => Nil, List(Nil), TypeTree(), - Block(List(Apply(Select(Super(tpnme.EMPTY, tpnme.EMPTY), nme.CONSTRUCTOR), Nil)), Literal(Constant(()))) + Block(List(Apply(Select(Super(This(tpnme.EMPTY), tpnme.EMPTY), nme.CONSTRUCTOR), Nil)), Literal(Constant(()))) ) // def main @@ -995,7 +995,7 @@ self => } } else if (in.token == SUPER) { in.nextToken() - t = atPos(start) { Super(tpnme.EMPTY, mixinQualifierOpt()) } + t = atPos(start) { Super(This(tpnme.EMPTY), mixinQualifierOpt()) } accept(DOT) t = selector(t) if (in.token == DOT) t = selectors(t, typeOK, in.skipToken()) @@ -1015,7 +1015,7 @@ self => t = selectors(t, typeOK, accept(DOT)) } else if (in.token == SUPER) { in.nextToken() - t = atPos(start) { Super(name.toTypeName, mixinQualifierOpt()) } + t = atPos(start) { Super(This(name.toTypeName), mixinQualifierOpt()) } accept(DOT) t = selector(t) if (in.token == DOT) t = selectors(t, typeOK, in.skipToken()) |