- Modified SymbolTablePrinter.getSymbolKeyword ...

- Modified SymbolTablePrinter.getSymbolKeyword to include package info

2 files changed, 2 insertions, 3 deletions

diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinter.java b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
index c604c0000c..638bcee31a 100644
--- a/sources/scala/tools/scaladoc/SymbolTablePrinter.java
+++ b/sources/scala/tools/scaladoc/SymbolTablePrinter.java
@@ -137,10 +137,8 @@ public abstract class MySymbolTablePrinter extends SymbolTablePrinter {
     /** The keyword of a symbol from the user side. */
     public String getSymbolKeywordForDoc(Symbol symbol) {
         String keyword = getSymbolKeyword(symbol);
-        // package
-        if (symbol.isPackage()) keyword = "package";
         // accessor function for a val
-        if (symbol.isInitializedMethod() && (symbol.flags & Modifiers.STABLE) != 0)
+        if (symbol.isInitializedMethod() && symbol.hasStableFlag())
             keyword = "val";
         return keyword;
     }
diff --git a/sources/scalac/symtab/SymbolTablePrinter.java b/sources/scalac/symtab/SymbolTablePrinter.java
index 333978257c..4cac9acfef 100644
--- a/sources/scalac/symtab/SymbolTablePrinter.java
+++ b/sources/scalac/symtab/SymbolTablePrinter.java
@@ -290,6 +290,7 @@ public class SymbolTablePrinter {
             return "type";
         case Kinds.VAL:
             if (symbol.isVariable()) return "var";
+            if (symbol.isPackage()) return "package";
             if (symbol.isModule()) return "object";
             if (symbol.isInitializedMethod()) return "def";
             return "val";