Merged revisions 19624,19629-19630,19645,19651,...

Merged revisions
19624,19629-19630,19645,19651,19655-19660,19666-19668,19670,19673-19679,
19683-19685,19688,19692,19695-19700,19706-19707,19717-19719,19723-19724,
19726,19730,19735-19740,19742-19744,19746-19759,19762-19764,19767-19769,
19773,19776,19781,19787,19789,19792-19793,19798-19800,19803-19804,19806-
19808,19813-19815,19818-19820,19824 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r19624 | moors | 2009-11-13 13:17:50 +0100 (Fri, 13 Nov 2009) | 2 lines

      fixed #1236
      another Symbol::tpe bites the dust (should'be been tpeHK)
........
  r19629 | rytz | 2009-11-13 16:53:11 +0100 (Fri, 13 Nov 2009) | 1 line

  review board scipt
........
  r19630 | rytz | 2009-11-13 17:10:35 +0100 (Fri, 13 Nov 2009) | 1 line

  updates to review script
........
  r19645 | odersky | 2009-11-13 18:31:12 +0100 (Fri, 13 Nov 2009) | 1 line

  Fixes #1477 by requiring that abstract types with non-volatile upper
bounds cannot be overridden by volatile types. ........ r19651 |
extempore | 2009-11-14 19:02:10 +0100 (Sat, 14 Nov 2009) | 5 lines

  Fixes and test cases for #2087 and #2400. This required fixing a
long-standing bug in fjbg and recompiling fjbg.jar, which had the side
effect of revealing that the current fjbg jar had never been recompiled
with target 1.5, so now it's smaller and (I imagine) faster. ........
r19655 | odersky | 2009-11-15 12:14:57 +0100 (Sun, 15 Nov 2009) | 2
lines

  Fixed #2848 and #2630; Improvements in equality speed ........ r19656
| odersky | 2009-11-15 14:56:21 +0100 (Sun, 15 Nov 2009) | 2 lines

  Fixed #1459
........
  r19657 | odersky | 2009-11-15 15:17:48 +0100 (Sun, 15 Nov 2009) | 2 lines

  Added benchmarks with results for equality.
........
  r19658 | milessabin | 2009-11-15 16:46:52 +0100 (Sun, 15 Nov 2009) | 1 line

  Fixed #2627. Also ensure that a non-empty dependencies file is created
on the first build. ........ r19659 | extempore | 2009-11-15 19:08:45
+0100 (Sun, 15 Nov 2009) | 3 lines

  Tweaked a test which has been regularly failing due to heap
exhaustion, although what it's supposed to be testing is stack
utilization. ........ r19660 | milessabin | 2009-11-15 21:57:46 +0100
(Sun, 15 Nov 2009) | 1 line

  Corrected help syntax for -Ybuilder-debug.
........
  r19666 | milessabin | 2009-11-16 11:17:01 +0100 (Mon, 16 Nov 2009) | 1 line

  Fixed #2627.
........
  r19667 | rytz | 2009-11-16 11:45:54 +0100 (Mon, 16 Nov 2009) | 1 line

  review requests can now be created outside a checkout ........ r19668
| rytz | 2009-11-16 11:55:59 +0100 (Mon, 16 Nov 2009) | 1 line

  another minor change to teh review script
........
  r19670 | odersky | 2009-11-16 13:31:40 +0100 (Mon, 16 Nov 2009) | 2 lines

  Fixed #2323; made Pickler do the right thing.
........
  r19673 | moors | 2009-11-16 18:44:25 +0100 (Mon, 16 Nov 2009) | 1 line

  test cases in pending
........
  r19674 | dragos | 2009-11-16 19:24:40 +0100 (Mon, 16 Nov 2009) | 2 lines

  Faster optimizer by caching successors/predecessors in basic blocks,
and better lub for icode ........ r19675 | extempore | 2009-11-16
22:30:22 +0100 (Mon, 16 Nov 2009) | 1 line

  Minor pickler organization stemming from optimizer appeasement.
........ r19676 | extempore | 2009-11-16 22:30:36 +0100 (Mon, 16 Nov
2009) | 2 lines

  Some organization & duplication removal in GenICode stemming from
optimizer appeasement. ........ r19677 | extempore | 2009-11-16 22:30:54
+0100 (Mon, 16 Nov 2009) | 2 lines

  A lot of minor code adjustments to ease the burden on the optimizer,
and various cleanups encountered along the way. ........ r19678 |
extempore | 2009-11-16 22:31:07 +0100 (Mon, 16 Nov 2009) | 2 lines

  Some organization & duplication removal in RefChecks stemming from
optimizer appeasement. ........ r19679 | extempore | 2009-11-16 22:56:00
+0100 (Mon, 16 Nov 2009) | 1 line

  Fix for #2647.
........
  r19683 | extempore | 2009-11-17 05:51:43 +0100 (Tue, 17 Nov 2009) | 1 line

  Fix and test case for #2636.
........
  r19684 | extempore | 2009-11-17 06:25:48 +0100 (Tue, 17 Nov 2009) | 2 lines

  Contents of scala.Math moved into scala.math package object, and
scala.Math deprecated. Also a couple janitorial cleanups. ........
r19685 | milessabin | 2009-11-17 10:04:00 +0100 (Tue, 17 Nov 2009) | 1
line

  More String.isEmpty breakage.
........
  r19688 | odersky | 2009-11-17 14:12:31 +0100 (Tue, 17 Nov 2009) | 1 line

  Allow implicit modifier on single-parameter function literals. Fixes
and closes #1492. ........ r19692 | extempore | 2009-11-17 21:51:23
+0100 (Tue, 17 Nov 2009) | 1 line

  Partial fix for #2625.
........
  r19695 | extempore | 2009-11-18 01:18:58 +0100 (Wed, 18 Nov 2009) | 11 lines

  Removing bits from the library which shouldn't make the 2.8 cut.
  Removed outright:

    util.Hashable: unused and I have a better plan for this net.Utility:
    class created to accomodate expansion which never materialized
    reflect.Invocation: doesn't go far enough, needs love it won't find
    right now reflect.RichClass: same as Invocation

  Moved into compiler:

    util.ScalaClassLoader: too useful to lose, not done enough to ship
........ r19696 | extempore | 2009-11-18 01:36:26 +0100 (Wed, 18 Nov
2009) | 1 line

  More minor removals and some cleanups of !!!s and XXXs. ........
r19697 | dcaoyuan | 2009-11-18 05:35:07 +0100 (Wed, 18 Nov 2009) | 1
line

  Fixed #2631
........
  r19698 | dcaoyuan | 2009-11-18 05:36:59 +0100 (Wed, 18 Nov 2009) | 1 line

  to fix varies conditions of removed source/class files that were
previously recorded in .scala_dependencies. ........ r19699 | extempore
| 2009-11-18 06:41:16 +0100 (Wed, 18 Nov 2009) | 3 lines

  More deprecation work. Removes most elements which have been
deprecated since 2.7.2 (still except for lower case primitive type
aliases) and removes every deprecated method which has never shipped in
a release. ........ r19700 | rytz | 2009-11-18 11:19:30 +0100 (Wed, 18
Nov 2009) | 1 line

  recompiled msil.jar, it refered to scala.Math$
........
  r19706 | extempore | 2009-11-18 15:45:11 +0100 (Wed, 18 Nov 2009) | 3 lines

  Fixed a bug in Range which was causing take and drop to overflow and
  return empty if the argument was larger than the actual length

  of the Range and arg * step > MaxInt.
........
  r19707 | dcaoyuan | 2009-11-18 15:46:01 +0100 (Wed, 18 Nov 2009) | 1 line

  Fixed #2645
........
  r19717 | extempore | 2009-11-18 23:06:03 +0100 (Wed, 18 Nov 2009) | 3 lines

  Finally completed the incredibly tedious task of removing the lower
case primitive aliases from Predef. Had to rebuild msil.jar along the
way. ........ r19718 | extempore | 2009-11-18 23:43:54 +0100 (Wed, 18
Nov 2009) | 2 lines

  New starr based on r19717 since I'm finding the current starr doesn't
have TupleN.zipped fully working. ........ r19719 | extempore |
2009-11-19 00:24:23 +0100 (Thu, 19 Nov 2009) | 2 lines

  More deprecation soothing. Soon we'll be down to a double-digit
warning count. ........ r19723 | extempore | 2009-11-19 05:59:46 +0100
(Thu, 19 Nov 2009) | 2 lines

  Restoring an embarassingly large quantity of deprecated methods whose
time had not yet come. ........ r19724 | dcaoyuan | 2009-11-19 09:24:37
+0100 (Thu, 19 Nov 2009) | 1 line

  Path.parent now returns Path instead of Option[Path], and it prefers
relative path. ........ r19726 | rytz | 2009-11-19 14:44:15 +0100 (Thu,
19 Nov 2009) | 1 line

  closes #2670. the target-annotations can now be placed on annotation
classes as well ........ r19730 | extempore | 2009-11-19 21:31:46 +0100
(Thu, 19 Nov 2009) | 2 lines

  Deprecation patrol exercises the new capabilities in Tuple2.zipped
among other exciting no-ops. ........ r19735 | extempore | 2009-11-20
01:49:58 +0100 (Fri, 20 Nov 2009) | 1 line

  Fix for infinite loop in StringBuilder pointed out by dpp. ........
r19736 | extempore | 2009-11-20 04:50:12 +0100 (Fri, 20 Nov 2009) | 1
line

  Slightly more fixy fix than the previous fix.
........
  r19737 | plocinic | 2009-11-20 10:04:04 +0100 (Fri, 20 Nov 2009) | 1 line

  closes #1422
........
  r19738 | odersky | 2009-11-20 14:57:22 +0100 (Fri, 20 Nov 2009) | 1 line

  Simplifiations in collections libraries, enabled by introduction of
Self type in TraversableLike. ........ r19739 | odersky | 2009-11-20
14:58:36 +0100 (Fri, 20 Nov 2009) | 1 line

  new test
........
  r19740 | extempore | 2009-11-20 16:16:45 +0100 (Fri, 20 Nov 2009) | 4 lines

  More world-shaking deprecation work. Using the scala.math package
object, updating some @deprecated messages to give realistic
alternatives, properly resolving the semantic mismatch between List.--
and diff, its once-recommended but inequivalent alternative. ........
r19742 | prokopec | 2009-11-20 17:11:19 +0100 (Fri, 20 Nov 2009) | 1
line

  PriorityQueue fixed, should work ok now.
........
  r19743 | prokopec | 2009-11-20 17:11:53 +0100 (Fri, 20 Nov 2009) | 1 line

  Priority queue test.
........
  r19744 | prokopec | 2009-11-20 17:12:48 +0100 (Fri, 20 Nov 2009) | 1 line

  Priority queue test, updated.
........
  r19746 | prokopec | 2009-11-20 18:25:08 +0100 (Fri, 20 Nov 2009) | 1 line

  Changes made in the clean up phase - now the symbols get interned during classload for each symbol literal - references to them reside in static fields. These static fields get initialized in static constructors - the java backend will now identify ctors with static flags and generate a static initializer containing the necessary code.
........
  r19747 | prokopec | 2009-11-20 18:29:39 +0100 (Fri, 20 Nov 2009) | 1 line

  Removed a couple of unneeded comments.
........
  r19748 | extempore | 2009-11-20 18:39:49 +0100 (Fri, 20 Nov 2009) | 3 lines

  Deprecated the Tuple(...) methods in Predef, but at the same time
extended the overload out to 22 and moved them into the scala package
object. ........ r19749 | odersky | 2009-11-20 19:02:42 +0100 (Fri, 20
Nov 2009) | 1 line

  Closed #2641
........
  r19750 | prokopec | 2009-11-20 19:06:41 +0100 (Fri, 20 Nov 2009) | 1 line

  Commented out anonymous function invocation for which Hudson was
complaining it couldn't find the classdef. ........ r19751 | extempore |
2009-11-20 19:08:57 +0100 (Fri, 20 Nov 2009) | 2 lines

  Subtly altered implementation of iterator which does not go into an
infinite loop when deprecated "append" is replaced with ++. ........
r19752 | extempore | 2009-11-20 19:09:08 +0100 (Fri, 20 Nov 2009) | 2
lines

  Tweak to Iterator.++ to keep it from going into an infinite loop on x
++ x. ........ r19753 | prokopec | 2009-11-20 19:17:13 +0100 (Fri, 20
Nov 2009) | 1 line

  Trying to get the test to pass on the server.
........
  r19754 | extempore | 2009-11-20 19:35:52 +0100 (Fri, 20 Nov 2009) | 1 line

  Eliminated warning about Tuple2 and Tuple3 importing Traversable.
........ r19755 | extempore | 2009-11-20 19:59:30 +0100 (Fri, 20 Nov
2009) | 1 line

  More deprecation avoidance and some minor smoothings. ........ r19756
| moors | 2009-11-20 20:25:32 +0100 (Fri, 20 Nov 2009) | 3 lines

  closes #2585: generate more precise Java generic signatures for
classes nested in parametric outer classes fix based on review by Martin
baseType is your friend ........ r19757 | michelou | 2009-11-20 21:19:41
+0100 (Fri, 20 Nov 2009) | 2 lines

  updated/extended serialization tests 
........
  r19758 | extempore | 2009-11-20 21:37:12 +0100 (Fri, 20 Nov 2009) | 1 line

  Expanding the warning cleansing into -unchecked territory. ........
r19759 | odersky | 2009-11-20 22:02:23 +0100 (Fri, 20 Nov 2009) | 2
lines

  Closed #2642
........
  r19762 | extempore | 2009-11-21 18:24:29 +0100 (Sat, 21 Nov 2009) | 1 line

  Applied performance patch and test case from ijuma; closes #2526.
........ r19763 | extempore | 2009-11-21 20:58:05 +0100 (Sat, 21 Nov
2009) | 2 lines

  Partially addresses #2626 - pattern matcher no longer depends
  on drop(n) behavior if n < 0.
........
  r19764 | extempore | 2009-11-22 00:55:06 +0100 (Sun, 22 Nov 2009) | 2 lines

  Cleanup of Cleanup. Finally straightening out a bunch of duplicated
boxing code in the right location. ........ r19767 | extempore |
2009-11-22 02:26:04 +0100 (Sun, 22 Nov 2009) | 2 lines

  Fix (I think) for recently introduced MSIL breakage stemming from
eliminating deprecation warnings. ........ r19768 | odersky | 2009-11-22
12:32:26 +0100 (Sun, 22 Nov 2009) | 2 lines

  Made implicit resolution compatible with numeric conformance. ........
r19769 | odersky | 2009-11-22 13:28:57 +0100 (Sun, 22 Nov 2009) | 2
lines

  Closed #2635
........
  r19773 | extempore | 2009-11-22 17:07:46 +0100 (Sun, 22 Nov 2009) | 1 line

  Removed all traces of Boxed*Array.  New starr.
........
  r19776 | odersky | 2009-11-22 19:13:34 +0100 (Sun, 22 Nov 2009) | 2 lines

  Moved failing test due to fix of #2635 to pending. ........ r19781 |
prokopec | 2009-11-22 23:47:08 +0100 (Sun, 22 Nov 2009) | 2 lines

  Priority queue reverse is undefined - overriden to throw an exception.
  Reverse iterator seems to have sense - it is overriden and is defined, and some methods in SeqLike are implemented in terms of it.
........
  r19787 | extempore | 2009-11-23 13:51:56 +0100 (Mon, 23 Nov 2009) | 1 line

  A couple more warning fixes I meant to check in with r19758. ........
r19789 | dragos | 2009-11-23 14:58:56 +0100 (Mon, 23 Nov 2009) | 2 lines

  == for specialized types will not cause boxing anymore ........ r19792
| odersky | 2009-11-23 15:45:44 +0100 (Mon, 23 Nov 2009) | 1 line

  Closed #1226. Added new test cases.
........
  r19793 | malayeri | 2009-11-23 16:16:25 +0100 (Mon, 23 Nov 2009) | 1 line

  Closed #2552. Changed Iterator.takeWhile and Iterator.filter to avoid
recomputing predicate in next and hasNext methods. ........ r19798 |
odersky | 2009-11-23 18:50:54 +0100 (Mon, 23 Nov 2009) | 1 line

  Partial fix for #2683
........
  r19799 | odersky | 2009-11-23 19:12:34 +0100 (Mon, 23 Nov 2009) | 1 line

  Closed #1545
........
  r19800 | extempore | 2009-11-23 22:03:51 +0100 (Mon, 23 Nov 2009) | 4 lines

  Partitioned scala.Math and scala.math a little bit. ALL_CAP aliases
are deprecated and only in Math. Formerly unavailable members of
java.lang.Math which were added in 1.5 are now available in scala.math.
........ r19803 | extempore | 2009-11-24 01:08:32 +0100 (Tue, 24 Nov
2009) | 2 lines

  Some more XML cleanups. I'm seeing if I can break the compiler
dependency on scala.util.automata. ........ r19804 | milessabin |
2009-11-24 02:13:01 +0100 (Tue, 24 Nov 2009) | 1 line

  Improved completion for locals and import.
........
  r19806 | moors | 2009-11-24 10:09:49 +0100 (Tue, 24 Nov 2009) | 5 lines

  close #2665 and close #2667: use weak conformance in polymorphic case
  of isApplicable reviewed by: odersky

  exprTypeArgs now takes a comparison function: isWeaklyCompatible is
passed in isApplicable's typesCompatible (to mimic what happens in the
monomorphic case) Martin: please review as this is different from my
original proposal (that one broke type inference, this one passes all
tests and does not slow down quick.comp) ........ r19807 | moors |
2009-11-24 11:15:58 +0100 (Tue, 24 Nov 2009) | 1 line

  pending test: see #2660, #2691
