diff options
| -rw-r--r-- | sources/scalac/symtab/SymbolTablePrinter.java | 4 | ||||
| -rw-r--r-- | test/files/neg/bug107.check | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sources/scalac/symtab/SymbolTablePrinter.java b/sources/scalac/symtab/SymbolTablePrinter.java index 6c5d17e52b..333978257c 100644 --- a/sources/scalac/symtab/SymbolTablePrinter.java +++ b/sources/scalac/symtab/SymbolTablePrinter.java @@ -251,14 +251,16 @@ public class SymbolTablePrinter { case Kinds.NONE: return null; case Kinds.CLASS: + if (symbol.isPackageClass()) return "package class"; + if (symbol.isModuleClass()) return "object class"; if (symbol.isTrait()) return "trait"; - if (symbol.isModuleClass() && global.debug) return "object class"; return "class"; case Kinds.TYPE: case Kinds.ALIAS: return "type"; case Kinds.VAL: if (symbol.isVariable()) return "variable"; + if (symbol.isPackage()) return "package"; if (symbol.isModule()) return "object"; if (symbol.isConstructor()) return "constructor"; if (symbol.isInitializedMethod()) diff --git a/test/files/neg/bug107.check b/test/files/neg/bug107.check index 5def0a4164..1669cf7c97 100644 --- a/test/files/neg/bug107.check +++ b/test/files/neg/bug107.check @@ -1,4 +1,4 @@ -bug107.scala:4: class O needs to be abstract, since method foo in trait C is not defined +bug107.scala:4: object class O needs to be abstract, since method foo in trait C is not defined object O extends C { ^ one error found |