Cleanup and refactoring - semicolons, unused or commented out code

This commit contains some minor changes made by the way when
implementing flat classpath.

Sample JUnit test that shows that all pieces of JUnit infrastructure
work correctly now uses assert method form JUnit as it should do from
the beginning.

I removed commented out lines which were obvious to me. In the case
of less obvious commented out lines I added TODOs as someone should
look at such places some day and clean them up.

I removed also some unnecessary semicolons and unused imports.

Many string concatenations using + have been changed to string
interpolation.

There's removed unused, private walkIterator method from ZipArchive.
It seems that it was unused since this commit:
https://github.com/scala/scala/commit/9d4994b96c77d914687433586eb6d1f9e49c520f
However, I had to add an exception for the compatibility checker
because it was complaining about this change.

I made some trivial corrections/optimisations like use 'findClassFile'
method instead of 'findClass' in combination with 'binary' to find
the class file.

2 files changed, 12 insertions, 12 deletions

diff --git a/src/scalap/scala/tools/scalap/Arguments.scala b/src/scalap/scala/tools/scalap/Arguments.scala
index c375a5bac4..de9c30b8af 100644
--- a/src/scalap/scala/tools/scalap/Arguments.scala
+++ b/src/scalap/scala/tools/scalap/Arguments.scala
@@ -9,7 +9,7 @@
 package scala.tools.scalap
 
 import scala.collection.mutable
-import mutable.{ Buffer, ListBuffer }
+import mutable.ListBuffer
 
 object Arguments {
   case class Parser(optionPrefix: Char) {
@@ -47,7 +47,7 @@ object Arguments {
     }
 
     def parseBinding(str: String, separator: Char): (String, String) = (str indexOf separator) match {
-      case -1   => argumentError("missing '" + separator + "' in binding '" + str + "'") ; ("", "")
+      case -1   => argumentError(s"missing '$separator' in binding '$str'") ; ("", "")
       case idx  => ((str take idx).trim, (str drop (idx + 1)).trim)
     }
 
@@ -71,7 +71,7 @@ object Arguments {
             i += 1
           } else if (optionalArgs contains args(i)) {
             if ((i + 1) == args.length) {
-              argumentError("missing argument for '" + args(i) + "'")
+              argumentError(s"missing argument for '${args(i)}'")
               i += 1
             } else {
               res.addArgument(args(i), args(i + 1))
@@ -79,11 +79,11 @@ object Arguments {
             }
           } else if (optionalBindings contains args(i)) {
             if ((i + 1) == args.length) {
-              argumentError("missing argument for '" + args(i) + "'")
+              argumentError(s"missing argument for '${args(i)}'")
               i += 1
             } else {
               res.addBinding(args(i),
-                parseBinding(args(i + 1), optionalBindings(args(i))));
+                parseBinding(args(i + 1), optionalBindings(args(i))))
               i += 2
             }
           } else {
@@ -92,23 +92,23 @@ object Arguments {
             while ((i == j) && iter.hasNext) {
               val prefix = iter.next
               if (args(i) startsWith prefix) {
-                res.addPrefixed(prefix, args(i).substring(prefix.length()).trim());
+                res.addPrefixed(prefix, args(i).substring(prefix.length()).trim())
                 i += 1
               }
             }
             if (i == j) {
-              val iter = prefixedBindings.keysIterator;
+              val iter = prefixedBindings.keysIterator
               while ((i == j) && iter.hasNext) {
                 val prefix = iter.next
                 if (args(i) startsWith prefix) {
                   val arg = args(i).substring(prefix.length()).trim()
                   i = i + 1
                   res.addBinding(prefix,
-                    parseBinding(arg, prefixedBindings(prefix)));
+                    parseBinding(arg, prefixedBindings(prefix)))
                 }
               }
               if (i == j) {
-                argumentError("unknown option '" + args(i) + "'")
+                argumentError(s"unknown option '${args(i)}'")
                 i = i + 1
               }
             }
@@ -119,7 +119,7 @@ object Arguments {
 
   def parse(options: String*)(args: Array[String]): Arguments = {
     val parser = new Parser('-')
-    options foreach (parser withOption _)
+    options foreach parser.withOption
     parser parse args
   }
 }
@@ -142,7 +142,7 @@ class Arguments {
     if (key.length > 0)
       bindings.getOrElseUpdate(tag, new mutable.HashMap)(key) = value
 
-  def addBinding(tag: String, binding: Tuple2[String, String]): Unit =
+  def addBinding(tag: String, binding: (String, String)): Unit =
     addBinding(tag, binding._1, binding._2)
 
   def addOther(arg: String): Unit = others += arg
diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala
index 34684fc3e1..7c554d196c 100644
--- a/src/scalap/scala/tools/scalap/Main.scala
+++ b/src/scalap/scala/tools/scalap/Main.scala
@@ -178,7 +178,7 @@ object Main extends Main {
       verbose = arguments contains opts.verbose
       printPrivates = arguments contains opts.showPrivateDefs
       // construct a custom class path
-      val cpArg = List(opts.classpath, opts.cp) map (arguments getArgument) reduceLeft (_ orElse _)
+      val cpArg = List(opts.classpath, opts.cp) map arguments.getArgument reduceLeft (_ orElse _)
 
       val settings = new Settings()