........
  r19808 | moors | 2009-11-24 11:19:08 +0100 (Tue, 24 Nov 2009) | 1 line

      close #2626 as specified by Martin
........
  r19813 | odersky | 2009-11-24 15:40:04 +0100 (Tue, 24 Nov 2009) | 1 line

  relaxed rule requiring `override` modifiers so that it's OK if self
type contains overridden symbol. ........ r19814 | odersky | 2009-11-24
16:50:06 +0100 (Tue, 24 Nov 2009) | 1 line

  Closed #2629 #2639 #2669
........
  r19815 | odersky | 2009-11-24 16:57:17 +0100 (Tue, 24 Nov 2009) | 1 line

  Closed #2696
........
  r19818 | odersky | 2009-11-24 17:07:49 +0100 (Tue, 24 Nov 2009) | 1 line

  Closed #2698
........
  r19819 | odersky | 2009-11-24 17:12:18 +0100 (Tue, 24 Nov 2009) | 1 line

  Closed #2664
........
  r19820 | prokopec | 2009-11-24 17:35:09 +0100 (Tue, 24 Nov 2009) | 1 line

  Added reverse capabilities to PriorityQueue. Seems to work well - tests pass.
........
  r19824 | phaller | 2009-11-24 18:11:45 +0100 (Tue, 24 Nov 2009) | 1 line

  Made mutable.OpenHashMap a MapLike. Closes #2681. ........

