diff options
| author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-03-21 13:37:53 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-03-21 13:37:53 +0000 |
| commit | 0b0a927a607f8884651168c2361c2d91ebcd04b0 (patch) | |
| tree | a7ab9ebd0c8a75634c11c285f6fb6ad3b0875e58 /src/compiler | |
| parent | b5d314af8ee4dcab49300ebdadc399298196f233 (diff) | |
| download | scala-0b0a927a607f8884651168c2361c2d91ebcd04b0.tar.gz scala-0b0a927a607f8884651168c2361c2d91ebcd04b0.tar.bz2 scala-0b0a927a607f8884651168c2361c2d91ebcd04b0.zip | |
Closes #4202 again, closes #4363.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Symbols.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Mixin.scala | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala index 0240e80816..d7f9063ec6 100644 --- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala +++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala @@ -1309,7 +1309,7 @@ trait Symbols extends reflect.generic.Symbols { self: SymbolTable => * class Foo . companionModule --> object Foo */ final def companionModule: Symbol = - if (isClass && !isAnonOrRefinementClass) companionModule0 + if (isClass && !isRefinementClass) companionModule0 else NoSymbol /** For a module: its linked class diff --git a/src/compiler/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala index 05224ae37b..caba8f9bd1 100644 --- a/src/compiler/scala/tools/nsc/transform/Mixin.scala +++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala @@ -574,10 +574,9 @@ abstract class Mixin extends InfoTransform with ast.TreeDSL { private def staticRef(sym: Symbol): Tree = { sym.owner.info //todo: needed? sym.owner.owner.info //todo: needed? - if (sym.owner.sourceModule == NoSymbol) { + if (sym.owner.sourceModule == NoSymbol) assert(false, "" + sym + " in " + sym.owner + " in " + sym.owner.owner + " " + sym.owner.owner.info.decls.toList)//debug - } REF(sym.owner.sourceModule) DOT sym } |