diff options
author | Martin Odersky <odersky@gmail.com> | 2007-03-30 16:48:24 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2007-03-30 16:48:24 +0000 |
commit | 8eafa3496a14f37645c7aaa8732cf49a046fc694 (patch) | |
tree | c0bd03c3362aec84d3094f8ce14b9314a5ff9d97 /src | |
parent | b1a3187949f3809e337342f057c0384303a03af2 (diff) | |
download | scala-8eafa3496a14f37645c7aaa8732cf49a046fc694.tar.gz scala-8eafa3496a14f37645c7aaa8732cf49a046fc694.tar.bz2 scala-8eafa3496a14f37645c7aaa8732cf49a046fc694.zip |
fixed bug1013
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Symbols.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 0cb0babfcf..0517e50624 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -1965,7 +1965,6 @@ trait Parsers requires SyntaxAnalyzer { syntaxError("traits cannot have type parameters with <% bounds", false) implicitClassViews = List() } - //if (mods.hasFlag(Flags.CASE) && in.token != LPAREN) accept(LPAREN) val constrAnnots = annotations() val (constrMods, vparamss) = if (mods.hasFlag(Flags.TRAIT)) (NoMods, List()) @@ -2122,6 +2121,7 @@ trait Parsers requires SyntaxAnalyzer { * | Annotations Modifiers Def * | Annotations Modifiers Dcl * | Expr1 + * | super ArgumentExprs {ArgumentExprs} * | */ def templateStatSeq(): (ValDef, List[Tree]) = { diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index 31d28b79db..49c52072fd 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -683,7 +683,7 @@ trait Symbols requires SymbolTable { */ final def outerClass: Symbol = if (owner.isClass) owner - else if (isClassLocalToConstructor) owner.owner.outerClass + else if (isClassLocalToConstructor) owner.enclClass.outerClass else owner.outerClass /** For a paramaccessor: a superclass paramaccessor for which this symbol |