12 files changed, 96 insertions, 96 deletions

diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala
index 9fbfbb533b..834b2b3a74 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala
@@ -72,7 +72,7 @@ class AssemblyBuilder(name: AssemblyName)
     }
 
     /** Sets a custom attribute. */
-    def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) {
+    def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) {
 	addCustomAttribute(constr, value)
     }
 
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala
index ad3a82d040..cfb54844c9 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala
@@ -21,7 +21,7 @@ import java.io.IOException
  * @author Nikolay Mihaylov
  * @version 1.0
  */
-class ConstructorBuilder(declType: Type, attrs: int, paramTypes: Array[Type])
+class ConstructorBuilder(declType: Type, attrs: Int, paramTypes: Array[Type])
       extends ConstructorInfo(declType, attrs, paramTypes)
       with ICustomAttributeSetter
       with Visitable
@@ -31,7 +31,7 @@ class ConstructorBuilder(declType: Type, attrs: int, paramTypes: Array[Type])
     // public interface
 
     /** Defines a parameter of this constructor. */
-    def DefineParameter(pos: int, attr: int, name: String): ParameterBuilder = {
+    def DefineParameter(pos: Int, attr: Int, name: String): ParameterBuilder = {
 	val param = new ParameterBuilder(name, params(pos).ParameterType, attr, pos)
 	params(pos) = param
 	return param
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala
index 1fc3e068b8..1306148975 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala
@@ -18,7 +18,7 @@ import java.io.IOException
  * @author Nikolay Mihaylov
  * @version 1.0
  */
-class FieldBuilder(name: String, declType: Type, attrs: int, fieldType: Type)
+class FieldBuilder(name: String, declType: Type, attrs: Int, fieldType: Type)
       extends FieldInfo(name, declType, attrs, fieldType)
       with ICustomAttributeSetter
       with Visitable
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala
index c19366cc33..88587a143d 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala
@@ -15,5 +15,5 @@ import ch.epfl.lamp.compiler.msil.ConstructorInfo
  * @version 1.0
  */
 trait ICustomAttributeSetter {
-    def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte])
+    def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte])
 }
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 28d0f7787a..4644cade72 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala
@@ -52,7 +52,7 @@ abstract class ILPrinterVisitor extends Visitor {
     private var newline = true
 
     // print types without or with members?
-    protected var nomembers: boolean = false
+    protected var nomembers: Boolean = false
 
     // external assemblies
     protected var as: Array[Assembly] = null
@@ -90,13 +90,13 @@ abstract class ILPrinterVisitor extends Visitor {
     // methods to print code
     protected def print(s: String)  { align(); out.print(s)}
     protected def print(o: Object)  { align(); out.print(o) }
-    protected def print(c: char)    { align(); out.print(c) }
-    protected def print(`val`: int) { align(); out.print(`val`)}
-    protected def print(`val`: long){ align(); out.print(`val`)}
+    protected def print(c: Char)    { align(); out.print(c) }
+    protected def print(`val`: Int) { align(); out.print(`val`)}
+    protected def print(`val`: Long){ align(); out.print(`val`)}
     protected def println()         { out.println(); newline = true; padding = 0 }
-    protected def println(c: char)  { print(c); println() }
-    protected def println(i: int)   { print(i); println() }
-    protected def println(l: long)  { print(l); println() }
+    protected def println(c: Char)  { print(c); println() }
+    protected def println(i: Int)   { print(i); println() }
+    protected def println(l: Long)  { print(l); println() }
     protected def println(s: String){ print(s); println() }
     protected def println(o: Object){ print(o); println() }
     protected def printName(name: String) {
@@ -489,7 +489,7 @@ abstract class ILPrinterVisitor extends Visitor {
 
     //##########################################################################
 
-    def printAssemblySignature(assem: Assembly, extern: boolean) {
+    def printAssemblySignature(assem: Assembly, extern: Boolean) {
         print(".assembly ")
         if (extern)
             print("extern ")
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/Label.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/Label.scala
index ac62dd9ccd..113121a5c1 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/Label.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/Label.scala
@@ -78,7 +78,7 @@ object Label {
             // 	    : "this.stacksize = " + stacksize + " that.stacksize = "
             // 	    + that.stacksize
             // 	stacksize = that.stacksize
-            val ss: Int = Math.max(stacksize, that.getStacksize())
+            val ss: Int = math.max(stacksize, that.getStacksize())
             stacksize = ss
             that.setStacksize(ss)
         }
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala
index e22c1fca13..eb86c96de5 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala
@@ -45,7 +45,7 @@ class MethodBuilder(name: String, declType: Type, attrs: Int, returnType: Type,
     }
 
     /** Sets a custom attribute. */
-    def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) {
+    def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) {
 	addCustomAttribute(constr, value)
     }
 
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 037b8660ee..5b42d6df76 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala
@@ -105,7 +105,7 @@ class ModuleBuilder(name: String, fullname: String, scopeName: String, assembly:
     }
 
     /** Sets a custom attribute. */
-    def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) {
+    def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) {
 	addCustomAttribute(constr, value)
     }
 
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala
index e7bff447cc..1bd8e48633 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala
@@ -23,23 +23,23 @@ class OpCode extends Visitable {
     var CEE_string: String = _
 
     /** The type of Microsoft intermediate language (MSIL) instruction. */
-    var CEE_code: short = _
+    var CEE_code: Short = _
 
     /** How the Microsoft intermediate language (MSIL) instruction pops the stack. */
-    var CEE_pop: byte = _
+    var CEE_pop: Byte = _
 
     /** How the Microsoft intermediate language (MSIL) instruction pushes operand onto the stack. */
-    var CEE_push: byte = _
+    var CEE_push: Byte = _
 
     /** Describes the type of flow control. */
-    var CEE_flow: byte = _
+    var CEE_flow: Byte = _
 
     /** ????? */
-    var CEE_inline: byte = _
+    var CEE_inline: Byte = _
 
-    var CEE_length: byte = _
+    var CEE_length: Byte = _
 
-    var CEE_popush: byte = _
+    var CEE_popush: Byte = _
 
     /**
      * the apply method for a visitor
@@ -49,13 +49,13 @@ class OpCode extends Visitable {
 	v.caseOpCode(this)
     }
 
-    protected def length(): byte = {
+    protected def length(): Byte = {
 	val code = OpCode.length(CEE_code)
 	val inline = OpCode.INLINE_length(CEE_inline)
 	return if(inline < 0) { -1 } else { (code + inline).toByte }
     }
 
-    protected def popush(): byte = {
+    protected def popush(): Byte = {
 	val pop = OpCode.POP_size(CEE_pop)
 	val push = OpCode.PUSH_size(CEE_push)
 	return if(pop < 0 || push < 0) { OpCode.POPUSH_SPECIAL } else { (push - pop).toByte }
@@ -391,27 +391,27 @@ object OpCode {
     //########################################################################
     // Opcode's amount and type of poped data
 
-    final val POP_NONE          : byte        = 0x00
-    final val POP_1             : byte        = 0x01
-    final val POP_1_1           : byte        = 0x02
-    final val POP_I             : byte        = 0x03
-    final val POP_I_1           : byte        = 0x04
-    final val POP_I_I           : byte        = 0x05
-    final val POP_I_I8          : byte        = 0x06
-    final val POP_I_R4          : byte        = 0x07
-    final val POP_I_R8          : byte        = 0x08
-    final val POP_I_I_I         : byte        = 0x09
-    final val POP_REF           : byte        = 0x0A
-    final val POP_REF_1         : byte        = 0x0B
-    final val POP_REF_I         : byte        = 0x0C
-    final val POP_REF_I_I       : byte        = 0x0D
-    final val POP_REF_I_I8      : byte        = 0x0E
-    final val POP_REF_I_R4      : byte        = 0x0F
-    final val POP_REF_I_R8      : byte        = 0x10
-    final val POP_REF_I_REF     : byte        = 0x11
-    final val POP_SPECIAL       : byte        = 0x12
+    final val POP_NONE          : Byte        = 0x00
+    final val POP_1             : Byte        = 0x01
+    final val POP_1_1           : Byte        = 0x02
+    final val POP_I             : Byte        = 0x03
+    final val POP_I_1           : Byte        = 0x04
+    final val POP_I_I           : Byte        = 0x05
+    final val POP_I_I8          : Byte        = 0x06
+    final val POP_I_R4          : Byte        = 0x07
+    final val POP_I_R8          : Byte        = 0x08
+    final val POP_I_I_I         : Byte        = 0x09
+    final val POP_REF           : Byte        = 0x0A
+    final val POP_REF_1         : Byte        = 0x0B
+    final val POP_REF_I         : Byte        = 0x0C
+    final val POP_REF_I_I       : Byte        = 0x0D
+    final val POP_REF_I_I8      : Byte        = 0x0E
+    final val POP_REF_I_R4      : Byte        = 0x0F
+    final val POP_REF_I_R8      : Byte        = 0x10
+    final val POP_REF_I_REF     : Byte        = 0x11
+    final val POP_SPECIAL       : Byte        = 0x12
     final val POP_count         : Int         = 0x13
-    final val POP_size          : Array[byte] = new Array[byte](POP_count)
+    final val POP_size          : Array[Byte] = new Array[Byte](POP_count)
 
 	POP_size(POP_NONE)              =  0
 	POP_size(POP_1)                 =  1
@@ -436,17 +436,17 @@ object OpCode {
     //########################################################################
     // Opcode's amount and type of pushed data
 
-    final val PUSH_NONE         : byte        = 0x00
-    final val PUSH_1            : byte        = 0x01
-    final val PUSH_1_1          : byte        = 0x02
-    final val PUSH_I            : byte        = 0x03
-    final val PUSH_I8           : byte        = 0x04
-    final val PUSH_R4           : byte        = 0x05
-    final val PUSH_R8           : byte        = 0x06
-    final val PUSH_REF          : byte        = 0x07
-    final val PUSH_SPECIAL      : byte        = 0x08
+    final val PUSH_NONE         : Byte        = 0x00
+    final val PUSH_1            : Byte        = 0x01
+    final val PUSH_1_1          : Byte        = 0x02
+    final val PUSH_I            : Byte        = 0x03
+    final val PUSH_I8           : Byte        = 0x04
+    final val PUSH_R4           : Byte        = 0x05
+    final val PUSH_R8           : Byte        = 0x06
+    final val PUSH_REF          : Byte        = 0x07
+    final val PUSH_SPECIAL      : Byte        = 0x08
     final val PUSH_count        : Int         = 0x09
-    final val PUSH_size         : Array[byte] = new Array[byte](PUSH_count)
+    final val PUSH_size         : Array[Byte] = new Array[Byte](PUSH_count)
 
 	PUSH_size(PUSH_NONE)             =  0
 	PUSH_size(PUSH_1)                =  1
@@ -461,30 +461,30 @@ object OpCode {
     //########################################################################
     // Opcode's amount of moved data
 
-    final val POPUSH_SPECIAL    : byte        = -128
+    final val POPUSH_SPECIAL    : Byte        = -128
 
     //########################################################################
     // Opcode's inline argument types
 
-    final val INLINE_NONE       : byte        = 0x00
-    final val INLINE_VARIABLE_S : byte        = 0x01
-    final val INLINE_TARGET_S   : byte        = 0x02
-    final val INLINE_I_S        : byte        = 0x03
-    final val INLINE_VARIABLE   : byte        = 0x04
-    final val INLINE_TARGET     : byte        = 0x05
-    final val INLINE_I          : byte        = 0x06
-    final val INLINE_I8         : byte        = 0x07
-    final val INLINE_R          : byte        = 0x08
-    final val INLINE_R8         : byte        = 0x09
-    final val INLINE_STRING     : byte        = 0x0A
-    final val INLINE_TYPE       : byte        = 0x0B
-    final val INLINE_FIELD      : byte        = 0x0C
-    final val INLINE_METHOD     : byte        = 0x0D
-    final val INLINE_SIGNATURE  : byte        = 0x0E
-    final val INLINE_TOKEN      : byte        = 0x0F
-    final val INLINE_SWITCH     : byte        = 0x10
+    final val INLINE_NONE       : Byte        = 0x00
+    final val INLINE_VARIABLE_S : Byte        = 0x01
+    final val INLINE_TARGET_S   : Byte        = 0x02
+    final val INLINE_I_S        : Byte        = 0x03
+    final val INLINE_VARIABLE   : Byte        = 0x04
+    final val INLINE_TARGET     : Byte        = 0x05
+    final val INLINE_I          : Byte        = 0x06
+    final val INLINE_I8         : Byte        = 0x07
+    final val INLINE_R          : Byte        = 0x08
+    final val INLINE_R8         : Byte        = 0x09
+    final val INLINE_STRING     : Byte        = 0x0A
+    final val INLINE_TYPE       : Byte        = 0x0B
+    final val INLINE_FIELD      : Byte        = 0x0C
+    final val INLINE_METHOD     : Byte        = 0x0D
+    final val INLINE_SIGNATURE  : Byte        = 0x0E
+    final val INLINE_TOKEN      : Byte        = 0x0F
+    final val INLINE_SWITCH     : Byte        = 0x10
     final val INLINE_count      : Int         = 0x11
-    final val INLINE_length     : Array[byte] = new Array[byte](INLINE_count)
+    final val INLINE_length     : Array[Byte] = new Array[Byte](INLINE_count)
 
 	INLINE_length(INLINE_NONE)       =  0
 	INLINE_length(INLINE_VARIABLE_S) =  1
@@ -507,21 +507,21 @@ object OpCode {
     //########################################################################
     // Opcode's control flow implications
 
-    final val FLOW_META         : byte = 0x00
-    final val FLOW_NEXT         : byte = 0x01
-    final val FLOW_BRANCH       : byte = 0x02
-    final val FLOW_COND_BRANCH  : byte = 0x03
-    final val FLOW_BREAK        : byte = 0x04
-    final val FLOW_CALL         : byte = 0x05
-    final val FLOW_RETURN       : byte = 0x06
-    final val FLOW_THROW        : byte = 0x07
+    final val FLOW_META         : Byte = 0x00
+    final val FLOW_NEXT         : Byte = 0x01
+    final val FLOW_BRANCH       : Byte = 0x02
+    final val FLOW_COND_BRANCH  : Byte = 0x03
+    final val FLOW_BREAK        : Byte = 0x04
+    final val FLOW_CALL         : Byte = 0x05
+    final val FLOW_RETURN       : Byte = 0x06
+    final val FLOW_THROW        : Byte = 0x07
     final val FLOW_count        : Int  = 0x08
 
     //########################################################################
     // Init methods for Opcode
 
-    def opcode(that: OpCode, opcode: int, string: String, code: Int,
-			pop: byte, push: byte, inline: byte, flow: byte) {
+    def opcode(that: OpCode, opcode: Int, string: String, code: Int,
+			pop: Byte, push: Byte, inline: Byte, flow: Byte) {
 	that.CEE_opcode = opcode
 	that.CEE_string = string
 	that.CEE_code = code.toShort
@@ -533,7 +533,7 @@ object OpCode {
 	that.CEE_popush = that.popush()
     }
 
-    def length(code: Int): byte = {
+    def length(code: Int): Byte = {
 	if ((code & 0xFFFFFF00) == 0xFFFFFF00) return 1
 	if ((code & 0xFFFFFF00) == 0xFFFFFE00) return 2
 	return 0
@@ -1862,7 +1862,7 @@ object OpCode {
 
     /**
      * Allocates a certain number of bytes from the local dynamic memory pool and pushes the
-     * address (a transient pointer, type *) of the first allocated byte onto the evaluation stack.
+     * address (a transient pointer, type *) of the first allocated Byte onto the evaluation stack.
      */
     final val Localloc = new OpCode()
 	opcode(Localloc, CEE_LOCALLOC, "localloc"  , 0xFFFFFE0F, POP_I, PUSH_I, INLINE_NONE, FLOW_NEXT)
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala
index 57ef69ba7f..f8e0f140a8 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala
@@ -1135,7 +1135,7 @@ object OpCodes {
 
     /**
      * Allocates a certain number of bytes from the local dynamic memory pool and pushes the
-     * address (a transient pointer, type *) of the first allocated byte onto the evaluation stack.
+     * address (a transient pointer, type *) of the first allocated Byte onto the evaluation stack.
      */
      final val Localloc = OpCode.Localloc
 
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala
index dabba58f0c..5a68f8f0ae 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala
@@ -29,7 +29,7 @@ class ParameterBuilder(name: String, tpe: Type, attr: Int, pos: Int)
     //##########################################################################
 
     /** Sets a custom attribute. */
-    def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) {
+    def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) {
 	addCustomAttribute(constr, value)
     }
 
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 81bf28bc04..84fd2a4023 100644
--- a/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala
+++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala
@@ -18,7 +18,7 @@ import java.io.IOException
  * @author Nikolay Mihaylov
  * @version 1.0
  */
-class TypeBuilder (module: Module, attributes: int, fullName: String, baseType: Type, interfaces: Array[Type], declType: Type)
+class TypeBuilder (module: Module, attributes: Int, fullName: String, baseType: Type, interfaces: Array[Type], declType: Type)
       extends Type(module, attributes, fullName, baseType, interfaces, declType, 0)
       with ICustomAttributeSetter
       with Visitable
@@ -45,7 +45,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType:
      * Adds a new field to the class, with the given name,
      * attributes and field type.
      */
-    def DefineField(name: String, `type`: Type, attrs: short): FieldBuilder = {
+    def DefineField(name: String, `type`: Type, attrs: Short): FieldBuilder = {
 	val field: FieldBuilder = new FieldBuilder(name, this, attrs, `type`)
 	fieldBuilders.add(field)
 	return field
@@ -55,7 +55,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType:
      * Adds a new method to the class, with the given name and
      * method signature.
      */
-    def DefineMethod(name: String, attrs: short, returnType: Type, paramTypes: Array[Type]): MethodBuilder = {
+    def DefineMethod(name: String, attrs: Short, returnType: Type, paramTypes: Array[Type]): MethodBuilder = {
 	val method = new MethodBuilder(name, this, attrs, returnType, paramTypes)
     val methods = methodBuilders.iterator()
     while(methods.hasNext()) {
@@ -72,7 +72,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType:
      * Adds a new constructor to the class, with the given attributes
      * and signature.
      */
-    def DefineConstructor(attrs: short, callingConvention: short, paramTypes: Array[Type]): ConstructorBuilder = {
+    def DefineConstructor(attrs: Short, callingConvention: Short, paramTypes: Array[Type]): ConstructorBuilder = {
 	val constr = new ConstructorBuilder(this, attrs, paramTypes)
 	constructorBuilders.add(constr)
 	return constr
@@ -81,7 +81,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType:
     /**
      * Defines a nested type given its name.
      */
-    def DefineNestedType(name: String, attributes: int, baseType: Type, interfaces: Array[Type]): TypeBuilder = {
+    def DefineNestedType(name: String, attributes: Int, baseType: Type, interfaces: Array[Type]): TypeBuilder = {
     val nested = nestedTypeBuilders.iterator()
     while(nested.hasNext()) {
         val nt = nested.next().asInstanceOf[TypeBuilder]
@@ -152,11 +152,11 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType:
     }
 
     /** Sets a custom attribute. */
-    def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) {
+    def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) {
 	addCustomAttribute(constr, value)
     }
 
-    def setPosition(sourceLine: int, sourceFilename: String) {
+    def setPosition(sourceLine: Int, sourceFilename: String) {
 	this.sourceLine = sourceLine
 	this.sourceFilename = sourceFilename
     }
@@ -213,7 +213,7 @@ object TypeBuilder {
     return s.toString()
     }
 
-    def methodsEqual(m1: MethodInfo, m2: MethodInfo): boolean = {
+    def methodsEqual(m1: MethodInfo, m2: MethodInfo): Boolean = {
     if (!m1.Name.equals(m2.Name))
         return false
     if (m1.ReturnType != m2.ReturnType)