- Added method isUnaccessedConstant

- Added removal of unaccessed constants from class scopes

1 files changed, 23 insertions, 0 deletions

diff --git a/sources/scalac/transformer/UnCurryPhase.java b/sources/scalac/transformer/UnCurryPhase.java
index 3309bce67b..22d29294ba 100644
--- a/sources/scalac/transformer/UnCurryPhase.java
+++ b/sources/scalac/transformer/UnCurryPhase.java
@@ -69,11 +69,34 @@ public class UnCurryPhase extends Phase implements Modifiers {
 	    }.map(tp);
 	case ConstantType(Type base, _):
 	    return base;
+        case CompoundType(Type[] parents, Scope scope):
+            Symbol symbol = tp.symbol();
+            if (!symbol.isClass() || symbol.isCompoundSym()) return tp;
+            Scope clone = new Scope();
+            for (Scope.SymbolIterator i = scope.iterator(true); i.hasNext();) {
+                Symbol member = i.next();
+                if (!isUnaccessedConstant(member))
+                    clone.enterOrOverload(member);
+            }
+            return Type.compoundType(parents, clone, symbol);
 	default:
 	    return tp;
 	}
     }
 
+    boolean isUnaccessedConstant(Symbol symbol) {
+        if (!symbol.isTerm()) return false;
+        if ((symbol.flags & ACCESSED) != 0) return false;
+        switch (symbol.type()) {
+        case PolyType(Symbol[] params, ConstantType(_, _)):
+            return params.length == 0;
+        case ConstantType(_, _):
+            return true;
+        default:
+            return false;
+        }
+    }
+
     public Checker[] postCheckers(Global global) {
         return new Checker[] {
             new CheckSymbols(global),