updated Scala comments (code examples, links, o...

updated Scala comments (code examples, links, overrides)

2 files changed, 24 insertions, 16 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala
index 3b39bc9a85..85e6e117a6 100644
--- a/src/compiler/scala/tools/nsc/doc/ModelToXML.scala
+++ b/src/compiler/scala/tools/nsc/doc/ModelToXML.scala
@@ -88,7 +88,7 @@ trait ModelToXML extends ModelExtractor {
   }
 
   def extendsFor(entity: Entity)(implicit frame: Frame): NodeSeq = {
-    if (entity.parents.isEmpty) NodeSeq.Empty;
+    if (entity.parents.isEmpty) NodeSeq.Empty
     else <code> extends </code>++
       entity.parents.mkXML(Text(""), <code> with </code>, Text(""))(link);
   }
@@ -122,18 +122,26 @@ trait ModelToXML extends ModelExtractor {
       case _ => NodeSeq.Empty
   }) ++ {
     val overridden = entity.overridden
-    if (!overridden.isEmpty) {
-      var seq : NodeSeq = Text("Overrides ");
-      seq = seq ++ overridden.mkXML("",", ", "")(sym => link(decode(sym.owner)) ++ Text(".") ++ link(sym));
-      seq
-    } else NodeSeq.Empty;
+    if (overridden.isEmpty)
+      NodeSeq.Empty
+    else {
+      <dl>
+        <dt style="margin:10px 0 0 20px;">
+          <b>Overrides</b>
+        </dt>
+        <dd>
+        { overridden.mkXML("",", ", "")(sym => link(decode(sym.owner)) ++ Text(".") ++ link(sym))
+        }
+        </dd>
+      </dl>
+    }
   } ++ <hr/>);
 
   def longComment(cmnt: Comment): NodeSeq = {
     val attrs = <dl>{
       var seq: NodeSeq = NodeSeq.Empty
       cmnt.decodeAttributes.foreach{
-      case (tag,xs) =>
+      case (tag, xs) =>
         seq = seq ++ <dt style="margin:10px 0 0 20px;">
         <b>{decodeTag(tag)}</b></dt> ++ {xs.flatMap{
         case (option,body) => <dd>{
@@ -142,7 +150,7 @@ trait ModelToXML extends ModelExtractor {
         }{parse(body)}</dd>
         }}
       };
-      seq;
+      seq
     }</dl>;
     <xml:group>
       <dl><dd>{parse(cmnt.body)}</dd></dl>
diff --git a/src/compiler/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala
index c458e9a089..72df84c9b3 100644
--- a/src/compiler/scala/tools/nsc/transform/Constructors.scala
+++ b/src/compiler/scala/tools/nsc/transform/Constructors.scala
@@ -1,5 +1,5 @@
 /* NSC -- new Scala compiler
- * Copyright 2005-2006 LAMP/EPFL
+ * Copyright 2005-2007 LAMP/EPFL
  * @author
  */
 // $Id$
@@ -31,7 +31,7 @@ abstract class Constructors extends Transform {
       var constrParams: List[Symbol] = null
       var constrBody: Block = null
       // decompose primary constructor into the three entities above.
-      for (val stat <- stats) {
+      for (stat <- stats) {
         stat match {
           case ddef @ DefDef(_, _, _, List(vparams), _, rhs @ Block(_, Literal(_))) =>
             if (ddef.symbol.isPrimaryConstructor) {
@@ -101,7 +101,7 @@ abstract class Constructors extends Transform {
           localTyper.typed {
             Assign(Select(This(clazz), to), from)
           }
-      }
+        }
 
       def copyParam(to: Symbol, from: Symbol): Tree = {
         var result = mkAssign(to, Ident(from))
@@ -121,7 +121,7 @@ abstract class Constructors extends Transform {
       val constrStatBuf = new ListBuffer[Tree]
       val constrPrefixBuf = new ListBuffer[Tree]
       val presupers = treeInfo.preSuperFields(stats)
-      for (val stat <- constrBody.stats) {
+      for (stat <- constrBody.stats) {
         constrStatBuf += stat
         stat match {
           case ValDef(mods, name, _, _) if (mods hasFlag PRESUPER) =>
@@ -140,7 +140,7 @@ abstract class Constructors extends Transform {
         }
       }
 
-      for (val stat <- stats) stat match {
+      for (stat <- stats) stat match {
         case DefDef(mods, name, tparams, vparamss, tpt, rhs) =>
           stat.symbol.tpe match {
             case MethodType(List(), tp @ ConstantType(c)) =>
@@ -186,9 +186,9 @@ abstract class Constructors extends Transform {
         }
       }
 
-      for (val stat <- defBuf.elements) accessTraverser.traverse(stat);
+      for (stat <- defBuf.elements) accessTraverser.traverse(stat)
 
-      val paramInits = for (val acc <- paramAccessors; isAccessed(acc))
+      val paramInits = for (acc <- paramAccessors if isAccessed(acc))
                        yield copyParam(acc, parameter(acc))
 
       defBuf += copy.DefDef(
@@ -198,7 +198,7 @@ abstract class Constructors extends Transform {
           paramInits ::: constrPrefixBuf.toList ::: constrStatBuf.toList,
           constrBody.expr));
 
-      for (val sym <- clazz.info.decls.toList)
+      for (sym <- clazz.info.decls.toList)
         if (!isAccessed(sym)) clazz.info.decls unlink sym
 
       copy.Template(impl, impl.parents, defBuf.toList filter (stat => isAccessed(stat.symbol)))