Removing unused locals and making vars into vals.

According to "git diff" the difference from master to this
commit includes:

   Minus: 112 vals, 135 vars
    Plus: 165 vals, 2 vars

Assuming all the removed ones were vals, which is true from 10K feet,
it suggests I removed 80 unused vals and turned 133 vars into vals.
There are a few other -Xlint driven improvements bundled with this,
like putting double-parentheses around Some((x, y)) so it doesn't
trigger the "adapting argument list" warning.

5 files changed, 18 insertions, 19 deletions

diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala
index 0ed5e3f3bb..413b08ddd8 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala
@@ -96,7 +96,7 @@ abstract class ILPrinterVisitor extends Visitor {
     protected def println(s: String){ print(s); println() }
     protected def println(o: Object){ print(o); println() }
     protected def printName(name: String) {
-	var ch = name.charAt(0)
+        val ch = name.charAt(0)
 	//if (Character.isLetter(ch) && Character.isLowerCase(ch)) {
 	if ((ch != '.') && (ch != '!')) {
 	    print('\''); print(name); print('\'')
@@ -174,7 +174,6 @@ abstract class ILPrinterVisitor extends Visitor {
       print(constraintFlags(tVar))
       if(tVar.Constraints.length > 0) {
         print('(')
-        val lastCnstrtIdx = tVar.Constraints.length - 1
         for (ic <- 0 until tVar.Constraints.length) {
           val cnstrt = tVar.Constraints(ic)
           printReference(cnstrt)
@@ -211,7 +210,7 @@ abstract class ILPrinterVisitor extends Visitor {
 	    print("       extends    ")
 	    printReference(`type`.BaseType())
 	}
-	var ifaces: Array[Type] = `type`.getInterfaces()
+        val ifaces: Array[Type] = `type`.getInterfaces()
 	if (ifaces.length > 0) {
 	    println()
 	    print("       implements ")
@@ -331,7 +330,7 @@ abstract class ILPrinterVisitor extends Visitor {
 
   def msilSyntaxDouble(valDou: java.lang.Double) : String = {
     // !!! check if encoding is correct
-    var bits = java.lang.Double.doubleToRawLongBits(valDou.doubleValue())
+    val bits = java.lang.Double.doubleToRawLongBits(valDou.doubleValue())
     /* see p. 170 in Lidin's book Expert .NET 2.0 IL Assembler */
     /* Note: no value is equal to Nan, including NaN. Thus, x == Double.NaN always evaluates to false. */
     val res = if (valDou.isNaN) "0xffffffffffffffff /* NaN */ " /* TODO this is 'quiet NaN, http://www.savrola.com/resources/NaN.html , what's the difference with a 'signaling NaN'?? */
@@ -452,7 +451,7 @@ abstract class ILPrinterVisitor extends Visitor {
      */
     @throws(classOf[IOException])
     def caseOpCode(opCode: OpCode) {
-	var opString = opCode.toString()
+        val opString = opCode.toString()
 	print(opString)
 	pad(14 - opString.length())
 
@@ -661,7 +660,7 @@ abstract class ILPrinterVisitor extends Visitor {
 	print(' '); printReference(method.DeclaringType)
 	print("::"); printName(method.Name)
 
-	var params = method.GetParameters()
+        val params = method.GetParameters()
 	print("(")
 	for (i <- 0 until params.length) {
 	    if (i > 0) print(", ")
@@ -744,7 +743,7 @@ abstract class ILPrinterVisitor extends Visitor {
     }
 
     def printAttributes(icap: ICustomAttributeProvider) {
-        var attrs = icap.GetCustomAttributes(false)
+        val attrs = icap.GetCustomAttributes(false)
         for (i <- 0 until attrs.length) {
             print(".custom ")
             printSignature((attrs(i).asInstanceOf[Attribute]).getConstructor())
@@ -767,7 +766,7 @@ object ILPrinterVisitor {
 
     def hasControlChars(str: String): Boolean = {
     for(i <- 0 until str.length()) {
-        var ch = str.charAt(i)
+        val ch = str.charAt(i)
         ch match {
           case '\b' =>
           case '\t' =>
@@ -789,7 +788,7 @@ object ILPrinterVisitor {
           case e : java.io.UnsupportedEncodingException => throw new RuntimeException(e)
         }
     }
-    var str = new StringBuffer(s)
+    val str = new StringBuffer(s)
     var ss = EMPTY
     var i = 0
     while(i < str.length()) {
@@ -834,7 +833,7 @@ object ILPrinterVisitor {
 
     final var primitive = scala.collection.mutable.Map.empty[Type, String]
     def addPrimitive(name: String, sig: String) {
-      var `type` =
+      val `type` =
       Type.GetType(name)
       assert(`type` != null, "Cannot lookup primitive type " + `type`)
       primitive.put(`type`, sig)
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala
index 981e855e0e..2319d5ca27 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala
@@ -73,7 +73,7 @@ class ModuleBuilder(name: String, fullname: String, scopeName: String, assembly:
 				  baseType: Type,
 				  interfaces: Array[Type]): TypeBuilder =
     {
-	var t: Type = GetType(typeName) // Module.GetType(String)
+        val t: Type = GetType(typeName) // Module.GetType(String)
 	if (t != null)
 	    throw new RuntimeException
 		("Type [" + Assembly + "]" + typeName + "' already exists!")
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/MultipleFilesILPrinterVisitor.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/MultipleFilesILPrinterVisitor.scala
index 55c52109b6..bbbbf40508 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/MultipleFilesILPrinterVisitor.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/MultipleFilesILPrinterVisitor.scala
@@ -41,7 +41,7 @@ final class MultipleFilesILPrinterVisitor(destPath: String, sourceFilesPath: Str
 	scala.util.Sorting.quickSort(as)(assemblyNameComparator)  // Arrays.sort(as, assemblyNameComparator)
 
 	// print each module
-	var m: Array[Module] = assemblyBuilder.GetModules()
+        val m: Array[Module] = assemblyBuilder.GetModules()
         nomembers = true
         for(i <- 0 until m.length) {
 	    print(m(i).asInstanceOf[ModuleBuilder])
@@ -68,10 +68,10 @@ final class MultipleFilesILPrinterVisitor(destPath: String, sourceFilesPath: Str
 	if (!module.globalsCreated)
 	    module.CreateGlobalFunctions()
 
-	var m: Array[MethodInfo] = module.GetMethods()
+        val m: Array[MethodInfo] = module.GetMethods()
 
 	// "Types" contain all the classes
-	var t: Array[Type] = module.GetTypes()
+        val t: Array[Type] = module.GetTypes()
         for(i <- 0 until t.length) {
         val tBuilder       = t(i).asInstanceOf[TypeBuilder]
         val sourceFilename = tBuilder.sourceFilename
@@ -108,7 +108,7 @@ final class MultipleFilesILPrinterVisitor(destPath: String, sourceFilesPath: Str
 
     // now write the global methods (typically contains the "main" method)
 	if(!nomembers) {
-       var globalMethods: File = new File(destPath, ILPrinterVisitor.currAssembly.GetName().Name + ".msil")
+       val globalMethods: File = new File(destPath, ILPrinterVisitor.currAssembly.GetName().Name + ".msil")
        val append = assemblyBuilder.generatedFiles.contains(globalMethods.getPath)
 
 		out = new PrintWriter(new BufferedWriter(new FileWriter(globalMethods, append)))
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/SingleFileILPrinterVisitor.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/SingleFileILPrinterVisitor.scala
index 5d59d4d25a..50e9f45373 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/SingleFileILPrinterVisitor.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/SingleFileILPrinterVisitor.scala
@@ -48,7 +48,7 @@ final class SingleFileILPrinterVisitor(_fileName: String) extends ILPrinterVisit
 	printAssemblyBoilerplate()
 
 	// print each module
-        var m: Array[Module] = assemblyBuilder.GetModules()
+        val m: Array[Module] = assemblyBuilder.GetModules()
         nomembers = true
         for(i <- 0 until m.length) {
 	    print(m(i).asInstanceOf[ModuleBuilder])
@@ -78,12 +78,12 @@ final class SingleFileILPrinterVisitor(_fileName: String) extends ILPrinterVisit
 	if (!module.globalsCreated)
 	    module.CreateGlobalFunctions()
 
-	var m: Array[MethodInfo] = module.GetMethods()
+        val m: Array[MethodInfo] = module.GetMethods()
         for(i <- 0 until m.length) {
 	    print(m(i).asInstanceOf[MethodBuilder])
 	}
 
-	var t: Array[Type] = module.GetTypes()
+        val t: Array[Type] = module.GetTypes()
         for(i <- 0 until t.length) {
 	    print(t(i).asInstanceOf[TypeBuilder])
 	}
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala
index 57dc883898..0b0b16da65 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala
@@ -221,7 +221,7 @@ class TypeBuilder (module: Module, attributes: Int, fullName: String, baseType:
 
 object TypeBuilder {
     def types2String(types: Array[Type]): String = {
-    var s = new StringBuffer("(")
+    val s = new StringBuffer("(")
     for(i <- 0 until types.length) {
         if (i > 0) s.append(", ")
         s.append(types(i))