subClasses => children

2 files changed, 8 insertions, 8 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
index e9b2bd1b31..76f50c1120 100644
--- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
@@ -875,12 +875,12 @@ trait Symbols requires SymbolTable {
     def isFromClassFile: Boolean =
       (if (isModule) moduleClass else toplevelClass).isFromClassFile
 
-    /** If this is a sealed class, its known subclasses. Otherwise Set.empty */
-    def subClasses: Set[Symbol] = emptySymbolSet
+    /** If this is a sealed class, its known direct subclasses. Otherwise Set.empty */
+    def children: Set[Symbol] = emptySymbolSet
 
     /** Declare given subclass `sym' of this sealed class */
-    def addSubClass(sym: Symbol) {
-      throw new Error("addSubClass_= inapplicable for " + this)
+    def addChild(sym: Symbol) {
+      throw new Error("addChild inapplicable for " + this)
     }
 
 
@@ -1261,9 +1261,9 @@ trait Symbols requires SymbolTable {
     override def sourceModule =
       if (isModuleClass) linkedModuleOfClass else NoSymbol
 
-    private var subClassSet: Set[Symbol] = emptySymbolSet
-    override def subClasses: Set[Symbol] = subClassSet
-    override def addSubClass(sym: Symbol) { subClassSet = subClassSet + sym }
+    private var childSet: Set[Symbol] = emptySymbolSet
+    override def children: Set[Symbol] = childSet
+    override def addChild(sym: Symbol) { childSet = childSet + sym }
 
     if (util.Statistics.enabled) classSymbolCount = classSymbolCount + 1
   }
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index a07f4c472e..36b9fef394 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -781,7 +781,7 @@ trait Typers requires Analyzer {
             if (context.unit.source.file != psym.sourceFile)
               error(parent.pos, "illegal inheritance from sealed "+psym)
             else
-              psym addSubClass context.owner
+              psym addChild context.owner
           }
           if (!(selfType <:< parent.tpe.typeOfThis) && !phase.erasedTypes) {
             //Console.println(context.owner);//DEBUG