updated for-comprehension syntax

2 files changed, 15 insertions, 15 deletions

diff --git a/src/manual/scala/tools/docutil/EmitHtml.scala b/src/manual/scala/tools/docutil/EmitHtml.scala
index 8f352b3d6f..700f8bf981 100644
--- a/src/manual/scala/tools/docutil/EmitHtml.scala
+++ b/src/manual/scala/tools/docutil/EmitHtml.scala
@@ -1,5 +1,5 @@
 /* NSC -- new Scala compiler
- * Copyright 2005-2006 LAMP/EPFL
+ * Copyright 2005-2007 LAMP/EPFL
  * @author Stephane Micheloud
  * Adapted from Lex Spoon's sbaz manual
  */
@@ -19,8 +19,8 @@ object EmitHtml {
         .replaceAll(">", ">")
 
 /* */
-  def emitSection(section: Section, depth: int): Unit = {
-    def emitPara(text: AbstractText): Unit = {
+  def emitSection(section: Section, depth: int) {
+    def emitPara(text: AbstractText) {
       out.println("<div>")
       emitText(text)
       out.println("\n</div>")
@@ -72,7 +72,7 @@ object EmitHtml {
 
         case DefinitionList(definitions @ _*) =>
           out.println("<ins><dl>")
-          for (val d <- definitions) {
+          for (d <- definitions) {
             out.println("<dt>")
             emitText(d.term)
             out.println("\n</dt>")
@@ -110,7 +110,7 @@ object EmitHtml {
 
         case lst:BulletList =>
           out.println("<ul>")
-          for (val item <- lst.items) {
+          for (item <- lst.items) {
             out.print("<li>")
             emitText(item)
             out.println("</li>")
@@ -119,7 +119,7 @@ object EmitHtml {
 
         case lst:NumberedList =>
           out.println("<ol>")
-          for(val item <- lst.items) {
+          for (item <- lst.items) {
             out.print("<li>")
             emitText(item)
           }
@@ -204,7 +204,7 @@ object EmitHtml {
 /*
  private def group(ns: Iterable[NodeSeq]): NodeSeq = {
     val zs = new NodeBuffer
-    for (val z <- ns) { zs &+ z }
+    for (z <- ns) { zs &+ z }
     zs
   }
 
@@ -337,7 +337,7 @@ object EmitHtml {
 */
   }
 */
-  def main(args: Array[String]) = {
+  def main(args: Array[String]) {
     if (args.length < 1) {
       System.err.println("usage: EmitHtml <classname>")
       exit(1)
diff --git a/src/manual/scala/tools/docutil/EmitManPage.scala b/src/manual/scala/tools/docutil/EmitManPage.scala
index 7be8229ce9..26efe4ee67 100644
--- a/src/manual/scala/tools/docutil/EmitManPage.scala
+++ b/src/manual/scala/tools/docutil/EmitManPage.scala
@@ -19,8 +19,8 @@ object EmitManPage {
   def escape(text: String) =
     text.replaceAll("-", "\\-")
 
-  def emitSection(section: Section, depth: int): Unit = {
-    def emitPara(text: AbstractText): Unit = {
+  def emitSection(section: Section, depth: int) {
+    def emitPara(text: AbstractText) {
       emitText(text)
       out.println("\n.IP")
     }
@@ -68,12 +68,12 @@ object EmitManPage {
 
         case DefinitionList(definitions @ _*) =>
           var n = definitions.length
-          for (val d <- definitions) {
+          for (d <- definitions) {
             out.println(".TP")
             emitText(d.term)
             out.println
             emitText(d.description)
-            if (n > 1) { out.println; n = n - 1 }
+            if (n > 1) { out.println; n -= 1 }
           }
 
         case Link(label, url) =>
@@ -101,7 +101,7 @@ object EmitManPage {
           out.println("\n.fi")
 
         case lst:BulletList =>
-          for(val item <- lst.items) {
+          for(item <- lst.items) {
             out.println(".IP")
             emitText(item)
             out.println
@@ -109,7 +109,7 @@ object EmitManPage {
 
         case lst:NumberedList =>
           for {
-            val idx <- List.range(0, lst.items.length)
+            idx <- List.range(0, lst.items.length)
             val item = lst.items(idx)
           } {
             out.println(".IP \"   " + (idx+1) + ".\"")
@@ -143,7 +143,7 @@ object EmitManPage {
     section.paragraphs.foreach(emitParagraph)
   }
 
-  def emitDocument(doc: Document) = {
+  def emitDocument(doc: Document) {
     out.println(".\\\" ##########################################################################")
     out.println(".\\\" #                      __                                                #")
     out.println(".\\\" #      ________ ___   / /  ___     Scala 2 On-line Manual Pages          #")