581 files changed, 631 insertions, 4928 deletions

diff --git a/README b/README
new file mode 100644
index 0000000000..837d5170ae
--- /dev/null
+++ b/README
@@ -0,0 +1,59 @@
+================================================================================
+                              THE SCALA REPOSITRY
+                           Structure and build system
+================================================================================
+
+Part I. The repository layout
+--------------------------------------------------------------------------------                            
+
+Follows the file layout of the Scala repository. Files marked with a † are not
+part of the Subversion repository but are either automatically generated by the
+build script or user-created if needed.
+
+scala/
+      build/ †                Temporary staging area for build products.
+      build.excludes †        An optional build configuration file.
+      build.properties †      An optional build configuration file.
+      build.xml               The main Ant build script.
+      dist/ †                 The destination folder of Scala distributions.
+      docs/                   Documentation of Scala. More in its own module.
+           development/       Developer documentation.
+           examples/          Scala example files.
+           man/               UNIX manual files.
+      lib/                    Pre-compiled libraries for the build.
+          fjbg.jar            The Java byte-code generation library.
+          jaco.jar            The JaCo Java compiler.
+          msil.jar            The CLR byte-code generation library.
+          scala-compiler.jar  The last stable version of the Scala compiler.
+          scala-library.jar   The last stable version of the Scala library.
+          scala.dll           The Scala library for Windows.
+      README                  The file you are currently reading.
+      sandbox/ †              A folder to test code etc.
+      src/                    All the source files of Scala.
+          compiler/           The sources of the Scala compiler.
+          exec/               The sources of the executable wrapper-scripts.
+          library/            The sources of the Scala library.
+      test/                   The Scala test suite.
+
+Any change to this structure requires a modification of the 'build.xml' file.
+
+
+
+Part II. Building Scala
+--------------------------------------------------------------------------------
+
+The Scala build system is based on Apache Ant. Most required pre-compiled libraries are part of the repository (in 'lib/'). The following however is assumed to be installed on the build machine:
+  - A Java SDK 1.4 or above (1.5 not supported).
+  - Apache Ant version 1.6.2 or above.
+
+More to come ...
+
+Part III. Creating distributions
+--------------------------------------------------------------------------------
+
+More to come ...
+
+Part IV. Contributing to Scala
+--------------------------------------------------------------------------------                            
+
+More to come ...
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 430aa8aa97..0000000000
--- a/VERSION
+++ /dev/null
@@ -1,9 +0,0 @@
-############################################################-*-Makefile-*-####
-# DO NOT EDIT. Automatically generated file!
-#
-# To modify the current version use the following command:
-#     make version-set VERSION=<version>
-#
-# DO NOT EDIT. Automatically generated file!
-##############################################################################
-1.4.0.4
diff --git a/build.readme b/build.readme
deleted file mode 100644
index 925093061b..0000000000
--- a/build.readme
+++ /dev/null
@@ -1,114 +0,0 @@
-BUILDING NEW SCALA WITH ANT
----------------------------
-
-This is version 1.0 of the Scala Ant-based build system SABBUS.
-
-QUICK START
------------
-
-- Copy the 'build.TEMPLATE.properties' file in 'build.support' to
-  'build.USER_NAME.properties'. Set all properties in this file.
-
-- In a terminal window, type:
-  ANT_OPTS="-Xmx256M" ant distrib
-
-USAGE GUIDE
------------
-
-PREREQUISITES
-
-The new Scala Ant-based build system (SABBUS) requires the following elements:
-  - An old Scala distribution. The Scala tools ('tools.jar' must be of a version
-    that does contain the improved Scalac Ant task at
-    'scala.tools.scalac.ant.Scalac'. The scala library ('scala.jar') must contain
-    all classes required to build NSC.
-  - A PiCo/JaCo distribution. It must contain the improved PiCo task at
-    'jaco.pizza.ant.Pico'.
-  - Ant version 1.6 or above.
-  - Java version 1.4 or above (Java 1.5 might not be supported).
-
-SETTING UP
-
-The set-up of SABBUS is done entirely in the 'build.properties' file. Make sure
-that all values in this file are set and correct.
-
-Another configuration file exists ('build.support/build.default'). This file
-should not be modified as any property declared in 'build.properties' will
-override the value set in 'build.default'.
-
-With a normal Java distribution, the standard memory allocated to the JVM in
-insufficient for Scala compilation. The ANT_OPTS environment variable needs to
-be set to increase the memory size (either each time as in the quick start
-example above, or once and for all in the default shell environment).
-
-Skipping parts of the build
-
-In some cases, parts of the build process should be disabled for debug reasons:
-  - skip.doc will not build the LaTeX documentation.
-  - skip.nsc will not build anything with NSC. This will create a non-working
-             distribution.
-
-BUILDING NEW SCALA
-
-The 'build' target builds all the Scala library and tools. It is composed of the
-following sub-targets:
-  - 'build.pico.nslib':
-      Builds the Java files in Scala (runtime, tools and scala root) with PiCo.
-      When both a Java file in sources and a Scala file in newsources exist, the
-      Java file is not compiled (it is considered to have been superseeded by the
-      Scala file).
-  - 'build.osc.nstools':
-      Builds NSC with an existing Scalac (found in path of property
-      'ostools.jar').
-  - 'build.nsc.nslib':
-      Builds the new Scala library with the compiler built at target
-      'build.osc.nstools'. Depends on 'build.osc.nstools' & 'build.pico.nslib'.
-      If files should not be compiled at that stage, they can be specified in the
-      'build.support/nsc.nslib.excludes'
-  - 'build.nsc.nstools':
-      Builds NSC with the compiler built at target 'build.osc.nstools'. Depends
-      on 'build.osc.nstools' & 'build.pico.nslib'. If files should not be
-      compiled at that stage, they can be specified in the
-      'build.support/nsc.nstools.excludes'
-
-CONSTRUCTING A DISTRIBUTION
-
-The 'distrib' target constructs a simple distribution of new Scala from the
-latest build. The following steps will be done:
-  - Creates a standard distribution folder hierarchy.
-  - Create JAR packages for the library ('nslib.jar'), and the tools, both
-    compiled with Scalac ('osc-nstools.jar') and with NSC ('nstools.jar').
-  - Create script files (bash and bat) to execute the new Scala compiler.
-  - Adds man files and the documentation to the distribution.
-  - Generates some symbolic links to simplify navigation (only on UNIX). Amongst
-    other, a 'latest' link in the 'dist' folder will point to the latest
-    distribution folder (useful to refer in a permanent way to the latest
-    distribution on your system).
-
-CLEANING
-
-The 'clean' target removes all build and distribution files.
-  - 'clean.build' only removes build files and does not touch distribution files.
-  - 'clean.distrib' only removes distribution files.
-
-DOCUMENTING
-
-Not implemented yet
-
-TESTING
-
-Not implemented yet
-
-KNOWN BUGS, LIMITATIONS AND PLANNED IMPROVEMENTS
-------------------------------------------------
-
-- Create NSC executable scripts for UNIX and Windows.
-- Create Windows build system.
-- Create documentation.
-- Support testing.
-
-HISTORY
--------
-
-1.0
-  First functioning version. Supports clean, build and a limited distrib.
diff --git a/build.xml b/build.xml
index 4fc5401fc7..e570ccd1cc 100644
--- a/build.xml
+++ b/build.xml
@@ -1,744 +1,494 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id$ -->
 
-<project name="nscala" default="distrib">
-
-    <description>
-      This is SABBUS, the system to build the Scala NSC compiler as well as
-      various related tools. The 'build.TEMPLATE.properties' file must be
-      customised for your own particular system, no other customisation should
-      be required. The build file expects the file structure of a Scala CVS
-      distribution.
-    </description>
-    
-    <echo>This is SABBUS, your helpful build script for new Scala.</echo>
-
-    <property environment="env"/>
-    <condition property="memory.set">
-    	<contains string="${env.ANT_OPTS}" substring="-Xmx"/>
-    </condition>
-    <fail unless="memory.set">SABBUS requires additional memory. Please set the 'ANT_OPTS' environment property to '-Xmx256M' or more.</fail>
-    <condition property="classpath.set">
-    	<and>
-    	    <isset property="env.CLASSPATH"/>
-    	    <not><equals arg1="${env.CLASSPATH}" arg2="" trim="true"/></not>
-    	</and>
+<project name="scala-core" default="build">
+
+  <description>
+    I am Sabbus for Scala-core, the build system for the Scala compiler and core
+    library. Please check the 'docs/README' file for more information about me.
+  </description>
+  
+  <echo>Running Sabbus for Scala-core</echo>
+
+  <!--
+  ##############################################################################
+  PROPERTIES
+  ##############################################################################
+  -->
+  
+  <property environment="env"/>
+  <condition property="memory.set">
+  	<contains string="${env.ANT_OPTS}" substring="-Xmx"/>
+  </condition>
+  <fail unless="memory.set">
+    Sabbus requires additional memory. Please set the 'ANT_OPTS' environment
+    property to '-Xmx256M' or more.
+  </fail>
+
+  <!-- Prevents system classpath from being used -->
+  <property name="build.sysclasspath" value="ignore"/>
+
+  <!-- Base properties -->
+  <property name="docs.dir" value="${basedir}/docs"/>
+  <property name="lib.dir" value="${basedir}/lib"/>
+  <property name="src.dir" value="${basedir}/src"/>
+  <property name="test.dir" value="${basedir}/test"/>
+  <!-- User properties -->
+  <property file="${basedir}/build.properties"/>
+  <!-- General properties -->
+  <property name="copyright" value="(c) 2002-05 LAMP/EPFL"/>
+  <!-- NSC configuration properties -->
+  <property name="nsc.logging" value="none"/>
+  <property name="nsc.debug-info" value="true"/>
+  <property name="nsc.excludes" value="build.excludes"/>
+  <!-- Location of pre-compiled libraries properties -->
+  <property name="starr.lib.jar" value="${lib.dir}/scala-library.jar"/>
+  <property name="starr.comp.jar" value="${lib.dir}/scala-compiler.jar"/>
+  <property name="jaco.jar" value="${lib.dir}/jaco.jar"/>
+  <property name="fjbg.jar" value="${lib.dir}/fjbg.jar"/>
+  <property name="msil.jar" value="${lib.dir}/msil.jar"/>
+  <property name="scala.dll" value="${lib.dir}/scala.dll"/>
+  <property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
+  <!-- Location of build products properties -->
+  <property name="locker.dir" value="${basedir}/build/locker"/>
+  <property name="quick.dir" value="${basedir}/build/quick"/>
+  <property name="strap.dir" value="${basedir}/build/strap"/>
+  <!-- Location of source and build elements names properties -->
+  <property name="lib.dir.name" value="library"/>
+  <property name="comp.dir.name" value="compiler"/>
+  <property name="exec.dir.name" value="exec"/>
+  <!-- Location of structure of the distribution properties -->
+  <property name="distrib.unix.dir" value="${basedir}/distribs/unix"/>
+  <property name="distrib.win.dir" value="${basedir}/distribs/windows"/>
+  <property name="distrib.latest.dir" value="${basedir}/distribs/latest"/>
+  <property name="distrib.name" value="scala"/>
+  <property name="lib.jar.name" value="${distrib.name}-${lib.dir.name}.jar"/>
+  <property name="comp.jar.name" value="${distrib.name}-${comp.dir.name}.jar"/>
+  <property name="scala.exec.name" value="${distrib.name}"/>
+  <property name="scalai.exec.name" value="${distrib.name}i"/>
+  <property name="scalac.exec.name" value="${distrib.name}c"/>
+  <property name="scalatok.exec.name" value="${distrib.name}tok"/>
+  <property name="wrapper.exec.name" value=".${distrib.name}-wrapper"/>
+  <!-- Shorcut names -->
+  <property name="locker.lib.dir" value="${locker.dir}/${lib.dir.name}"/>
+  <property name="locker.comp.dir" value="${locker.dir}/${comp.dir.name}"/>
+  <property name="quick.lib.dir" value="${quick.dir}/${lib.dir.name}"/>
+  <property name="quick.comp.dir" value="${quick.dir}/${comp.dir.name}"/>
+  <property name="strap.lib.dir" value="${strap.dir}/${lib.dir.name}"/>
+  <property name="strap.comp.dir" value="${strap.dir}/${comp.dir.name}"/>
+
+  <!--
+  ##############################################################################
+  INITIALISATION
+  ##############################################################################
+  -->
+  
+  <target name="init">
+    <!-- Testing if everything is in place -->
+    <echo level="verbose">starr.lib.jar=${starr.lib.jar}</echo>
+    <fail message="STARR library in 'lib/' is not available">
+      <condition><not><and>
+        <available classname="scala.Predef" 
+                   classpath="${starr.lib.jar}"/>
+        <available classname="scala.List"
+                   classpath="${starr.lib.jar}"/>
+        <available classname="scala.runtime.ObjectRef"
+                   classpath="${starr.lib.jar}"/>
+      </and></not></condition>
+    </fail>
+    <echo level="verbose">starr.comp.jar=${starr.comp.jar}</echo>
+    <fail message="STARR compiler in 'lib/' is not available">
+      <condition><not>
+        <available classname="scala.tools.nsc.ant.NSC"
+                   classpath="${starr.comp.jar}:${starr.lib.jar}"/>
+      </not></condition>
+    </fail>
+    <echo level="verbose">fjbg.jar=${fjbg.jar}</echo>
+    <fail message="FJBG library in 'lib/' is not available">
+      <condition><not>
+        <available classname="ch.epfl.lamp.fjbg.JCode"
+                   classpath="${fjbg.jar}"/>
+      </not></condition>
+    </fail>
+    <echo level="verbose">msil.jar=${msil.jar}</echo>
+    <fail message="MSIL library in 'lib/' is not available">
+      <condition><not>
+        <available classname="ch.epfl.lamp.compiler.msil.Assembly"
+                   classpath="${msil.jar}"/>
+      </not></condition>
+    </fail>
+    <echo level="verbose">jaco.jar=${jaco.jar}</echo>
+    <fail message="JaCo compiler in 'lib/' is not available">
+      <condition><not>
+        <available classname="jaco.pizza.Main" classpath="${jaco.jar}"/>
+      </not></condition>
+    </fail>
+    <echo level="verbose">ant.jar=${ant.jar}</echo>
+    <!-- Finding out what is available -->
+    <available property="excludes.avail" file="${nsc.excludes}"/>
+    <condition property="locker.avail">
+      <and>
+        <available classname="scala.Predef" classpath="${locker.lib.dir}"/>
+        <available classname="scala.List" classpath="${locker.lib.dir}"/>
+        <available classname="scala.runtime.ObjectRef"
+                   classpath="${locker.lib.dir}"/>
+        <available classname="scala.tools.nsc.ant.NSC"
+                   classpath="${locker.comp.dir}:${locker.lib.dir}"/>
+        <available file="${locker.dir}/${exec.dir.name}/${scalac.exec.name}"/>
+      </and>
     </condition>
-    <fail if="classpath.set">SABBUS is too unstable when used with a non-empty classpath. Unset your classpath environment variable.</fail>
-
-    <!-- The system classpath should not be used -->
-    <property name="build.sysclasspath" value="ignore"/>
-
-    <!-- Properties in 'build.base.properties' are all defined relatively
-         to ${basedir}.
-    -->
-    <echo level="verbose">Loading properties from '${basedir}/config/build.base.properties'</echo>
-    <property file="${basedir}/config/build.base.properties"/>
-
-    <!-- Properties in 'build.${user.name}.properties' take precedence over
-         properties in 'build.default.properties'.
-    -->
-    <echo level="verbose">Loading properties from '${config.dir}/build.${user.name}.properties'</echo>
-    <property file="${config.dir}/build.${user.name}.properties"/>
-    <echo level="verbose">Loading properties from '${build.support.dir}/build.${user.name}.properties'</echo>
-    <property file="${build.support.dir}/build.${user.name}.properties"/>
-    <echo level="verbose">Loading properties from '${config.dir}/build.default.properties'</echo>
-    <property file="${config.dir}/build.default.properties"/>
-    
-    <!-- A path containing pre-compiled Scala libraries found typically
-         in a Scala distribution. -->
-    <path id="osc.classpath">
-        <pathelement location="${oslib.jar}"/>
-        <pathelement location="${oslib.src}"/>
-        <pathelement location="${ostools.jar}"/>
-        <pathelement location="${fjbg.jar}"/>
-        <pathelement location="${msil.jar}"/>
+    <!-- Creating class-pathes -->
+    <path id="common.classpath">
+      <pathelement location="${fjbg.jar}"/>
+      <pathelement location="${msil.jar}"/>
     </path>
-
-    <!-- A path containing the Pico library -->
-    <path id="pico.classpath">
-        <pathelement location="${jaco.jar}"/>
+    <path id="starr.classpath">
+      <pathelement location="${starr.lib.jar}"/>
+      <pathelement location="${starr.comp.jar}"/>
+      <path refid="common.classpath"/>
     </path>
-
-    <!-- A path containing the new Scala library -->
-    <path id="nsc.classpath">
-        <pathelement location="${build.pico-nslib.dir}"/>
-        <pathelement location="${build.osc-nstools.dir}"/>
-        <pathelement location="${oslib.jar}"/>
-        <pathelement location="${fjbg.jar}"/>
-        <pathelement location="${msil.jar}"/>
+    <!-- Defining version number -->
+  	<tstamp prefix="start"/>
+    <property name="version" value="${start.DSTAMP}-${start.TSTAMP}"/>
+    <!-- Creating boot-level tasks -->
+    <taskdef name="starr"
+             classname="scala.tools.nsc.ant.NSC"
+             classpathref="starr.classpath"/>
+    <taskdef name="pico"
+             classname="jaco.pizza.ant.Pico"
+             classpath="${jaco.jar}"/>
+  </target>
+  
+  <target name="init.locker" depends="init, build.locker">
+    <path id="locker.classpath">
+      <pathelement location="${locker.dir}/${lib.dir.name}"/>
+      <pathelement location="${locker.dir}/${comp.dir.name}"/>
+      <path refid="common.classpath"/>
     </path>
-    
-    <target name="all" depends="clean.all, distrib.all"/>
-
-    <!--
-    #####################################################################
-    VERSION MANAGEMENT
-    #####################################################################
-    -->
-    
-    <target name="version.init" depends="version.trunk"/>
-    
-    <target name="version.trunk" depends="version.public">
-    	<tstamp prefix="start"/>
-        <property name="distrib.version" value="${start.DSTAMP}-${start.TSTAMP}"/>
-    </target>
-    
-    <target name="version.public" if="version.public">
-        <loadfile srcfile="${basedir}/VERSION" property="distrib.version">
-            <filterchain>
-                <linecontainsregexp>
-                    <regexp pattern="[0-9]+\.[0-9]+\.[0-9]+\.[0-9]"/>
-                </linecontainsregexp>
-                <striplinebreaks/>
-            </filterchain>
-        </loadfile>
-    </target>
-
-    <!--
-    #####################################################################
-    INIT
-    #####################################################################
-    -->
-    
-    <target name="init.osc">
-        <echo level="verbose">oslib.jar=${oslib.jar}</echo>
-        <echo level="verbose">oslib.src=${oslib.src}</echo>
-        <echo level="verbose">ostools.jar=${ostools.jar}</echo>
-        <echo level="verbose">fjbg.jar=${fjbg.jar}</echo>
-        <echo level="verbose">msil.jar=${msil.jar}</echo>
-        <fail message="Required classes for OSC are missing; check the 'oslib.jar', 'ostools.jar' properties in 'build.${user.name}.properties'.">
-            <condition><not><and>
-                <available classname="scala.List" classpathref="osc.classpath"/>
-                <available classname="scala.runtime.RunTime" classpathref="osc.classpath"/>
-                <available classname="scala.tools.scalac.Main" classpathref="osc.classpath"/>
-                <available classname="scala.tools.scalac.ant.Scalac" classpathref="osc.classpath"/>
-            </and></not></condition>
-        </fail>
-        <fail message="Required classes for FJBG are missing; check the 'fjbg.jar' property in 'build.${user.name}.properties'.">
-            <condition><not><and>
-                <available classname="ch.epfl.lamp.fjbg.JField" classpathref="osc.classpath"/>
-                <available classname="ch.epfl.lamp.util.ByteArray" classpathref="osc.classpath"/>
-            </and></not></condition>
-        </fail>
-        <fail message="Required classes for MSIL are missing; check the 'msil.jar' property in 'build.${user.name}.properties'.">
-            <condition><not><and>
-                <available classname="ch.epfl.lamp.compiler.msil.Module" classpathref="osc.classpath"/>
-                <available classname="ch.epfl.lamp.compiler.msil.Type" classpathref="osc.classpath"/>
-            </and></not></condition>
-        </fail>
-        <taskdef name="osc" classname="scala.tools.scalac.ant.Scalac"
-                 classpathref="osc.classpath"/>
-    </target>
-
-    <target name="init.nsc" depends="build.osc.nstools, build.pico.nslib">
-        <taskdef name="nsc" classname="scala.tools.nsc.ant.NSC$class"
-                 classpathref="nsc.classpath"/>
-    </target>
-
-    <target name="init.pico">
-        <echo level="verbose">jaco.jar=${jaco.jar}</echo>
-        <fail message="Required classes for PiCo are missing; check the 'jaco.jar' property in 'build.properties'.">
-            <condition><not><and>
-                <available classname="jaco.pizza.Main" classpathref="pico.classpath"/>
-                <available classname="jaco.pizza.ant.Pico" classpathref="pico.classpath"/>
-            </and></not></condition>
-        </fail>
-        <taskdef name="pico" classname="jaco.pizza.ant.Pico" classpathref="pico.classpath"/>
-    </target>
-    
-    <!--
-    #####################################################################
-    BUILD
-    #####################################################################
-    -->
-    
-    <target name="build" depends="build.jars"
-            description="Builds new Scala (compiler and library)."/>
-    
-    <target name="build.init">
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${build.pico-nslib.dir}"/>
-        <mkdir dir="${build.nslib.dir}"/>
-        <mkdir dir="${build.osc-nstools.dir}"/>
-        <mkdir dir="${build.nstools.dir}"/>
-    </target>
-    
-    <target name="build.pico.nslib" depends="init.pico, build.init"
-            description="Builds the runtime and pico libraries of the new Scala library.">
-        <pico srcdir="${sources.dir}" destdir="${build.pico-nslib.dir}"
-              scalahack="true" includes="**/*.java">
-            <classpath>
-                <pathelement location="${build.pico-nslib.dir}"/>
-            </classpath>
-            <or>
-                <filename name="scala/runtime/**/*"/>
-                <filename name="scala/tools/util/*"/>
-                <and>
-                    <filename name="scala/*"/>
-                    <not>
-                        <present targetdir="${newsources.dir}" present="both">
-                            <mapper type="glob" from="*.java" to="*.scala"/>
-                        </present>
-                    </not>
-                </and>
-            </or>
-        </pico>
-        <delete>
-            <fileset dir="${build.pico-nslib.dir}">
-                <present targetdir="${newsources.dir}" present="both">
-                    <mapper type="glob" from="*.class" to="*.scala"/>
-                </present>
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="build.osc.nstools" depends="init.osc, build.init"
-            description="Builds the new Scala compiler.">
-        <osc srcdir="${sources.dir}" destdir="${build.osc-nstools.dir}"
-             excludesfile="${nsc.osc-nstools.excludes}"
-             force="changed">
-            <classpath>
-                <pathelement location="${build.osc-nstools.dir}"/>
-                <pathelement location="${oslib.jar}"/>
-                <pathelement location="${oslib.src}"/>
-                <pathelement location="${fjbg.jar}"/>
-                <pathelement location="${ant.jar}"/>
-            </classpath>
-            <include name="scala/tools/nsc/**/*.scala"/>
-            <include name="scala/tools/scalap/**/*.scala"/>
-            <include name="scala/reflect/*.scala"/>
-            <include name="scala/runtime/*.scala"/>
-            <include name="scala/runtime/**/*.scala"/>
-        </osc>
-    </target>
-
-    <target name="build.nsc.nslib" depends="init.nsc, build.pico.nslib, build.init"
-            unless="skip.nsc"
-            description="Builds the Scala library with the new Scala compiler.">
-        <nsc srcdir="${sources.dir}" destdir="${build.nslib.dir}"
-             usepredefs="false" debuginfo="${nsc.debuginfo}"
-             stop="${nsc.stop}" skip="${nsc.skip}" check="${nsc.check}" log="${nsc.log}"
-             logging="${nsc.logging}" print="${nsc.print}">
-            <classpath>
-                <pathelement location="${build.pico-nslib.dir}"/>
-                <pathelement location="${build.nslib.dir}"/>
-                <pathelement location="${sources.dir}"/>
-                <pathelement location="${newsources.dir}"/>
-                <pathelement location="${fjbg.jar}"/>
-            </classpath>
-            <include name="scala/Predef.scala"/>
-            <include name="scala/runtime/ScalaRunTime.scala"/>
-        </nsc>
-        <nsc srcdir="${sources.dir}" destdir="${build.nslib.dir}"
-             excludesfile="${nsc.nslib.excludes}" debuginfo="${nsc.debuginfo}"
-             stop="${nsc.stop}" skip="${nsc.skip}" check="${nsc.check}" log="${nsc.log}"
-             logging="${nsc.logging}" print="${nsc.print}">
-            <classpath>
-                <pathelement location="${build.pico-nslib.dir}"/>
-                <pathelement location="${build.nslib.dir}"/>
-                <pathelement location="${sources.dir}"/>
-                <pathelement location="${newsources.dir}"/>
-                <pathelement location="${fjbg.jar}"/>
-            </classpath>
-            <include name="scala/**/*.scala"/>
-            <exclude name="scala/Predef.scala"/>
-            <exclude name="scala/runtime/ScalaRunTime.scala"/>
-            <exclude name="scala/tools/**"/>
-        </nsc>
-    </target>
-    
-    <target name="build.nsc.nstools" depends="init.nsc, build.nsc.nslib, build.init"
-            unless="skip.nsc"
-            description="Builds the Scala tools (NSC and Scalap) with the new Scala compiler.">
-        <nsc srcdir="${sources.dir}" destdir="${build.nstools.dir}"
-             excludesfile="${nsc.nstools.excludes}" debuginfo="${nsc.debuginfo}"
-             stop="${nsc.stop}" skip="${nsc.skip}" check="${nsc.check}" log="${nsc.log}"
-             logging="${nsc.logging}" print="${nsc.print}">
-            <classpath>
-                <pathelement location="${build.pico-nslib.dir}"/>
-                <pathelement location="${build.nslib.dir}"/>
-                <pathelement location="${build.nstools.dir}"/>
-                <pathelement location="${fjbg.jar}"/>
-                <pathelement location="${ant.jar}"/>
-            </classpath>
-            <include name="scala/tools/nsc/**/*.scala"/>
-        </nsc>
-    </target>
-
-    <target name="build.jars"
-            depends="build.nsc.nslib, build.nsc.nstools, build.osc.nstools, build.pico.nslib, build.init"
-            description="Builds JAR archives for all elements of Scala">
-        <jar destfile="${build.dir}/${osc-nstools.jar.name}"
-             basedir="${build.osc-nstools.dir}">
-            <manifest>
-                <attribute name="Built-By" value="${user.name}"/>
-                <attribute name="Main-Class" value="scala.tools.nsc.Main$class"/>
-            </manifest>
-        </jar>
-        <jar destfile="${build.dir}/${nstools.jar.name}"
-             basedir="${build.nstools.dir}">
-            <manifest>
-                <attribute name="Built-By" value="${user.name}"/>
-                <attribute name="Main-Class" value="scala.tools.nsc.Main$class"/>
-            </manifest>
-        </jar>
-        <jar destfile="${build.dir}/${nslib.jar.name}"
-             basedir="${build.nslib.dir}">
-            <manifest>
-                <attribute name="Built-By" value="${user.name}"/>
-            </manifest>
-        </jar>
-        <jar destfile="${build.dir}/${nslib.jar.name}" update="yes"
-             basedir="${build.pico-nslib.dir}">
-        </jar>
-    </target>
-
-    <!--
-    #####################################################################
-    DISTRIB
-    #####################################################################
-    -->
-
-    <target name="distrib.init" depends="version.init">
-        <echo level="verbose">scala.dll=${scala.dll}</echo>
-        <fail message="Required DLL library is missing; check the 'scala.dll' property in 'build.${user.name}.properties'.">
-            <condition><not><and>
-                <available file="${scala.dll}"/>
-            </and></not></condition>
-        </fail>
-    	<condition property="os.unix"><or>
-                <os family="unix"/>
-                <os family="mac"/>
-        </or></condition>
-        <condition property="os.mac">
-            <os family="mac"/>
-        </condition>
-        <condition property="os.win">
-            <os family="windows"/>
-        </condition>
-        <exec executable="cygpath" vmlauncher="false" errorproperty="err">
-            <arg value="--windir"/>
-        </exec>
-        <condition property="os.cygwin">
-            <equals arg1="${err}" arg2=""/>
-        </condition>
-        <!-- This is a hack that compensates for the possibility of doc generation to be skipped. -->
-        <mkdir dir="${build.dir}/doc"/>
-    </target>
-
-    <target name="distrib" depends="distrib.unix, distrib.win, distrib.cygwin"
-            description="Creates a simplified Scala distribution."/>
-
-    <target name="distrib.unix" if="os.unix"
-            depends="build, distrib.init"
-            description="Creates a simplified Scala distribution for Unix.">
-        <property name="distrib.unix.current.dir"
-                  value="${distrib.unix.dir}/${distrib.name}-${distrib.version}"/>
-        <property name="distrib.unix.scala.dir"
-                  value="${distrib.unix.current.dir}/share/${distrib.name}"/>
-        <!-- Set up 'bin' directory (unix) -->
-        <mkdir dir="${distrib.unix.scala.dir}/bin"/>
-        <copy file="${sources.dir}/bin/nscala.unix.tmpl"
-              tofile="${distrib.unix.scala.dir}/bin/.scala_wrapper">
-            <filterset>
-                <filter token="VERSION" value="${distrib.version}"/>
-                <filter token="COPYRIGHT" value="${copyright.notice}"/>
-                <filter token="TOOLS_CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/${nslib.jar.name}:$PREFIX/lib/${nstools.jar.name}"/>
-                <filter token="LIB_CPATH" value="$PREFIX/lib/${nslib.jar.name}"/>
-                <filter token="SCALA" value="${scala.exec.name}"/>
-                <filter token="SCALAC" value="${scalac.exec.name}"/>
-                <filter token="SCALAI" value="${scalai.exec.name}"/>
-                <filter token="SCALAP" value="${scalap.exec.name}"/>
-                <filter token="SCALATOK" value="${scalatok.exec.name}"/>
-            </filterset>
-        </copy>
-        <chmod file="${distrib.unix.scala.dir}/bin/.scala_wrapper" perm="ugo+rx"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.unix.scala.dir}/bin/${scala.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.unix.scala.dir}/bin/${scalac.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.unix.scala.dir}/bin/${scalai.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.unix.scala.dir}/bin/${scalap.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.unix.scala.dir}/bin/${scalatok.exec.name}"/>
-        <mkdir dir="${distrib.unix.current.dir}/bin"/>
-        <symlink resource="${distrib.unix.scala.dir}/bin/${scala.exec.name}"
-                 link="${distrib.unix.current.dir}/bin/${scala.exec.name}"/>
-        <symlink resource="${distrib.unix.scala.dir}/bin/${scalac.exec.name}"
-                 link="${distrib.unix.current.dir}/bin/${scalac.exec.name}"/>
-        <symlink resource="${distrib.unix.scala.dir}/bin/${scalai.exec.name}"
-                 link="${distrib.unix.current.dir}/bin/${scalai.exec.name}"/>
-        <symlink resource="${distrib.unix.scala.dir}/bin/${scalap.exec.name}"
-                 link="${distrib.unix.current.dir}/bin/${scalap.exec.name}"/>
-        <symlink resource="${distrib.unix.scala.dir}/bin/${scalatok.exec.name}"
-                 link="${distrib.unix.current.dir}/bin/${scalatok.exec.name}"/>
-        <!-- Set up 'lib' directory -->
-        <mkdir dir="${distrib.unix.scala.dir}/lib"/>
-        <copy todir="${distrib.unix.scala.dir}/lib">
-            <fileset dir="${build.dir}">
-                <include name="*.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="${distrib.unix.scala.dir}/lib" file="${oslib.jar}"/>
-        <copy todir="${distrib.unix.scala.dir}/lib" file="${ostools.jar}"/>
-        <copy todir="${distrib.unix.scala.dir}/lib" file="${fjbg.jar}"/>
-        <copy todir="${distrib.unix.scala.dir}/lib" file="${msil.jar}"/>
-        <copy todir="${distrib.unix.scala.dir}/lib" file="${scala.dll}"/>
-        <!-- Set up latest -->
-        <symlink resource="${distrib.unix.current.dir}"
-                 link="${distrib.unix.dir}/latest"
-                 overwrite="yes"/>
-    </target>
-
-    <target name="distrib.win" if="os.win"
-            depends="build, distrib.init"
-            description="Creates a simplified Scala distribution for Windows.">
-        <property name="distrib.win.current.dir"
-                  value="${distrib.win.dir}/${distrib.name}-${distrib.version}"/>
-        <property name="quotted.lib.dir"
-                  value="&quot;%SCALA_HOME%&quot;\lib"/>
-        <!-- Set up 'bin' directory -->
-        <mkdir dir="${distrib.win.current.dir}/bin"/>
-        <copy file="${sources.dir}/bin/nscala.win.tmpl"
-              tofile="${distrib.win.current.dir}/bin/${scala.exec.name}.bat">
-            <filterset>
-                <filter token="PRODUCT"   value="${scala.exec.name}"/>
-                <filter token="VERSION"   value="${distrib.version}"/>
-                <filter token="COPYRIGHT" value="${copyright.notice}"/>
-                <filter token="BOOTCPATH" value="${quotted.lib.dir}\${nslib.jar.name}"/>
-            </filterset>
-        </copy>
-        <copy file="${sources.dir}/bin/nscala-tool.win.tmpl"
-              tofile="${distrib.win.current.dir}/bin/${scalac.exec.name}.bat">
-            <filterset>
-                <filter token="PRODUCT"   value="${scalac.exec.name}"/>
-                <filter token="VERSION"   value="${distrib.version}"/>
-                <filter token="COPYRIGHT" value="${copyright.notice}"/>
-                <filter token="MAIN"      value="scala.tools.nsc.Main"/>
-                <filter token="TOOLS_CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\${nslib.jar.name};${quotted.lib.dir}\${nstools.jar.name}"/>
-                <filter token="LIB_CPATH"     value="${quotted.lib.dir}\${nslib.jar.name}"/>
-            </filterset>
-        </copy>
-        <copy file="${sources.dir}/bin/nscala-tool.win.tmpl"
-              tofile="${distrib.win.current.dir}/bin/${scalap.exec.name}.bat">
-            <filterset>
-                <filter token="PRODUCT"   value="${scalap.exec.name}"/>
-                <filter token="VERSION"   value="${distrib.version}"/>
-                <filter token="COPYRIGHT" value="${copyright.notice}"/>
-                <filter token="MAIN"      value="scala.tools.scalap.Main"/>
-                <filter token="TOOLS_CPATH" value="${quotted.lib.dir}\fjbg.jar;${quotted.lib.dir}\msil.jar;${quotted.lib.dir}\scala.jar;${quotted.lib.dir}\tools.jar;${quotted.lib.dir}\${osc-nstools.jar.name}"/>
-                <filter token="LIB_CPATH"     value="${quotted.lib.dir}\${nslib.jar.name}"/>
-            </filterset>
-        </copy>
-        <fixcrlf srcdir="${distrib.win.current.dir}/bin" eol="dos"/>
-        <attrib readonly="true">
-            <fileset dir="${distrib.win.current.dir}/bin"
-                     includes="**/*.bat"/>
-        </attrib>
-        <!-- Set up 'lib' directory (win) -->
-        <mkdir dir="${distrib.win.current.dir}/lib"/>
-        <copy todir="${distrib.win.current.dir}/lib">
-            <fileset dir="${build.dir}">
-                <include name="*.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="${distrib.win.current.dir}/lib" file="${oslib.jar}"/>
-        <copy todir="${distrib.win.current.dir}/lib" file="${ostools.jar}"/>
-        <copy todir="${distrib.win.current.dir}/lib" file="${fjbg.jar}"/>
-        <copy todir="${distrib.win.current.dir}/lib" file="${msil.jar}"/>
-        <copy todir="${distrib.win.current.dir}/lib" file="${scala.dll}"/>
-    </target>
-
-    <target name="distrib.cygwin" if="os.cygwin"
-            depends="distrib.win"
-            description="Creates symbolic links for NSC commands on Cygwin.">
-        <copy file="${sources.dir}/bin/nscala.unix.tmpl"
-              tofile="${distrib.win.current.dir}/bin/.scala_wrapper">
-            <filterset>
-                <filter token="VERSION" value="${distrib.version}"/>
-                <filter token="COPYRIGHT" value="${copyright.notice}"/>
-                <filter token="TOOLS_CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/${nslib.jar.name}:$PREFIX/lib/${nstools.jar.name}"/>
-                <filter token="LIB_CPATH" value="$PREFIX/lib/${nslib.jar.name}"/>
-                <filter token="SCALA" value="${scala.exec.name}"/>
-                <filter token="SCALAC" value="${scalac.exec.name}"/>
-                <filter token="SCALAI" value="${scalai.exec.name}"/>
-                <filter token="SCALAP" value="${scalap.exec.name}"/>
-                <filter token="SCALATOK" value="${scalatok.exec.name}"/>
-            </filterset>
-        </copy>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.win.current.dir}/bin/${scala.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.win.current.dir}/bin/${scalac.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.win.current.dir}/bin/${scalai.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.win.current.dir}/bin/${scalap.exec.name}"/>
-        <symlink resource=".scala_wrapper"
-                 link="${distrib.win.current.dir}/bin/${scalatok.exec.name}"/>
-        <!-- Set up latest -->
-        <symlink resource="${distrib.win.current.dir}"
-                 link="${distrib.win.dir}/latest"
-                 overwrite="yes"/>
-    </target>
-
-    <!--
-    #####################################################################
-    FULL DISTRIB
-    #####################################################################
-    -->
-
-    <target name="distrib.all"
-            depends="distrib.unix.all, distrib.win.all"
-            description="Creates a full Scala distribution."/>
-    
-    <target name="distrib.all.init"
-            depends="docs">
-        <fail if="skip.nsc">A full distribution cannot be build when skipping NSC.</fail>
-        <property name="os.unix" value="yes"/>
-        <property name="os.win" value="yes"/>
-        <property name="os.mac" value="yes"/>
-    </target>
-
-    <target name="distrib.unix.all" depends="distrib.all.init, distrib.unix"
-            description="Creates a full Scala distribution for Unix.">
-        <property name="distrib.unix.doc.dir"
-                  value="${distrib.unix.current.dir}/share/doc/${distrib.name}"/>
-        <!-- Set up 'doc' directory (unix) -->
-        <mkdir dir="${distrib.unix.doc.dir}"/>
-        <copy todir="${distrib.unix.doc.dir}">
-            <fileset dir="${basedir}" includes="LICENSE,README,VERSION"/>
-            <fileset dir="${basedir}/sources" includes="examples/**/*.scala"/>
-            <fileset dir="${build.dir}/doc"/>
-            <fileset dir="${doc.dir}/reference"
-                     includes="ScalaByExample.pdf,ScalaReference.pdf"/>
-            <fileset dir="${doc.dir}/tutorial" includes="ScalaTutorial.pdf"/>
-        </copy>
-        <fixcrlf srcdir="${distrib.unix.doc.dir}" eol="unix"
-                 includes="LICENSE,README,VERSION,examples/**/*.scala"/>
-        <!-- Set up 'man' directory (unix) -->
-        <mkdir dir="${distrib.unix.current.dir}/share/man"/>
-        <copy todir="${distrib.unix.current.dir}/share/man">
-            <fileset dir="${doc.dir}/man" includes="**/*.1"/>
-        </copy>
-        <!-- Set up 'support' directory (unix) -->
-        <mkdir dir="${distrib.unix.scala.dir}/support"/>
-        <copy todir="${distrib.unix.scala.dir}/support">
-            <fileset dir="${support.dir}"
-                     includes="emacs/**,gedit/**,jedit/**,scite/**,vim/**,xcode/**"/>
-        </copy>
-        <fixcrlf srcdir="${distrib.unix.scala.dir}/support" eol="unix"/>
-        <!-- Set up 'sources.tar.gz' (unix) -->
-        <tar destfile="${distrib.unix.scala.dir}/sources.tar.gz"
-             basedir="${basedir}" includes="sources/scala/**/*.scala" compression="gzip"/>
-        <!-- Create gz and bz2 compressed tarballs -->
-        <tar destfile="${distrib.unix.dir}/${distrib.name}-${distrib.version}.tar.gz"
-             basedir="${distrib.unix.current.dir}" compression="gzip"/>
-        <tar destfile="${distrib.unix.dir}/${distrib.name}-${distrib.version}.tar.bz2"
-             basedir="${distrib.unix.current.dir}" compression="bzip2"/>
-        <!-- Create md5 checksums -->
-        <checksum file="${distrib.unix.dir}/${distrib.name}-${distrib.version}.tar.gz"
-                  forceOverwrite="yes" fileext=".md5"/>
-        <checksum file="${distrib.unix.dir}/${distrib.name}-${distrib.version}.tar.bz2"
-                  forceOverwrite="yes" fileext=".md5"/>
-    </target>
-
-    <target name="distrib.mac.all" depends="distrib.unix.all"/>
-
-    <target name="distrib.win.all" depends="distrib.all.init, distrib.win"
-            description="Creates a full Scala distribution for Windows.">
-        <!-- Set up 'doc' directory (win) -->
-        <mkdir dir="${distrib.win.current.dir}/doc"/>
-        <copy todir="${distrib.win.current.dir}/doc">
-            <fileset dir="${build.dir}/doc"/>
-            <fileset dir="${doc.dir}/reference"
-                     includes="ScalaByExample.pdf,ScalaReference.pdf"/>
-            <fileset dir="${doc.dir}/tutorial" includes="ScalaTutorial.pdf"/>
-        </copy>
-        <fixcrlf srcdir="${distrib.win.current.dir}/doc" eol="dos"
-                 includes="**/*.css,**/*.html,**/*.js"/>
-        <!-- Set up 'examples' directory (win) -->
-        <copy todir="${distrib.win.current.dir}">
-            <fileset dir="${basedir}" includes="LICENSE,README,VERSION"/>
-            <fileset dir="${basedir}/sources" includes="examples/**/*.scala"/>
-        </copy>
-        <copy file="${basedir}/VERSION"
-              tofile="${distrib.win.current.dir}/VERSION-${distrib.version}"/>
-        <fixcrlf srcdir="${distrib.win.current.dir}" eol="dos"
-                 includes="LICENSE,README,VERSION,examples/**/*.scala"/>
-        <!-- Set up 'support' directory -->
-        <mkdir dir="${distrib.win.current.dir}/support"/>
-        <copy todir="${distrib.win.current.dir}/support">
-            <fileset dir="${support.dir}"
-                     includes="context/**,emacs/**,jedit/**,scite/**,textpad/**,ultraedit/**,vim/**"/>
-        </copy>
-        <fixcrlf srcdir="${distrib.win.current.dir}/support" eol="dos"/>
-        <!-- Set up 'sources.zip' (win) -->
-        <zip destfile="${distrib.win.current.dir}/sources.zip"
-             basedir="${basedir}" includes="sources/scala/**/*.scala"/>
-        <!-- Create zip archive -->
-        <zip destfile="${distrib.win.dir}/${distrib.name}-${distrib.version}.zip"
-             basedir="${distrib.win.current.dir}"/>
-        <checksum file="${distrib.win.dir}/${distrib.name}-${distrib.version}.zip"
-                  forceOverwrite="yes" fileext=".md5"/>
-    </target>
-
-    <!--
-    #####################################################################
-    IZPACK DISTRIB
-    #####################################################################
-    -->
-    
-    <!-- A path containing the IzPack library -->
-    <path id="izpack.classpath">
-        <pathelement location="${izpack.home}/lib/compiler.jar"/>
+    <taskdef name="locker"
+             classname="scala.tools.nsc.ant.NSC"
+             classpathref="locker.classpath"/>
+  </target>
+  
+  <target name="init.quick" depends="init, build">
+    <path id="quick.classpath">
+      <pathelement location="${quick.dir}/${lib.dir.name}"/>
+      <pathelement location="${quick.dir}/${comp.dir.name}"/>
+      <path refid="common.classpath"/>
     </path>
-    
-    <target name="izpack.all" depends="distrib.all, izpack.unix, izpack.win, izpack.mac"
-            description="Creates an IzPack installer for all scala distributions"/>
-    
-    <target name="izpack.init">
-        <echo level="verbose">izpack.home=${izpack.home}</echo>
-        <fail message="IzPack distribution not supported; check the 'izpack.home' property in 'build.${user.name}.properties'.">
-            <condition><not>
-                <available classname="com.izforge.izpack.ant.IzPackTask"
-                           classpathref="izpack.classpath"/>
-            </not></condition>
-        </fail>
-        <taskdef name="izpack"
-                 classname="com.izforge.izpack.ant.IzPackTask"
-                 classpathref="izpack.classpath"/>
-    </target>
-    
-    <target name="izpack.unix" depends="izpack.init, distrib.unix.all">
-        <property name="resource.dir" value="${build.dir}/izpack"/>
-        <copy todir="${resource.dir}" overwrite="true">
-            <fileset dir="${config.dir}/izpack"
-                     excludes="**/*.html, **/*.xml"/>
-        </copy>
-        <copy todir="${resource.dir}" overwrite="true">
-            <!-- CAUTION! Copy operations using filters will -->
-            <!-- corrupt binary files (see "Core Types").    -->
-            <fileset dir="${config.dir}/izpack"
-                     includes="**/*.html, **/*.xml"/>
-            <filterset>
-                <filter token="RESOURCEDIR" value="${resource.dir}"/>
-                <filter token="PREFIX"      value="${distrib.name}"/>
-                <filter token="VERSION"     value="${distrib.version}"/>
-                <filter token="URL"         value="http://scala.epfl.ch/"/>
-            </filterset>
-        </copy>
-        <izpack input="${resource.dir}/install-nsc.xml"
-                output="${distrib.unix.dir}/${distrib.name}-install-${distrib.version}.jar"
-                installerType="standard" basedir="${basedir}"
-                izPackDir="${izpack.home}"/>
-    </target>
-    
-    <target name="izpack.mac" depends="izpack.unix"/>
-    
-    <target name="izpack.win" depends="izpack.init, distrib.win.all">
-        <echo>Windows-specific IzPack installer is not generated yet.</echo>
-    </target>
-
-    <!--
-    #####################################################################
-    TEST
-    #####################################################################
-    -->
-
-    <target name="test" description="Runs the Scala test suite.">
-        <exec executable="test-nsc/scalanstest"
-              dir="${basedir}"
-              os="Mac OS X, Linux, FreeBSD, Solaris"/>
-    <!--
-        <junit printsummary="yes" fork="yes" haltonfailure="yes">
-            <formatter type="plain"/>
-            <test name="my.test.TestCase"/>
-        </junit>
-    -->
-    </target>
-
-    <!--
-    #####################################################################
-    DOCS
-    #####################################################################
-    -->
-    
-    <target name="docs" description="Generates all documentation."
-            depends="version.init" unless="skip.doc">
-        <echo level="verbose">oslib.jar=${oslib.jar}</echo>
-        <echo level="verbose">oslib.src=${oslib.src}</echo>
-        <echo level="verbose">ostools.jar=${ostools.jar}</echo>
-        <fail message="Required classes for OSC are missing; check the 'oslib.jar','ostools.jar' properties in 'build.${user.name}.properties'.">
-            <condition><not><and>
-                <available classname="scala.List" classpathref="osc.classpath"/>
-                <available classname="scala.runtime.RunTime" classpathref="osc.classpath"/>
-                <available classname="scala.tools.scaladoc.Main" classpathref="osc.classpath"/>
-            </and></not></condition>
-        </fail>
-        <fileset id="oslib.src.files" dir="${sources.dir}">
-            <include name="scala/**/*.scala"/>
-            <exclude name="scala/tools/**"/>
-        </fileset>
-        <pathconvert pathsep=" " property="docs.sources" refid="oslib.src.files"/>
-        <mkdir dir="${build.dir}/doc/api"/>
-        <echo>Generating API documentation to ${build.dir}/doc/api</echo>
-        <java classname="scala.tools.scaladoc.Main" fork="true">
-            <jvmarg value="-Dscala.library.source.path=${oslib.src}"/>
-            <jvmarg value="-Dscala.library.class.path=${oslib.jar}"/>
-            <classpath>
-                <pathelement location="${oslib.jar}"/>
-                <pathelement location="${ostools.jar}"/>
-            </classpath>
-            <arg line="-windowtitle 'Scala Library Documentation'"/>
-            <arg line="-doctitle 'Scala&lt;br/&gt;${distrib.version}'"/>
-            <arg line="-d ${build.dir}/doc/api"/>
-            <arg line="${docs.sources}"/>
-            <arg line="-- scala"/>
-        </java>
-    </target>
-    
-    <!--
-    #####################################################################
-    CLEAN
-    #####################################################################
-    -->
-    
-    <target name="clean"
-            depends="clean.build"
-            description="Deletes all generated build files."/>
-    
-    <target name="clean.all"
-            depends="clean.build, clean.distrib"
-            description="Deletes all generated files, both build and distribution files."/>
-
-    <target name="clean.build">
-        <delete dir="${build.dir}" includeemptydirs="true"
-                quiet="true" failonerror="false"/>
-    </target>
-    
-    <target name="clean.distrib"
-            description="Deletes all generated distribution files.">
-        <delete dir="${distrib.unix.dir}" includeemptydirs="true"
-                quiet="true" failonerror="false"/>
-        <delete dir="${distrib.win.dir}" includeemptydirs="true"
-                quiet="true" failonerror="false"/>
-    </target>
-
-    <!--
-    #####################################################################
-    HELP
-    #####################################################################
-    -->
-
-    <target name="help" depends="usage"/>
-
-    <target name="usage" description="Display usage information.">
-        <echo>Execute 'ant -projecthelp' for build file help.</echo>
-        <echo>Execute 'ant -help' for Ant help.</echo>
-    </target>
+    <taskdef name="quick"
+             classname="scala.tools.nsc.ant.NSC"
+             classpathref="quick.classpath"/>
+  </target>
+  
+  <!--
+  ##############################################################################
+  BUILD SUPPORT MACROS
+  ##############################################################################
+  -->
+  
+  <macrodef name="build.exec">
+    <attribute name="lib.dir"/>
+    <attribute name="comp.dir"/>
+    <attribute name="exec.dir"/>
+    <sequential>
+      <mkdir dir="@{exec.dir}"/>
+      <copy file="${src.dir}/${exec.dir.name}/nscala.unix.tmpl"
+            tofile="@{exec.dir}/${wrapper.exec.name}">
+        <filterset>
+          <filter token="version" value="${version}"/>
+          <filter token="copyright" value="${copyright}"/>
+          <filter token="lib.path" value="@{lib.dir}"/>
+          <filter token="comp.path" value="@{comp.dir}"/>
+          <filter token="fjbg.jar" value="${fjbg.jar}"/>
+          <filter token="msil.jar" value="${msil.jar}"/>
+          <filter token="scala.exec.name" value="${scala.exec.name}"/>
+          <filter token="scalac.exec.name" value="${scalac.exec.name}"/>
+          <filter token="scalai.exec.name" value="${scalai.exec.name}"/>
+          <filter token="scalatok.exec.name" value="${scalatok.exec.name}"/>
+        </filterset>
+      </copy>
+      <chmod file="@{exec.dir}/${wrapper.exec.name}" perm="ugo+rx"/>
+      <symlink resource="${wrapper.exec.name}" overwrite="yes"
+               link="@{exec.dir}/${scala.exec.name}"/>
+      <symlink resource="${wrapper.exec.name}" overwrite="yes"
+               link="@{exec.dir}/${scalac.exec.name}"/>
+      <symlink resource="${wrapper.exec.name}" overwrite="yes"
+               link="@{exec.dir}/${scalai.exec.name}"/>
+      <symlink resource="${wrapper.exec.name}" overwrite="yes"
+               link="@{exec.dir}/${scalatok.exec.name}"/>
+    </sequential>
+  </macrodef>
+  
+  <!--
+  ##############################################################################
+  BUILD LOCAL REFERENCE (LOCKER) LAYER
+  ##############################################################################
+  -->
+  
+  <target name="build.locker" depends="init" unless="locker.avail">
+    <!-- Build library -->
+    <mkdir dir="${locker.lib.dir}"/>
+    <pico srcdir="${src.dir}/${lib.dir.name}"
+          destdir="${locker.lib.dir}"
+          scalahack="true">
+      <classpath>
+        <pathelement location="${locker.lib.dir}"/>
+      </classpath>
+      <include name="**/*.java"/>
+    </pico>
+    <starr srcdir="${src.dir}/${lib.dir.name}"
+           destdir="${locker.lib.dir}"
+           usepredefs="false"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${locker.lib.dir}"/>
+      </classpath>
+      <include name="scala/Predef.scala"/>
+      <include name="scala/runtime/ScalaRunTime.scala"/>
+    </starr>
+    <starr srcdir="${src.dir}/${lib.dir.name}"
+           destdir="${locker.lib.dir}"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${locker.lib.dir}"/>
+      </classpath>
+      <include name="**/*.scala"/>
+      <exclude name="scala/Predef.scala"/>
+      <exclude name="scala/runtime/ScalaRunTime.scala"/>
+      <excludesfile name="${nsc.excludes}" if="excludes.avail"/>
+    </starr>
+    <!-- Build compiler -->
+    <mkdir dir="${locker.comp.dir}"/>
+    <pico srcdir="${src.dir}/${comp.dir.name}"
+          destdir="${locker.comp.dir}"
+          scalahack="true">
+      <classpath>
+        <pathelement location="${locker.lib.dir}"/>
+        <pathelement location="${locker.comp.dir}"/>
+      </classpath>
+      <include name="**/*.java"/>
+    </pico>
+    <starr srcdir="${src.dir}/${comp.dir.name}"
+           destdir="${locker.comp.dir}"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${locker.lib.dir}"/>
+        <pathelement location="${locker.comp.dir}"/>
+        <path refid="starr.classpath"/>
+        <pathelement location="${ant.jar}"/>
+      </classpath>
+      <include name="**/*.scala"/>
+      <excludesfile name="${nsc.excludes}" if="excludes.avail"/>
+    </starr>
+    <!-- Build executable files -->
+    <build.exec lib.dir="${locker.lib.dir}"
+                comp.dir="${locker.comp.dir}"
+                exec.dir="${locker.dir}/${exec.dir.name}"/>
+  </target>
+  
+  <!--
+  ##############################################################################
+  BUILD QUICK-TEST LAYER
+  ##############################################################################
+  -->
+  
+  <target name="build" depends="init.locker">
+    <!-- Build library -->
+    <mkdir dir="${quick.lib.dir}"/>
+    <pico srcdir="${src.dir}/${lib.dir.name}"
+          destdir="${quick.lib.dir}"
+          scalahack="true">
+      <classpath>
+        <pathelement location="${quick.lib.dir}"/>
+      </classpath>
+      <include name="**/*.java"/>
+    </pico>
+    <locker srcdir="${src.dir}/${lib.dir.name}"
+           destdir="${quick.lib.dir}"
+           usepredefs="false"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${quick.lib.dir}"/>
+      </classpath>
+      <include name="scala/Predef.scala"/>
+      <include name="scala/runtime/ScalaRunTime.scala"/>
+    </locker>
+    <locker srcdir="${src.dir}/${lib.dir.name}"
+           destdir="${quick.lib.dir}"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${quick.lib.dir}"/>
+      </classpath>
+      <include name="**/*.scala"/>
+      <exclude name="scala/Predef.scala"/>
+      <exclude name="scala/runtime/ScalaRunTime.scala"/>
+      <excludesfile name="${nsc.excludes}" if="excludes.avail"/>
+    </locker>
+    <!-- Build compiler -->
+    <mkdir dir="${quick.comp.dir}"/>
+    <pico srcdir="${src.dir}/${comp.dir.name}"
+          destdir="${quick.comp.dir}"
+          scalahack="true">
+      <classpath>
+        <pathelement location="${quick.lib.dir}"/>
+        <pathelement location="${quick.comp.dir}"/>
+      </classpath>
+      <include name="**/*.java"/>
+    </pico>
+    <locker srcdir="${src.dir}/${comp.dir.name}"
+           destdir="${quick.comp.dir}"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${quick.lib.dir}"/>
+        <pathelement location="${quick.comp.dir}"/>
+        <path refid="locker.classpath"/>
+        <pathelement location="${ant.jar}"/>
+      </classpath>
+      <include name="**/*.scala"/>
+      <excludesfile name="${nsc.excludes}" if="excludes.avail"/>
+    </locker>
+    <!-- Build executable files -->
+    <build.exec lib.dir="${quick.lib.dir}"
+                comp.dir="${quick.comp.dir}"
+                exec.dir="${quick.dir}/${exec.dir.name}"/>
+  </target>
+
+  <!--
+  ##############################################################################
+  TEST
+  ##############################################################################
+  -->
+  
+  <target name="test" depends="init.quick">
+    <!-- Build the bootstrap layer -->
+    <!-- Build library -->
+    <mkdir dir="${strap.lib.dir}"/>
+    <pico srcdir="${src.dir}/${lib.dir.name}"
+          destdir="${strap.lib.dir}"
+          scalahack="true">
+      <classpath>
+        <pathelement location="${strap.lib.dir}"/>
+      </classpath>
+      <include name="**/*.java"/>
+    </pico>
+    <quick srcdir="${src.dir}/${lib.dir.name}"
+           destdir="${strap.lib.dir}"
+           usepredefs="false"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${strap.lib.dir}"/>
+      </classpath>
+      <include name="scala/Predef.scala"/>
+      <include name="scala/runtime/ScalaRunTime.scala"/>
+    </quick>
+    <quick srcdir="${src.dir}/${lib.dir.name}"
+           destdir="${strap.lib.dir}"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${strap.lib.dir}"/>
+      </classpath>
+      <include name="**/*.scala"/>
+      <exclude name="scala/Predef.scala"/>
+      <exclude name="scala/runtime/ScalaRunTime.scala"/>
+      <excludesfile name="${nsc.excludes}" if="excludes.avail"/>
+    </quick>
+    <!-- Build compiler -->
+    <mkdir dir="${strap.comp.dir}"/>
+    <pico srcdir="${src.dir}/${comp.dir.name}"
+          destdir="${strap.comp.dir}"
+          scalahack="true">
+      <classpath>
+        <pathelement location="${strap.lib.dir}"/>
+        <pathelement location="${strap.comp.dir}"/>
+      </classpath>
+      <include name="**/*.java"/>
+    </pico>
+    <quick srcdir="${src.dir}/${comp.dir.name}"
+           destdir="${strap.comp.dir}"
+           debuginfo="${nsc.debug-info}">
+      <classpath>
+        <pathelement location="${strap.lib.dir}"/>
+        <pathelement location="${strap.comp.dir}"/>
+        <path refid="quick.classpath"/>
+        <pathelement location="${ant.jar}"/>
+      </classpath>
+      <include name="**/*.scala"/>
+      <excludesfile name="${nsc.excludes}" if="excludes.avail"/>
+    </quick>
+    <!-- Build executable files -->
+    <build.exec lib.dir="${strap.lib.dir}"
+                comp.dir="${strap.comp.dir}"
+                exec.dir="${strap.dir}/${exec.dir.name}"/>
+    <!-- Compares quick and test level -->
+    <checksum totalproperty="quick.md5">
+      <fileset dir="${quick.dir}"/>
+    </checksum>
+    <delete quiet="true" failonerror="false">
+      <fileset dir="${quick.dir}"><include name="**/*.MD5"/></fileset>
+    </delete>
+    <checksum totalproperty="strap.md5">
+      <fileset dir="${strap.dir}"/>
+    </checksum>
+    <delete quiet="true" failonerror="false">
+      <fileset dir="${strap.dir}"><include name="**/*.MD5"/></fileset>
+    </delete>
+    <fail message="Build is not stable">
+      <condition><not>
+        <equals arg1="${quick.md5}" arg2="${strap.md5}"/>
+      </not></condition>
+    </fail>
+    <echo>Build is stable</echo>
+  </target>
+
+  <!--
+  ##############################################################################
+  DOCUMENT
+  ##############################################################################
+  -->
+  
+  <target name="docs">
+    <echo>Docs is not available yet.</echo>
+  </target>
+
+  <!--
+  ##############################################################################
+  GENERATES A DISTRIBUTION
+  ##############################################################################
+  -->
+  
+  <target name="dist">
+    <echo>Dist is not available yet.</echo>
+  </target>
+  
+  <!--
+  ##############################################################################
+  CLEAN
+  ##############################################################################
+  -->
+  
+  <macrodef name="remove">
+    <attribute name="dir"/>
+    <sequential>
+      <delete dir="@{dir}"
+              includeemptydirs="true"
+              quiet="true"
+              failonerror="false"/>
+    </sequential>
+  </macrodef>
+  
+  <target name="clean">
+    <remove dir="${quick.dir}"/>
+    <remove dir="${strap.dir}"/>
+  </target>
+  
+  <target name="clean.all">
+    <remove dir="${locker.dir}"/>
+    <remove dir="${quick.dir}"/>
+    <remove dir="${strap.dir}"/>
+    <remove dir="${distrib.unix.dir}"/>
+    <remove dir="${distrib.win.dir}"/>
+    <remove dir="${distrib.latest.dir}"/>
+  </target>
 
 </project>
diff --git a/config/build.TEMPLATE.properties b/config/build.TEMPLATE.properties
deleted file mode 100644
index 2606ac4625..0000000000
--- a/config/build.TEMPLATE.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-##############################################################################
-# USER PROPERTIES FOR SABBUS                                                 #
-##############################################################################
-# These are user-specific properties for SABBUS. Any property that has not
-# been set here will take the value defined in 'build.default.properties'
-# or 'build.base.properties'. Properties in the latter of these files can
-# be refered to from within this file.
-# $Id$
-##############################################################################
-
-# The path to the old Scala library JAR package and source directory.
-oslib.jar=
-oslib.src=
-
-# The path to the old Scala tools.
-ostools.jar=
-
-# The path to the Jaco/Pico compiler.
-jaco.jar=
-
-# The path to the FJBG byte-code generation library.
-fjbg.jar=
-
-# The path to the MSIL byte-code generation library.
-msil.jar=
-
-# The path to the MSIL DLL library.
-scala.dll=
-
-# The path to the IzPack tool.
-izpack.jar=
-
-# Other custom properties come here
-nsc.skip=
diff --git a/config/build.base.properties b/config/build.base.properties
deleted file mode 100644
index 25ef7417eb..0000000000
--- a/config/build.base.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-##############################################################################
-# BASE PROPERTIES FOR SABBUS                                                 #
-##############################################################################
-# These are properties specific to the layout of the Scala distribution.
-# DO NOT CHANGE them unless one of the mentioned directory is changed.
-# $Id$
-##############################################################################
-
-bin.dir=${basedir}/bin
-build.support.dir=${basedir}/build.support
-config.dir=${basedir}/config
-doc.dir=${basedir}/doc
-newsources.dir=${basedir}/newsources
-sources.dir=${basedir}/sources
-support.dir=${basedir}/support
-test.dir=${basedir}/test
diff --git a/config/build.default.properties b/config/build.default.properties
deleted file mode 100644
index 8f9788f4dc..0000000000
--- a/config/build.default.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-##############################################################################
-# DEFAULT PROPERTIES FOR SABBUS                                              #
-##############################################################################
-# These are default values for all properties used by SABBUS. DO NOT CHANGE
-# them in this file. All properties can be overriden in the
-# build.USER_NAME.properties file.
-# $Id$
-##############################################################################
-
-# CONFIGURATION OF NSC
-##############################################################################
-
-copyright.notice=(C) 2002-06 LAMP/EPFL
-
-# What NSC should output during compilation. Either 'none', 'verbose', 'debug'.
-nsc.logging=none
-
-# After which compile phase NSC should stop. This will induce build errors.
-nsc.stop=
-
-# A comma-separated list of compile phases that NSC should skip.
-nsc.skip=
-
-# A comma-separated list of compile phases that NSC should log.
-nsc.log=
-
-# A comma-separated list of compile phases which result should be checked for
-# consistency.
-nsc.check=
-
-# A comma-separated list of compile phases that NSC should print.
-nsc.print=
-
-# The name of a file that lists files that should be excluded when building
-# the new Scala library. This file MUST EXIST.
-nsc.nslib.excludes=${config.dir}/excludes/nsc.nslib.excludes
-
-# The name of a file that lists files that should be excluded when building
-# the new Scala tools. This file MUST EXIST.
-nsc.nstools.excludes=${config.dir}/excludes/nsc.nstools.excludes
-
-# The name of a file that lists files that should be excluded when building
-# the new Scala tools. This file MUST EXIST.
-nsc.osc-nstools.excludes=${config.dir}/excludes/nsc.osc-nstools.excludes
-
-# Boolean flag that controls whether the NSC compiler will generate
-# debug information in class files
-nsc.debuginfo=true
-
-
-# LOCATION OF PRE-COMPILED LIBRARIES
-##############################################################################
-
-# The path to the old Scala library ('scala.jar').
-oslib.jar=/usr/local/lib/scala.jar
-
-# The path to the old Scala library sources.
-oslib.src=/usr/local/share/scala/src
-
-# The path to the old Scala tools ('tools.jar').
-ostools.jar=/usr/local/lib/tools.jar
-
-# The path to the JaCo compiler ('jaco.jar').
-jaco.jar=/usr/local/lib/jaco.jar
-
-# The path to the FJBG byte-code generation library ('fjbg.jar').
-fjbg.jar=/usr/local/lib/fjbg.jar
-
-# The path to the MSIL byte-code generation library ('fjbg.jar').
-msil.jar=/usr/local/lib/msil.jar
-
-# The path to the MSIL DLL library ('scala.dll').
-scala.dll=/usr/local/lib/scala.dll
-
-# The path to the Java base classes ('rt.jar' or 'classes.jar').
-java.jar=${java.home}/jre/lib/rt.jar
-
-# The path to the Ant base classes ('ant.jar').
-ant.jar=${ant.home}/lib/ant.jar
-
-# The path to the IzPack tools ('standalone-compiler.jar').
-izpack.home=/usr/local/
-
-# LOCATION OF BUILD PRODUCTS
-##############################################################################
-
-# The directory in which all build products live.
-build.dir=${basedir}/build
-
-# The directory to which the new Scala library is compiled.
-build.nslib.dir=${build.dir}/nslib
-
-# The directory to which the part of the new Scala library built with PiCo
-# is compiled. This should be different from ${build.nslib.dir}.
-build.pico-nslib.dir=${build.dir}/pico-nslib
-
-# The directory to which the new Scala tools (built with OSC) are compiled.
-build.osc-nstools.dir=${build.dir}/osc-nstools
-
-# The directory to which the new Scala tools are compiled.
-build.nstools.dir=${build.dir}/nstools
-
-# LOCATION AND STRUCTURE OF THE DISTRIBUTION
-# Overriding these properties will produce a non-standard distribution that
-# might not be useable.
-##############################################################################
-
-# The directory to which a new distribution will be added, both for UNIX and
-# Windows. These directories MUST BE SEPARATE!
-distrib.unix.dir=${basedir}/distribs/unix
-distrib.win.dir=${basedir}/distribs/windows
-
-# The name of the product to build.
-distrib.name=nscala
-
-# The name of the JAR file in which the new Scala library should be archived.
-nslib.jar.name=nslib.jar
-
-# The name of the JAR file in which the new Scala tools should be archived.
-nstools.jar.name=nstools.jar
-
-# The name of the JAR file in which the new Scala tools (built with OSC)
-# should be archived.
-osc-nstools.jar.name=osc-nstools.jar
-
-# The name of the Scala executables
-scala.exec.name=ns
-scalac.exec.name=nsc
-scalai.exec.name=nsi
-scalap.exec.name=nsp
-scalatok.exec.name=nsctok
-
-##############################################################################
diff --git a/config/excludes/nsc.nslib.excludes b/config/excludes/nsc.nslib.excludes
deleted file mode 100644
index 7dd733694c..0000000000
--- a/config/excludes/nsc.nslib.excludes
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-# NSLIB EXCLUDED FILES                                                         #
-################################################################################
-# A list of files to exclude when compiling the Scala library with NSC. All
-# files can be defined using Ant's fileset wildcard notation; one statement per
-# line.
-# $Id$
-################################################################################
-
-scala/dbc/**
diff --git a/config/excludes/nsc.nstools.excludes b/config/excludes/nsc.nstools.excludes
deleted file mode 100644
index a02527bf19..0000000000
--- a/config/excludes/nsc.nstools.excludes
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# NSTOOLS EXCLUDED FILES                                                       #
-################################################################################
-# A list of files to exclude when compiling the Scala tools with NSC. All files
-# can be defined using Ant's fileset wildcard notation; one statement per line.
-# $Id$
-################################################################################
diff --git a/config/excludes/nsc.osc-nstools.excludes b/config/excludes/nsc.osc-nstools.excludes
deleted file mode 100644
index 3ef12c77d6..0000000000
--- a/config/excludes/nsc.osc-nstools.excludes
+++ /dev/null
@@ -1,7 +0,0 @@
-################################################################################
-# OSC-NSTOOLS EXCLUDED FILES                                                   #
-################################################################################
-# A list of files to exclude when compiling the Scala tools with NSC. All files
-# can be defined using Ant's fileset wildcard notation; one statement per line.
-# $Id$
-################################################################################
diff --git a/config/izpack/images/Splash.png b/config/izpack/images/Splash.png
deleted file mode 100644
index 8d0e8389cc..0000000000
--- a/config/izpack/images/Splash.png
+++ /dev/null
diff --git a/config/izpack/images/install.png b/config/izpack/images/install.png
deleted file mode 100644
index f75b7fb2c1..0000000000
--- a/config/izpack/images/install.png
+++ /dev/null
diff --git a/config/izpack/install-nsc.xml b/config/izpack/install-nsc.xml
deleted file mode 100644
index 08737a42fe..0000000000
--- a/config/izpack/install-nsc.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version=1.0" encoding="UTF-8" standalone="yes"?>
-<!-- $Id$ -->
-
-<installation version="1.0">
-
-  <info>
-    <appname>Scala</appname>
-    <appversion>@VERSION@</appversion>
-    <url>@URL@</url>
-    <javaversion>1.4</javaversion>
-  </info>
-
-  <native type="izpack" name="ShellLink.dll"/>
-
-  <guiprefs resizable="yes" height="400" width="600">
-    <laf name="metouia">
-      <os family="unix"/>
-    </laf>
-    <laf name="looks">
-      <os family="windows"/>
-      <param name="variant" value="extwin"/>
-    </laf>
-  </guiprefs>
-
-  <locale>
-    <langpack iso3="eng"/>
-    <langpack iso3="fra"/>
-    <langpack iso3="deu"/>
-  </locale>
-
-  <resources>
-    <res id="installer.langsel.img"        src="@RESOURCEDIR@/images/Splash.png"/>
-    <res id="Installer.image"              src="@RESOURCEDIR@/images/install.png"/>
-    <res id="HTMLInfoPanel.info_eng"       src="@RESOURCEDIR@/locales/INFO_en.html"/>
-    <res id="HTMLInfoPanel.info_fra"       src="@RESOURCEDIR@/locales/INFO_fr.html"/>
-    <res id="HTMLInfoPanel.info_deu"       src="@RESOURCEDIR@/locales/INFO_de.html"/>
-    <res id="HTMLLicencePanel.licence_eng" src="@RESOURCEDIR@/locales/LICENSE_en.html"/>
-    <res id="HTMLLicencePanel.licence_fra" src="@RESOURCEDIR@/locales/LICENSE_fr.html"/>
-    <res id="HTMLLicencePanel.licence_deu" src="@RESOURCEDIR@/locales/LICENSE_de.html"/>
-    <res id="TargetPanel.dir.macosx"       src="@RESOURCEDIR@/targets/path_macosx.txt"/>
-    <res id="TargetPanel.dir.unix"         src="@RESOURCEDIR@/targets/path_unix.txt"/>
-    <res id="ProcessPanel.Spec.xml"        src="@RESOURCEDIR@/izpack_process.xml"/>
-    <res id="shortcutSpec.xml"             src="@RESOURCEDIR@/izpack_shortcut.xml"/>
-  </resources>
-
-  <panels>
-    <panel classname="HelloPanel"/>
-    <panel classname="HTMLInfoPanel"/>
-    <panel classname="HTMLLicencePanel"/>
-    <panel classname="TargetPanel"/>
-    <panel classname="InstallPanel"/>
-    <panel classname="ProcessPanel"/>
-    <panel classname="ShortcutPanel"/>
-    <panel classname="SimpleFinishPanel"/>
-  </panels>
-
-  <packs>
-    <pack name="Package Installation" required="yes">
-      <description>Installing the Scala software.</description>
-
-      <!-- unix -->
-
-      <fileset os="unix"
-               dir="distribs/unix/@PREFIX@-@VERSION@"
-               targetdir="$INSTALL_PATH"
-               includes="share/**"/>
-      <!-- The <singlefile> tag allows the file -->
-      <!-- to be renamed (unlike <file>).       -->
-      <singlefile os="unix"
-                  target="$INSTALL_PATH/bin/.nsc_symlink"
-                  src="sources/bin/izpack.symlink.tmpl"/>
-      <executable os="unix"
-                  targetfile="$INSTALL_PATH/bin/.nsc_symlink"/>
-      <singlefile os="unix"
-                  target="$INSTALL_PATH/share/@PREFIX@/bin/.nsc_symlink"
-                  src="sources/bin/izpack.symlink.tmpl"/>
-      <executable os="unix"
-                  targetfile="$INSTALL_PATH/share/@PREFIX@/bin/.nsc_symlink"/>
-      <executable os="unix" keep="true"
-                  targetfile="$INSTALL_PATH/share/@PREFIX@/bin/.scala_wrapper"/>
-
-      <!-- windows -->
-
-      <!-- we share common resources doc/*.pdf and lib/** -->
-      <fileset os="windows"
-               dir="distribs/windows/@PREFIX@-@VERSION@"
-               targetdir="$INSTALL_PATH"
-               excludes="doc/*.pdf, lib/**"/>
-      <fileset os="windows"
-               dir="distribs/unix/@PREFIX@-@VERSION@/share/doc/@PREFIX@"
-               targetdir="$INSTALL_PATH/doc"
-               includes="*.pdf"/>
-      <fileset os="windows"
-               dir="distribs/unix/@PREFIX@-@VERSION@/share/@PREFIX@"
-               targetdir="$INSTALL_PATH"
-               includes="lib/**"/>
-      <fileset os="windows"
-               dir="config/izpack/registry/bin"
-               targetdir="$INSTALL_PATH/Uninstaller"/>
-      <executable os="windows" stage="uninstall"
-                  targetfile="$JAVA_HOME\bin\java">
-        <arg>-Djava.library.path=$INSTALL_PATH\Uninstaller</arg>
-        <arg>-cp</arg>
-        <arg>$INSTALL_PATH\Uninstaller\registry.jar;$INSTALL_PATH\Uninstaller\setenv.jar</arg>
-        <arg>Main</arg>
-        <arg>@VERSION@</arg>
-      </executable>
-    </pack>
-  </packs>
-
-</installation>
diff --git a/config/izpack/izpack_process.xml b/config/izpack/izpack_process.xml
deleted file mode 100644
index ed5982707a..0000000000
--- a/config/izpack/izpack_process.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- $Id$ -->
-
-<processing>
-
-  <logfiledir>$INSTALL_PATH/Uninstaller</logfiledir>
-
-  <!-- unix jobs -->
-
-  <job name="Create symbolic links for Scala commands">
-    <description>Create symbolic links</description>
-    <os family="unix"/>
-    <executefile name="$INSTALL_PATH/bin/.nsc_symlink">
-      <arg>../share/@PREFIX@/bin/.scala_wrapper</arg>
-    </executefile>
-    <executefile name="$INSTALL_PATH/share/@PREFIX@/bin/.nsc_symlink">
-      <arg>.scala_wrapper</arg>
-    </executefile>
-  </job>
-  <job name="Remote helper script">
-    <description>Clean up</description>
-    <os family="unix"/>
-    <executefile name="/bin/rm">
-      <arg>-f</arg>
-      <arg>$INSTALL_PATH/bin/.nsc_symlink</arg>
-      <arg>$INSTALL_PATH/share/@PREFIX@/bin/.nsc_symlink</arg>
-    </executefile>
-  </job>
-
-  <!-- windows jobs -->
-
-  <job name="Update the Windows registry">
-    <description>Add the SCALA_HOME variable to the user environment</description>
-    <os family="windows"/>
-    <executefile name="$JAVA_HOME\bin\java">
-      <arg>-Djava.library.path=$INSTALL_PATH\Uninstaller</arg>
-      <arg>-cp</arg>
-      <arg>$INSTALL_PATH\Uninstaller\registry.jar;$INSTALL_PATH\Uninstaller\setenv.jar</arg>
-      <arg>Main</arg>
-      <arg>@VERSION@</arg>
-      <arg>$INSTALL_PATH</arg>
-    </executefile>
-  </job>
-
-</processing>
diff --git a/config/izpack/izpack_scala.xml b/config/izpack/izpack_scala.xml
deleted file mode 100644
index 282ed59e39..0000000000
--- a/config/izpack/izpack_scala.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version=1.0" encoding="UTF-8" standalone="yes" ?>
-<installation version="1.0">
-
-  <info>
-    <appname>Scala</appname>
-    <appversion>1.4.0.1</appversion>
-<!--
-    <authors>
-      <author name="Martin Odersky"     email="martin.odersky@epfl.ch" />
-      <author name="Vincent Cremet"     email="vincent.cremet@epfl.ch" />
-      <author name="Iulian Dragos"      email="Iulian.Dragos@epfl.ch" />
-      <author name="Gilles Dubochet"    email="gilles.dubochet@epfl.ch" />
-      <author name="Burak Emir"         email="burak.emir@epfl.ch" />
-      <author name="Stephane Micheloud" email="stephane.micheloud@epfl.ch" />
-      <author name="Nikolay Mihaylov"   email="nikolay.mihaylov@epfl.ch" />
-
-      <author name="Philippe Altherr (past member)" email="philippe.alther@epfl.ch" />
-      <author name="Michel Schinz (past member)"    email="michel.schinz@epfl.ch" />
-      <author name="Erik Stenmann (past member)"    email="happi@home.se" />
-      <author name="Matthias Zenger (past member)"  email="matthias.zenger@google.com" />
-    </authors>
--->
-    <url>http://scala.epfl.ch/</url>
-    <javaversion>1.4</javaversion>
-  </info>
-
-  <variables>
-    <variable name="JDKPathPanel.minVersion" value="1.4.0" />
-    <variable name="JDKPathPanel.maxVersion" value="1.5.0" />
-    <variable name="JDKPathPanel.skipIfValid" value="yes" />
-  </variables>
-
-  <native type="izpack" name="ShellLink.dll" />
-
-  <guiprefs resizable="yes" height="480" width="640">
-    <laf name="metouia">
-      <os family="unix" />
-    </laf>
-    <laf name="looks">
-      <os family="windows" />
-      <param name="variant" value="extwin" />
-    </laf>
-  </guiprefs>
-
-  <locale>
-    <langpack iso3="eng" />
-    <langpack iso3="fra" />
-    <langpack iso3="deu" />
-  </locale>
-
-  <resources>
-    <res id="installer.langsel.img" src="images/Splash.png" />
-    <res id="Installer.image" src="images/install.png" />
-    <res id="HTMLInfoPanel.info_eng" src="locales/INFO_en.html" />
-    <res id="HTMLInfoPanel.info_fra" src="locales/INFO_fr.html" />
-    <res id="HTMLInfoPanel.info_deu" src="locales/INFO_de.html" />
-    <res id="HTMLLicencePanel.licence_eng" src="locales/LICENSE_en.html" />
-    <res id="HTMLLicencePanel.licence_fra" src="locales/LICENSE_fr.html" />
-    <res id="HTMLLicencePanel.licence_deu" src="locales/LICENSE_de.html" />
-    <res id="TargetPanel.dir.macosx" src="targets/path_macosx.txt" />
-    <res id="TargetPanel.dir.unix" src="targets/path_unix.txt" />
-    <res id="ProcessPanel.Spec.xml" src="izpack_process.xml" />
-    <res id="shortcutSpec.xml" src="izpack_shortcut.xml" />
-  </resources>
-
-  <panels>
-    <panel classname="HelloPanel" />
-    <panel classname="HTMLInfoPanel" />
-    <panel classname="HTMLLicencePanel" />
-    <panel classname="JDKPathPanel" />
-    <!--
-    <panel classname="PacksPanel" />
-    -->
-    <panel classname="TargetPanel" />
-    <panel classname="InstallPanel" />
-    <panel os="unix" classname="ProcessPanel" />
-    <panel classname="ShortcutPanel" />
-    <panel classname="SimpleFinishPanel" />
-  </panels>
-
-  <packs>
-    <pack name="Installing..." required="yes">
-      <description>Installing the Scala software.</description>
-      <fileset os="unix" dir="unix" targetdir="$INSTALL_PATH" />
-      <fileset os="unix" dir="lib" targetdir="$INSTALL_PATH/share/scala-$APP_VER/lib" />
-      <fileset os="unix" dir="pdf" targetdir="$INSTALL_PATH/share/doc/scala-$APP_VER" />
-      <fileset os="windows" dir="windows" targetdir="$INSTALL_PATH" />
-      <fileset os="windows" dir="lib" targetdir="$INSTALL_PATH/lib" />
-      <fileset os="windows" dir="pdf" targetdir="$INSTALL_PATH/doc" />
-      <singlefile os="unix" target="$INSTALL_PATH/bin/.create_wrappers" src="create_wrappers.sh" />
-      <executable os="unix" targetfile="$INSTALL_PATH/bin/.create_wrappers" />
-      <executable os="unix" targetfile="$INSTALL_PATH/bin/.scala_wrapper" keep="true" />
-    </pack>
-  </packs>
-
-</installation>
diff --git a/config/izpack/izpack_shortcut.xml b/config/izpack/izpack_shortcut.xml
deleted file mode 100644
index 4d396dea1d..0000000000
--- a/config/izpack/izpack_shortcut.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version=1.0" encoding="UTF-8" standalone="yes" ?>
-<shortcuts>
-
-  <programGroup defaultName="Scala 1.4.0.1" location="applications" />
-
-  <skipIfNotSupported />
-
-  <shortcut
-    os="windows"
-    name="Scala Interpreter"
-    target="$INSTALL_PATH\bin\scalaint.bat"
-    workingDirectory="$SYSTEM_user_home"
-    commandLine=""
-    terminal="true"
-    programGroup="yes" />
-
-  <shortcut
-    os="windows"
-    name="Scala API Documentation"
-    target="$INSTALL_PATH\doc\api\index.html"
-    commandLine=""
-    programGroup="yes" />
-
-  <shortcut
-    os="windows"
-    name="ScalaByExample.pdf"
-    target="$INSTALL_PATH\doc\ScalaByExample.pdf"
-    programGroup="yes" />
-
-  <shortcut
-    os="windows"
-    name="ScalaReference.pdf"
-    target="$INSTALL_PATH\doc\ScalaReference.pdf"
-    programGroup="yes" />
-
-  <shortcut
-    os="windows"
-    name="ScalaTutorial.pdf"
-    target="$INSTALL_PATH\doc\ScalaTutorial.pdf"
-    programGroup="yes" />
-
-</shortcuts>
diff --git a/config/izpack/locales/INFO_de.html b/config/izpack/locales/INFO_de.html
deleted file mode 100644
index 8ca5c531cf..0000000000
--- a/config/izpack/locales/INFO_de.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-  <head>
-    <style type="text/css">
-    <!--
-    p { font-family:Helvetica,Arial,Sans-Serif; font-size:small; }
-    -->
-    </style>
-  </head>
-  <body>
-    <p>
-      <a href="http://www.izforge.com/">IzPack</a> f&uuml;hrt Sie durch
-      die Installation von Scala @VERSION@.
-    </p>
-    <p>
-      Scala erfordert Sun <a href="http://java.sun.com/j2se/">JDK/JRE</a>
-      version 1.4 oder neuer.
-    </p>
-    <p>
-      Sie k&ouml;nnen die Installation jederzeit abbrechen, indem
-      Sie auf 'Beenden' klicken.
-    </p>
-  </body>
-</html>
diff --git a/config/izpack/locales/INFO_en.html b/config/izpack/locales/INFO_en.html
deleted file mode 100644
index 3112960fe3..0000000000
--- a/config/izpack/locales/INFO_en.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-  <head>
-    <style type="text/css">
-    <!--
-    p { font-family:Helvetica,Arial,Sans-Serif; font-size:small; }
-    -->
-    </style>
-  </head>
-  <body>
-    <p>
-      <a href="http://www.izforge.com/">IzPack</a> will guide you through
-      the installation of Scala @VERSION@.
-    </p>
-    <p>
-      Scala requires Sun <a href="http://java.sun.com/j2se/">JDK/JRE</a>
-      version 1.4 or newer.
-    </p>
-    <p>
-      You may cancel this installation at any time by clicking the
-      'Quit' button.
-    </p>
-  </body>
-</html>
diff --git a/config/izpack/locales/INFO_fr.html b/config/izpack/locales/INFO_fr.html
deleted file mode 100644
index 9edfe4455e..0000000000
--- a/config/izpack/locales/INFO_fr.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-  <head>
-    <style type="text/css">
-    <!--
-    p { font-family:Helvetica,Arial,Sans-Serif; font-size:small; }
-    -->
-    </style>
-  </head>
-  <body>
-    <p>
-      <a href="http://www.izforge.com/">IzPack</a> will guide you through
-      the installation of Scala @VERSION@.
-    </p>
-    <p>
-      Scala requiert Sun <a href="http://java.sun.com/j2se/">JDK/JRE</a>
-      version 1.4 ou plus r&eacute;cent.
-    </p>
-    <p>
-      Vous pouvez abandonner l'installation &agrave; tout moment
-      en cliquant sur 'Quitter'.
-    </p>
-  </body>
-</html>
diff --git a/config/izpack/locales/LICENSE_de.html b/config/izpack/locales/LICENSE_de.html
deleted file mode 100644
index 90b5da193e..0000000000
--- a/config/izpack/locales/LICENSE_de.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-
-<head>
-  <style type="text/css">
-  <!--
-  body { font-family:Helvetica,Arial,Sans-Serif; }
-  div.title { font-weight:bold; }
-  p { font-size:small; }
-  li { font-size:small; margin:0px 0px 6px 0px; }
-  -->
-  </style>
-</head>
-
-<body>
-
-<div class="title">
-SCALA LIZENZ
-</div>
-
-<p>
-Copyright &copy; 2002-05 <a href="http://www.epfl.ch/">EPFL</a>, Lausanne.
-Alle Rechte vorbehalten.
-</p>
-
-<p>
-Diese Software wurde von der Gruppe Methoden der Programmierung an
-der Eidgen&ouml;ssiche Technische Hochschule von Lausanne, Schweiz,
-entwickelt.
-</p>
-
-<p>
-Die Genehmigung zum Verwenden, Kopieren, &Auml;ndern and Weitervertreiben
-dieser Software im Quell- und Bin&auml;rformat zu einem beliebigen Zweck
-wird hiermit ohne Geb&uuml;hr erteilt, sofern folgende Konditionen
-erf&uuml;llt sind:
-</p>
-
-<ol>
-   <li>
-     Bei Weitervertrieb des Quellcodes m&uuml;ssen vorstehender
-     Urheberrechtshinweis, diese Liste der Konditionen und die folgende
-     Verzichtserkl&auml;rung beibehalten werden.
-   </li>
-   <li>
-     Bei Weitervertrieb im Bin&auml;rformat müssen in der Dokumentation
-     und/oder anderen Materialien, die vertrieben werden, vorstehender
-     Urheberrechtshinweis, diese Liste der Konditionen und die folgende
-     Verzichtserkl&auml;rung reproduziert werden.
-   </li>
-   <li>
-      Neither the name of the EPFL nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-   </li>
-</ol>
-
-<p>
-DIESE SOFTWARE WIRD VON DEN AUTOREN WIE BESEHEN UND UNTER AUSSCHLUSS ALLER
-AUSDR&Uuml;CKLICHEN ODER KONKLUDENTEN GARANTIEN ZUR VERFÜGUNG GESTELLT,
-EINSCHLIESSLICH, ABER NICHT BESCHR&Auml;NKT AUF KONKLUDENTE GARANTIEN DER
-HANDELS&Uuml;BLICHKEIT UND/ODER EIGNUNG F&Uuml;R EINEN BESTIMMTEN ZWECK.
-UNTER KEINEN UMST&Auml;NDEN KÖNNEN DIE AUTOREN F&Uuml;R DIREKTE, INDIREKTE,
-ZUF&Auml;LLIGE, BESONDERE, EXEMPLARISCHE ODER FOLGESCH&Auml;DEN (EINSCHLIESSLICH
-VON, ABER NICHT BESCHR&Auml;NKT AUF, BESCHAFFUNG VON ERSATZWAREN ODER
-ERSATZLEISTUNGEN, ENTGANGENEM NUTZEN, VERLUST VON DATEN, ENTGANGENEM GEWINN
-ODER GESCH&Auml;FTSAUSFALL) HAFTBAR GEMACHT WERDEN, DIE AUS EINER BELIEBIGEN
-URSACHE UND AUF GRUNDLAGE IRGENDEINES HAFTBARKEITSVERST&Auml;NDNISSES ENTSTEHEN,
-UNABH&Auml;NGIG VON VERTR&Auml;GEN, DER GEFÄHRDUNGSHAFTUNG ODER UNERLAUBTEN
-HANDLUNGEN (EINSCHLIESSLICH FAHRL&Auml;SSIGKEIT ODER ANDERWEITIG), DIE IN
-IRGENDEINER WEISE DURCH DIE VERWENDUNG DIESER SOFTWARE ENTSTEHEN, AUCH DANN,
-WENN DIE AUTOREN &Uuml;BER DIE M&Ouml;GLICHKEIT SOLCHER SCH&Auml;DEN UNTERRICHTET WURDEN.
-</p>
-
-</body>
-</html>
-
diff --git a/config/izpack/locales/LICENSE_en.html b/config/izpack/locales/LICENSE_en.html
deleted file mode 100644
index 59ef4cc4e0..0000000000
--- a/config/izpack/locales/LICENSE_en.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<html>
-
-<head>
-  <style type="text/css">
-  <!--
-  body { font-family:Helvetica,Arial,Sans-Serif; }
-  div.title { font-weight:bold; }
-  p { font-size:small; }
-  li { font-size:small; margin:0px 0px 6px 0px; }
-  -->
-  </style>
-</head>
-
-<body>
-
-<div class="title">
-SCALA LICENSE
-</div>
-
-<p>
-Copyright &copy; 2002-05 <a href="http://www.epfl.ch/">EPFL</a>, Lausanne.
-All rights reserved.
-</p>
-
-<p>
-This software was developed by the Programming Methods Laboratory of
-the Swiss Federal Institute of Technology, Lausanne, Switzerland.
-</p>
-
-<p>
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-provided that the following conditions are met:
-</p>
-
-<ol>
-   <li>
-      Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   </li>
-   <li>
-      Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   </li>
-   <li>
-      Neither the name of the EPFL nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-   </li>
-</ol>
-
-<p>
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-</p>
-
-</body>
-</html>
diff --git a/config/izpack/locales/LICENSE_fr.html b/config/izpack/locales/LICENSE_fr.html
deleted file mode 100644
index dab0ccd677..0000000000
--- a/config/izpack/locales/LICENSE_fr.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
-
-<head>
-  <style type="text/css">
-  <!--
-  body { font-family:Helvetica,Arial,Sans-Serif; }
-  div.title { font-weight:bold; }
-  p { font-size:small; }
-  li { font-size:small; margin:0px 0px 6px 0px; }
-  -->
-  </style>
-</head>
-
-<body>   
-    
-<div class="title">
-LICENCE SCALA
-</div>
-
-<p>
-Copyright &copy; 2002-05 <a href="http://www.epfl.ch/">EPFL</a>, Lausanne.
-Tous droits r&eacute;serv&eacute;s.
-</p>
-
-<p>
-Ce logiciel a &eacute;t&eacute; d&eacute;velopp&eacute; par le Laboratoire
-des M&eacute;thodes de Programmation de l'Ecole Polytechnique
-F&eacute;d&eacute;rale de Lausanne (EPFL), Suisse.
-</p>
-
-<p>
-L'utilisation, la modification et la redistribution de ce logiciel sous forme
-de code source et/ou binaire, dans un but commercial ou non, sont permis
-&eacute;tant entendu que les conditions suivantes sont satisfaites:
-</p>
-
-<ol>
-   <li>
-      Toute redistribution du code source doit contenir la notice de droits
-      d'auteur ci-dessus, la pr&eacute;sente liste des conditions
-      d'utilisation et l'avis de non-responsabilit&eacute; mentionn&eacute;
-      plus bas.
-   </li>
-   <li>
-      Toute redistribution du code binaire doit contenir la notice de droits
-      d'auteur ci-dessus, la pr&eacute;sente liste des conditions d'utilisation
-      et l'avis de non-responsabilit&eacute; mentionn&eacute; plus bas dans
-      la documentation et/ou tout autre support fourni dans la distribution.
-   </li>
-   <li>
-      Ni le nom de l'EPFL, ni celui des personnes qui ont
-      contribu&eacute; au d&eacute;veloppement de ce logiciel ne peuvent
-      &ecirc;tre utilis&eacute;s dans le but de promouvoir des produits
-      d&eacute;riv&eacute;s de ce logiciel sans permission &eacute;crite
-      pr&eacute;alable.
-   </li>
-</ol>
-
-<p>
-CE LOGICIEL EST FOURNI "EN L'&Eacute;TAT" SANS GARANTIE AUCUNE QUANT
-&Agrave; SON UTILISATION, Y COMPRIS, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. EN AUCUN CAS L'UNIVERSIT&Eacute; OU QUICONQUE AYANT
-CONTRIBU&Eacute; AU D&Eacute;VELOPPEMENT DU LOGICIEL NE SAURAIT &Ecirc;TRE
-TENU RESPONSABLE DE TOUS DOMMAGES DIRECTS OU INDIRECTS, CONS&Eacute;CUTIFS
-&Agrave; L'UTILISATION DU LOGICIEL ET, NOTAMMENT DE TOUTES PERTES DE PROFITS
-OU MANQUES &Agrave; GAGNER, PERTE D'INFORMATION, D&Eacute;FAILLANCE
-D'ORDINATEUR, INTERRUPTION DE TRAVAIL OU AUTRES D&Eacute;G&Acirc;TS, ET
-CELA QUAND BIEN M&Ecirc;ME UN REPR&Eacute;SENTANT DE L'UNIVERSIT&Eacute;
-AURAIT &Eacute;T&Eacute; INFORM&Eacute; DE LA POSSIBILIT&Eacute; DE TELS
-DOMMAGES.
-</p>
-
-<p>
-Seule la version anglaise de ce contrat fait foi juridiquement.
-Les traductions en d'autres langues sont fournies aux usagers &agrave;
-titre indicatif, mais elles ne sont pas n&eacute;cessairement exactes
-d'un point de vue juridique.
-</p>
-
-</body>
-</html>
diff --git a/config/izpack/registry/bin/ICE_JNIRegistry.dll b/config/izpack/registry/bin/ICE_JNIRegistry.dll
deleted file mode 100644
index 5463a70a40..0000000000
--- a/config/izpack/registry/bin/ICE_JNIRegistry.dll
+++ /dev/null
diff --git a/config/izpack/registry/bin/readme.txt b/config/izpack/registry/bin/readme.txt
deleted file mode 100644
index 19b8731936..0000000000
--- a/config/izpack/registry/bin/readme.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
-    Windows Registry API Native Interface
-
-*Release 3.1.3, September 11, 2003*
-
-The com.ice.jni.registry package is a Java native interface for the
-Windows Registry API. This allows Java program to access, modify, and
-export Windows Registry resources.
-
-The com.ice.jni.registry package has been placed into the public domain.
-Thus, you have absolutely no licensing issues to consider. You may do
-anything you wish with the code. Of course, I always appreciate it when
-you properly credit my work.
-
-The package will work only with Java 1.1 and greater, and uses the
-Javasoft native interface, not the Netscape interface. The package also
-includes a DLL that implements the interface. The package has been used
-with JDK1.2, and JDK1.3, JDK1.4, as well as JDK1.1.8.
-
-The package includes the pre-built DLL (debug and release), source code
-(both the Java and the DLL's C code), as well as the compiled Java classes.
-
-The original release was posted on November 17, 1997. The current
-release is 3.1.3, which was posted on September 11, 2003.
-
-Email me if you have questions. <mailto:time@gjt.org>
-
-
-      View The Source Code
-
-You can now directly view the JNIRegistry source code
-<http://www.gjt.org/servlets/JCVSlet/list/ice/com/ice/jni/registry/> and
-source code documentation
-<http://www.gjt.org/javadoc/com/ice/jni/registry/package-summary.html>
-online via the Giant Java Tree. <http://www.gjt.org>
-
-
-      Downloads
-
-Download the WinZip-ed package. (FTP)
-<ftp://ftp.gjt.org/pub/users/time/java/registry-3.1.3.zip>
-
-Download the WinZip-ed package. (HTTP)
-<http://www.gjt.org/download/time/java/jnireg/registry-3.1.3.zip>
-
-	
-------------------------------------------------------------------------
-* All contents are copyrighted (c) by ICE Engineering, Inc. *
-http://www.trustice.com/ --- http://www.icetoo.com/
-
diff --git a/config/izpack/registry/bin/registry.jar.desired.sha1 b/config/izpack/registry/bin/registry.jar.desired.sha1
deleted file mode 100644
index 634c7ec706..0000000000
--- a/config/izpack/registry/bin/registry.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-54ed7dd49e6370b92f67acc20b43a32f4373343f ?registry.jar
diff --git a/config/izpack/registry/bin/setenv.jar.desired.sha1 b/config/izpack/registry/bin/setenv.jar.desired.sha1
deleted file mode 100644
index 30ace1f6cc..0000000000
--- a/config/izpack/registry/bin/setenv.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6cd4b4e5799e861e00d1307f4e0ecd16ee3188cd ?setenv.jar
diff --git a/config/izpack/registry/src/MANIFEST.MF b/config/izpack/registry/src/MANIFEST.MF
deleted file mode 100644
index a99365f10a..0000000000
--- a/config/izpack/registry/src/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: 1.4.2_09 (Sun Microsystems Inc.)
-Main-Class: Main
diff --git a/config/izpack/registry/src/Main.java b/config/izpack/registry/src/Main.java
deleted file mode 100644
index 6f5ee96bfd..0000000000
--- a/config/izpack/registry/src/Main.java
+++ /dev/null
@@ -1,120 +0,0 @@
-// File       : Main.java
-// Project    : Scala
-// Author(s)  : Stephane Micheloud (mics)
-// Environment: JNI Registry 3.1.3, Sun JDK 1.4.2_09
-// Version    : 01
-// Created    : 25.09.2005/mics
-// Modified   : -
-
-
-import com.ice.jni.registry.NoSuchKeyException;
-import com.ice.jni.registry.NoSuchValueException;
-import com.ice.jni.registry.Registry;
-import com.ice.jni.registry.RegistryException;
-import com.ice.jni.registry.RegistryKey;
-import com.ice.jni.registry.RegistryValue;
-import com.ice.jni.registry.RegMultiStringValue;
-import com.ice.jni.registry.RegStringValue;
-
-public class Main {
-
-    private static final String PATH       = "PATH";
-    private static final String SCALA_HOME = "SCALA_HOME";
-    private static final String SCALA_BIN  = "%" + SCALA_HOME + "%\\bin";
-
-    private static void updateRegistry(String homePath, String fullName) throws RegistryException {
-        // HKEY_CURRENT_USER\Environment
-        RegistryKey envKey = Registry.openSubkey(
-            Registry.HKEY_CURRENT_USER,
-            "Environment",
-            RegistryKey.ACCESS_ALL);
-        if (homePath != null) {
-            // set home directory
-            RegStringValue data = new RegStringValue(envKey, SCALA_HOME, homePath);
-            envKey.setValue(data);
-            // update user path
-            String path = envKey.getStringValue(PATH);
-            if (path.indexOf(SCALA_BIN) < 0) {
-            	int inx = path.lastIndexOf(";");
-            	StringBuffer buf = new StringBuffer(path);
-                if (0 < inx && inx < path.length()-1)
-                    buf.append(";");
-                buf.append(SCALA_BIN);
-                data = new RegStringValue(envKey, PATH, buf.toString());
-                envKey.setValue(data);
-            }
-        }
-        else { // uninstall
-            // remove home directory
-            try {
-                envKey.deleteValue(SCALA_HOME);
-            }
-            catch (NoSuchValueException e) {
-                // do nothing
-            }
-            String path = envKey.getStringValue(PATH);
-            int inx1 = path.indexOf(SCALA_BIN);
-            if (inx1 >= 0) {
-                int inx2 = path.indexOf(";", inx1);
-                StringBuffer buf = new StringBuffer(path.substring(0, inx1));
-                if (inx2 >= 0)
-                    buf.append(path.substring(inx2));
-                RegStringValue data = new RegStringValue(envKey, PATH, buf.toString());
-                envKey.setValue(data);
-            }
-        }
-
-        // HKEY_CURRENT_USER\Software
-        RegistryKey softwareKey = Registry.openSubkey(
-            Registry.HKEY_CURRENT_USER,
-            "Software",
-            RegistryKey.ACCESS_WRITE);
-        if (homePath != null) {
-            RegistryKey productKey = softwareKey.createSubKey(
-                fullName,
-                "java.lang.String",
-                RegistryKey.ACCESS_WRITE);
-            RegStringValue data = new RegStringValue(productKey, "Location", homePath);
-            productKey.setValue(data);
-        }
-        else { // uninstall
-            try {
-            	softwareKey.deleteSubKey(fullName);
-                String name = fullName;
-                int inx = name.lastIndexOf("\\");
-                while (inx != -1) {
-                    String parentName = name.substring(0, inx);
-                    RegistryKey key = softwareKey.openSubKey(parentName, RegistryKey.ACCESS_READ);
-                    int n = key.getNumberSubkeys();
-            	    if (n == 0) softwareKey.deleteSubKey(parentName);
-            	    name = parentName;
-            	    inx = name.lastIndexOf("\\");
-            	}
-            }
-            catch (NoSuchKeyException e) {
-                // do nothing
-            }
-        }
-    }
-
-    public static void main(String[] args) {
-    	int argc = args.length;
-    	if (argc != 1 && argc != 2) {
-    	    System.out.println("Usage: java Main <version> [ <installpath> ]\n");
-    	    System.out.println("\tversion number (e.g. 1.4.0.1)");
-    	    System.out.println("\tinstall path   (e.g. c:\\\\Program Files\\\\Scala)");
-    	    System.out.println();
-    	    System.exit((argc > 0) ? 1 : 0);
-    	}
-        String homePath = (argc == 2) ? args[1] : null;   // e.g. "C:\\Program Files\\Scala"
-        String fullName = "EPFL\\Scala\\" + args[0];      // e.g. "EPFL\\Scala\\1.4.0.1"
-        try {
-            updateRegistry(homePath, fullName);
-        }
-        catch (RegistryException e) {
-            System.out.println(e.getMessage());
-            System.exit(1);
-        }
-    }
-
-}
diff --git a/config/izpack/targets/path_macosx.txt b/config/izpack/targets/path_macosx.txt
deleted file mode 100644
index bbae42e6bc..0000000000
--- a/config/izpack/targets/path_macosx.txt
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/
diff --git a/config/izpack/targets/path_unix.txt b/config/izpack/targets/path_unix.txt
deleted file mode 100644
index bbae42e6bc..0000000000
--- a/config/izpack/targets/path_unix.txt
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/
diff --git a/lib/fjbg.jar.desired.sha1 b/lib/fjbg.jar.desired.sha1
new file mode 100644
index 0000000000..ed3c414956
--- /dev/null
+++ b/lib/fjbg.jar.desired.sha1
@@ -0,0 +1 @@
+0b8a2e9257039ac9a7ba02720e3497655aa2015b ?fjbg.jar
diff --git a/lib/jaco.jar.desired.sha1 b/lib/jaco.jar.desired.sha1
new file mode 100644
index 0000000000..cfd3e09ca8
--- /dev/null
+++ b/lib/jaco.jar.desired.sha1
@@ -0,0 +1 @@
+d7d547efe60ae6f398183bd04074723e480dc39d ?jaco.jar
diff --git a/lib/msil.jar.desired.sha1 b/lib/msil.jar.desired.sha1
new file mode 100644
index 0000000000..90c937b347
--- /dev/null
+++ b/lib/msil.jar.desired.sha1
@@ -0,0 +1 @@
+eee44b93d8b1936061e55ec9207e8c4151198e08 ?msil.jar
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
new file mode 100644
index 0000000000..306cc36177
--- /dev/null
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -0,0 +1 @@
+050578dd01ce7a0189f9a703bc3862296818ca36 ?scala-compiler.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
new file mode 100644
index 0000000000..444d9bcb44
--- /dev/null
+++ b/lib/scala-library.jar.desired.sha1
@@ -0,0 +1 @@
+2a39d9395a726506fe3978133e0a4ae2119993c4 ?scala-library.jar
diff --git a/lib/scala.dll b/lib/scala.dll
new file mode 100644
index 0000000000..22c2e372e9
--- /dev/null
+++ b/lib/scala.dll
diff --git a/newsources/scala/CaseClass.scala b/newsources/scala/CaseClass.scala
deleted file mode 100644
index e644a03750..0000000000
--- a/newsources/scala/CaseClass.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2004, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-** $Id$
-\*                                                                      */
-
-package scala;
-
-/** defines an access function for instances of case classes
- *
- *  @author  Burak Emir
- */
-trait CaseClass extends AnyRef {
-
-  /** for a case class A(x_0,...,x_(k-1)), returns x_i for 0 &lt;= i &lt; k,
-  **  null otherwise
-  */
-  def caseElement(n: Int): Any ;
-
-  /** need also, for reflection
-  def setCaseElement(n: Int, v: Any): unit
-  */
-
-  /** for a case class A(x_0,...,x_(k-1)), returns k
-  */
-  def caseArity: Int;
-
-  def caseName: String;
-}
diff --git a/sources/bin/izpack.symlink.tmpl b/sources/bin/izpack.symlink.tmpl
deleted file mode 100644
index 009f8b6eec..0000000000
--- a/sources/bin/izpack.symlink.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-DIRNAME="dirname"
-LN="/bin/ln -sf"
-
-COMMANDS="scala scalac scaladoc scalap"
-
-cd `$DIRNAME $0` && \
-for cmd in $COMMANDS; do $LN $1 $cmd; done
-
-# $Id$
diff --git a/sources/msil/scala_part2.il.diff.tmpl b/sources/msil/scala_part2.il.diff.tmpl
deleted file mode 100644
index 8f63867b2b..0000000000
--- a/sources/msil/scala_part2.il.diff.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
---- scala_part2.il	2005-09-21 16:19:30.676754000 +0200
-+++ scala_part2.il.new	2005-09-21 16:21:58.522947000 +0200
-@@ -1,18 +1,3 @@
--.assembly extern 'mscorlib'
--{
--    .ver 1:0:3300:0
--    .publickeytoken = (b7 7a 5c 56 19 34 e0 89)
--}
--.assembly extern 'scala_part1'
--{
--    .ver SCALA_VERSION
--    .publickeytoken = (80 07 fc 78 8a 2e 53 08)
--}
--.assembly 'scala_part2'
--{
--}
--.module 'scala_part2.dll'
--
- .namespace 'scala'
- {
-    .class public auto ansi interface 'Tuple1'
diff --git a/sources/scala/Array.cs b/sources/scala/Array.cs
deleted file mode 100644
index f48f18d5e4..0000000000
--- a/sources/scala/Array.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-using System;
-using scala.runtime;
-
-namespace scala
-{
-
-	[Meta("class [?T] extends scala.AnyRef;")]
-	[Serializable]
-	public abstract class Array /*: Cloneable*/
-	{
-
-		[Meta("constr (scala.Int);")]
-		public Array() {}
-
-		[Meta("method []scala.Array[?T];")]
-		public abstract object value();
-
-		[Meta("method []scala.Int;")]
-		public abstract int length();
-		[Meta("method (scala.Int)?T;")]
-		public abstract object apply(int i);
-		[Meta("method (scala.Int,?T)scala.Unit;")]
-		public abstract void update(int i, object x);
-	}
-}
diff --git a/sources/scala/Array.java b/sources/scala/Array.java
deleted file mode 100644
index df85888513..0000000000
--- a/sources/scala/Array.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala;
-
-/** @meta class [?T] extends scala.AnyRef with java.lang.Cloneable with java.io.Serializable; */
-public abstract class Array implements Cloneable, java.io.Serializable {
-
-    /** @meta constr (scala.Int); */
-    public Array() {}
-
-    /** @meta method []scala.Array[?T]; */
-    public abstract Object value();
-
-    /** @meta method []scala.Int; */
-    public abstract int length();
-    /** @meta method (scala.Int)?T; */
-    public abstract Object apply(int i);
-    /** @meta method (scala.Int,?T)scala.Unit; */
-    public abstract void update(int i, Object x);
-
-}
diff --git a/sources/scala/MatchError.cs b/sources/scala/MatchError.cs
deleted file mode 100644
index 1ce0b37b09..0000000000
--- a/sources/scala/MatchError.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-**                                                                      **
-** $Id$
-\*                                                                      */
-using System;
-using scala.runtime;
-
-namespace scala 
-{
-
-
-	/** This class implements errors which are thrown whenever an
-	 *  object doesn't match any pattern of a pattern matching
-	 *  expression.
-	 *  
-	 *  @author  Matthias Zenger
-	 *  @version 1.1, 05/03/2004
-	 */
-	public sealed class MatchError : ApplicationException  
-	{
-    
-		[Meta("constr (System.String, scala.Int);")]
-		private MatchError(string source, int line) :
-			base(" in '" + source + "' at line " + line)
-		{
-		}
-    
-		[Meta("constr (System.String, scala.Int, System.String);")]
-		private MatchError(string source, int line, string obj) :
-			base("for object " + obj + " in '" + source + "' at line " + line)
-		{
-		}
-    
-		[Meta("method [?T](System.String, scala.Int) ?T;")]
-		public static object fail(string source, int line) 
-		{
-			throw new MatchError(source, line);
-		}
-    
-		[Meta("method [?T](System.String, scala.Int, scala.Any) ?T;")]
-		public static object report(string source, int line, object obj) 
-		{
-			try 
-			{
-				throw new MatchError(source, line, obj.ToString());
-			} 
-			catch (MatchError e) 
-			{
-				throw e;
-			} 
-			catch (Exception e) 
-			{
-				throw new MatchError(source, line);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/sources/scala/MatchError.java b/sources/scala/MatchError.java
deleted file mode 100644
index 0668f5a1d6..0000000000
--- a/sources/scala/MatchError.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-**                                                                      **
-** $Id$
-\*                                                                      */
-
-package scala;
-
-
-/** This class implements errors which are thrown whenever an
- *  object doesn't match any pattern of a pattern matching
- *  expression.
- *
- *  @author  Matthias Zenger
- *  @version 1.1, 05/03/2004
- */
-public final class MatchError extends Error {
-
-    /** @meta constr (java.lang.String, scala.Int);
-     */
-    private MatchError(java.lang.String source, int line) {
-        super(" in '" + source + "' at line " + line);
-    }
-
-    /** @meta constr (java.lang.String, scala.Int, java.lang.String);
-     */
-    private MatchError(java.lang.String source, int line, String obj) {
-        super("for object " + obj + " in '" + source + "' at line " + line);
-    }
-
-    /** @meta method [?T](java.lang.String, scala.Int) ?T;
-     */
-    public static java.lang.Object fail(java.lang.String source, int line) {
-        throw new MatchError(source, line);
-    }
-
-    /** @meta method [?T](java.lang.String, scala.Int, scala.Any) ?T;
-     */
-    public static java.lang.Object report(java.lang.String source, int line, java.lang.Object obj) {
-    	try {
-        	throw new MatchError(source, line, obj.toString());
-        } catch (MatchError e) {
-        	throw e;
-        } catch (Throwable e) {
-        	throw new MatchError(source, line);
-        }
-    }
-}
diff --git a/sources/scala/ScalaObject.java b/sources/scala/ScalaObject.java
deleted file mode 100644
index c958960a02..0000000000
--- a/sources/scala/ScalaObject.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala;
-
-import scala.runtime.types.ClassType;
-
-/** @meta class extends scala.AnyRef;
- */
-public interface ScalaObject {
-    /**
-     * Return the Scala type of the object.
-     */
-    public ClassType getScalaType();
-
-    /** This method is needed for optimizing pattern matching expressions
-     *  which match on constructors of case classes.
-     */
-    public int $tag();
-}
diff --git a/sources/scala/Type.java b/sources/scala/Type.java
deleted file mode 100644
index 288bb634f5..0000000000
--- a/sources/scala/Type.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala;
-
-import scala.runtime.RunTime;
-import scala.runtime.types.ScalaClassType;
-import scala.runtime.types.JavaClassType;
-import scala.runtime.types.TypeBoolean;
-import scala.runtime.types.TypeByte;
-import scala.runtime.types.TypeChar;
-import scala.runtime.types.TypeDouble;
-import scala.runtime.types.TypeFloat;
-import scala.runtime.types.TypeInt;
-import scala.runtime.types.TypeLong;
-import scala.runtime.types.TypeShort;
-import scala.runtime.types.TypeUnit;
-import scala.runtime.types.TypeAll;
-import scala.runtime.types.TypeAllRef;
-import scala.runtime.types.TypeAny;
-import scala.runtime.types.TypeAnyVal;
-import scala.runtime.types.Statistics;
-
-import scala.runtime.FNV_Hash;
-
-/**
- * Run-time types for Scala.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-abstract public class Type implements java.io.Serializable {
-    public Type() {
-        assert Statistics.incInstances(getClass().getName(), this);
-    }
-
-    protected static ThreadLocal unsafeArraysAllowed = new BooleanThreadLocal();
-
-    /*
-     * Allow (or not) the creation of "unsafe" arrays for the current
-     * thread.
-     */
-    public static void allowUnsafeArrays(boolean allow) {
-        unsafeArraysAllowed.set(allow
-                                ? java.lang.Boolean.TRUE
-                                : java.lang.Boolean.FALSE);
-    }
-
-    /** @meta method [?T](scala.Int) scala.Array[?T]; */
-    abstract public Array newArray(int size);
-
-    /** Return the default value for the type (_ in Scala) */
-    abstract public Object defaultValue();
-
-    /**
-     * Return true iff the given object is an instance of a subtype of
-     * this type (implement Scala's isInstanceOf operation).
-     */
-    abstract public boolean isInstance(Object o);
-
-    abstract public boolean isSameType(Type that);
-    abstract public boolean isSubType(Type that);
-
-    public boolean isSameAsJavaType(Class that) {
-        throw new Error("cannot compare Scala type " + this
-                        + " with Java type " + that);
-    }
-
-    public boolean equals(Object that) {
-        return (that instanceof Type) && this.isSameType((Type)that);
-    }
-
-    public int hashCode() {
-        throw new Error("missing hashCode implementation in class "
-                        + this.getClass());
-    }
-
-    /**
-     * Check that the given object can be cast to this type, and throw
-     * an exception if this is not possible (implement Scala's
-     * asInstanceOf operation).
-     */
-    public Object cast(Object o) {
-        assert Statistics.incTypeCast();
-        if (o == null) {
-            if (this.isSubType(JavaLangObject))
-                return null;
-            else
-                throw new ClassCastException();
-        } else {
-            assert Statistics.decInstanceOf();
-            if (isInstance(o))
-                return o;
-            else
-                throw new ClassCastException("\n" + ((ScalaObject)o).getScalaType()
-                                             + "\n" + this.toString());
-        }
-    }
-
-    // Value types
-    public static final TypeDouble  Double  = TypeDouble.INSTANCE;
-    public static final TypeFloat   Float   = TypeFloat.INSTANCE;
-    public static final TypeLong    Long    = TypeLong.INSTANCE;
-    public static final TypeInt     Int     = TypeInt.INSTANCE;
-    public static final TypeShort   Short   = TypeShort.INSTANCE;
-    public static final TypeChar    Char    = TypeChar.INSTANCE;
-    public static final TypeByte    Byte    = TypeByte.INSTANCE;
-    public static final TypeBoolean Boolean = TypeBoolean.INSTANCE;
-    public static final TypeUnit    Unit    = TypeUnit.INSTANCE;
-
-    // "Special" types
-    public static final TypeAny    Any    = TypeAny.INSTANCE;
-    public static final TypeAnyVal AnyVal = TypeAnyVal.INSTANCE;
-    public static final TypeAllRef AllRef = TypeAllRef.INSTANCE;
-    public static final TypeAll    All    = TypeAll.INSTANCE;
-
-    private static JavaClassType JavaLangObject;
-
-    static {
-        try {
-            JavaLangObject = new JavaClassType("java.lang.Object");
-        } catch (ClassNotFoundException e) {
-            throw new Error(e);
-        }
-    }
-
-    public static boolean isSameType(Type[] these, Type[] those) {
-        if (these.length != those.length)
-            return false;
-        for (int i = 0; i < these.length; ++i) {
-            if (!these[i].isSameType(those[i]))
-                return false;
-        }
-        return true;
-    }
-
-    public static int hashCode(Type[] types) {
-        final int len = types.length;
-
-        int h = FNV_Hash.INIT;
-        for (int i = 0; i < len; ++i)
-            h = FNV_Hash.hashStep32(h, types[i].hashCode());
-
-        return h;
-    }
-}
-
-class BooleanThreadLocal extends ThreadLocal {
-    protected Object initialValue() {
-        return java.lang.Boolean.TRUE;
-    }
-}
diff --git a/sources/scala/runtime/RunTime.cs b/sources/scala/runtime/RunTime.cs
deleted file mode 100644
index eadb95bacf..0000000000
--- a/sources/scala/runtime/RunTime.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $OldId: RunTime.java,v 1.13 2002/11/19 12:01:40 paltherr Exp $
-// $Id$
-
-using System;
-using scala;
-
-namespace scala.runtime 
-{
-
-	public abstract class RunTime 
-	{
-
-		//########################################################################
-		// Private Constants
-
-		private static readonly int BITS        = 8;
-		private static readonly int ARRAY_SIZE  = 2 << BITS;
-		private static readonly int INDEX_MASK  = ARRAY_SIZE - 1;
-		private static readonly int CHECK_MASK  = ~(ARRAY_SIZE / 2 - 1);
-
-		private static readonly UValue uvalue   = new UValue();
-		private static readonly ZValue zvalue_f = new ZValue(false);
-		private static readonly ZValue zvalue_t = new ZValue(true);
-		private static readonly BValue[] bvalue = new BValue[256];
-		private static readonly SValue[] svalue = new SValue[ARRAY_SIZE];
-		private static readonly CValue[] cvalue = new CValue[ARRAY_SIZE / 2];
-		private static readonly IValue[] ivalue = new IValue[ARRAY_SIZE];
-		private static readonly LValue[] lvalue = new LValue[ARRAY_SIZE];
-
-		static RunTime() 
-		{
-			for (int i = 0; i < bvalue.Length; i++)
-				bvalue[i] = new BValue((sbyte)i);
-			for (int i = 0; i < ARRAY_SIZE / 2; i++) 
-			{
-				svalue[i] = new SValue((short)i);
-				cvalue[i] = new CValue((char )i);
-				ivalue[i] = new IValue((int  )i);
-				lvalue[i] = new LValue((long )i);
-				svalue[i + ARRAY_SIZE / 2] = new SValue((short)(CHECK_MASK | i));
-				ivalue[i + ARRAY_SIZE / 2] = new IValue((int  )(CHECK_MASK | i));
-				lvalue[i + ARRAY_SIZE / 2] = new LValue((long )(CHECK_MASK | i));
-			}
-		}
-
-		//########################################################################
-		// Private Variables
-
-		//private static ClassLoader loader = ClassLoader.getSystemClassLoader();
-
-		//########################################################################
-		// Public Functions - Getting & setting class loader
-
-//		public static ClassLoader getClassLoader() 
-//		{
-//			return loader;
-//		}
-//
-//		public static void setClassLoader(ClassLoader loader) 
-//		{
-//			RunTime.loader = loader;
-//		}
-
-		//########################################################################
-		// Public Functions - Catching exceptions
-		public interface Runnable {
-			void run();
-		}
-
-		public static Exception tryCatch(Runnable runnable) 
-		{
-			try 
-			{
-				runnable.run();
-				return null;
-			} 
-			catch (Exception exception) 
-			{
-				return exception;
-			}
-		}
-
-		//########################################################################
-		// Public Functions - Boxing primitives
-
-		public static Unit    box_uvalue(         ) 
-		{
-			return uvalue;
-		}
-
-		public static Boolean box_zvalue(bool x) 
-		{
-			return x ? zvalue_t : zvalue_f;
-		}
-
-		public static Byte    box_bvalue(sbyte    x) 
-		{
-			return bvalue[x & 0x000000FF];
-		}
-
-		public static Short   box_svalue(short   x) 
-		{
-			int c = x & CHECK_MASK;
-			if (c == 0 || c == CHECK_MASK) return svalue[x & INDEX_MASK];
-			return new SValue(x);
-		}
-
-		public static Char    box_cvalue(char    x) 
-		{
-			int c = (int)x & CHECK_MASK;
-			if (c == 0) return cvalue[(int)x & INDEX_MASK];
-			return new CValue(x);
-		}
-
-		public static Int     box_ivalue(int     x) 
-		{
-			int c = x & CHECK_MASK;
-			if (c == 0 || c == CHECK_MASK) return ivalue[x & INDEX_MASK];
-			return new IValue(x);
-		}
-
-		public static Long    box_lvalue(long    x) 
-		{
-			long c = x & CHECK_MASK;
-			if (c == 0 || c == CHECK_MASK) return lvalue[(int)x & INDEX_MASK];
-			return new LValue(x);
-		}
-
-		public static Float   box_fvalue(float   x) 
-		{
-			return new FValue(x);
-		}
-
-		public static Double  box_dvalue(double  x) 
-		{
-			return new DValue(x);
-		}
-
-		/** @meta method (scala.Array[scala.Boolean]) scala.Array[scala.Boolean];*/
-		public static Array   box_zarray(bool[] xs) 
-		{
-			return new ZArray(xs);
-		}
-
-		/** @meta method (scala.Array[scala.Byte]) scala.Array[scala.Byte]; */
-		public static Array   box_barray(sbyte   [] xs) 
-		{
-			return new BArray(xs);
-		}
-
-		/** @meta method (scala.Array[scala.Short]) scala.Array[scala.Short]; */
-		public static Array   box_sarray(short  [] xs) 
-		{
-			return new SArray(xs);
-		}
-
-		/** @meta method (scala.Array[scala.Char]) scala.Array[scala.Char]; */
-		public static Array   box_carray(char   [] xs) 
-		{
-			return new CArray(xs);
-		}
-
-		/** @meta method (scala.Array[scala.Int]) scala.Array[scala.Int]; */
-		public static Array   box_iarray(int    [] xs) 
-		{
-			return new IArray(xs);
-		}
-
-		/** @meta method (scala.Array[scala.Long]) scala.Array[scala.Long]; */
-		public static Array   box_larray(long   [] xs) 
-		{
-			return new LArray(xs);
-		}
-
-		/** @meta method (scala.Array[scala.Float]) scala.Array[scala.Float]; */
-		public static Array   box_farray(float  [] xs) 
-		{
-			return new FArray(xs);
-		}
-
-		/** @meta method (scala.Array[scala.Double]) scala.Array[scala.Double]; */
-		public static Array   box_darray(double [] xs) 
-		{
-			return new DArray(xs);
-		}
-
-		/** @meta method [?T < scala.AnyRef](scala.Array[?T]) scala.Array[?T]; */
-		public static Array   box_oarray(object [] xs) 
-		{
-			return new OArray(xs);
-		}
-
-		/** @meta method [?T](scala.Array[?T]) scala.Array[?T]; */
-		public static Array   box__array(object    xs) 
-		{
-			if (xs == null             ) return box_oarray((object [])xs);
-			if (xs is bool[]) return box_zarray((bool[])xs);
-			if (xs is sbyte   []) return box_barray((sbyte   [])xs);
-			if (xs is short  []) return box_sarray((short  [])xs);
-			if (xs is char   []) return box_carray((char   [])xs);
-			if (xs is int    []) return box_iarray((int    [])xs);
-			if (xs is long   []) return box_larray((long   [])xs);
-			if (xs is float  []) return box_farray((float  [])xs);
-			if (xs is double []) return box_darray((double [])xs);
-			if (xs is object []) return box_oarray((object [])xs);
-			throw new InvalidCastException(xs.GetType() + " is not an array class");
-		}
-
-		//########################################################################
-		// Public Functions - Unboxing primitives
-
-		public static void      unbox_uvalue(Unit    x) {        x.value(); }
-		public static bool   unbox_zvalue(Boolean x) { return x.value  ; }
-		public static sbyte      unbox_bvalue(Byte    x) { return x.value  ; }
-		public static short     unbox_svalue(Short   x) { return x.value  ; }
-		public static char      unbox_cvalue(Char    x) { return x.value  ; }
-		public static int       unbox_ivalue(Int     x) { return x.value  ; }
-		public static long      unbox_lvalue(Long    x) { return x.value  ; }
-		public static float     unbox_fvalue(Float   x) { return x.value  ; }
-		public static double    unbox_dvalue(Double  x) { return x.value  ; }
-
-		/** @meta method (scala.Array[scala.Boolean]) scala.Array[scala.Boolean];*/
-		public static bool[] unbox_zarray(Array xs) 
-		{
-			return xs == null ? null : ((ZArray)xs)._value;
-		}
-		/** @meta method (scala.Array[scala.Byte]) scala.Array[scala.Byte]; */
-		public static sbyte   [] unbox_barray(Array xs) 
-		{
-			return xs == null ? null : ((BArray)xs)._value;
-		}
-		/** @meta method (scala.Array[scala.Short]) scala.Array[scala.Short]; */
-		public static short  [] unbox_sarray(Array xs) 
-		{
-			return xs == null ? null : ((SArray)xs)._value;
-		}
-		/** @meta method (scala.Array[scala.Char]) scala.Array[scala.Char]; */
-		public static char   [] unbox_carray(Array xs) 
-		{
-			return xs == null ? null : ((CArray)xs)._value;
-		}
-		/** @meta method (scala.Array[scala.Int]) scala.Array[scala.Int]; */
-		public static int    [] unbox_iarray(Array xs) 
-		{
-			return xs == null ? null : ((IArray)xs)._value;
-		}
-		/** @meta method (scala.Array[scala.Long]) scala.Array[scala.Long]; */
-		public static long   [] unbox_larray(Array xs) 
-		{
-			return xs == null ? null : ((LArray)xs)._value;
-		}
-		/** @meta method (scala.Array[scala.Float]) scala.Array[scala.Float]; */
-		public static float  [] unbox_farray(Array xs) 
-		{
-			return xs == null ? null : ((FArray)xs)._value;
-		}
-		/** @meta method (scala.Array[scala.Double]) scala.Array[scala.Double]; */
-		public static double [] unbox_darray(Array xs) 
-		{
-			return xs == null ? null : ((DArray)xs)._value;
-		}
-		/** @meta method [?T < scala.AnyRef](scala.Array[?T]) scala.Array[scala.AnyRef]; */
-		public static object [] unbox_oarray(Array xs) 
-		{
-			return xs == null ? null : ((OArray)xs)._value;
-		}
-		/** @meta method [?T](scala.Array[?T]) scala.AnyRef; */
-		public static object    unbox__array(Array xs) 
-		{
-			return xs == null ? null : xs.value();
-		}
-
-		//########################################################################
-		// Public Functions - Conversion primitives
-
-		public static sbyte   b2b(sbyte   x) { return (sbyte  )x; }
-		public static short  b2s(sbyte   x) { return (short )x; }
-		public static char   b2c(sbyte   x) { return (char  )x; }
-		public static int    b2i(sbyte   x) { return (int   )x; }
-		public static long   b2l(sbyte   x) { return (long  )x; }
-		public static float  b2f(sbyte   x) { return (float )x; }
-		public static double b2d(sbyte   x) { return (double)x; }
-		public static sbyte   s2b(short  x) { return (sbyte  )x; }
-		public static short  s2s(short  x) { return (short )x; }
-		public static char   s2c(short  x) { return (char  )x; }
-		public static int    s2i(short  x) { return (int   )x; }
-		public static long   s2l(short  x) { return (long  )x; }
-		public static float  s2f(short  x) { return (float )x; }
-		public static double s2d(short  x) { return (double)x; }
-		public static sbyte   c2b(char   x) { return (sbyte  )x; }
-		public static short  c2s(char   x) { return (short )x; }
-		public static char   c2c(char   x) { return (char  )x; }
-		public static int    c2i(char   x) { return (int   )x; }
-		public static long   c2l(char   x) { return (long  )x; }
-		public static float  c2f(char   x) { return (float )x; }
-		public static double c2d(char   x) { return (double)x; }
-		public static sbyte   i2b(int    x) { return (sbyte  )x; }
-		public static short  i2s(int    x) { return (short )x; }
-		public static char   i2c(int    x) { return (char  )x; }
-		public static int    i2i(int    x) { return (int   )x; }
-		public static long   i2l(int    x) { return (long  )x; }
-		public static float  i2f(int    x) { return (float )x; }
-		public static double i2d(int    x) { return (double)x; }
-		public static sbyte   l2b(long   x) { return (sbyte  )x; }
-		public static short  l2s(long   x) { return (short )x; }
-		public static char   l2c(long   x) { return (char  )x; }
-		public static int    l2i(long   x) { return (int   )x; }
-		public static long   l2l(long   x) { return (long  )x; }
-		public static float  l2f(long   x) { return (float )x; }
-		public static double l2d(long   x) { return (double)x; }
-		public static sbyte   f2b(float  x) { return (sbyte  )x; }
-		public static short  f2s(float  x) { return (short )x; }
-		public static char   f2c(float  x) { return (char  )x; }
-		public static int    f2i(float  x) { return (int   )x; }
-		public static long   f2l(float  x) { return (long  )x; }
-		public static float  f2f(float  x) { return (float )x; }
-		public static double f2d(float  x) { return (double)x; }
-		public static sbyte   d2b(double x) { return (sbyte  )x; }
-		public static short  d2s(double x) { return (short )x; }
-		public static char   d2c(double x) { return (char  )x; }
-		public static int    d2i(double x) { return (int   )x; }
-		public static long   d2l(double x) { return (long  )x; }
-		public static float  d2f(double x) { return (float )x; }
-		public static double d2d(double x) { return (double)x; }
-
-		//########################################################################
-		// Public Functions - Array primitives
-
-		public static bool[] zarray(int length) { return new bool[length]; }
-		public static sbyte   [] barray(int length) { return new sbyte   [length]; }
-		public static short  [] sarray(int length) { return new short  [length]; }
-		public static char   [] carray(int length) { return new char   [length]; }
-		public static int    [] iarray(int length) { return new int    [length]; }
-		public static long   [] larray(int length) { return new long   [length]; }
-		public static float  [] farray(int length) { return new float  [length]; }
-		public static double [] darray(int length) { return new double [length]; }
-		public static object    oarray(int length, string classname) 
-		{
-			try
-			{
-				Type clasz = Type.GetType(classname);
-				return System.Array.CreateInstance(clasz, length);
-			} 
-			catch (Exception exception) 
-			{
-				//throw new Error(exception.ToString());
-				throw new ApplicationException(exception.ToString());
-			}
-		}
-
-		public static int zarray_length(bool[] xs) { return xs.Length; }
-		public static int barray_length(sbyte   [] xs) { return xs.Length; }
-		public static int sarray_length(short  [] xs) { return xs.Length; }
-		public static int carray_length(char   [] xs) { return xs.Length; }
-		public static int iarray_length(int    [] xs) { return xs.Length; }
-		public static int larray_length(long   [] xs) { return xs.Length; }
-		public static int farray_length(float  [] xs) { return xs.Length; }
-		public static int darray_length(double [] xs) { return xs.Length; }
-		public static int oarray_length(object [] xs) { return xs.Length; }
-
-		public static bool zarray_get(bool[] xs, int i) { return xs[i]; }
-		public static sbyte    barray_get(sbyte   [] xs, int i) { return xs[i]; }
-		public static short   sarray_get(short  [] xs, int i) { return xs[i]; }
-		public static char    carray_get(char   [] xs, int i) { return xs[i]; }
-		public static int     iarray_get(int    [] xs, int i) { return xs[i]; }
-		public static long    larray_get(long   [] xs, int i) { return xs[i]; }
-		public static float   farray_get(float  [] xs, int i) { return xs[i]; }
-		public static double  darray_get(double [] xs, int i) { return xs[i]; }
-		public static object  oarray_get(object [] xs, int i) { return xs[i]; }
-
-		public static void zarray_set(bool[] xs, int i, bool x) { xs[i] = x;}
-		public static void barray_set(sbyte   [] xs, int i, sbyte    x) { xs[i] = x;}
-		public static void sarray_set(short  [] xs, int i, short   x) { xs[i] = x;}
-		public static void carray_set(char   [] xs, int i, char    x) { xs[i] = x;}
-		public static void iarray_set(int    [] xs, int i, int     x) { xs[i] = x;}
-		public static void larray_set(long   [] xs, int i, long    x) { xs[i] = x;}
-		public static void farray_set(float  [] xs, int i, float   x) { xs[i] = x;}
-		public static void darray_set(double [] xs, int i, double  x) { xs[i] = x;}
-		public static void oarray_set(object [] xs, int i, object  x) { xs[i] = x;}
-
-		//########################################################################
-	}
-
-	// These classes may not be defined in class RunTime because inner
-	// classes confuse pico which then attributes the metadata to the
-	// wrong members.
-
-	sealed class UValue : Unit    { public UValue(         ) : base( ) { } }
-	sealed class ZValue : Boolean { public ZValue(bool x   ) : base(x) { } }
-	sealed class BValue : Byte    { public BValue(sbyte    x) : base(x) { } }
-	sealed class SValue : Short   { public SValue(short   x) : base(x) { } }
-	sealed class CValue : Char    { public CValue(char    x) : base(x) { } }
-	sealed class IValue : Int     { public IValue(int     x) : base(x) { } }
-	sealed class LValue : Long    { public LValue(long    x) : base(x) { } }
-	sealed class FValue : Float   { public FValue(float   x) : base(x) { } }
-	sealed class DValue : Double  { public DValue(double  x) : base(x) { } }
-
-	/** @meta class extends scala.Array[scala.Boolean]; */
-	sealed class ZArray : Array 
-	{
-		internal readonly bool[] _value;
-		public ZArray(bool[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_zvalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Boolean)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-
-	[Meta("class extends scala.Array[scala.Byte];")]
-	sealed class BArray : Array 
-	{
-		internal readonly sbyte[] _value;
-		public BArray(sbyte[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_bvalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Byte)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-
-	[Meta("class extends scala.Array[scala.Short];")]
-	sealed class SArray : Array 
-	{
-		internal readonly short[] _value;
-		public SArray(short[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_svalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Short)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-
-	[Meta("class extends scala.Array[scala.Char];")]
-	sealed class CArray : Array 
-	{
-		internal readonly char[] _value;
-		public CArray(char[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_cvalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Char)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return ((object)_value).ToString(); }
-	}
-
-	[Meta("class extends scala.Array[scala.Int];")]
-	sealed class IArray : Array 
-	{
-		internal readonly int[] _value;
-		public IArray(int[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_ivalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Int)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-
-	[Meta("class extends scala.Array[scala.Long];")]
-	sealed class LArray : Array 
-	{
-		internal readonly long[] _value;
-		public LArray(long[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_lvalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Long)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-
-	[Meta("class extends scala.Array[scala.Float];")]
-	sealed class FArray : Array 
-	{
-		internal readonly float[] _value;
-		public FArray(float[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_fvalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Float)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-
-	[Meta("class extends scala.Array[scala.Double];")]
-	sealed class DArray : Array 
-	{
-		internal readonly double[] _value;
-		public DArray(double[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return RunTime.box_dvalue(_value[i]); }
-		public override void update(int i, object x) { _value[i] = ((Double)x).value; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-
-	[Meta("class [?T < scala.AnyRef] extends scala.Array[?T];")]
-	sealed class OArray : Array 
-	{
-		internal readonly object[] _value;
-		public OArray(object[] _value) { this._value = _value; }
-		public override object value() { return _value; }
-		public override object apply(int i) { return _value[i]; }
-		public override void update(int i, object x) { _value[i] = x; }
-		public override int length() { return _value.Length; }
-		public override string ToString() { return _value.ToString(); }
-	}
-}
\ No newline at end of file
diff --git a/sources/scala/runtime/RunTime.java b/sources/scala/runtime/RunTime.java
deleted file mode 100644
index 452ca595f2..0000000000
--- a/sources/scala/runtime/RunTime.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $OldId: RunTime.java,v 1.13 2002/11/19 12:01:40 paltherr Exp $
-// $Id$
-
-package scala.runtime;
-
-import scala.Unit;
-import scala.Boolean;
-import scala.Byte;
-import scala.Short;
-import scala.Char;
-import scala.Int;
-import scala.Long;
-import scala.Float;
-import scala.Double;
-import scala.Array;
-
-public abstract class RunTime {
-
-    //########################################################################
-    // Private Constants
-
-    private static final int BITS        = 8;
-    private static final int ARRAY_SIZE  = 2 << BITS;
-    private static final int INDEX_MASK  = ARRAY_SIZE - 1;
-    private static final int CHECK_MASK  = ~(ARRAY_SIZE / 2 - 1);
-
-    private static final UValue uvalue   = new UValue();
-    private static final ZValue zvalue_f = new ZValue(false);
-    private static final ZValue zvalue_t = new ZValue(true);
-    private static final BValue bvalue[] = new BValue[256];
-    private static final SValue svalue[] = new SValue[ARRAY_SIZE];
-    private static final CValue cvalue[] = new CValue[ARRAY_SIZE / 2];
-    private static final IValue ivalue[] = new IValue[ARRAY_SIZE];
-    private static final LValue lvalue[] = new LValue[ARRAY_SIZE];
-
-    static {
-        for (int i = 0; i < bvalue.length; i++)
-            bvalue[i] = new BValue((byte)i);
-        for (int i = 0; i < ARRAY_SIZE / 2; i++) {
-            svalue[i] = new SValue((short)i);
-            cvalue[i] = new CValue((char )i);
-            ivalue[i] = new IValue((int  )i);
-            lvalue[i] = new LValue((long )i);
-            svalue[i + ARRAY_SIZE / 2] = new SValue((short)(CHECK_MASK | i));
-            ivalue[i + ARRAY_SIZE / 2] = new IValue((int  )(CHECK_MASK | i));
-            lvalue[i + ARRAY_SIZE / 2] = new LValue((long )(CHECK_MASK | i));
-        }
-    }
-
-    //########################################################################
-    // Private Variables
-
-    private static ClassLoader loader = ClassLoader.getSystemClassLoader();
-
-    //########################################################################
-    // Public Functions - Getting & setting class loader
-
-    public static ClassLoader getClassLoader() {
-        return loader;
-    }
-
-    public static void setClassLoader(ClassLoader loader) {
-        RunTime.loader = loader;
-    }
-
-    //########################################################################
-    // Public Functions - Catching exceptions
-
-    public static Throwable tryCatch(Runnable runnable) {
-	try {
-	    runnable.run();
-            return null;
-	} catch (Throwable exception) {
-	    return exception;
-	}
-    }
-
-    //########################################################################
-    // Public Functions - Boxing primitives
-
-    public static Unit    box_uvalue(         ) {
-        return uvalue;
-    }
-
-    public static Boolean box_zvalue(boolean x) {
-        return x ? zvalue_t : zvalue_f;
-    }
-
-    public static Byte    box_bvalue(byte    x) {
-        return bvalue[x & 0x000000FF];
-    }
-
-    public static Short   box_svalue(short   x) {
-        int c = x & CHECK_MASK;
-        if (c == 0 || c == CHECK_MASK) return svalue[x & INDEX_MASK];
-        return new SValue(x);
-    }
-
-    public static Char    box_cvalue(char    x) {
-        int c = (int)x & CHECK_MASK;
-        if (c == 0) return cvalue[(int)x & INDEX_MASK];
-        return new CValue(x);
-    }
-
-    public static Int     box_ivalue(int     x) {
-        int c = x & CHECK_MASK;
-        if (c == 0 || c == CHECK_MASK) return ivalue[x & INDEX_MASK];
-        return new IValue(x);
-    }
-
-    public static Long    box_lvalue(long    x) {
-        long c = x & CHECK_MASK;
-        if (c == 0 || c == CHECK_MASK) return lvalue[(int)x & INDEX_MASK];
-        return new LValue(x);
-    }
-
-    public static Float   box_fvalue(float   x) {
-        return new FValue(x);
-    }
-
-    public static Double  box_dvalue(double  x) {
-        return new DValue(x);
-    }
-
-    /** @meta method (scala.Array[scala.Boolean]) scala.Array[scala.Boolean];*/
-    public static Array   box_zarray(boolean[] xs) {
-        return new ZArray(xs);
-    }
-
-    /** @meta method (scala.Array[scala.Byte]) scala.Array[scala.Byte]; */
-    public static Array   box_barray(byte   [] xs) {
-        return new BArray(xs);
-    }
-
-    /** @meta method (scala.Array[scala.Short]) scala.Array[scala.Short]; */
-    public static Array   box_sarray(short  [] xs) {
-        return new SArray(xs);
-    }
-
-    /** @meta method (scala.Array[scala.Char]) scala.Array[scala.Char]; */
-    public static Array   box_carray(char   [] xs) {
-        return new CArray(xs);
-    }
-
-    /** @meta method (scala.Array[scala.Int]) scala.Array[scala.Int]; */
-    public static Array   box_iarray(int    [] xs) {
-        return new IArray(xs);
-    }
-
-    /** @meta method (scala.Array[scala.Long]) scala.Array[scala.Long]; */
-    public static Array   box_larray(long   [] xs) {
-        return new LArray(xs);
-    }
-
-    /** @meta method (scala.Array[scala.Float]) scala.Array[scala.Float]; */
-    public static Array   box_farray(float  [] xs) {
-        return new FArray(xs);
-    }
-
-    /** @meta method (scala.Array[scala.Double]) scala.Array[scala.Double]; */
-    public static Array   box_darray(double [] xs) {
-        return new DArray(xs);
-    }
-
-    /** @meta method [?T < scala.AnyRef](scala.Array[?T]) scala.Array[?T]; */
-    public static Array   box_oarray(Object [] xs) {
-        return new OArray(xs);
-    }
-
-    /** @meta method [?T](scala.Array[?T]) scala.Array[?T]; */
-    public static Array   box__array(Object    xs) {
-        if (xs == null             ) return box_oarray((Object [])xs);
-        if (xs instanceof boolean[]) return box_zarray((boolean[])xs);
-        if (xs instanceof byte   []) return box_barray((byte   [])xs);
-        if (xs instanceof short  []) return box_sarray((short  [])xs);
-        if (xs instanceof char   []) return box_carray((char   [])xs);
-        if (xs instanceof int    []) return box_iarray((int    [])xs);
-        if (xs instanceof long   []) return box_larray((long   [])xs);
-        if (xs instanceof float  []) return box_farray((float  [])xs);
-        if (xs instanceof double []) return box_darray((double [])xs);
-        if (xs instanceof Object []) return box_oarray((Object [])xs);
-        throw new ClassCastException(xs.getClass() + " is not an array class");
-    }
-
-    //########################################################################
-    // Public Functions - Unboxing primitives
-
-    public static void      unbox_uvalue(Unit    x) {        x.value(); }
-    public static boolean   unbox_zvalue(Boolean x) { return x.value  ; }
-    public static byte      unbox_bvalue(Byte    x) { return x.value  ; }
-    public static short     unbox_svalue(Short   x) { return x.value  ; }
-    public static char      unbox_cvalue(Char    x) { return x.value  ; }
-    public static int       unbox_ivalue(Int     x) { return x.value  ; }
-    public static long      unbox_lvalue(Long    x) { return x.value  ; }
-    public static float     unbox_fvalue(Float   x) { return x.value  ; }
-    public static double    unbox_dvalue(Double  x) { return x.value  ; }
-
-    /** @meta method (scala.Array[scala.Boolean]) scala.Array[scala.Boolean];*/
-    public static boolean[] unbox_zarray(Array xs) {
-        return xs == null ? null : ((ZArray)xs).value;
-    }
-    /** @meta method (scala.Array[scala.Byte]) scala.Array[scala.Byte]; */
-    public static byte   [] unbox_barray(Array xs) {
-        return xs == null ? null : ((BArray)xs).value;
-    }
-    /** @meta method (scala.Array[scala.Short]) scala.Array[scala.Short]; */
-    public static short  [] unbox_sarray(Array xs) {
-        return xs == null ? null : ((SArray)xs).value;
-    }
-    /** @meta method (scala.Array[scala.Char]) scala.Array[scala.Char]; */
-    public static char   [] unbox_carray(Array xs) {
-        return xs == null ? null : ((CArray)xs).value;
-    }
-    /** @meta method (scala.Array[scala.Int]) scala.Array[scala.Int]; */
-    public static int    [] unbox_iarray(Array xs) {
-        return xs == null ? null : ((IArray)xs).value;
-    }
-    /** @meta method (scala.Array[scala.Long]) scala.Array[scala.Long]; */
-    public static long   [] unbox_larray(Array xs) {
-        return xs == null ? null : ((LArray)xs).value;
-    }
-    /** @meta method (scala.Array[scala.Float]) scala.Array[scala.Float]; */
-    public static float  [] unbox_farray(Array xs) {
-        return xs == null ? null : ((FArray)xs).value;
-    }
-    /** @meta method (scala.Array[scala.Double]) scala.Array[scala.Double]; */
-    public static double [] unbox_darray(Array xs) {
-        return xs == null ? null : ((DArray)xs).value;
-    }
-    /** @meta method [?T < scala.AnyRef](scala.Array[?T]) scala.Array[scala.AnyRef]; */
-    public static Object [] unbox_oarray(Array xs) {
-        return xs == null ? null : ((OArray)xs).value;
-    }
-    /** @meta method [?T](scala.Array[?T]) scala.AnyRef; */
-    public static Object    unbox__array(Array xs) {
-        return xs == null ? null : xs.value();
-    }
-
-    //########################################################################
-    // Public Functions - Conversion primitives
-
-    public static byte   b2b(byte   x) { return (byte  )x; }
-    public static short  b2s(byte   x) { return (short )x; }
-    public static char   b2c(byte   x) { return (char  )x; }
-    public static int    b2i(byte   x) { return (int   )x; }
-    public static long   b2l(byte   x) { return (long  )x; }
-    public static float  b2f(byte   x) { return (float )x; }
-    public static double b2d(byte   x) { return (double)x; }
-    public static byte   s2b(short  x) { return (byte  )x; }
-    public static short  s2s(short  x) { return (short )x; }
-    public static char   s2c(short  x) { return (char  )x; }
-    public static int    s2i(short  x) { return (int   )x; }
-    public static long   s2l(short  x) { return (long  )x; }
-    public static float  s2f(short  x) { return (float )x; }
-    public static double s2d(short  x) { return (double)x; }
-    public static byte   c2b(char   x) { return (byte  )x; }
-    public static short  c2s(char   x) { return (short )x; }
-    public static char   c2c(char   x) { return (char  )x; }
-    public static int    c2i(char   x) { return (int   )x; }
-    public static long   c2l(char   x) { return (long  )x; }
-    public static float  c2f(char   x) { return (float )x; }
-    public static double c2d(char   x) { return (double)x; }
-    public static byte   i2b(int    x) { return (byte  )x; }
-    public static short  i2s(int    x) { return (short )x; }
-    public static char   i2c(int    x) { return (char  )x; }
-    public static int    i2i(int    x) { return (int   )x; }
-    public static long   i2l(int    x) { return (long  )x; }
-    public static float  i2f(int    x) { return (float )x; }
-    public static double i2d(int    x) { return (double)x; }
-    public static byte   l2b(long   x) { return (byte  )x; }
-    public static short  l2s(long   x) { return (short )x; }
-    public static char   l2c(long   x) { return (char  )x; }
-    public static int    l2i(long   x) { return (int   )x; }
-    public static long   l2l(long   x) { return (long  )x; }
-    public static float  l2f(long   x) { return (float )x; }
-    public static double l2d(long   x) { return (double)x; }
-    public static byte   f2b(float  x) { return (byte  )x; }
-    public static short  f2s(float  x) { return (short )x; }
-    public static char   f2c(float  x) { return (char  )x; }
-    public static int    f2i(float  x) { return (int   )x; }
-    public static long   f2l(float  x) { return (long  )x; }
-    public static float  f2f(float  x) { return (float )x; }
-    public static double f2d(float  x) { return (double)x; }
-    public static byte   d2b(double x) { return (byte  )x; }
-    public static short  d2s(double x) { return (short )x; }
-    public static char   d2c(double x) { return (char  )x; }
-    public static int    d2i(double x) { return (int   )x; }
-    public static long   d2l(double x) { return (long  )x; }
-    public static float  d2f(double x) { return (float )x; }
-    public static double d2d(double x) { return (double)x; }
-
-    //########################################################################
-    // Public Functions - Array primitives
-
-    public static boolean[] zarray(int length) { return new boolean[length]; }
-    public static byte   [] barray(int length) { return new byte   [length]; }
-    public static short  [] sarray(int length) { return new short  [length]; }
-    public static char   [] carray(int length) { return new char   [length]; }
-    public static int    [] iarray(int length) { return new int    [length]; }
-    public static long   [] larray(int length) { return new long   [length]; }
-    public static float  [] farray(int length) { return new float  [length]; }
-    public static double [] darray(int length) { return new double [length]; }
-    public static Object    oarray(int length, String classname) {
-        try {
-            Class clasz = Class.forName(classname, false, loader);
-            return java.lang.reflect.Array.newInstance(clasz, length);
-        } catch (ClassNotFoundException exception) {
-            throw new Error(exception.toString());
-        }
-    }
-
-    public static int zarray_length(boolean[] xs) { return xs.length; }
-    public static int barray_length(byte   [] xs) { return xs.length; }
-    public static int sarray_length(short  [] xs) { return xs.length; }
-    public static int carray_length(char   [] xs) { return xs.length; }
-    public static int iarray_length(int    [] xs) { return xs.length; }
-    public static int larray_length(long   [] xs) { return xs.length; }
-    public static int farray_length(float  [] xs) { return xs.length; }
-    public static int darray_length(double [] xs) { return xs.length; }
-    public static int oarray_length(Object [] xs) { return xs.length; }
-
-    public static boolean zarray_get(boolean[] xs, int i) { return xs[i]; }
-    public static byte    barray_get(byte   [] xs, int i) { return xs[i]; }
-    public static short   sarray_get(short  [] xs, int i) { return xs[i]; }
-    public static char    carray_get(char   [] xs, int i) { return xs[i]; }
-    public static int     iarray_get(int    [] xs, int i) { return xs[i]; }
-    public static long    larray_get(long   [] xs, int i) { return xs[i]; }
-    public static float   farray_get(float  [] xs, int i) { return xs[i]; }
-    public static double  darray_get(double [] xs, int i) { return xs[i]; }
-    public static Object  oarray_get(Object [] xs, int i) { return xs[i]; }
-
-    public static void zarray_set(boolean[] xs, int i, boolean x) { xs[i] = x;}
-    public static void barray_set(byte   [] xs, int i, byte    x) { xs[i] = x;}
-    public static void sarray_set(short  [] xs, int i, short   x) { xs[i] = x;}
-    public static void carray_set(char   [] xs, int i, char    x) { xs[i] = x;}
-    public static void iarray_set(int    [] xs, int i, int     x) { xs[i] = x;}
-    public static void larray_set(long   [] xs, int i, long    x) { xs[i] = x;}
-    public static void farray_set(float  [] xs, int i, float   x) { xs[i] = x;}
-    public static void darray_set(double [] xs, int i, double  x) { xs[i] = x;}
-    public static void oarray_set(Object [] xs, int i, Object  x) { xs[i] = x;}
-
-    //########################################################################
-}
-
-// These classes may not be defined in class RunTime because inner
-// classes confuse pico which then attributes the metadata to the
-// wrong members.
-
-final class UValue extends Unit    implements java.io.Serializable
-  { public UValue(         ) { super( ); } }
-final class ZValue extends Boolean implements java.io.Serializable
-  { public ZValue(boolean x) { super(x); } }
-final class BValue extends Byte    implements java.io.Serializable
-  { public BValue(byte    x) { super(x); } }
-final class SValue extends Short   implements java.io.Serializable
-  { public SValue(short   x) { super(x); } }
-final class CValue extends Char    implements java.io.Serializable
-  { public CValue(char    x) { super(x); } }
-final class IValue extends Int     implements java.io.Serializable
-  { public IValue(int     x) { super(x); } }
-final class LValue extends Long    implements java.io.Serializable
-  { public LValue(long    x) { super(x); } }
-final class FValue extends Float   implements java.io.Serializable
-  { public FValue(float   x) { super(x); } }
-final class DValue extends Double  implements java.io.Serializable
-  { public DValue(double  x) { super(x); } }
-
-/** @meta class extends scala.Array[scala.Boolean]; */
-final class ZArray extends Array implements java.io.Serializable {
-    public final boolean[] value;
-    public ZArray(boolean[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_zvalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Boolean)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
-
-/** @meta class extends scala.Array[scala.Byte]; */
-final class BArray extends Array implements java.io.Serializable {
-    public final byte[] value;
-    public BArray(byte[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_bvalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Byte)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
-
-/** @meta class extends scala.Array[scala.Short]; */
-final class SArray extends Array implements java.io.Serializable {
-    public final short[] value;
-    public SArray(short[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_svalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Short)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
-
-/** @meta class extends scala.Array[scala.Char]; */
-final class CArray extends Array implements java.io.Serializable {
-    public final char[] value;
-    public CArray(char[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_cvalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Char)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf((Object)value); }
-}
-
-/** @meta class extends scala.Array[scala.Int]; */
-final class IArray extends Array implements java.io.Serializable {
-    public final int[] value;
-    public IArray(int[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_ivalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Int)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
-
-/** @meta class extends scala.Array[scala.Long]; */
-final class LArray extends Array implements java.io.Serializable {
-    public final long[] value;
-    public LArray(long[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_lvalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Long)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
-
-/** @meta class extends scala.Array[scala.Float]; */
-final class FArray extends Array implements java.io.Serializable {
-    public final float[] value;
-    public FArray(float[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_fvalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Float)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
-
-/** @meta class extends scala.Array[scala.Double]; */
-final class DArray extends Array implements java.io.Serializable {
-    public final double[] value;
-    public DArray(double[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return RunTime.box_dvalue(value[i]); }
-    public void update(int i, Object x) { value[i] = ((Double)x).value; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
-
-/** @meta class [?T < scala.AnyRef] extends scala.Array[?T]; */
-final class OArray extends Array implements java.io.Serializable {
-    public final Object[] value;
-    public OArray(Object[] value) { this.value = value; }
-    public Object value() { return value; }
-    public Object apply(int i) { return value[i]; }
-    public void update(int i, Object x) { value[i] = x; }
-    public int length() { return value.length; }
-    public String toString() { return String.valueOf(value); }
-}
diff --git a/sources/scala/runtime/types/ClassType.java b/sources/scala/runtime/types/ClassType.java
deleted file mode 100644
index b0fb83b79e..0000000000
--- a/sources/scala/runtime/types/ClassType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-import scala.runtime.RunTime;
-
-public abstract class ClassType extends Type {
-    public final Class clazz;
-    public final boolean isTrivial;
-
-    public ClassType(Class clazz, boolean isTrivial) {
-        this.clazz = clazz;
-        this.isTrivial = isTrivial;
-    }
-
-    public Array newArray(int size) {
-        Object[] array =
-            (Object[])java.lang.reflect.Array.newInstance(clazz, size);
-        return RunTime.box_oarray(array);
-    }
-
-    public Object defaultValue() {
-        return null;
-    }
-
-    public boolean isInstance(Object o) {
-        assert Statistics.incInstanceOf();
-        return clazz.isInstance(o);
-    }
-
-    public boolean isNonTrivialInstance(Object o) {
-        assert isTrivial;       // must be overridden for non-trivial types
-        return true;
-    }
-
-    public boolean isSubType(Type that) {
-        return (that == Type.Any)
-            || (that instanceof ClassType
-                && isSubClassType((ClassType)that))
-            || (that instanceof CompoundType
-                && isSubCompoundType((CompoundType)that));
-    }
-
-    protected boolean isSubClassType(ClassType that) {
-        return that.clazz.isAssignableFrom(this.clazz);
-    }
-
-    public boolean isNonTrivialSubClassType(ClassType that) {
-        assert isTrivial;       // must be overridden for non-trivial types
-        return true;
-    }
-
-    protected final boolean isSubCompoundType(CompoundType that) {
-        // TODO? check refinement
-        for (int i = 0; i < that.components.length; ++i) {
-            if (!isSubType(that.components[i]))
-                return false;
-        }
-
-        return true;
-    }
-
-    public boolean isSameType(Type that) {
-        return (that instanceof ClassType)
-            && (((ClassType)that).clazz == this.clazz);
-    }
-
-    public boolean isSameAsJavaType(Class that) {
-        if (this.isTrivial)
-            return clazz == that;
-        else if (clazz != that)
-            return false;
-        else
-            throw new Error("uncomparable types");
-    }
-
-    public int hashCode() {
-        return clazz.hashCode();
-    }
-
-    public String toString() {
-        return clazz.getName();
-    }
-}
diff --git a/sources/scala/runtime/types/CompoundType.java b/sources/scala/runtime/types/CompoundType.java
deleted file mode 100644
index 4dcb830b0d..0000000000
--- a/sources/scala/runtime/types/CompoundType.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-import scala.ScalaObject;
-import scala.runtime.RunTime;
-
-/**
- * Run-time representation for compound types.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-public class CompoundType extends Type {
-    public final ClassType[] components;
-    public final boolean emptyRefinement;
-
-    public CompoundType(ClassType[] components, boolean emptyRefinement) {
-        this.components = components;
-        this.emptyRefinement = emptyRefinement;
-    }
-
-    public Array newArray(int size) {
-        if (Type.unsafeArraysAllowed.get() == java.lang.Boolean.TRUE)
-            return (Array)
-                java.lang.reflect.Array.newInstance(components[0].clazz, size);
-        else
-            throw new Error("cannot create arrays of compound types");
-    }
-
-    public Object defaultValue() {
-        return null;
-    }
-
-    public boolean isInstance(Object o) {
-        assert Statistics.incInstanceOf();
-        for (int i = 0; i < components.length; ++i) {
-            if (!components[i].isInstance(o))
-                return false;
-        }
-
-        return true;
-    }
-
-    public boolean isSubType(Type that) {
-        if (!emptyRefinement)
-            throw new Error("cannot compute isSubType (non-empty refinement)");
-
-        if (that instanceof CompoundType) {
-            CompoundType thatCT = (CompoundType)that;
-            ClassType[] thatComponents = thatCT.components;
-            for (int i = 0; i < thatComponents.length; ++i) {
-                if (!this.isSubType(thatComponents[i]))
-                    return false;
-            }
-            return true;
-        } else {
-            for (int i = 0; i < components.length; ++i) {
-                if (components[i].isSubType(that))
-                    return true;
-            }
-            return false;
-        }
-    }
-
-    public boolean isSameType(Type that) {
-        if (!emptyRefinement)
-            throw new Error("cannot compute isSameType (non-empty refinement)");
-
-        if (that instanceof CompoundType) {
-            CompoundType thatCT = (CompoundType)that;
-
-            if (components.length != thatCT.components.length)
-                return false;
-
-            for (int i = 0; i < components.length; ++i) {
-                if (!components[i].isSameType(thatCT.components[i]))
-                    return false;
-            }
-
-            return true;
-        } else
-            return false;
-    }
-
-    public int hashCode() {
-        return Type.hashCode(components);
-    }
-
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < components.length; ++i) {
-            if (i > 0) buf.append(" with ");
-            buf.append(components[i]);
-        }
-        return buf.toString();
-    }
-}
diff --git a/sources/scala/runtime/types/JavaClassType.java b/sources/scala/runtime/types/JavaClassType.java
deleted file mode 100644
index 5a73641e51..0000000000
--- a/sources/scala/runtime/types/JavaClassType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import java.util.HashMap;
-
-public class JavaClassType extends ClassType {
-    private static final ClassLoader loader =
-        ClassLoader.getSystemClassLoader();
-
-    private static ThreadLocal cacheLocal = new ThreadLocal() {
-            protected Object initialValue() {
-                return new HashMap();
-            }
-        };
-
-    public static JavaClassType javaClassType(String fullName) {
-        HashMap/*<String, JavaClassType>*/ cache = (HashMap)cacheLocal.get();
-        JavaClassType jct = (JavaClassType)cache.get(fullName);
-        if (jct == null) {
-            try {
-                jct = new JavaClassType(fullName);
-                cache.put(fullName, jct);
-            } catch (ClassNotFoundException e) {
-                throw new Error(e);
-            }
-        }
-        return jct;
-    }
-
-    public static JavaClassType javaArrayType(String elemFullName, int dimen) {
-        StringBuffer fullName = new StringBuffer();
-        for (int i = 0; i < dimen; ++i)
-            fullName.append('[');
-        if (elemFullName.length() == 1 && "ZBCDFIJS".indexOf(elemFullName) >= 0)
-            fullName.append(elemFullName);
-        else
-            fullName.append('L').append(elemFullName).append(';');
-        return javaClassType(fullName.toString());
-    }
-
-    public JavaClassType(String fullName) throws ClassNotFoundException {
-        super(Class.forName(fullName, false, loader), true);
-    }
-}
diff --git a/sources/scala/runtime/types/JavaRefArrayType.java b/sources/scala/runtime/types/JavaRefArrayType.java
deleted file mode 100644
index 2b25592f7a..0000000000
--- a/sources/scala/runtime/types/JavaRefArrayType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-
-/**
- * Type for Java arrays of references.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-public class JavaRefArrayType extends Type {
-    public final int dimensions;
-    public final Type elemType;
-
-    public static JavaRefArrayType javaRefArrayType(Type elemType,
-                                                    int dimensions) {
-        if (elemType instanceof JavaRefArrayType) {
-            JavaRefArrayType other = (JavaRefArrayType)elemType;
-            return new JavaRefArrayType(other.elemType,
-                                        dimensions + other.dimensions);
-        } else
-            return new JavaRefArrayType(elemType, dimensions);
-    }
-
-    private JavaRefArrayType(Type elemType, int dimensions) {
-        this.elemType = elemType;
-        this.dimensions = dimensions;
-    }
-
-    public Array newArray(int size) {
-        throw new Error();      // TODO
-    }
-
-    public Object defaultValue() {
-        return null;
-    }
-
-    public boolean isInstance(Object o) {
-        assert Statistics.incInstanceOf();
-        return this.isSameAsJavaType(o.getClass());
-    }
-
-    public boolean isSameType(Type that) {
-        return (that instanceof JavaRefArrayType)
-            && (elemType.isSameType(((JavaRefArrayType)that).elemType));
-    }
-
-    public boolean isSameAsJavaType(Class that) {
-        Class thatElemType = that;
-        for (int i = 0; i < dimensions && thatElemType != null; ++i)
-            thatElemType = thatElemType.getComponentType();
-
-        return (thatElemType != null)
-            && (elemType.isSameAsJavaType(thatElemType));
-    }
-
-    public boolean isSubType(Type that) {
-        return isSameType(that);
-    }
-
-    public String toString() {
-        return elemType.toString() + "[]";
-    }
-
-    public int hashCode() {
-        return elemType.hashCode() * 11;
-    }
-}
diff --git a/sources/scala/runtime/types/ScalaClassType.java b/sources/scala/runtime/types/ScalaClassType.java
deleted file mode 100644
index 47b7b7f4d9..0000000000
--- a/sources/scala/runtime/types/ScalaClassType.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-import scala.ScalaObject;
-import scala.runtime.RunTime;
-import scala.runtime.FNV_Hash;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
-/**
- * Provides a run-time representation of the Scala types.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-public class ScalaClassType extends ClassType {
-    public static final ScalaClassType[] EMPTY_ARRAY =
-        new ScalaClassType[0];
-
-    private static final ScalaClassType[][] EMPTY_ANCESTORS =
-        new ScalaClassType[0][];
-
-    private final TypeConstructor constr;
-    private final Type[] inst;
-
-    private final Object parents;
-    private ScalaClassType[][] ancestors = null;
-
-    private final int hashCode;
-
-    public ScalaClassType(TypeConstructor constr, Type[] inst, Object parents) {
-        super(constr.clazz, constr.isTrivial);
-
-        this.constr = constr;
-        this.inst = inst;
-
-        int hash = FNV_Hash.hashStep32(FNV_Hash.INIT, constr.hashCode());
-        for (int i = 0; i < inst.length; ++i) {
-            hash = FNV_Hash.hashStep32(hash, inst[i].hashCode());
-        }
-        this.hashCode = hash;
-        this.parents = parents;
-    }
-
-    public boolean isInstance(Object o) {
-        return super.isInstance(o)
-            && (isTrivial
-                || ((ScalaObject)o).getScalaType().isNonTrivialSubClassType(this));
-    }
-
-    public boolean isNonTrivialInstance(Object o) {
-        assert Statistics.incWeakInstanceOf();
-        return ((ScalaObject)o).getScalaType().isNonTrivialSubClassType(this);
-    }
-
-    protected boolean isSubClassType(ClassType that) {
-        return (this == that)
-            || (super.isSubClassType(that)
-                && (that.isTrivial
-                    || isNonTrivialSubClassType((ScalaClassType)that)));
-    }
-
-    public boolean isNonTrivialSubClassType(ClassType that) {
-        ScalaClassType thatCT = (ScalaClassType)that;
-        ScalaClassType parentCT = myInstantiationFor(thatCT);
-
-        // At this stage, if parentCT is null, it means that the
-        // constructors had different prefixes, hence we return false.
-        return (parentCT != null)
-            && (parentCT == thatCT || parentCT.hasSubInstantiation(thatCT));
-    }
-
-    // Return true iff the instantiation of THIS is "smaller" than the
-    // one of THAT.
-    private boolean hasSubInstantiation(ScalaClassType that) {
-        assert this.constr == that.constr;
-
-        final Type[] thisInst = this.inst;
-        final Type[] thatInst = that.inst;
-
-        int i = 0;
-
-        // invariant parameters
-        final int firstM = this.constr.zCount;
-        while (i < firstM) {
-            Type thisTp = thisInst[i], thatTp = thatInst[i];
-            if (!(thisTp == thatTp || thisTp.isSameType(thatTp)))
-                return false;
-            ++i;
-        }
-        // contravariant parameters
-        final int firstP = firstM + this.constr.mCount;
-        while (i < firstP) {
-            Type thisTp = thisInst[i], thatTp = thatInst[i];
-            if (!(thisTp == thatTp || thatTp.isSubType(thisTp)))
-                return false;
-            ++i;
-        }
-        // covariant parameters
-        final int firstOutside = firstP + this.constr.pCount;
-        while (i < firstOutside) {
-            Type thisTp = thisInst[i], thatTp = thatInst[i];
-            if (!(thisTp == thatTp || thisTp.isSubType(thatTp)))
-                return false;
-            ++i;
-        }
-        return true;
-    }
-
-    public boolean isSameType(Type that) {
-        return this == that;
-    }
-
-    private ScalaClassType myInstantiationFor(ScalaClassType that) {
-        // Find our instantiation for the other type, if any.
-        ScalaClassType[] thisSlice = getAncestors()[that.constr.level];
-
-        for (int i = 0; i < thisSlice.length; ++i) {
-            if (thisSlice[i].constr == that.constr) {
-                assert Statistics.addAncestorSearchIterations(i + 1);
-                return thisSlice[i];
-            }
-        }
-        assert Statistics.addAncestorSearchIterations(thisSlice.length);
-
-        return null;
-    }
-
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-
-        int firstM = constr.zCount;
-        int firstP = firstM + constr.mCount;
-        buf.append(constr);
-        if (inst.length > 0) {
-            buf.append("[");
-            for (int i = 0; i < inst.length; ++i) {
-                if (i > 0) buf.append(", ");
-                if (i >= firstP)
-                    buf.append('+');
-                else if (i >= firstM)
-                    buf.append('-');
-                buf.append(inst[i]);
-            }
-            buf.append("]");
-        }
-        return buf.toString();
-    }
-
-    public int hashCode() {
-        return hashCode;
-    }
-
-    public ScalaClassType[] getParents() {
-        if (parents instanceof LazyParents)
-            return ((LazyParents)parents).force();
-        else
-            return (ScalaClassType[])parents;
-    }
-
-    private ScalaClassType[][] getAncestors() {
-        if (ancestors == null)
-            computeAncestors();
-        return ancestors;
-    }
-
-    private void computeAncestors() {
-        final int level = constr.level;
-        final int ancestorDepth = constr.ancestorCacheDepth;
-        final int[] ancestorCode = constr.ancestorCode;
-        ScalaClassType[] parents = getParents();
-
-        ScalaClassType[][] ancestors = new ScalaClassType[ancestorDepth][];
-        ScalaClassType[][] initialAncestors = parents.length > 0
-            ? parents[0].getAncestors()
-            : EMPTY_ANCESTORS;
-
-        for (int l = 0, dci = 0; l < ancestorDepth; ++l) {
-            int toAddParents = 0;
-            if (dci < ancestorCode.length && ancestorCode[dci] == l) {
-                dci++;
-                toAddParents = ancestorCode[dci++];
-            }
-            int toAddSelf = (l == level) && (!constr.isTrivial) ? 1 : 0;
-            int toAdd = toAddParents + toAddSelf;
-            ScalaClassType[] initialRow;
-
-            if (l < initialAncestors.length)
-                initialRow = initialAncestors[l];
-            else
-                initialRow = ScalaClassType.EMPTY_ARRAY;
-
-            if (toAdd == 0) {
-                ancestors[l] = initialRow;
-            } else {
-                int initialLen = initialRow.length;
-                ScalaClassType[] newRow =
-                    new ScalaClassType[initialLen + toAdd];
-
-                if (toAddSelf == 1)
-                    newRow[0] = this;
-
-                System.arraycopy(initialRow, 0, newRow, toAddSelf, initialLen);
-                for (int i = 0; i < toAddParents; ++i) {
-                    int p = ancestorCode[dci++];
-                    int o = ancestorCode[dci++];
-                    newRow[toAddSelf + initialLen + i] =
-                        parents[p].getAncestors()[l][o];
-                }
-                ancestors[l] = newRow;
-            }
-        }
-        this.ancestors = ancestors;
-    }
-
-    private static final ClassLoader loader =
-        ClassLoader.getSystemClassLoader();
-
-    // Must match value defined in class scalac.util.Names !
-    private static final String INSTANTIATE_PREFIX = "instantiate$";
-
-    // Enforces uniqueness of the instance when serializing and
-    // deserializing the same Scala type object many times.
-    private Object readResolve() {
-        if (constr.clazz == null)
-             return this; // TODO: check why clazz may be null
-        String fullName = constr.clazz.getName();
-        Class instClazz = constr.clazz;
-        if (constr.clazz.isInterface()) {
-            try {
-                instClazz = Class.forName(fullName + "$class", false, loader);
-            }
-            catch (ClassNotFoundException e) {
-                throw new Error(e);
-            }
-        }
-        try {
-            int inx = fullName.lastIndexOf('.');
-            String className = (inx < 0) ? fullName : fullName.substring(inx + 1);
-            String name = INSTANTIATE_PREFIX + className + "$";
-            Class[] paramTypes = new Class[]{ Type[].class };
-            Method instMeth = instClazz.getDeclaredMethod(name, paramTypes);
-            assert Modifier.isStatic(instMeth.getModifiers());
-            return instMeth.invoke(null, new Object[]{ inst });
-        }
-        catch (NoSuchMethodException e) {
-            throw new Error(e);
-        }
-        catch (IllegalAccessException e) {
-            throw new Error(e);
-        }
-        catch (InvocationTargetException e) {
-            throw new Error(e);
-        }
-    }
-
-}
diff --git a/sources/scala/runtime/types/SingleType.java b/sources/scala/runtime/types/SingleType.java
deleted file mode 100644
index 44093475d2..0000000000
--- a/sources/scala/runtime/types/SingleType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-
-public class SingleType extends Type {
-    private final Object instance;
-
-    public SingleType(Object instance) {
-        this.instance = instance;
-    }
-
-    public Array newArray(int size) {
-        if (Type.unsafeArraysAllowed.get() == java.lang.Boolean.TRUE)
-            return (Array)
-                java.lang.reflect.Array.newInstance(instance.getClass(), size);
-        else
-            throw new Error("cannot create array of single types");
-    }
-
-    public Object defaultValue() {
-        return null;
-    }
-
-    public boolean isInstance(Object o) {
-        assert Statistics.incInstanceOf();
-        return o == instance;
-    }
-
-    public boolean isSubType(Type that) {
-        return that.isInstance(instance);
-    }
-
-    public boolean isSameType(Type that) {
-        return (that instanceof SingleType)
-            && (this.instance == ((SingleType)that).instance);
-    }
-
-    public int hashCode() {
-        return System.identityHashCode(instance);
-    }
-}
diff --git a/sources/scala/runtime/types/SpecialType.java b/sources/scala/runtime/types/SpecialType.java
deleted file mode 100644
index 6c2527570b..0000000000
--- a/sources/scala/runtime/types/SpecialType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-import scala.runtime.RunTime;
-
-/**
- * Abstract superclass for all "special" types, which are types
- * existing in Scala but not in Java: Any, AnyVal, All and AllRef.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-abstract public class SpecialType extends Type {
-    public Array newArray(int size) {
-        if (Type.unsafeArraysAllowed.get() == java.lang.Boolean.TRUE)
-            return (Array)
-                java.lang.reflect.Array.newInstance(Object.class, size);
-        else
-            throw new Error("cannot create arrays of special type "
-                            + "(" + getClass().getName() + ")");
-    }
-
-    public Object defaultValue() {
-        return null;
-    }
-
-    public boolean isSameType(Type that) {
-        return this == that;
-    }
-}
diff --git a/sources/scala/runtime/types/Statistics.java b/sources/scala/runtime/types/Statistics.java
deleted file mode 100644
index db3317370b..0000000000
--- a/sources/scala/runtime/types/Statistics.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.ArrayList;
-
-import scala.Type;
-
-/**
- * Collect various statistics about run time types, and output them to
- * a file as s-expressions.
- *
- * Notice that all methods return true, in order to be usable as
- * assertions and disabled easily.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-public class Statistics {
-    private static long instantiationsCount = 0;
-    private static long uniqueInstantiationsCount = 0;
-
-    private static long instanceOfCount = 0;
-    private static long weakInstanceOfCount = 0;
-    private static long typeCastCount = 0;
-
-    private static long ancestorSearchIterations = 0;
-    private static long ancestorSearches = 0;
-
-    private static HashMap instances = new HashMap();
-
-    static {
-        assert addWriteFileHook();
-    }
-
-    public static boolean addWriteFileHook() {
-        Thread writeFileHook = new Thread() {
-                public void run() {
-                    try {
-                        writeToFile();
-                    } catch (Throwable t) {
-                        throw new Error(t);
-                    }
-                }
-            };
-
-        Runtime.getRuntime().addShutdownHook(writeFileHook);
-        return true;
-    }
-
-    public static synchronized boolean incInstantiations(boolean unique) {
-        ++instantiationsCount;
-        if (unique) ++uniqueInstantiationsCount;
-        return true;
-    }
-
-    public static synchronized boolean incInstanceOf() {
-        ++instanceOfCount;
-        return true;
-    }
-
-    public static synchronized boolean incWeakInstanceOf() {
-        ++weakInstanceOfCount;
-        return true;
-    }
-
-    public static synchronized boolean decInstanceOf() {
-        --instanceOfCount;
-        return true;
-    }
-
-    public static synchronized boolean incTypeCast() {
-        ++typeCastCount;
-        return true;
-    }
-
-    public static synchronized boolean incInstances(String className,
-                                                    Type tp) {
-        ArrayList currInst = (ArrayList)instances.get(className);
-        if (currInst == null) {
-            currInst = new ArrayList();
-            instances.put(className, currInst);
-        }
-        currInst.add(tp);
-        return true;
-    }
-
-    public static synchronized boolean addAncestorSearchIterations(int n) {
-        ancestorSearchIterations += n;
-        ancestorSearches++;
-        return true;
-    }
-
-    /**
-     * Output statistics to a file, as an a-list associating numbers
-     * to tags.
-     */
-    public static boolean writeToFile() throws java.io.FileNotFoundException {
-        String fileName = System.getProperty("scala.runtime.types.statfile");
-        assert fileName != null
-            : "property scala.runtime.types.statfile not set";
-
-        System.out.println("Writing RTT statistics to file " + fileName);
-
-        PrintStream stream = new PrintStream(new FileOutputStream(fileName));
-        stream.println("(");
-        stream.println("(instantiations . "
-                       + instantiationsCount + ")");
-        stream.println("(unique-instantiations . "
-                       + uniqueInstantiationsCount + ")");
-        stream.println("(instance-of . "
-                       + instanceOfCount + ")");
-        stream.println("(weak-instance-of . "
-                       + weakInstanceOfCount + ")");
-        stream.println("(type-cast . "
-                       + typeCastCount + ")");
-        if (ancestorSearches > 0) {
-            stream.println("(ancestor-searches . "
-                           + ancestorSearches + ")");
-            stream.println("(ancestor-search-iterations . "
-                           + ancestorSearchIterations + ")");
-        }
-        stream.println("(instances . (");
-        Iterator instIt = instances.entrySet().iterator();
-        while (instIt.hasNext()) {
-            Map.Entry entry = (Map.Entry)instIt.next();
-            String name = (String)entry.getKey();
-            ArrayList instances = (ArrayList)entry.getValue();
-            HashSet uniqueInstances = new HashSet(instances);
-            stream.println("(\"" + name + "\" . "
-                           + instances.size() + ")");
-            stream.println("(\"Unique" + name + "\" . "
-                           + uniqueInstances.size() + ")");
-        }
-        stream.print("))");
-        stream.println(")");
-        stream.close();
-        return true;
-    }
-}
diff --git a/sources/scala/runtime/types/TypeAll.java b/sources/scala/runtime/types/TypeAll.java
deleted file mode 100644
index 9c79646c69..0000000000
--- a/sources/scala/runtime/types/TypeAll.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public class TypeAll extends SpecialType {
-    public boolean isInstance(Object o) {
-        assert Statistics.incInstanceOf();
-        return false;
-    }
-
-    public boolean isSubType(Type that) {
-        return true;
-    }
-
-    public String toString() { return "scala.All"; }
-    public int hashCode() { return 0xAAAAAAAA; }
-
-    // Make TypeAll a serializable singleton
-    public static TypeAll INSTANCE = new TypeAll();
-    protected TypeAll() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeAllRef.java b/sources/scala/runtime/types/TypeAllRef.java
deleted file mode 100644
index e037a340f0..0000000000
--- a/sources/scala/runtime/types/TypeAllRef.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public class TypeAllRef extends SpecialType {
-    public boolean isInstance(Object o) {
-        assert Statistics.incInstanceOf();
-        return false;
-    }
-
-    public boolean isSubType(Type that) {
-        return !that.isSubType(Type.AnyVal);
-    }
-
-    public String toString() { return "scala.AllRef"; }
-
-    public int hashCode() { return 0xDDDDDDDD; }
-
-    // Make TypeAllRef a serializable singleton
-    public static TypeAllRef INSTANCE = new TypeAllRef();
-    protected TypeAllRef() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeAny.java b/sources/scala/runtime/types/TypeAny.java
deleted file mode 100644
index 6a2a5483a4..0000000000
--- a/sources/scala/runtime/types/TypeAny.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public class TypeAny extends SpecialType {
-    public boolean isInstance(Object o) {
-        assert Statistics.incInstanceOf();
-        return true;
-    }
-
-    public boolean isSubType(Type that) {
-        return that == this;
-    }
-
-    public String toString() { return "scala.Any"; }
-
-    public int hashCode() { return 0xBBBBBBBB; }
-
-    // Make TypeAny a serializable singleton
-    public static TypeAny INSTANCE = new TypeAny();
-    protected TypeAny() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeAnyVal.java b/sources/scala/runtime/types/TypeAnyVal.java
deleted file mode 100644
index 9fe397b576..0000000000
--- a/sources/scala/runtime/types/TypeAnyVal.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public class TypeAnyVal extends SpecialType {
-    public boolean isInstance(Object o) {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isSubType(Type that) {
-        return that == Type.Any || that == this;
-    }
-
-    public String toString() { return "scala.AnyVal"; }
-
-    public int hashCode() { return 0xCCCCCCCC; }
-
-    // Make TypeAnyVal a serializable singleton
-    public static TypeAnyVal INSTANCE = new TypeAnyVal();
-    protected TypeAnyVal() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeBoolean.java b/sources/scala/runtime/types/TypeBoolean.java
deleted file mode 100644
index 69788a9752..0000000000
--- a/sources/scala/runtime/types/TypeBoolean.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-import scala.Boolean;
-
-public class TypeBoolean extends ValueType {
-    private final Boolean ZERO = RunTime.box_zvalue(false);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (! (o == null || o instanceof scala.Boolean))
-            throw new ClassCastException(); // TODO error message
-        return o;
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Boolean.TYPE;
-    }
-    public String toString() { return "scala.Boolean"; }
-    public int hashCode() { return 0x88888888; }
-
-    // Make TypeBoolean a serializable singleton
-    public static TypeBoolean INSTANCE = new TypeBoolean();
-    protected TypeBoolean() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeByte.java b/sources/scala/runtime/types/TypeByte.java
deleted file mode 100644
index cafab096f3..0000000000
--- a/sources/scala/runtime/types/TypeByte.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-import scala.Byte;
-
-public class TypeByte extends ValueType {
-    private final Byte ZERO = RunTime.box_bvalue((byte)0);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (o == null || o instanceof scala.Byte)
-            return o;
-        else if (o instanceof scala.Double)
-            return RunTime.box_bvalue((byte)((scala.Double)o).value);
-        else if (o instanceof scala.Float)
-            return RunTime.box_bvalue((byte)((scala.Float)o).value);
-        else if (o instanceof scala.Long)
-            return RunTime.box_bvalue((byte)((scala.Long)o).value);
-        else if (o instanceof scala.Int)
-            return RunTime.box_bvalue((byte)((scala.Int)o).value);
-        else if (o instanceof scala.Short)
-            return RunTime.box_bvalue((byte)((scala.Short)o).value);
-        else if (o instanceof scala.Char)
-            return RunTime.box_bvalue((byte)((scala.Char)o).value);
-        else
-            throw new ClassCastException();
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Byte.TYPE;
-    }
-    public String toString() { return "scala.Byte"; }
-    public int hashCode() { return 0x77777777; }
-
-    // Make TypeByte a serializable singleton
-    public static TypeByte INSTANCE = new TypeByte();
-    protected TypeByte() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeChar.java b/sources/scala/runtime/types/TypeChar.java
deleted file mode 100644
index 19d42a2887..0000000000
--- a/sources/scala/runtime/types/TypeChar.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-import scala.Char;
-
-public class TypeChar extends ValueType {
-    private final Char ZERO = RunTime.box_cvalue((char)0);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (o == null || o instanceof scala.Char)
-            return o;
-        else if (o instanceof scala.Double)
-            return RunTime.box_cvalue((char)((scala.Double)o).value);
-        else if (o instanceof scala.Float)
-            return RunTime.box_cvalue((char)((scala.Float)o).value);
-        else if (o instanceof scala.Long)
-            return RunTime.box_cvalue((char)((scala.Long)o).value);
-        else if (o instanceof scala.Int)
-            return RunTime.box_cvalue((char)((scala.Int)o).value);
-        else if (o instanceof scala.Short)
-            return RunTime.box_cvalue((char)((scala.Short)o).value);
-        else if (o instanceof scala.Byte)
-            return RunTime.box_cvalue((char)((scala.Byte)o).value);
-        else
-            throw new ClassCastException();
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == char.class;
-    }
-    public String toString() { return "scala.Char"; }
-    public int hashCode() { return 0x66666666; }
-
-    // Make TypeChar a serializable singleton
-    public static TypeChar INSTANCE = new TypeChar();
-    protected TypeChar() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeConstructor.java b/sources/scala/runtime/types/TypeConstructor.java
deleted file mode 100644
index b1a71916c3..0000000000
--- a/sources/scala/runtime/types/TypeConstructor.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*                     __                                               * \
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-import scala.runtime.AtomicReference;
-import scala.runtime.IOMap;
-
-/**
- * Class modelling a type constructor (this includes non-polymorphic
- * types, which are handled as polymorphic types with zero arguments).
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-public final class TypeConstructor implements java.io.Serializable {
-    public final static TypeConstructor[] EMPTY_ARRAY =
-        new TypeConstructor[0];
-
-    private static class Outer implements java.io.Serializable {}
-
-    public final static Object FUNCTION_OUTER = new Outer();
-
-    /** Java class corresponding to this constructor. */
-    public Class clazz;
-
-    /**
-     * Number of invariant (z), contravariant (m) and covariant (p)
-     * type arguments.
-     */
-    public final int zCount, mCount, pCount;
-
-    /**
-     * Level of this type in the hierarchy (scala.AnyRef is at 0, its
-     * direct children at 1, and so on).
-     */
-    public final int level;
-
-    /**
-     * Indication of triviality: a constructor is trivial iff it has
-     * no enclosing class, and no type arguments.
-     */
-    public final boolean isTrivial;
-
-    public final int ancestorCacheDepth;
-    /**
-     * "Code" to compute the ancestors for an instance of this
-     * constructor, based on the ancestors of its not-strongly-trivial
-     * parents. This code is structured as follows:
-     *
-     * l1 n1 p1,0 o1,0 p1,1 o1,1 ... l2 n2 p2,0 o2,0 ...
-     *
-     * where all l, n, p and o are integers. ni gives the number of
-     * additional entries to add to the ancestors of the first parent
-     * at level li. pi gives the index of the parent in which to pick
-     * this additional entry, and oi gives the offset of this entry in
-     * the parent's ancestors.
-     */
-    public final int[] ancestorCode;
-
-    /** Enclosing class for this type constructor */
-    private final Object outer;
-
-    private final InstantiationMap instMapModule = new InstantiationMap();
-    private final AtomicReference/*<InstantiationMap.T>*/ instances =
-        new AtomicReference(IOMap.EMPTY);
-
-    private static final ClassLoader loader =
-        ClassLoader.getSystemClassLoader();
-
-    private static final int[] EMPTY_ANCESTOR_CODE = new int[0];
-
-    public TypeConstructor(int level,
-                           String fullName,
-                           Object outer,
-                           int zCount,
-                           int mCount,
-                           int pCount,
-                           int ancestorCacheDepth,
-                           int[] ancestorCode) {
-        this.level = level;
-        this.outer = outer;
-        this.zCount = zCount;
-        this.mCount = mCount;
-        this.pCount = pCount;
-
-        this.ancestorCacheDepth = ancestorCacheDepth;
-        this.ancestorCode =
-            (ancestorCode == null ? EMPTY_ANCESTOR_CODE : ancestorCode);
-
-        this.isTrivial = (outer == null) && (zCount + pCount + mCount == 0);
-
-        try {
-            this.clazz = Class.forName(fullName, false, loader);
-        } catch (ClassNotFoundException e) {
-            throw new Error(e);
-        }
-
-        assert (zCount >= 0) && (mCount >= 0) && (pCount >= 0);
-    }
-
-    public String toString() {
-        if (outer == null)
-            return clazz.getName();
-        else if (outer == FUNCTION_OUTER)
-            return "<function>." + clazz.getName();
-        else
-            return outer.toString() + "." + clazz.getName();
-    }
-
-    public ScalaClassType getInstantiation(Type[] args) {
-        ScalaClassType inst =
-            instMapModule.get((InstantiationMap.T)instances.get(), args);
-        assert Statistics.incInstantiations(inst == null);
-        return inst;
-    }
-
-    public ScalaClassType instantiate(Type[] args, Object parents) {
-        ScalaClassType tp = new ScalaClassType(this, args, parents);
-
-        try {
-            InstantiationMap.T oldMap, newMap;
-            do {
-                oldMap = (InstantiationMap.T)instances.get();
-                newMap = instMapModule.put(oldMap, args, tp);
-            } while (!instances.compareAndSet(oldMap, newMap));
-        } catch (IOMap.ConflictException e) {
-            return (ScalaClassType)e.oldValue;
-        }
-        return tp;
-    }
-
-    //////////////////////////////////////////////////////////////////////
-
-    private static class InstantiationMap
-        extends IOMap
-        implements java.io.Serializable {
-        public T put(T map, Type[] inst, ScalaClassType value)
-            throws ConflictException {
-            return super.put(map, Type.hashCode(inst), value);
-        }
-
-        public ScalaClassType get(T map, Type[] inst) {
-            return (ScalaClassType)super.get(map, Type.hashCode(inst));
-        }
-    }
-}
diff --git a/sources/scala/runtime/types/TypeDouble.java b/sources/scala/runtime/types/TypeDouble.java
deleted file mode 100644
index 0bc22709ee..0000000000
--- a/sources/scala/runtime/types/TypeDouble.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public public class TypeDouble extends ValueType {
-    private final scala.Double ZERO = RunTime.box_dvalue(0.0);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (o == null || o instanceof scala.Double)
-            return o;
-        else if (o instanceof scala.Float)
-            return RunTime.box_dvalue(((scala.Float)o).value);
-        else if (o instanceof scala.Long)
-            return RunTime.box_dvalue(((scala.Long)o).value);
-        else if (o instanceof scala.Int)
-            return RunTime.box_dvalue(((scala.Int)o).value);
-        else if (o instanceof scala.Short)
-            return RunTime.box_dvalue(((scala.Short)o).value);
-        else if (o instanceof scala.Char)
-            return RunTime.box_dvalue(((scala.Char)o).value);
-        else if (o instanceof scala.Byte)
-            return RunTime.box_dvalue(((scala.Byte)o).value);
-        else
-            throw new ClassCastException();
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Double.TYPE;
-    }
-    public String toString() { return "scala.Double"; }
-    public int hashCode() { return 0x11111111; }
-
-    // Make TypeDouble a serializable singleton
-    public static TypeDouble INSTANCE = new TypeDouble();
-    protected TypeDouble() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeFloat.java b/sources/scala/runtime/types/TypeFloat.java
deleted file mode 100644
index 5f0e18898c..0000000000
--- a/sources/scala/runtime/types/TypeFloat.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public class TypeFloat extends ValueType {
-    private final scala.Float ZERO = RunTime.box_fvalue(0.0f);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (o == null || o instanceof scala.Float)
-            return o;
-        else if (o instanceof scala.Double)
-            return RunTime.box_fvalue((float)((scala.Double)o).value);
-        else if (o instanceof scala.Long)
-            return RunTime.box_fvalue(((scala.Long)o).value);
-        else if (o instanceof scala.Int)
-            return RunTime.box_fvalue(((scala.Int)o).value);
-        else if (o instanceof scala.Short)
-            return RunTime.box_fvalue(((scala.Short)o).value);
-        else if (o instanceof scala.Char)
-            return RunTime.box_fvalue(((scala.Char)o).value);
-        else if (o instanceof scala.Byte)
-            return RunTime.box_fvalue(((scala.Byte)o).value);
-        else
-            throw new ClassCastException();
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Float.TYPE;
-    }
-    public String toString() { return "scala.Float"; }
-    public int hashCode() { return 0x22222222; }
-
-    // Make TypeFloat a serializable singleton
-    public static TypeFloat INSTANCE = new TypeFloat();
-    protected TypeFloat() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeInt.java b/sources/scala/runtime/types/TypeInt.java
deleted file mode 100644
index 3c29b70c0a..0000000000
--- a/sources/scala/runtime/types/TypeInt.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-import scala.Int;
-
-public class TypeInt extends ValueType {
-    private final Int ZERO = RunTime.box_ivalue(0);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (o == null || o instanceof scala.Int)
-            return o;
-        else if (o instanceof scala.Double)
-            return RunTime.box_ivalue((int)((scala.Double)o).value);
-        else if (o instanceof scala.Float)
-            return RunTime.box_ivalue((int)((scala.Float)o).value);
-        else if (o instanceof scala.Long)
-            return RunTime.box_ivalue((int)((scala.Long)o).value);
-        else if (o instanceof scala.Short)
-            return RunTime.box_ivalue(((scala.Short)o).value);
-        else if (o instanceof scala.Char)
-            return RunTime.box_ivalue(((scala.Char)o).value);
-        else if (o instanceof scala.Byte)
-            return RunTime.box_ivalue(((scala.Byte)o).value);
-        else
-            throw new ClassCastException();
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Integer.TYPE;
-    }
-    public String toString() { return "scala.Int"; }
-    public int hashCode() { return 0x44444444; }
-
-    // Make TypeInt a serializable singleton
-    public static TypeInt INSTANCE = new TypeInt();
-    protected TypeInt() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeLong.java b/sources/scala/runtime/types/TypeLong.java
deleted file mode 100644
index cc03d72e8f..0000000000
--- a/sources/scala/runtime/types/TypeLong.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public class TypeLong extends ValueType {
-    private final scala.Long ZERO = RunTime.box_lvalue(0l);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (o == null || o instanceof scala.Long)
-            return o;
-        else if (o instanceof scala.Double)
-            return RunTime.box_lvalue((long)((scala.Double)o).value);
-        else if (o instanceof scala.Float)
-            return RunTime.box_lvalue((long)((scala.Float)o).value);
-        else if (o instanceof scala.Int)
-            return RunTime.box_lvalue(((scala.Int)o).value);
-        else if (o instanceof scala.Short)
-            return RunTime.box_lvalue(((scala.Short)o).value);
-        else if (o instanceof scala.Char)
-            return RunTime.box_lvalue(((scala.Char)o).value);
-        else if (o instanceof scala.Byte)
-            return RunTime.box_lvalue(((scala.Byte)o).value);
-        else
-            throw new ClassCastException();
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Long.TYPE;
-    }
-    public String toString() { return "scala.Long"; }
-    public int hashCode() { return 0x33333333; }
-
-    // Make TypeLong a serializable singleton
-    public static TypeLong INSTANCE = new TypeLong();
-    protected TypeLong() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeShort.java b/sources/scala/runtime/types/TypeShort.java
deleted file mode 100644
index 286a518596..0000000000
--- a/sources/scala/runtime/types/TypeShort.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-
-public class TypeShort extends ValueType {
-    private final scala.Short ZERO = RunTime.box_svalue((short)0);
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (o == null || o instanceof scala.Short)
-            return o;
-        else if (o instanceof scala.Double)
-            return RunTime.box_svalue((short)((scala.Double)o).value);
-        else if (o instanceof scala.Float)
-            return RunTime.box_svalue((short)((scala.Float)o).value);
-        else if (o instanceof scala.Long)
-            return RunTime.box_svalue((short)((scala.Long)o).value);
-        else if (o instanceof scala.Int)
-            return RunTime.box_svalue((short)((scala.Int)o).value);
-        else if (o instanceof scala.Char)
-            return RunTime.box_svalue((short)((scala.Char)o).value);
-        else if (o instanceof scala.Byte)
-            return RunTime.box_svalue(((scala.Byte)o).value);
-        else
-            throw new ClassCastException();
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Short.TYPE;
-    }
-    public String toString() { return "scala.Short"; }
-    public int hashCode() { return 0x55555555; }
-
-    // Make TypeShort a serializable singleton
-    public static TypeShort INSTANCE = new TypeShort();
-    protected TypeShort() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/TypeUnit.java b/sources/scala/runtime/types/TypeUnit.java
deleted file mode 100644
index 29edaa325f..0000000000
--- a/sources/scala/runtime/types/TypeUnit.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.runtime.RunTime;
-import scala.Type;
-import scala.Array;
-import scala.Unit;
-
-public class TypeUnit extends ValueType {
-    private final Unit ZERO = RunTime.box_uvalue();
-    public Object cast(Object o) {
-        assert scala.runtime.types.Statistics.incTypeCast();
-        if (! (o == null || o instanceof scala.Unit))
-            throw new ClassCastException(); // TODO error message
-        return o;
-    }
-    public Object defaultValue() { return ZERO; }
-    public boolean isSameAsJavaType(Class that) {
-        return that == java.lang.Void.TYPE;
-    }
-    public String toString() { return "scala.Unit"; }
-    public int hashCode() { return 0x99999999; }
-
-    // Make TypeUnit a serializable singleton
-    public static TypeUnit INSTANCE = new TypeUnit();
-    protected TypeUnit() { /* exists only to that instantiation */ }
-    private Object readResolve() { return INSTANCE; }
-}
diff --git a/sources/scala/runtime/types/ValueType.java b/sources/scala/runtime/types/ValueType.java
deleted file mode 100644
index 0cffb9c854..0000000000
--- a/sources/scala/runtime/types/ValueType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003, LAMP/EPFL                  **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-package scala.runtime.types;
-
-import scala.Type;
-import scala.Array;
-
-/**
- * Abstract superclass for all value types.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-abstract public class ValueType extends Type {
-    public boolean isInstance(Object o) {
-        throw new UnsupportedOperationException();
-    }
-    public boolean isSubType(Type that) {
-        return that == Type.Any
-            || that == Type.AnyVal
-            || that == this;
-    }
-    public boolean isSameType(Type that) {
-        return this == that;
-    }
-    public Array newArray(int size) {
-        throw new Error("internal error (Scala runtime)");
-    }
-}
diff --git a/sources/scala/tools/nsc/CompilationUnits.scala b/src/compiler/scala/tools/nsc/CompilationUnits.scala
index 0c39d99c16..0c39d99c16 100644
--- a/sources/scala/tools/nsc/CompilationUnits.scala
+++ b/src/compiler/scala/tools/nsc/CompilationUnits.scala
diff --git a/sources/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index 9768eaa621..9768eaa621 100644
--- a/sources/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
diff --git a/sources/scala/tools/nsc/CompilerRun.scala b/src/compiler/scala/tools/nsc/CompilerRun.scala
index 7677fc2cb8..7677fc2cb8 100644
--- a/sources/scala/tools/nsc/CompilerRun.scala
+++ b/src/compiler/scala/tools/nsc/CompilerRun.scala
diff --git a/sources/scala/tools/nsc/EvalLoop.scala b/src/compiler/scala/tools/nsc/EvalLoop.scala
index 240547491a..240547491a 100644
--- a/sources/scala/tools/nsc/EvalLoop.scala
+++ b/src/compiler/scala/tools/nsc/EvalLoop.scala
diff --git a/sources/scala/tools/nsc/FatalError.scala b/src/compiler/scala/tools/nsc/FatalError.scala
index aa849fa5d0..aa849fa5d0 100644
--- a/sources/scala/tools/nsc/FatalError.scala
+++ b/src/compiler/scala/tools/nsc/FatalError.scala
diff --git a/sources/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 75558c30b5..75558c30b5 100644
--- a/sources/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
diff --git a/sources/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 847cdade6a..847cdade6a 100644
--- a/sources/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
diff --git a/sources/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala
index 58b352db61..58b352db61 100644
--- a/sources/scala/tools/nsc/Main.scala
+++ b/src/compiler/scala/tools/nsc/Main.scala
diff --git a/sources/scala/tools/nsc/MainInterpreter.scala b/src/compiler/scala/tools/nsc/MainInterpreter.scala
index b1ea38e065..b1ea38e065 100644
--- a/sources/scala/tools/nsc/MainInterpreter.scala
+++ b/src/compiler/scala/tools/nsc/MainInterpreter.scala
diff --git a/sources/scala/tools/nsc/MainTokenMetric.scala b/src/compiler/scala/tools/nsc/MainTokenMetric.scala
index df05b627e0..df05b627e0 100644
--- a/sources/scala/tools/nsc/MainTokenMetric.scala
+++ b/src/compiler/scala/tools/nsc/MainTokenMetric.scala
diff --git a/sources/scala/tools/nsc/NoPhase.scala b/src/compiler/scala/tools/nsc/NoPhase.scala
index 342b022842..342b022842 100644
--- a/sources/scala/tools/nsc/NoPhase.scala
+++ b/src/compiler/scala/tools/nsc/NoPhase.scala
diff --git a/sources/scala/tools/nsc/Phase.scala b/src/compiler/scala/tools/nsc/Phase.scala
index 4ca3aa2e9c..4ca3aa2e9c 100644
--- a/sources/scala/tools/nsc/Phase.scala
+++ b/src/compiler/scala/tools/nsc/Phase.scala
diff --git a/sources/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala
index a7a5dfe73c..a7a5dfe73c 100644
--- a/sources/scala/tools/nsc/Settings.scala
+++ b/src/compiler/scala/tools/nsc/Settings.scala
diff --git a/sources/scala/tools/nsc/SubComponent.scala b/src/compiler/scala/tools/nsc/SubComponent.scala
index 556b6538ad..556b6538ad 100644
--- a/sources/scala/tools/nsc/SubComponent.scala
+++ b/src/compiler/scala/tools/nsc/SubComponent.scala
diff --git a/sources/scala/tools/nsc/ant/NSC.scala b/src/compiler/scala/tools/nsc/ant/NSC.scala
index 9010a92bf9..9010a92bf9 100644
--- a/sources/scala/tools/nsc/ant/NSC.scala
+++ b/src/compiler/scala/tools/nsc/ant/NSC.scala
diff --git a/sources/scala/tools/nsc/ast/TreeBrowsers.scala b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
index 9e4821a734..9e4821a734 100644
--- a/sources/scala/tools/nsc/ast/TreeBrowsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
diff --git a/sources/scala/tools/nsc/ast/TreeGen.scala b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
index 425cf9eac8..425cf9eac8 100644
--- a/sources/scala/tools/nsc/ast/TreeGen.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
diff --git a/sources/scala/tools/nsc/ast/TreeInfo.scala b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala
index dedfc6b03a..dedfc6b03a 100644
--- a/sources/scala/tools/nsc/ast/TreeInfo.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeInfo.scala
diff --git a/sources/scala/tools/nsc/ast/TreePrinters.scala b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
index 206fa58061..206fa58061 100644
--- a/sources/scala/tools/nsc/ast/TreePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
diff --git a/sources/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala
index 92b147c947..92b147c947 100644
--- a/sources/scala/tools/nsc/ast/Trees.scala
+++ b/src/compiler/scala/tools/nsc/ast/Trees.scala
diff --git a/sources/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
index cf4244cb3f..cf4244cb3f 100644
--- a/sources/scala/tools/nsc/ast/parser/MarkupParsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
diff --git a/sources/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 0634ace4d0..0634ace4d0 100644
--- a/sources/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
diff --git a/sources/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
index 5fbf54834e..5fbf54834e 100644
--- a/sources/scala/tools/nsc/ast/parser/Scanners.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala
diff --git a/sources/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala
index 4fc234bead..4fc234bead 100644
--- a/sources/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala
diff --git a/sources/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala b/src/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala
index b4a3b507b3..b4a3b507b3 100644
--- a/sources/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala
diff --git a/sources/scala/tools/nsc/ast/parser/Tokens.scala b/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala
index b99ee08811..b99ee08811 100644
--- a/sources/scala/tools/nsc/ast/parser/Tokens.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Tokens.scala
diff --git a/sources/scala/tools/nsc/ast/parser/TreeBuilder.scala b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
index 70355350a7..70355350a7 100644
--- a/sources/scala/tools/nsc/ast/parser/TreeBuilder.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/TreeBuilder.scala
diff --git a/sources/scala/tools/nsc/backend/ScalaPrimitives.scala b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
index 91dad33b05..91dad33b05 100644
--- a/sources/scala/tools/nsc/backend/ScalaPrimitives.scala
+++ b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
diff --git a/sources/scala/tools/nsc/backend/WorklistAlgorithm.scala b/src/compiler/scala/tools/nsc/backend/WorklistAlgorithm.scala
index 6676c820bc..6676c820bc 100644
--- a/sources/scala/tools/nsc/backend/WorklistAlgorithm.scala
+++ b/src/compiler/scala/tools/nsc/backend/WorklistAlgorithm.scala
diff --git a/sources/scala/tools/nsc/backend/icode/BasicBlocks.scala b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
index 6fdbe98c57..6fdbe98c57 100644
--- a/sources/scala/tools/nsc/backend/icode/BasicBlocks.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/BasicBlocks.scala
diff --git a/sources/scala/tools/nsc/backend/icode/CheckerError.scala b/src/compiler/scala/tools/nsc/backend/icode/CheckerError.scala
index da1232b6e9..da1232b6e9 100644
--- a/sources/scala/tools/nsc/backend/icode/CheckerError.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/CheckerError.scala
diff --git a/sources/scala/tools/nsc/backend/icode/Checkers.scala b/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala
index 8aba76fa97..8aba76fa97 100644
--- a/sources/scala/tools/nsc/backend/icode/Checkers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Checkers.scala
diff --git a/sources/scala/tools/nsc/backend/icode/ExceptionHandlers.scala b/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala
index 126e20ebef..126e20ebef 100644
--- a/sources/scala/tools/nsc/backend/icode/ExceptionHandlers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala
diff --git a/sources/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
index a7940cd66a..a7940cd66a 100644
--- a/sources/scala/tools/nsc/backend/icode/GenICode.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
diff --git a/sources/scala/tools/nsc/backend/icode/ICodes.scala b/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala
index d29a8b5433..d29a8b5433 100644
--- a/sources/scala/tools/nsc/backend/icode/ICodes.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/ICodes.scala
diff --git a/sources/scala/tools/nsc/backend/icode/Linearizers.scala b/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
index 7a0b77f6fa..7a0b77f6fa 100644
--- a/sources/scala/tools/nsc/backend/icode/Linearizers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
diff --git a/sources/scala/tools/nsc/backend/icode/Members.scala b/src/compiler/scala/tools/nsc/backend/icode/Members.scala
index f12c4ef62c..f12c4ef62c 100644
--- a/sources/scala/tools/nsc/backend/icode/Members.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Members.scala
diff --git a/sources/scala/tools/nsc/backend/icode/Opcodes.scala b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
index 24eb1132f6..24eb1132f6 100644
--- a/sources/scala/tools/nsc/backend/icode/Opcodes.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
diff --git a/sources/scala/tools/nsc/backend/icode/Primitives.scala b/src/compiler/scala/tools/nsc/backend/icode/Primitives.scala
index 5cebb0edaf..5cebb0edaf 100644
--- a/sources/scala/tools/nsc/backend/icode/Primitives.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Primitives.scala
diff --git a/sources/scala/tools/nsc/backend/icode/Printers.scala b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala
index dbc7badb9a..dbc7badb9a 100644
--- a/sources/scala/tools/nsc/backend/icode/Printers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Printers.scala
diff --git a/sources/scala/tools/nsc/backend/icode/TypeKinds.scala b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
index c1f0c204c6..c1f0c204c6 100644
--- a/sources/scala/tools/nsc/backend/icode/TypeKinds.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
diff --git a/sources/scala/tools/nsc/backend/icode/TypeStacks.scala b/src/compiler/scala/tools/nsc/backend/icode/TypeStacks.scala
index 1f0f8b887c..1f0f8b887c 100644
--- a/sources/scala/tools/nsc/backend/icode/TypeStacks.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/TypeStacks.scala
diff --git a/sources/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 50a86fdf27..50a86fdf27 100644
--- a/sources/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
diff --git a/sources/scala/tools/nsc/matching/AlgebraicMatchers.scala b/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala
index 4137b128eb..4137b128eb 100644
--- a/sources/scala/tools/nsc/matching/AlgebraicMatchers.scala
+++ b/src/compiler/scala/tools/nsc/matching/AlgebraicMatchers.scala
diff --git a/sources/scala/tools/nsc/matching/Autom2.scala b/src/compiler/scala/tools/nsc/matching/Autom2.scala
index b99db700b4..b99db700b4 100644
--- a/sources/scala/tools/nsc/matching/Autom2.scala
+++ b/src/compiler/scala/tools/nsc/matching/Autom2.scala
diff --git a/sources/scala/tools/nsc/matching/BerrySethis.scala b/src/compiler/scala/tools/nsc/matching/BerrySethis.scala
index 85638903b0..85638903b0 100644
--- a/sources/scala/tools/nsc/matching/BerrySethis.scala
+++ b/src/compiler/scala/tools/nsc/matching/BerrySethis.scala
diff --git a/sources/scala/tools/nsc/matching/CodeFactory.scala b/src/compiler/scala/tools/nsc/matching/CodeFactory.scala
index 1d6882a0fa..1d6882a0fa 100644
--- a/sources/scala/tools/nsc/matching/CodeFactory.scala
+++ b/src/compiler/scala/tools/nsc/matching/CodeFactory.scala
diff --git a/sources/scala/tools/nsc/matching/DetWordAutoms.scala b/src/compiler/scala/tools/nsc/matching/DetWordAutoms.scala
index 8e4d2943be..8e4d2943be 100644
--- a/sources/scala/tools/nsc/matching/DetWordAutoms.scala
+++ b/src/compiler/scala/tools/nsc/matching/DetWordAutoms.scala
diff --git a/sources/scala/tools/nsc/matching/LeftTracers.scala b/src/compiler/scala/tools/nsc/matching/LeftTracers.scala
index b58e11b4cb..b58e11b4cb 100644
--- a/sources/scala/tools/nsc/matching/LeftTracers.scala
+++ b/src/compiler/scala/tools/nsc/matching/LeftTracers.scala
diff --git a/sources/scala/tools/nsc/matching/MatcherLabels.scala b/src/compiler/scala/tools/nsc/matching/MatcherLabels.scala
index 06c8cd2baa..06c8cd2baa 100644
--- a/sources/scala/tools/nsc/matching/MatcherLabels.scala
+++ b/src/compiler/scala/tools/nsc/matching/MatcherLabels.scala
diff --git a/sources/scala/tools/nsc/matching/NondetWordAutoms.scala b/src/compiler/scala/tools/nsc/matching/NondetWordAutoms.scala
index cd1d8b576e..cd1d8b576e 100644
--- a/sources/scala/tools/nsc/matching/NondetWordAutoms.scala
+++ b/src/compiler/scala/tools/nsc/matching/NondetWordAutoms.scala
diff --git a/sources/scala/tools/nsc/matching/Npair.scala b/src/compiler/scala/tools/nsc/matching/Npair.scala
index 8cb050de2e..8cb050de2e 100644
--- a/sources/scala/tools/nsc/matching/Npair.scala
+++ b/src/compiler/scala/tools/nsc/matching/Npair.scala
diff --git a/sources/scala/tools/nsc/matching/PatternMatchers.scala b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala
index 7d4292e3ff..7d4292e3ff 100644
--- a/sources/scala/tools/nsc/matching/PatternMatchers.scala
+++ b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala
diff --git a/sources/scala/tools/nsc/matching/PatternNodeCreator.scala b/src/compiler/scala/tools/nsc/matching/PatternNodeCreator.scala
index 79ba780469..79ba780469 100644
--- a/sources/scala/tools/nsc/matching/PatternNodeCreator.scala
+++ b/src/compiler/scala/tools/nsc/matching/PatternNodeCreator.scala
diff --git a/sources/scala/tools/nsc/matching/PatternNodes.scala b/src/compiler/scala/tools/nsc/matching/PatternNodes.scala
index 551d964c39..551d964c39 100644
--- a/sources/scala/tools/nsc/matching/PatternNodes.scala
+++ b/src/compiler/scala/tools/nsc/matching/PatternNodes.scala
diff --git a/sources/scala/tools/nsc/matching/RightTracers.scala b/src/compiler/scala/tools/nsc/matching/RightTracers.scala
index f0daf20fed..f0daf20fed 100644
--- a/sources/scala/tools/nsc/matching/RightTracers.scala
+++ b/src/compiler/scala/tools/nsc/matching/RightTracers.scala
diff --git a/sources/scala/tools/nsc/matching/SequenceMatchers.scala b/src/compiler/scala/tools/nsc/matching/SequenceMatchers.scala
index d2d8aa7414..d2d8aa7414 100644
--- a/sources/scala/tools/nsc/matching/SequenceMatchers.scala
+++ b/src/compiler/scala/tools/nsc/matching/SequenceMatchers.scala
diff --git a/sources/scala/tools/nsc/matching/StateSetComparator.scala b/src/compiler/scala/tools/nsc/matching/StateSetComparator.scala
index 99942f38d5..99942f38d5 100644
--- a/sources/scala/tools/nsc/matching/StateSetComparator.scala
+++ b/src/compiler/scala/tools/nsc/matching/StateSetComparator.scala
diff --git a/sources/scala/tools/nsc/matching/TransMatcher.scala b/src/compiler/scala/tools/nsc/matching/TransMatcher.scala
index bca478b0dc..bca478b0dc 100644
--- a/sources/scala/tools/nsc/matching/TransMatcher.scala
+++ b/src/compiler/scala/tools/nsc/matching/TransMatcher.scala
diff --git a/sources/scala/tools/nsc/matching/WordAutoms.scala b/src/compiler/scala/tools/nsc/matching/WordAutoms.scala
index de17fc6445..de17fc6445 100644
--- a/sources/scala/tools/nsc/matching/WordAutoms.scala
+++ b/src/compiler/scala/tools/nsc/matching/WordAutoms.scala
diff --git a/sources/scala/tools/nsc/models/Models.scala.xxx b/src/compiler/scala/tools/nsc/models/Models.scala.xxx
index e95976ed19..e95976ed19 100644
--- a/sources/scala/tools/nsc/models/Models.scala.xxx
+++ b/src/compiler/scala/tools/nsc/models/Models.scala.xxx
diff --git a/sources/scala/tools/nsc/models/SemanticTokens.scala b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
index 51d127b54b..51d127b54b 100644
--- a/sources/scala/tools/nsc/models/SemanticTokens.scala
+++ b/src/compiler/scala/tools/nsc/models/SemanticTokens.scala
diff --git a/sources/scala/tools/nsc/models/Signatures.scala b/src/compiler/scala/tools/nsc/models/Signatures.scala
index 3a779a7021..3a779a7021 100644
--- a/sources/scala/tools/nsc/models/Signatures.scala
+++ b/src/compiler/scala/tools/nsc/models/Signatures.scala
diff --git a/sources/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
index c2953e0a5c..c2953e0a5c 100644
--- a/sources/scala/tools/nsc/reporters/AbstractReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
diff --git a/sources/scala/tools/nsc/reporters/ConsoleReporter.scala b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
index f759b66bec..f759b66bec 100644
--- a/sources/scala/tools/nsc/reporters/ConsoleReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
diff --git a/sources/scala/tools/nsc/reporters/Reporter.scala b/src/compiler/scala/tools/nsc/reporters/Reporter.scala
index 950e1a2c6f..950e1a2c6f 100644
--- a/sources/scala/tools/nsc/reporters/Reporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/Reporter.scala
diff --git a/sources/scala/tools/nsc/reporters/ReporterTimer.scala b/src/compiler/scala/tools/nsc/reporters/ReporterTimer.scala
index 5c0cfd4092..5c0cfd4092 100644
--- a/sources/scala/tools/nsc/reporters/ReporterTimer.scala
+++ b/src/compiler/scala/tools/nsc/reporters/ReporterTimer.scala
diff --git a/sources/scala/tools/nsc/reporters/StoreReporter.scala b/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala
index e4734fcee7..e4734fcee7 100644
--- a/sources/scala/tools/nsc/reporters/StoreReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/StoreReporter.scala
diff --git a/sources/scala/tools/nsc/symtab/Constants.scala b/src/compiler/scala/tools/nsc/symtab/Constants.scala
index 3a6746cf61..3a6746cf61 100644
--- a/sources/scala/tools/nsc/symtab/Constants.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Constants.scala
diff --git a/sources/scala/tools/nsc/symtab/Definitions.scala b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
index 36d34f76f1..36d34f76f1 100644
--- a/sources/scala/tools/nsc/symtab/Definitions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Definitions.scala
diff --git a/sources/scala/tools/nsc/symtab/Flags.scala b/src/compiler/scala/tools/nsc/symtab/Flags.scala
index 2627640d2e..2627640d2e 100644
--- a/sources/scala/tools/nsc/symtab/Flags.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Flags.scala
diff --git a/sources/scala/tools/nsc/symtab/InfoTransformers.scala b/src/compiler/scala/tools/nsc/symtab/InfoTransformers.scala
index e1ff9bbac5..e1ff9bbac5 100644
--- a/sources/scala/tools/nsc/symtab/InfoTransformers.scala
+++ b/src/compiler/scala/tools/nsc/symtab/InfoTransformers.scala
diff --git a/sources/scala/tools/nsc/symtab/Names.scala b/src/compiler/scala/tools/nsc/symtab/Names.scala
index 5fedb67ce4..5fedb67ce4 100644
--- a/sources/scala/tools/nsc/symtab/Names.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Names.scala
diff --git a/sources/scala/tools/nsc/symtab/Scopes.scala b/src/compiler/scala/tools/nsc/symtab/Scopes.scala
index fe8ffaa47b..fe8ffaa47b 100644
--- a/sources/scala/tools/nsc/symtab/Scopes.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Scopes.scala
diff --git a/sources/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
index 2b8b8692f5..2b8b8692f5 100644
--- a/sources/scala/tools/nsc/symtab/StdNames.scala
+++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
diff --git a/sources/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 11f0c21c4f..11f0c21c4f 100644
--- a/sources/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
diff --git a/sources/scala/tools/nsc/symtab/SymbolTable.scala b/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala
index eb29dad289..eb29dad289 100644
--- a/sources/scala/tools/nsc/symtab/SymbolTable.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala
diff --git a/sources/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
index 6bdf29c54e..6bdf29c54e 100644
--- a/sources/scala/tools/nsc/symtab/Symbols.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
diff --git a/sources/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala
index 583ca6503c..583ca6503c 100644
--- a/sources/scala/tools/nsc/symtab/Types.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Types.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala
index f023552443..f023552443 100644
--- a/sources/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 0e56cf8824..0e56cf8824 100644
--- a/sources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/MetaParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/MetaParser.scala
index eca5da7091..eca5da7091 100644
--- a/sources/scala/tools/nsc/symtab/classfile/MetaParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/MetaParser.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/PickleBuffer.scala b/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala
index aed16bf057..aed16bf057 100644
--- a/sources/scala/tools/nsc/symtab/classfile/PickleBuffer.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/PickleBuffer.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/PickleFormat.scala b/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala
index 220b4bc6b5..220b4bc6b5 100644
--- a/sources/scala/tools/nsc/symtab/classfile/PickleFormat.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/PickleFormat.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
index 5ecd30fcd1..5ecd30fcd1 100644
--- a/sources/scala/tools/nsc/symtab/classfile/Pickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/SymblfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/SymblfileParser.scala
index cb7e401b1c..cb7e401b1c 100644
--- a/sources/scala/tools/nsc/symtab/classfile/SymblfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/SymblfileParser.scala
diff --git a/sources/scala/tools/nsc/symtab/classfile/UnPickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
index 70c50e592b..70c50e592b 100644
--- a/sources/scala/tools/nsc/symtab/classfile/UnPickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/UnPickler.scala
diff --git a/sources/scala/tools/nsc/transform/AddInterfaces.scala b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
index 0ddcd4d33d..0ddcd4d33d 100644
--- a/sources/scala/tools/nsc/transform/AddInterfaces.scala
+++ b/src/compiler/scala/tools/nsc/transform/AddInterfaces.scala
diff --git a/sources/scala/tools/nsc/transform/Constructors.scala b/src/compiler/scala/tools/nsc/transform/Constructors.scala
index ea31249d30..ea31249d30 100644
--- a/sources/scala/tools/nsc/transform/Constructors.scala
+++ b/src/compiler/scala/tools/nsc/transform/Constructors.scala
diff --git a/sources/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala
index c726d2255d..c726d2255d 100644
--- a/sources/scala/tools/nsc/transform/Erasure.scala
+++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala
diff --git a/sources/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
index 2a3fc9a19f..2a3fc9a19f 100644
--- a/sources/scala/tools/nsc/transform/ExplicitOuter.scala
+++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
diff --git a/sources/scala/tools/nsc/transform/Flatten.scala b/src/compiler/scala/tools/nsc/transform/Flatten.scala
index 031f7a0fcd..031f7a0fcd 100644
--- a/sources/scala/tools/nsc/transform/Flatten.scala
+++ b/src/compiler/scala/tools/nsc/transform/Flatten.scala
diff --git a/sources/scala/tools/nsc/transform/InfoTransform.scala b/src/compiler/scala/tools/nsc/transform/InfoTransform.scala
index a5af6beb06..a5af6beb06 100644
--- a/sources/scala/tools/nsc/transform/InfoTransform.scala
+++ b/src/compiler/scala/tools/nsc/transform/InfoTransform.scala
diff --git a/sources/scala/tools/nsc/transform/LambdaLift.scala b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala
index 753fc65b48..753fc65b48 100644
--- a/sources/scala/tools/nsc/transform/LambdaLift.scala
+++ b/src/compiler/scala/tools/nsc/transform/LambdaLift.scala
diff --git a/sources/scala/tools/nsc/transform/Mixin.scala b/src/compiler/scala/tools/nsc/transform/Mixin.scala
index d20deb8b85..d20deb8b85 100644
--- a/sources/scala/tools/nsc/transform/Mixin.scala
+++ b/src/compiler/scala/tools/nsc/transform/Mixin.scala
diff --git a/sources/scala/tools/nsc/transform/OverridingPairs.scala b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
index 2f80216dbe..2f80216dbe 100644
--- a/sources/scala/tools/nsc/transform/OverridingPairs.scala
+++ b/src/compiler/scala/tools/nsc/transform/OverridingPairs.scala
diff --git a/sources/scala/tools/nsc/transform/SampleTransform.scala b/src/compiler/scala/tools/nsc/transform/SampleTransform.scala
index 404e03e572..404e03e572 100644
--- a/sources/scala/tools/nsc/transform/SampleTransform.scala
+++ b/src/compiler/scala/tools/nsc/transform/SampleTransform.scala
diff --git a/sources/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
index c6fa574228..c6fa574228 100644
--- a/sources/scala/tools/nsc/transform/TailCalls.scala
+++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
diff --git a/sources/scala/tools/nsc/transform/Transform.scala b/src/compiler/scala/tools/nsc/transform/Transform.scala
index cfdf796f27..cfdf796f27 100644
--- a/sources/scala/tools/nsc/transform/Transform.scala
+++ b/src/compiler/scala/tools/nsc/transform/Transform.scala
diff --git a/sources/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
index a435b2a2b2..a435b2a2b2 100644
--- a/sources/scala/tools/nsc/transform/UnCurry.scala
+++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
diff --git a/sources/scala/tools/nsc/typechecker/Analyzer.scala b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
index e895524915..e895524915 100644
--- a/sources/scala/tools/nsc/typechecker/Analyzer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Analyzer.scala
diff --git a/sources/scala/tools/nsc/typechecker/Codification.scala b/src/compiler/scala/tools/nsc/typechecker/Codification.scala
index 1deda7bdfb..1deda7bdfb 100644
--- a/sources/scala/tools/nsc/typechecker/Codification.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Codification.scala
diff --git a/sources/scala/tools/nsc/typechecker/ConstantFolder.scala b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala
index 0afb18d8d5..0afb18d8d5 100644
--- a/sources/scala/tools/nsc/typechecker/ConstantFolder.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/ConstantFolder.scala
diff --git a/sources/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 021e810a43..021e810a43 100644
--- a/sources/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
diff --git a/sources/scala/tools/nsc/typechecker/EtaExpansion.scala b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala
index f6d481d58b..f6d481d58b 100644
--- a/sources/scala/tools/nsc/typechecker/EtaExpansion.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala
diff --git a/sources/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
index fb03509627..fb03509627 100644
--- a/sources/scala/tools/nsc/typechecker/Infer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
diff --git a/sources/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index bb0aeed305..bb0aeed305 100644
--- a/sources/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
diff --git a/sources/scala/tools/nsc/typechecker/RefChecks.scala b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
index f60ffae9b5..f60ffae9b5 100644
--- a/sources/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
diff --git a/sources/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index 50749deb5e..50749deb5e 100644
--- a/sources/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
diff --git a/sources/scala/tools/nsc/typechecker/SyntheticMethods.scala b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
index da6ac07d6c..da6ac07d6c 100644
--- a/sources/scala/tools/nsc/typechecker/SyntheticMethods.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
diff --git a/sources/scala/tools/nsc/typechecker/TreeCheckers.scala b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
index b494e1c33f..b494e1c33f 100644
--- a/sources/scala/tools/nsc/typechecker/TreeCheckers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/TreeCheckers.scala
diff --git a/sources/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index f4098b615a..f4098b615a 100644
--- a/sources/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff --git a/sources/scala/tools/nsc/typechecker/Variances.scala b/src/compiler/scala/tools/nsc/typechecker/Variances.scala
index ca7c52d242..ca7c52d242 100644
--- a/sources/scala/tools/nsc/typechecker/Variances.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Variances.scala
diff --git a/sources/scala/tools/nsc/util/CharArrayReader.scala b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
index 182a730694..182a730694 100644
--- a/sources/scala/tools/nsc/util/CharArrayReader.scala
+++ b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
diff --git a/sources/scala/tools/nsc/util/FreshNameCreator.scala b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala
index 8215941256..8215941256 100644
--- a/sources/scala/tools/nsc/util/FreshNameCreator.scala
+++ b/src/compiler/scala/tools/nsc/util/FreshNameCreator.scala
diff --git a/sources/scala/tools/nsc/util/HashSet.scala b/src/compiler/scala/tools/nsc/util/HashSet.scala
index d74d7e9582..d74d7e9582 100644
--- a/sources/scala/tools/nsc/util/HashSet.scala
+++ b/src/compiler/scala/tools/nsc/util/HashSet.scala
diff --git a/sources/scala/tools/nsc/util/LinkedList.scala b/src/compiler/scala/tools/nsc/util/LinkedList.scala
index 375e6ca615..375e6ca615 100644
--- a/sources/scala/tools/nsc/util/LinkedList.scala
+++ b/src/compiler/scala/tools/nsc/util/LinkedList.scala
diff --git a/sources/scala/tools/nsc/util/ListBuffer.scala b/src/compiler/scala/tools/nsc/util/ListBuffer.scala
index bdc09412eb..bdc09412eb 100644
--- a/sources/scala/tools/nsc/util/ListBuffer.scala
+++ b/src/compiler/scala/tools/nsc/util/ListBuffer.scala
diff --git a/sources/scala/tools/nsc/util/NameTransformer.scala b/src/compiler/scala/tools/nsc/util/NameTransformer.scala
index 709bd00a84..709bd00a84 100644
--- a/sources/scala/tools/nsc/util/NameTransformer.scala
+++ b/src/compiler/scala/tools/nsc/util/NameTransformer.scala
diff --git a/sources/scala/tools/nsc/util/Position.scala b/src/compiler/scala/tools/nsc/util/Position.scala
index bf502cac3b..bf502cac3b 100644
--- a/sources/scala/tools/nsc/util/Position.scala
+++ b/src/compiler/scala/tools/nsc/util/Position.scala
diff --git a/sources/scala/tools/nsc/util/Set.scala b/src/compiler/scala/tools/nsc/util/Set.scala
index dab7898e39..dab7898e39 100644
--- a/sources/scala/tools/nsc/util/Set.scala
+++ b/src/compiler/scala/tools/nsc/util/Set.scala
diff --git a/sources/scala/tools/nsc/util/ShowPickled.scala b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
index 481b7278e4..481b7278e4 100644
--- a/sources/scala/tools/nsc/util/ShowPickled.scala
+++ b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
diff --git a/sources/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala
index 0d4354d325..0d4354d325 100644
--- a/sources/scala/tools/nsc/util/SourceFile.scala
+++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala
diff --git a/sources/scala/tools/nsc/util/Statistics.scala b/src/compiler/scala/tools/nsc/util/Statistics.scala
index 2034b07541..2034b07541 100644
--- a/sources/scala/tools/nsc/util/Statistics.scala
+++ b/src/compiler/scala/tools/nsc/util/Statistics.scala
diff --git a/sources/scala/tools/nsc/util/TreeSet.scala b/src/compiler/scala/tools/nsc/util/TreeSet.scala
index 552f06b3f4..552f06b3f4 100644
--- a/sources/scala/tools/nsc/util/TreeSet.scala
+++ b/src/compiler/scala/tools/nsc/util/TreeSet.scala
diff --git a/sources/scala/tools/util/AbstractFile.java b/src/compiler/scala/tools/util/AbstractFile.java
index 723d983a4a..723d983a4a 100644
--- a/sources/scala/tools/util/AbstractFile.java
+++ b/src/compiler/scala/tools/util/AbstractFile.java
diff --git a/sources/scala/tools/util/AbstractFileReader.java b/src/compiler/scala/tools/util/AbstractFileReader.java
index bafb170217..bafb170217 100644
--- a/sources/scala/tools/util/AbstractFileReader.java
+++ b/src/compiler/scala/tools/util/AbstractFileReader.java
diff --git a/sources/scala/tools/util/AbstractReporter.java b/src/compiler/scala/tools/util/AbstractReporter.java
index 19b1eacbef..19b1eacbef 100644
--- a/sources/scala/tools/util/AbstractReporter.java
+++ b/src/compiler/scala/tools/util/AbstractReporter.java
diff --git a/sources/scala/tools/util/AbstractTimer.java b/src/compiler/scala/tools/util/AbstractTimer.java
index 6314023fe3..6314023fe3 100644
--- a/sources/scala/tools/util/AbstractTimer.java
+++ b/src/compiler/scala/tools/util/AbstractTimer.java
diff --git a/sources/scala/tools/util/ByteArrayFile.java b/src/compiler/scala/tools/util/ByteArrayFile.java
index afbc9ce089..afbc9ce089 100644
--- a/sources/scala/tools/util/ByteArrayFile.java
+++ b/src/compiler/scala/tools/util/ByteArrayFile.java
diff --git a/sources/scala/tools/util/CharArrayFile.java b/src/compiler/scala/tools/util/CharArrayFile.java
index 55c8f4a19d..55c8f4a19d 100644
--- a/sources/scala/tools/util/CharArrayFile.java
+++ b/src/compiler/scala/tools/util/CharArrayFile.java
diff --git a/sources/scala/tools/util/ClassPath.java b/src/compiler/scala/tools/util/ClassPath.java
index 8df26355c8..8df26355c8 100644
--- a/sources/scala/tools/util/ClassPath.java
+++ b/src/compiler/scala/tools/util/ClassPath.java
diff --git a/sources/scala/tools/util/ConsoleReporter.java b/src/compiler/scala/tools/util/ConsoleReporter.java
index d7ae018e44..d7ae018e44 100644
--- a/sources/scala/tools/util/ConsoleReporter.java
+++ b/src/compiler/scala/tools/util/ConsoleReporter.java
diff --git a/sources/scala/tools/util/DirectoryPath.java b/src/compiler/scala/tools/util/DirectoryPath.java
index 2b114f8efe..2b114f8efe 100644
--- a/sources/scala/tools/util/DirectoryPath.java
+++ b/src/compiler/scala/tools/util/DirectoryPath.java
diff --git a/sources/scala/tools/util/DummyTimer.java b/src/compiler/scala/tools/util/DummyTimer.java
index e16c44b6be..e16c44b6be 100644
--- a/sources/scala/tools/util/DummyTimer.java
+++ b/src/compiler/scala/tools/util/DummyTimer.java
diff --git a/sources/scala/tools/util/EmptyIterator.java b/src/compiler/scala/tools/util/EmptyIterator.java
index f677d97e3d..f677d97e3d 100644
--- a/sources/scala/tools/util/EmptyIterator.java
+++ b/src/compiler/scala/tools/util/EmptyIterator.java
diff --git a/sources/scala/tools/util/PlainFile.java b/src/compiler/scala/tools/util/PlainFile.java
index aee80cb52f..aee80cb52f 100644
--- a/sources/scala/tools/util/PlainFile.java
+++ b/src/compiler/scala/tools/util/PlainFile.java
diff --git a/sources/scala/tools/util/Position.java b/src/compiler/scala/tools/util/Position.java
index 25d356c144..25d356c144 100644
--- a/sources/scala/tools/util/Position.java
+++ b/src/compiler/scala/tools/util/Position.java
diff --git a/sources/scala/tools/util/Reporter.java b/src/compiler/scala/tools/util/Reporter.java
index b2411e0649..b2411e0649 100644
--- a/sources/scala/tools/util/Reporter.java
+++ b/src/compiler/scala/tools/util/Reporter.java
diff --git a/sources/scala/tools/util/ReporterTimer.java b/src/compiler/scala/tools/util/ReporterTimer.java
index 174f349305..174f349305 100644
--- a/sources/scala/tools/util/ReporterTimer.java
+++ b/src/compiler/scala/tools/util/ReporterTimer.java
diff --git a/sources/scala/tools/util/SourceFile.java b/src/compiler/scala/tools/util/SourceFile.java
index 025f7602ad..025f7602ad 100644
--- a/sources/scala/tools/util/SourceFile.java
+++ b/src/compiler/scala/tools/util/SourceFile.java
diff --git a/sources/scala/tools/util/SourceReader.java b/src/compiler/scala/tools/util/SourceReader.java
index ae5ae2a162..ae5ae2a162 100644
--- a/sources/scala/tools/util/SourceReader.java
+++ b/src/compiler/scala/tools/util/SourceReader.java
diff --git a/sources/scala/tools/util/StringBufferWriter.java b/src/compiler/scala/tools/util/StringBufferWriter.java
index 3e239b08cb..3e239b08cb 100644
--- a/sources/scala/tools/util/StringBufferWriter.java
+++ b/src/compiler/scala/tools/util/StringBufferWriter.java
diff --git a/sources/scala/tools/util/Timer.java b/src/compiler/scala/tools/util/Timer.java
index df60d580ae..df60d580ae 100644
--- a/sources/scala/tools/util/Timer.java
+++ b/src/compiler/scala/tools/util/Timer.java
diff --git a/sources/scala/tools/util/UTF8Codec.java b/src/compiler/scala/tools/util/UTF8Codec.java
index 29fe516537..29fe516537 100644
--- a/sources/scala/tools/util/UTF8Codec.java
+++ b/src/compiler/scala/tools/util/UTF8Codec.java
diff --git a/sources/scala/tools/util/VirtualDirectory.java b/src/compiler/scala/tools/util/VirtualDirectory.java
index 597f52d14b..597f52d14b 100644
--- a/sources/scala/tools/util/VirtualDirectory.java
+++ b/src/compiler/scala/tools/util/VirtualDirectory.java
diff --git a/sources/scala/tools/util/VirtualFile.java b/src/compiler/scala/tools/util/VirtualFile.java
index b0e6e2a897..b0e6e2a897 100644
--- a/sources/scala/tools/util/VirtualFile.java
+++ b/src/compiler/scala/tools/util/VirtualFile.java
diff --git a/sources/scala/tools/util/ZipArchive.java b/src/compiler/scala/tools/util/ZipArchive.java
index 6367b28013..6367b28013 100644
--- a/sources/scala/tools/util/ZipArchive.java
+++ b/src/compiler/scala/tools/util/ZipArchive.java
diff --git a/sources/scala/tools/util/debug/AbortError.java b/src/compiler/scala/tools/util/debug/AbortError.java
index e3c84a7cda..e3c84a7cda 100644
--- a/sources/scala/tools/util/debug/AbortError.java
+++ b/src/compiler/scala/tools/util/debug/AbortError.java
diff --git a/sources/scala/tools/util/debug/ArrayDebugger.java b/src/compiler/scala/tools/util/debug/ArrayDebugger.java
index 6bc6621ab4..6bc6621ab4 100644
--- a/sources/scala/tools/util/debug/ArrayDebugger.java
+++ b/src/compiler/scala/tools/util/debug/ArrayDebugger.java
diff --git a/sources/scala/tools/util/debug/Debug.java b/src/compiler/scala/tools/util/debug/Debug.java
index 38ee3c7b9a..38ee3c7b9a 100644
--- a/sources/scala/tools/util/debug/Debug.java
+++ b/src/compiler/scala/tools/util/debug/Debug.java
diff --git a/sources/scala/tools/util/debug/Debugger.java b/src/compiler/scala/tools/util/debug/Debugger.java
index 0a40f74768..0a40f74768 100644
--- a/sources/scala/tools/util/debug/Debugger.java
+++ b/src/compiler/scala/tools/util/debug/Debugger.java
diff --git a/sources/scala/tools/util/debug/ObjectDebugger.java b/src/compiler/scala/tools/util/debug/ObjectDebugger.java
index 7edcdbd0f0..7edcdbd0f0 100644
--- a/sources/scala/tools/util/debug/ObjectDebugger.java
+++ b/src/compiler/scala/tools/util/debug/ObjectDebugger.java
diff --git a/sources/scala/tools/util/debug/ThrowableDebugger.java b/src/compiler/scala/tools/util/debug/ThrowableDebugger.java
index 8bdf93cbcb..8bdf93cbcb 100644
--- a/sources/scala/tools/util/debug/ThrowableDebugger.java
+++ b/src/compiler/scala/tools/util/debug/ThrowableDebugger.java
diff --git a/sources/scala/tools/util/debug/ToStringDebugger.java b/src/compiler/scala/tools/util/debug/ToStringDebugger.java
index 85e0e18776..85e0e18776 100644
--- a/sources/scala/tools/util/debug/ToStringDebugger.java
+++ b/src/compiler/scala/tools/util/debug/ToStringDebugger.java
diff --git a/sources/bin/nscala-tool.win.tmpl b/src/exec/nscala-tool.win.tmpl
index ff9f7475c5..ff9f7475c5 100644
--- a/sources/bin/nscala-tool.win.tmpl
+++ b/src/exec/nscala-tool.win.tmpl
diff --git a/sources/bin/nscala.unix.tmpl b/src/exec/nscala.unix.tmpl
index 8288bde383..759450b7c4 100644
--- a/sources/bin/nscala.unix.tmpl
+++ b/src/exec/nscala.unix.tmpl
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ##############################################################################
-# Copyright @COPYRIGHT@
+# Copyright @copyright@
 #
 # This is free software; see the distribution for copying conditions.
 # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
@@ -36,8 +36,8 @@ if [ -z "$SCRIPT" ]; then
 fi;
 
 _JAVACMD=java
-_TOOLS_CPATH=@TOOLS_CPATH@
-_LIB_CPATH=@LIB_CPATH@
+_TOOLS_CPATH=@fjbg.jar@:@msil.jar@:@comp.path@:@lib.path@
+_LIB_CPATH=@lib.path@
 
 # For Cygwin, switch paths to appropriate format before running java
 if $cygwin; then
@@ -52,11 +52,10 @@ fi
 
 main=
 case "$SCRIPT" in
-    @SCALA@     ) ;;
-    @SCALAC@    ) main=scala.tools.nsc.Main;;
-    @SCALAI@    ) main=scala.tools.nsc.MainInterpreter;;
-    @SCALAP@    ) main=scala.tools.scalap.Main;;
-    @SCALATOK@  ) main=scala.tools.nsc.MainTokenMetric;;
+    @scala.exec.name@     ) ;;
+    @scalac.exec.name@    ) main=scala.tools.nsc.Main;;
+    @scalai.exec.name@    ) main=scala.tools.nsc.MainInterpreter;;
+    @scalatok.exec.name@  ) main=scala.tools.nsc.MainTokenMetric;;
     *            ) abort "Don't know what to do for $SCRIPT.";;
 esac;
 
@@ -64,7 +63,7 @@ if [ -z "$main" ]; then
     for arg in "" "$@"; do
         [ -z "$arg" ] && continue;
         if [ "$arg" = "-version" ]; then
-            echo "$SCRIPT @VERSION@ -- @COPYRIGHT@";
+            echo "$SCRIPT @version@ -- @copyright@";
             exit 0
         fi
     done;
@@ -75,7 +74,7 @@ else
     $_JAVACMD \
         -Xms16M -Xmx256M \
         -Dscala.product="$SCRIPT" \
-        -Dscala.version="@VERSION@" \
+        -Dscala.version="@version@" \
         -Dscala.home="$PREFIX" \
         -cp "$_TOOLS_CPATH" \
         $main -sourcepath "$_LIB_CPATH" "$@"
diff --git a/sources/bin/nscala.win.tmpl b/src/exec/nscala.win.tmpl
index feb4655e0f..feb4655e0f 100644
--- a/sources/bin/nscala.win.tmpl
+++ b/src/exec/nscala.win.tmpl
diff --git a/sources/scala/All$.java b/src/library/scala/All$.java
index e220b26ac7..e220b26ac7 100644
--- a/sources/scala/All$.java
+++ b/src/library/scala/All$.java
diff --git a/sources/scala/AllRef$.java b/src/library/scala/AllRef$.java
index e8c7e77aa9..e8c7e77aa9 100644
--- a/sources/scala/AllRef$.java
+++ b/src/library/scala/AllRef$.java
diff --git a/sources/scala/AnyVal.cs b/src/library/scala/AnyVal.cs
index 2178416e4e..13cf2f3e2c 100644
--- a/sources/scala/AnyVal.cs
+++ b/src/library/scala/AnyVal.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:AnyVal.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using scala.runtime;
 
diff --git a/sources/scala/AnyVal.java b/src/library/scala/AnyVal.java
index a7a96d0a6d..a7a96d0a6d 100644
--- a/sources/scala/AnyVal.java
+++ b/src/library/scala/AnyVal.java
diff --git a/sources/scala/Application.scala b/src/library/scala/Application.scala
index 80fc41acbd..b536c8a31d 100644
--- a/sources/scala/Application.scala
+++ b/src/library/scala/Application.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Application.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/newsources/scala/Array.scala b/src/library/scala/Array.scala
index b1f15e1b6d..b1f15e1b6d 100644
--- a/newsources/scala/Array.scala
+++ b/src/library/scala/Array.scala
diff --git a/sources/scala/Attribute.scala b/src/library/scala/Attribute.scala
index 263d1cfbb5..ad0df6b2f3 100644
--- a/sources/scala/Attribute.scala
+++ b/src/library/scala/Attribute.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Attribute.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Boolean.cs b/src/library/scala/Boolean.cs
index add1f882f1..73e72935ed 100644
--- a/sources/scala/Boolean.cs
+++ b/src/library/scala/Boolean.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Boolean.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Boolean.java b/src/library/scala/Boolean.java
index 960595f5a5..960595f5a5 100644
--- a/sources/scala/Boolean.java
+++ b/src/library/scala/Boolean.java
diff --git a/sources/scala/BufferedIterator.scala b/src/library/scala/BufferedIterator.scala
index e17093e1d2..6ee72ee785 100644
--- a/sources/scala/BufferedIterator.scala
+++ b/src/library/scala/BufferedIterator.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:BufferedIterator.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Byte.cs b/src/library/scala/Byte.cs
index 4fd6493458..a8faa7080e 100644
--- a/sources/scala/Byte.cs
+++ b/src/library/scala/Byte.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Byte.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Byte.java b/src/library/scala/Byte.java
index 2a841225dc..2a841225dc 100644
--- a/sources/scala/Byte.java
+++ b/src/library/scala/Byte.java
diff --git a/sources/scala/CaseClass.scala b/src/library/scala/CaseClass.scala
index 0180efe267..07b766ede9 100644
--- a/sources/scala/CaseClass.scala
+++ b/src/library/scala/CaseClass.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:CaseClass.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Cell.scala b/src/library/scala/Cell.scala
index 8a5146a3a3..77ee7015c2 100644
--- a/sources/scala/Cell.scala
+++ b/src/library/scala/Cell.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Cell.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Char.cs b/src/library/scala/Char.cs
index b3e28a454b..3afde58dfd 100644
--- a/sources/scala/Char.cs
+++ b/src/library/scala/Char.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Char.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Char.java b/src/library/scala/Char.java
index a875e717df..a875e717df 100644
--- a/sources/scala/Char.java
+++ b/src/library/scala/Char.java
diff --git a/sources/scala/Console.scala b/src/library/scala/Console.scala
index f9ec8fc490..f7175d1e19 100644
--- a/sources/scala/Console.scala
+++ b/src/library/scala/Console.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Console.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Double.cs b/src/library/scala/Double.cs
index 59da220403..30b9293c47 100644
--- a/sources/scala/Double.cs
+++ b/src/library/scala/Double.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Double.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Double.java b/src/library/scala/Double.java
index 77f44fd10e..77f44fd10e 100644
--- a/sources/scala/Double.java
+++ b/src/library/scala/Double.java
diff --git a/sources/scala/Enumeration.scala b/src/library/scala/Enumeration.scala
index 4515a8c4bf..885d51a180 100644
--- a/sources/scala/Enumeration.scala
+++ b/src/library/scala/Enumeration.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Enumeration.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Float.cs b/src/library/scala/Float.cs
index 13832f3f1b..5a3a162de9 100644
--- a/sources/scala/Float.cs
+++ b/src/library/scala/Float.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Float.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Float.java b/src/library/scala/Float.java
index a4a35f575e..a4a35f575e 100644
--- a/sources/scala/Float.java
+++ b/src/library/scala/Float.java
diff --git a/sources/scala/Function0.scala b/src/library/scala/Function0.scala
index f689152741..f689152741 100644
--- a/sources/scala/Function0.scala
+++ b/src/library/scala/Function0.scala
diff --git a/sources/scala/Function1.scala b/src/library/scala/Function1.scala
index cfb5897a2c..cfb5897a2c 100644
--- a/sources/scala/Function1.scala
+++ b/src/library/scala/Function1.scala
diff --git a/sources/scala/Function2.scala b/src/library/scala/Function2.scala
index fd5eedc497..fd5eedc497 100644
--- a/sources/scala/Function2.scala
+++ b/src/library/scala/Function2.scala
diff --git a/sources/scala/Function3.scala b/src/library/scala/Function3.scala
index 9212945a4e..9212945a4e 100644
--- a/sources/scala/Function3.scala
+++ b/src/library/scala/Function3.scala
diff --git a/sources/scala/Function4.scala b/src/library/scala/Function4.scala
index 4731986c30..4731986c30 100644
--- a/sources/scala/Function4.scala
+++ b/src/library/scala/Function4.scala
diff --git a/sources/scala/Function5.scala b/src/library/scala/Function5.scala
index 17abc7eb7f..17abc7eb7f 100644
--- a/sources/scala/Function5.scala
+++ b/src/library/scala/Function5.scala
diff --git a/sources/scala/Function6.scala b/src/library/scala/Function6.scala
index 02f6c94af2..02f6c94af2 100644
--- a/sources/scala/Function6.scala
+++ b/src/library/scala/Function6.scala
diff --git a/sources/scala/Function7.scala b/src/library/scala/Function7.scala
index e97dc787ec..e97dc787ec 100644
--- a/sources/scala/Function7.scala
+++ b/src/library/scala/Function7.scala
diff --git a/sources/scala/Function8.scala b/src/library/scala/Function8.scala
index f905cae58d..f905cae58d 100644
--- a/sources/scala/Function8.scala
+++ b/src/library/scala/Function8.scala
diff --git a/sources/scala/Function9.scala b/src/library/scala/Function9.scala
index 8ae0a5d658..8ae0a5d658 100644
--- a/sources/scala/Function9.scala
+++ b/src/library/scala/Function9.scala
diff --git a/sources/scala/Int.cs b/src/library/scala/Int.cs
index 001ee900d5..1c909df500 100644
--- a/sources/scala/Int.cs
+++ b/src/library/scala/Int.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Int.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Int.java b/src/library/scala/Int.java
index 5c5d95a63e..5c5d95a63e 100644
--- a/sources/scala/Int.java
+++ b/src/library/scala/Int.java
diff --git a/sources/scala/Iterable.scala b/src/library/scala/Iterable.scala
index 035da41067..89103802fd 100644
--- a/sources/scala/Iterable.scala
+++ b/src/library/scala/Iterable.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Iterable.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/IterableProxy.scala b/src/library/scala/IterableProxy.scala
index 19bae8825d..52ebe8806f 100644
--- a/sources/scala/IterableProxy.scala
+++ b/src/library/scala/IterableProxy.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:IterableProxy.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Iterator.scala b/src/library/scala/Iterator.scala
index 5a60a198ca..1664eb2ffe 100644
--- a/sources/scala/Iterator.scala
+++ b/src/library/scala/Iterator.scala
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Iterator.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 package scala;
 
diff --git a/sources/scala/List.scala b/src/library/scala/List.scala
index f71a09e110..4da2611640 100644
--- a/sources/scala/List.scala
+++ b/src/library/scala/List.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:List.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Long.cs b/src/library/scala/Long.cs
index 01995f7d04..cf147b04b3 100644
--- a/sources/scala/Long.cs
+++ b/src/library/scala/Long.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Long.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Long.java b/src/library/scala/Long.java
index bcaf38eb36..bcaf38eb36 100644
--- a/sources/scala/Long.java
+++ b/src/library/scala/Long.java
diff --git a/newsources/scala/MatchError.scala b/src/library/scala/MatchError.scala
index 4979df8717..4979df8717 100644
--- a/newsources/scala/MatchError.scala
+++ b/src/library/scala/MatchError.scala
diff --git a/sources/scala/None.scala b/src/library/scala/None.scala
index 9905889ac1..337426b1ee 100644
--- a/sources/scala/None.scala
+++ b/src/library/scala/None.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:None.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Option.scala b/src/library/scala/Option.scala
index 7d9dbce459..c19748c875 100644
--- a/sources/scala/Option.scala
+++ b/src/library/scala/Option.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Option.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Ordered.scala b/src/library/scala/Ordered.scala
index dc2bed7784..b8ef8c0ab9 100644
--- a/sources/scala/Ordered.scala
+++ b/src/library/scala/Ordered.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Ordered.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/PartialFunction.scala b/src/library/scala/PartialFunction.scala
index 470f9c5718..9bea5386c5 100644
--- a/sources/scala/PartialFunction.scala
+++ b/src/library/scala/PartialFunction.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:PartialFunction.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/PartiallyOrdered.scala b/src/library/scala/PartiallyOrdered.scala
index fba76066e0..424e50b77d 100644
--- a/sources/scala/PartiallyOrdered.scala
+++ b/src/library/scala/PartiallyOrdered.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:PartiallyOrdered.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Predef.scala b/src/library/scala/Predef.scala
index 5005e3df3e..94bd73b79d 100644
--- a/sources/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Predef.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Proxy.scala b/src/library/scala/Proxy.scala
index 5129f0eb00..5bf65c2ed4 100644
--- a/sources/scala/Proxy.scala
+++ b/src/library/scala/Proxy.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Proxy.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Ref.cs b/src/library/scala/Ref.cs
index 3a10a7c648..660b07321c 100644
--- a/sources/scala/Ref.cs
+++ b/src/library/scala/Ref.cs
@@ -7,7 +7,7 @@
 \*                                                                      */
 
 // $OldId: Ref.java,v 1.2 2002/03/12 13:16:04 zenger Exp $
-// $Id$
+// $Id:Ref.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Ref.java b/src/library/scala/Ref.java
index 3c47ae5573..3c47ae5573 100644
--- a/sources/scala/Ref.java
+++ b/src/library/scala/Ref.java
diff --git a/newsources/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala
index 21c1fdbfba..21c1fdbfba 100644
--- a/newsources/scala/ScalaObject.scala
+++ b/src/library/scala/ScalaObject.scala
diff --git a/sources/scala/Seq.scala b/src/library/scala/Seq.scala
index efc3996333..0298f5913e 100644
--- a/sources/scala/Seq.scala
+++ b/src/library/scala/Seq.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Seq.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/SeqProxy.scala b/src/library/scala/SeqProxy.scala
index 03f6031312..aa4496a8fe 100644
--- a/sources/scala/SeqProxy.scala
+++ b/src/library/scala/SeqProxy.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:SeqProxy.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/SerialVersionUID.scala b/src/library/scala/SerialVersionUID.scala
index c86da7b66c..9b42c09411 100644
--- a/sources/scala/SerialVersionUID.scala
+++ b/src/library/scala/SerialVersionUID.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:SerialVersionUID.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 */
 
 package scala;
diff --git a/sources/scala/Short.cs b/src/library/scala/Short.cs
index 0e03090d59..5503b9360a 100644
--- a/sources/scala/Short.cs
+++ b/src/library/scala/Short.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Short.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Short.java b/src/library/scala/Short.java
index e800678202..e800678202 100644
--- a/sources/scala/Short.java
+++ b/src/library/scala/Short.java
diff --git a/sources/scala/Some.scala b/src/library/scala/Some.scala
index 4f0bd7ea3c..4d5d210ab8 100644
--- a/sources/scala/Some.scala
+++ b/src/library/scala/Some.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Some.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Stream.scala b/src/library/scala/Stream.scala
index bd0501b4fb..a281577bf8 100644
--- a/sources/scala/Stream.scala
+++ b/src/library/scala/Stream.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Stream.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Symbol.scala b/src/library/scala/Symbol.scala
index 2e1ab3a724..4e5805f545 100644
--- a/sources/scala/Symbol.scala
+++ b/src/library/scala/Symbol.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:Symbol.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/Tuple1.scala b/src/library/scala/Tuple1.scala
index 620ad276bc..620ad276bc 100644
--- a/sources/scala/Tuple1.scala
+++ b/src/library/scala/Tuple1.scala
diff --git a/sources/scala/Tuple2.scala b/src/library/scala/Tuple2.scala
index e830a4f769..e830a4f769 100644
--- a/sources/scala/Tuple2.scala
+++ b/src/library/scala/Tuple2.scala
diff --git a/sources/scala/Tuple3.scala b/src/library/scala/Tuple3.scala
index 53ce97a5b1..53ce97a5b1 100644
--- a/sources/scala/Tuple3.scala
+++ b/src/library/scala/Tuple3.scala
diff --git a/sources/scala/Tuple4.scala b/src/library/scala/Tuple4.scala
index 419afd7eb1..419afd7eb1 100644
--- a/sources/scala/Tuple4.scala
+++ b/src/library/scala/Tuple4.scala
diff --git a/sources/scala/Tuple5.scala b/src/library/scala/Tuple5.scala
index 24bca2d443..24bca2d443 100644
--- a/sources/scala/Tuple5.scala
+++ b/src/library/scala/Tuple5.scala
diff --git a/sources/scala/Tuple6.scala b/src/library/scala/Tuple6.scala
index 205afce10d..205afce10d 100644
--- a/sources/scala/Tuple6.scala
+++ b/src/library/scala/Tuple6.scala
diff --git a/sources/scala/Tuple7.scala b/src/library/scala/Tuple7.scala
index 61dcac85b5..61dcac85b5 100644
--- a/sources/scala/Tuple7.scala
+++ b/src/library/scala/Tuple7.scala
diff --git a/sources/scala/Tuple8.scala b/src/library/scala/Tuple8.scala
index 6857e876d3..6857e876d3 100644
--- a/sources/scala/Tuple8.scala
+++ b/src/library/scala/Tuple8.scala
diff --git a/sources/scala/Tuple9.scala b/src/library/scala/Tuple9.scala
index 50b3c66b40..50b3c66b40 100644
--- a/sources/scala/Tuple9.scala
+++ b/src/library/scala/Tuple9.scala
diff --git a/sources/scala/Unit.cs b/src/library/scala/Unit.cs
index 0acb8db74b..44fd1aa3ca 100644
--- a/sources/scala/Unit.cs
+++ b/src/library/scala/Unit.cs
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:Unit.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 using System;
 using scala.runtime;
diff --git a/sources/scala/Unit.java b/src/library/scala/Unit.java
index dd50889c10..dd50889c10 100644
--- a/sources/scala/Unit.java
+++ b/src/library/scala/Unit.java
diff --git a/sources/scala/_trait_.scala b/src/library/scala/_trait_.scala
index 61928d4284..087508da64 100644
--- a/sources/scala/_trait_.scala
+++ b/src/library/scala/_trait_.scala
@@ -6,7 +6,7 @@
 **                          |/                                          **
 */
 
-// $Id$
+// $Id:_trait_.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 package scala;
 
diff --git a/sources/scala/cloneable.scala b/src/library/scala/cloneable.scala
index 8369799be0..4067a3d732 100644
--- a/sources/scala/cloneable.scala
+++ b/src/library/scala/cloneable.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:cloneable.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 */
 
 package scala;
diff --git a/sources/scala/collection/BitSet.scala b/src/library/scala/collection/BitSet.scala
index bd5855c1de..bd5855c1de 100644
--- a/sources/scala/collection/BitSet.scala
+++ b/src/library/scala/collection/BitSet.scala
diff --git a/sources/scala/collection/Map.scala b/src/library/scala/collection/Map.scala
index 14546e9e71..14546e9e71 100644
--- a/sources/scala/collection/Map.scala
+++ b/src/library/scala/collection/Map.scala
diff --git a/sources/scala/collection/MapProxy.scala b/src/library/scala/collection/MapProxy.scala
index 8284a628d2..8284a628d2 100644
--- a/sources/scala/collection/MapProxy.scala
+++ b/src/library/scala/collection/MapProxy.scala
diff --git a/sources/scala/collection/Set.scala b/src/library/scala/collection/Set.scala
index 00ac17f6df..00ac17f6df 100644
--- a/sources/scala/collection/Set.scala
+++ b/src/library/scala/collection/Set.scala
diff --git a/sources/scala/collection/SetProxy.scala b/src/library/scala/collection/SetProxy.scala
index 0fc1931385..0fc1931385 100644
--- a/sources/scala/collection/SetProxy.scala
+++ b/src/library/scala/collection/SetProxy.scala
diff --git a/sources/scala/collection/immutable/BitSet.scala b/src/library/scala/collection/immutable/BitSet.scala
index 61299bf069..61299bf069 100644
--- a/sources/scala/collection/immutable/BitSet.scala
+++ b/src/library/scala/collection/immutable/BitSet.scala
diff --git a/sources/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala
index b6c9989531..b6c9989531 100644
--- a/sources/scala/collection/immutable/ListMap.scala
+++ b/src/library/scala/collection/immutable/ListMap.scala
diff --git a/sources/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala
index 305e54cb90..305e54cb90 100644
--- a/sources/scala/collection/immutable/ListSet.scala
+++ b/src/library/scala/collection/immutable/ListSet.scala
diff --git a/sources/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala
index b737f48886..b737f48886 100644
--- a/sources/scala/collection/immutable/Map.scala
+++ b/src/library/scala/collection/immutable/Map.scala
diff --git a/sources/scala/collection/immutable/Queue.scala b/src/library/scala/collection/immutable/Queue.scala
index cb005d3b5e..cb005d3b5e 100644
--- a/sources/scala/collection/immutable/Queue.scala
+++ b/src/library/scala/collection/immutable/Queue.scala
diff --git a/sources/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala
index af3340e8f1..af3340e8f1 100644
--- a/sources/scala/collection/immutable/Set.scala
+++ b/src/library/scala/collection/immutable/Set.scala
diff --git a/sources/scala/collection/immutable/Stack.scala b/src/library/scala/collection/immutable/Stack.scala
index 46b15794a3..46b15794a3 100644
--- a/sources/scala/collection/immutable/Stack.scala
+++ b/src/library/scala/collection/immutable/Stack.scala
diff --git a/sources/scala/collection/immutable/Tree.scala b/src/library/scala/collection/immutable/Tree.scala
index fdb3f8cf46..fdb3f8cf46 100644
--- a/sources/scala/collection/immutable/Tree.scala
+++ b/src/library/scala/collection/immutable/Tree.scala
diff --git a/sources/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala
index 12814b7a41..12814b7a41 100644
--- a/sources/scala/collection/immutable/TreeMap.scala
+++ b/src/library/scala/collection/immutable/TreeMap.scala
diff --git a/sources/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala
index bb3099e007..bb3099e007 100644
--- a/sources/scala/collection/immutable/TreeSet.scala
+++ b/src/library/scala/collection/immutable/TreeSet.scala
diff --git a/sources/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala
index e89e1a9c81..e89e1a9c81 100644
--- a/sources/scala/collection/mutable/ArrayBuffer.scala
+++ b/src/library/scala/collection/mutable/ArrayBuffer.scala
diff --git a/sources/scala/collection/mutable/BitSet.scala b/src/library/scala/collection/mutable/BitSet.scala
index 40d0bf0529..40d0bf0529 100644
--- a/sources/scala/collection/mutable/BitSet.scala
+++ b/src/library/scala/collection/mutable/BitSet.scala
diff --git a/sources/scala/collection/mutable/Buffer.scala b/src/library/scala/collection/mutable/Buffer.scala
index f1e8d0fe9b..f1e8d0fe9b 100644
--- a/sources/scala/collection/mutable/Buffer.scala
+++ b/src/library/scala/collection/mutable/Buffer.scala
diff --git a/sources/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala
index c06202024a..c06202024a 100644
--- a/sources/scala/collection/mutable/BufferProxy.scala
+++ b/src/library/scala/collection/mutable/BufferProxy.scala
diff --git a/sources/scala/collection/mutable/DefaultMapModel.scala b/src/library/scala/collection/mutable/DefaultMapModel.scala
index 6ae089bc3e..6ae089bc3e 100644
--- a/sources/scala/collection/mutable/DefaultMapModel.scala
+++ b/src/library/scala/collection/mutable/DefaultMapModel.scala
diff --git a/sources/scala/collection/mutable/DoubleLinkedList.scala b/src/library/scala/collection/mutable/DoubleLinkedList.scala
index 977f42b23a..977f42b23a 100644
--- a/sources/scala/collection/mutable/DoubleLinkedList.scala
+++ b/src/library/scala/collection/mutable/DoubleLinkedList.scala
diff --git a/sources/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala
index dcdde2e40c..dcdde2e40c 100644
--- a/sources/scala/collection/mutable/HashMap.scala
+++ b/src/library/scala/collection/mutable/HashMap.scala
diff --git a/sources/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala
index 7f71b037b4..7f71b037b4 100644
--- a/sources/scala/collection/mutable/HashSet.scala
+++ b/src/library/scala/collection/mutable/HashSet.scala
diff --git a/sources/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala
index 984f33f561..984f33f561 100644
--- a/sources/scala/collection/mutable/HashTable.scala
+++ b/src/library/scala/collection/mutable/HashTable.scala
diff --git a/sources/scala/collection/mutable/History.scala b/src/library/scala/collection/mutable/History.scala
index 43be629602..43be629602 100644
--- a/sources/scala/collection/mutable/History.scala
+++ b/src/library/scala/collection/mutable/History.scala
diff --git a/sources/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
index 5167636b40..5167636b40 100644
--- a/sources/scala/collection/mutable/ImmutableMapAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
diff --git a/sources/scala/collection/mutable/ImmutableSetAdaptor.scala b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
index 623074b3d9..623074b3d9 100644
--- a/sources/scala/collection/mutable/ImmutableSetAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
diff --git a/sources/scala/collection/mutable/JavaMapAdaptor.scala b/src/library/scala/collection/mutable/JavaMapAdaptor.scala
index 3679e787e8..3679e787e8 100644
--- a/sources/scala/collection/mutable/JavaMapAdaptor.scala
+++ b/src/library/scala/collection/mutable/JavaMapAdaptor.scala
diff --git a/sources/scala/collection/mutable/JavaSetAdaptor.scala b/src/library/scala/collection/mutable/JavaSetAdaptor.scala
index 3279e85a13..3279e85a13 100644
--- a/sources/scala/collection/mutable/JavaSetAdaptor.scala
+++ b/src/library/scala/collection/mutable/JavaSetAdaptor.scala
diff --git a/sources/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala
index c08928a04a..c08928a04a 100644
--- a/sources/scala/collection/mutable/LinkedList.scala
+++ b/src/library/scala/collection/mutable/LinkedList.scala
diff --git a/sources/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala
index 527741bbc9..527741bbc9 100644
--- a/sources/scala/collection/mutable/ListBuffer.scala
+++ b/src/library/scala/collection/mutable/ListBuffer.scala
diff --git a/sources/scala/collection/mutable/Location.scala b/src/library/scala/collection/mutable/Location.scala
index 30abd06781..30abd06781 100644
--- a/sources/scala/collection/mutable/Location.scala
+++ b/src/library/scala/collection/mutable/Location.scala
diff --git a/sources/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala
index 75f544193e..75f544193e 100644
--- a/sources/scala/collection/mutable/Map.scala
+++ b/src/library/scala/collection/mutable/Map.scala
diff --git a/sources/scala/collection/mutable/MapProxy.scala b/src/library/scala/collection/mutable/MapProxy.scala
index 8081e3a66a..8081e3a66a 100644
--- a/sources/scala/collection/mutable/MapProxy.scala
+++ b/src/library/scala/collection/mutable/MapProxy.scala
diff --git a/sources/scala/collection/mutable/Message.scala b/src/library/scala/collection/mutable/Message.scala
index bd805c5d6e..bd805c5d6e 100644
--- a/sources/scala/collection/mutable/Message.scala
+++ b/src/library/scala/collection/mutable/Message.scala
diff --git a/sources/scala/collection/mutable/MultiMap.scala b/src/library/scala/collection/mutable/MultiMap.scala
index 0569d0b0c9..0569d0b0c9 100644
--- a/sources/scala/collection/mutable/MultiMap.scala
+++ b/src/library/scala/collection/mutable/MultiMap.scala
diff --git a/sources/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala
index 37bb9ada63..37bb9ada63 100644
--- a/sources/scala/collection/mutable/MutableList.scala
+++ b/src/library/scala/collection/mutable/MutableList.scala
diff --git a/sources/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala
index e3439b1dff..e3439b1dff 100644
--- a/sources/scala/collection/mutable/ObservableBuffer.scala
+++ b/src/library/scala/collection/mutable/ObservableBuffer.scala
diff --git a/sources/scala/collection/mutable/ObservableMap.scala b/src/library/scala/collection/mutable/ObservableMap.scala
index 207a294753..207a294753 100644
--- a/sources/scala/collection/mutable/ObservableMap.scala
+++ b/src/library/scala/collection/mutable/ObservableMap.scala
diff --git a/sources/scala/collection/mutable/ObservableSet.scala b/src/library/scala/collection/mutable/ObservableSet.scala
index 656545d78e..656545d78e 100644
--- a/sources/scala/collection/mutable/ObservableSet.scala
+++ b/src/library/scala/collection/mutable/ObservableSet.scala
diff --git a/sources/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala
index 83552417cc..83552417cc 100644
--- a/sources/scala/collection/mutable/PriorityQueue.scala
+++ b/src/library/scala/collection/mutable/PriorityQueue.scala
diff --git a/sources/scala/collection/mutable/PriorityQueueProxy.scala b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
index e78b98065f..e78b98065f 100644
--- a/sources/scala/collection/mutable/PriorityQueueProxy.scala
+++ b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
diff --git a/sources/scala/collection/mutable/Publisher.scala b/src/library/scala/collection/mutable/Publisher.scala
index ee442eccd2..ee442eccd2 100644
--- a/sources/scala/collection/mutable/Publisher.scala
+++ b/src/library/scala/collection/mutable/Publisher.scala
diff --git a/sources/scala/collection/mutable/Queue.scala b/src/library/scala/collection/mutable/Queue.scala
index 0d297f5e0d..0d297f5e0d 100644
--- a/sources/scala/collection/mutable/Queue.scala
+++ b/src/library/scala/collection/mutable/Queue.scala
diff --git a/sources/scala/collection/mutable/QueueProxy.scala b/src/library/scala/collection/mutable/QueueProxy.scala
index 65c426a9c2..65c426a9c2 100644
--- a/sources/scala/collection/mutable/QueueProxy.scala
+++ b/src/library/scala/collection/mutable/QueueProxy.scala
diff --git a/sources/scala/collection/mutable/ResizableArray.scala b/src/library/scala/collection/mutable/ResizableArray.scala
index 5f1c5f053c..5f1c5f053c 100644
--- a/sources/scala/collection/mutable/ResizableArray.scala
+++ b/src/library/scala/collection/mutable/ResizableArray.scala
diff --git a/sources/scala/collection/mutable/RevertableHistory.scala b/src/library/scala/collection/mutable/RevertableHistory.scala
index c9bb1ef6d1..c9bb1ef6d1 100644
--- a/sources/scala/collection/mutable/RevertableHistory.scala
+++ b/src/library/scala/collection/mutable/RevertableHistory.scala
diff --git a/sources/scala/collection/mutable/Scriptable.scala b/src/library/scala/collection/mutable/Scriptable.scala
index 448109bde3..448109bde3 100644
--- a/sources/scala/collection/mutable/Scriptable.scala
+++ b/src/library/scala/collection/mutable/Scriptable.scala
diff --git a/sources/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala
index d493ee1560..d493ee1560 100644
--- a/sources/scala/collection/mutable/Set.scala
+++ b/src/library/scala/collection/mutable/Set.scala
diff --git a/sources/scala/collection/mutable/SetProxy.scala b/src/library/scala/collection/mutable/SetProxy.scala
index 4cd759a60d..4cd759a60d 100644
--- a/sources/scala/collection/mutable/SetProxy.scala
+++ b/src/library/scala/collection/mutable/SetProxy.scala
diff --git a/sources/scala/collection/mutable/SingleLinkedList.scala b/src/library/scala/collection/mutable/SingleLinkedList.scala
index b60d32ba1b..b60d32ba1b 100644
--- a/sources/scala/collection/mutable/SingleLinkedList.scala
+++ b/src/library/scala/collection/mutable/SingleLinkedList.scala
diff --git a/sources/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala
index 0cf269dba7..0cf269dba7 100644
--- a/sources/scala/collection/mutable/Stack.scala
+++ b/src/library/scala/collection/mutable/Stack.scala
diff --git a/sources/scala/collection/mutable/StackProxy.scala b/src/library/scala/collection/mutable/StackProxy.scala
index cfca6ca56c..cfca6ca56c 100644
--- a/sources/scala/collection/mutable/StackProxy.scala
+++ b/src/library/scala/collection/mutable/StackProxy.scala
diff --git a/sources/scala/collection/mutable/Subscriber.scala b/src/library/scala/collection/mutable/Subscriber.scala
index 30ca2d03e2..30ca2d03e2 100644
--- a/sources/scala/collection/mutable/Subscriber.scala
+++ b/src/library/scala/collection/mutable/Subscriber.scala
diff --git a/sources/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
index e15c59b4b4..e15c59b4b4 100644
--- a/sources/scala/collection/mutable/SynchronizedBuffer.scala
+++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
diff --git a/sources/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala
index b0db7078de..b0db7078de 100644
--- a/sources/scala/collection/mutable/SynchronizedMap.scala
+++ b/src/library/scala/collection/mutable/SynchronizedMap.scala
diff --git a/sources/scala/collection/mutable/SynchronizedPriorityQueue.scala b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
index 8b3078e74b..8b3078e74b 100644
--- a/sources/scala/collection/mutable/SynchronizedPriorityQueue.scala
+++ b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
diff --git a/sources/scala/collection/mutable/SynchronizedQueue.scala b/src/library/scala/collection/mutable/SynchronizedQueue.scala
index 74fb9782b5..74fb9782b5 100644
--- a/sources/scala/collection/mutable/SynchronizedQueue.scala
+++ b/src/library/scala/collection/mutable/SynchronizedQueue.scala
diff --git a/sources/scala/collection/mutable/SynchronizedSet.scala b/src/library/scala/collection/mutable/SynchronizedSet.scala
index 743a5a85c4..743a5a85c4 100644
--- a/sources/scala/collection/mutable/SynchronizedSet.scala
+++ b/src/library/scala/collection/mutable/SynchronizedSet.scala
diff --git a/sources/scala/collection/mutable/SynchronizedStack.scala b/src/library/scala/collection/mutable/SynchronizedStack.scala
index c21a17b22d..c21a17b22d 100644
--- a/sources/scala/collection/mutable/SynchronizedStack.scala
+++ b/src/library/scala/collection/mutable/SynchronizedStack.scala
diff --git a/sources/scala/collection/mutable/Undoable.scala b/src/library/scala/collection/mutable/Undoable.scala
index 62e7335411..62e7335411 100644
--- a/sources/scala/collection/mutable/Undoable.scala
+++ b/src/library/scala/collection/mutable/Undoable.scala
diff --git a/sources/scala/concurrent/Actor.scala b/src/library/scala/concurrent/Actor.scala
index 4ba4ab3078..4ba4ab3078 100644
--- a/sources/scala/concurrent/Actor.scala
+++ b/src/library/scala/concurrent/Actor.scala
diff --git a/sources/scala/concurrent/Channel.scala b/src/library/scala/concurrent/Channel.scala
index a57fd7f530..a57fd7f530 100644
--- a/sources/scala/concurrent/Channel.scala
+++ b/src/library/scala/concurrent/Channel.scala
diff --git a/sources/scala/concurrent/Lock.scala b/src/library/scala/concurrent/Lock.scala
index a473c358c8..a473c358c8 100644
--- a/sources/scala/concurrent/Lock.scala
+++ b/src/library/scala/concurrent/Lock.scala
diff --git a/sources/scala/concurrent/MailBox.scala b/src/library/scala/concurrent/MailBox.scala
index 427d424b28..427d424b28 100644
--- a/sources/scala/concurrent/MailBox.scala
+++ b/src/library/scala/concurrent/MailBox.scala
diff --git a/sources/scala/concurrent/NameServer.scala b/src/library/scala/concurrent/NameServer.scala
index b7646e6deb..b7646e6deb 100644
--- a/sources/scala/concurrent/NameServer.scala
+++ b/src/library/scala/concurrent/NameServer.scala
diff --git a/sources/scala/concurrent/Process.scala b/src/library/scala/concurrent/Process.scala
index 950220da35..950220da35 100644
--- a/sources/scala/concurrent/Process.scala
+++ b/src/library/scala/concurrent/Process.scala
diff --git a/sources/scala/concurrent/SyncChannel.scala b/src/library/scala/concurrent/SyncChannel.scala
index 6cab7b2ad6..6cab7b2ad6 100644
--- a/sources/scala/concurrent/SyncChannel.scala
+++ b/src/library/scala/concurrent/SyncChannel.scala
diff --git a/sources/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala
index 0e1b9fd38c..0e1b9fd38c 100644
--- a/sources/scala/concurrent/SyncVar.scala
+++ b/src/library/scala/concurrent/SyncVar.scala
diff --git a/sources/scala/concurrent/TIMEOUT.scala b/src/library/scala/concurrent/TIMEOUT.scala
index d665fdf649..d665fdf649 100644
--- a/sources/scala/concurrent/TIMEOUT.scala
+++ b/src/library/scala/concurrent/TIMEOUT.scala
diff --git a/sources/scala/concurrent/jolib.scala b/src/library/scala/concurrent/jolib.scala
index 08611be513..08611be513 100644
--- a/sources/scala/concurrent/jolib.scala
+++ b/src/library/scala/concurrent/jolib.scala
diff --git a/sources/scala/concurrent/ops.scala b/src/library/scala/concurrent/ops.scala
index 04bee676ec..04bee676ec 100644
--- a/sources/scala/concurrent/ops.scala
+++ b/src/library/scala/concurrent/ops.scala
diff --git a/sources/scala/concurrent/pilib.scala b/src/library/scala/concurrent/pilib.scala
index 6ce7a560af..6ce7a560af 100644
--- a/sources/scala/concurrent/pilib.scala
+++ b/src/library/scala/concurrent/pilib.scala
diff --git a/sources/scala/dbc/DataType.scala b/src/library/scala/dbc/DataType.scala
index b984169350..b984169350 100644
--- a/sources/scala/dbc/DataType.scala
+++ b/src/library/scala/dbc/DataType.scala
diff --git a/sources/scala/dbc/Database.scala b/src/library/scala/dbc/Database.scala
index 28270184b5..28270184b5 100644
--- a/sources/scala/dbc/Database.scala
+++ b/src/library/scala/dbc/Database.scala
diff --git a/sources/scala/dbc/Syntax.scala b/src/library/scala/dbc/Syntax.scala
index cde8112979..cde8112979 100644
--- a/sources/scala/dbc/Syntax.scala
+++ b/src/library/scala/dbc/Syntax.scala
diff --git a/sources/scala/dbc/Utilities.scala b/src/library/scala/dbc/Utilities.scala
index 46ca27a019..46ca27a019 100644
--- a/sources/scala/dbc/Utilities.scala
+++ b/src/library/scala/dbc/Utilities.scala
diff --git a/sources/scala/dbc/Value.scala b/src/library/scala/dbc/Value.scala
index 3ab2d0cbe5..3ab2d0cbe5 100644
--- a/sources/scala/dbc/Value.scala
+++ b/src/library/scala/dbc/Value.scala
diff --git a/sources/scala/dbc/Vendor.scala b/src/library/scala/dbc/Vendor.scala
index db44ddec42..db44ddec42 100644
--- a/sources/scala/dbc/Vendor.scala
+++ b/src/library/scala/dbc/Vendor.scala
diff --git a/sources/scala/dbc/datatype/ApproximateNumeric.scala b/src/library/scala/dbc/datatype/ApproximateNumeric.scala
index d75da1eb50..d75da1eb50 100644
--- a/sources/scala/dbc/datatype/ApproximateNumeric.scala
+++ b/src/library/scala/dbc/datatype/ApproximateNumeric.scala
diff --git a/sources/scala/dbc/datatype/Boolean.scala b/src/library/scala/dbc/datatype/Boolean.scala
index 7c68ab9c7d..7c68ab9c7d 100644
--- a/sources/scala/dbc/datatype/Boolean.scala
+++ b/src/library/scala/dbc/datatype/Boolean.scala
diff --git a/sources/scala/dbc/datatype/Character.scala b/src/library/scala/dbc/datatype/Character.scala
index ded08c5602..ded08c5602 100644
--- a/sources/scala/dbc/datatype/Character.scala
+++ b/src/library/scala/dbc/datatype/Character.scala
diff --git a/sources/scala/dbc/datatype/CharacterLargeObject.scala b/src/library/scala/dbc/datatype/CharacterLargeObject.scala
index adbd979f6e..adbd979f6e 100644
--- a/sources/scala/dbc/datatype/CharacterLargeObject.scala
+++ b/src/library/scala/dbc/datatype/CharacterLargeObject.scala
diff --git a/sources/scala/dbc/datatype/CharacterString.scala b/src/library/scala/dbc/datatype/CharacterString.scala
index e937d10b9e..e937d10b9e 100644
--- a/sources/scala/dbc/datatype/CharacterString.scala
+++ b/src/library/scala/dbc/datatype/CharacterString.scala
diff --git a/sources/scala/dbc/datatype/CharacterVarying.scala b/src/library/scala/dbc/datatype/CharacterVarying.scala
index b7f743ce0b..b7f743ce0b 100644
--- a/sources/scala/dbc/datatype/CharacterVarying.scala
+++ b/src/library/scala/dbc/datatype/CharacterVarying.scala
diff --git a/sources/scala/dbc/datatype/ExactNumeric.scala b/src/library/scala/dbc/datatype/ExactNumeric.scala
index 9152a7e928..9152a7e928 100644
--- a/sources/scala/dbc/datatype/ExactNumeric.scala
+++ b/src/library/scala/dbc/datatype/ExactNumeric.scala
diff --git a/sources/scala/dbc/datatype/Factory.scala b/src/library/scala/dbc/datatype/Factory.scala
index 13d9cd35e2..13d9cd35e2 100644
--- a/sources/scala/dbc/datatype/Factory.scala
+++ b/src/library/scala/dbc/datatype/Factory.scala
diff --git a/sources/scala/dbc/datatype/Numeric.scala b/src/library/scala/dbc/datatype/Numeric.scala
index ef3eee1f32..ef3eee1f32 100644
--- a/sources/scala/dbc/datatype/Numeric.scala
+++ b/src/library/scala/dbc/datatype/Numeric.scala
diff --git a/sources/scala/dbc/datatype/String.scala b/src/library/scala/dbc/datatype/String.scala
index 7d409e6c2d..7d409e6c2d 100644
--- a/sources/scala/dbc/datatype/String.scala
+++ b/src/library/scala/dbc/datatype/String.scala
diff --git a/sources/scala/dbc/datatype/Unknown.scala b/src/library/scala/dbc/datatype/Unknown.scala
index 1e7895eb46..1e7895eb46 100644
--- a/sources/scala/dbc/datatype/Unknown.scala
+++ b/src/library/scala/dbc/datatype/Unknown.scala
diff --git a/sources/scala/dbc/exception/IncompatibleSchema.scala b/src/library/scala/dbc/exception/IncompatibleSchema.scala
index 6095fbec82..6095fbec82 100644
--- a/sources/scala/dbc/exception/IncompatibleSchema.scala
+++ b/src/library/scala/dbc/exception/IncompatibleSchema.scala
diff --git a/sources/scala/dbc/exception/UnsupportedFeature.scala b/src/library/scala/dbc/exception/UnsupportedFeature.scala
index 9fbaed81d7..9fbaed81d7 100644
--- a/sources/scala/dbc/exception/UnsupportedFeature.scala
+++ b/src/library/scala/dbc/exception/UnsupportedFeature.scala
diff --git a/sources/scala/dbc/result/Field.scala b/src/library/scala/dbc/result/Field.scala
index af129d18b7..af129d18b7 100644
--- a/sources/scala/dbc/result/Field.scala
+++ b/src/library/scala/dbc/result/Field.scala
diff --git a/sources/scala/dbc/result/FieldMetadata.scala b/src/library/scala/dbc/result/FieldMetadata.scala
index 97c5bdb3a3..97c5bdb3a3 100644
--- a/sources/scala/dbc/result/FieldMetadata.scala
+++ b/src/library/scala/dbc/result/FieldMetadata.scala
diff --git a/sources/scala/dbc/result/Relation.scala b/src/library/scala/dbc/result/Relation.scala
index 006b6dbf07..006b6dbf07 100644
--- a/sources/scala/dbc/result/Relation.scala
+++ b/src/library/scala/dbc/result/Relation.scala
diff --git a/sources/scala/dbc/result/Status.scala b/src/library/scala/dbc/result/Status.scala
index 56d83d4ae6..56d83d4ae6 100644
--- a/sources/scala/dbc/result/Status.scala
+++ b/src/library/scala/dbc/result/Status.scala
diff --git a/sources/scala/dbc/result/Tuple.scala b/src/library/scala/dbc/result/Tuple.scala
index 41c2f1f6d1..41c2f1f6d1 100644
--- a/sources/scala/dbc/result/Tuple.scala
+++ b/src/library/scala/dbc/result/Tuple.scala
diff --git a/sources/scala/dbc/statement/AccessMode.scala b/src/library/scala/dbc/statement/AccessMode.scala
index 815f8b3c37..815f8b3c37 100644
--- a/sources/scala/dbc/statement/AccessMode.scala
+++ b/src/library/scala/dbc/statement/AccessMode.scala
diff --git a/sources/scala/dbc/statement/DerivedColumn.scala b/src/library/scala/dbc/statement/DerivedColumn.scala
index 020304f979..020304f979 100644
--- a/sources/scala/dbc/statement/DerivedColumn.scala
+++ b/src/library/scala/dbc/statement/DerivedColumn.scala
diff --git a/sources/scala/dbc/statement/Expression.scala b/src/library/scala/dbc/statement/Expression.scala
index 51cada90bb..51cada90bb 100644
--- a/sources/scala/dbc/statement/Expression.scala
+++ b/src/library/scala/dbc/statement/Expression.scala
diff --git a/sources/scala/dbc/statement/Insert.scala b/src/library/scala/dbc/statement/Insert.scala
index 23f93ec4a0..23f93ec4a0 100644
--- a/sources/scala/dbc/statement/Insert.scala
+++ b/src/library/scala/dbc/statement/Insert.scala
diff --git a/sources/scala/dbc/statement/InsertionData.scala b/src/library/scala/dbc/statement/InsertionData.scala
index 2d6f370319..2d6f370319 100644
--- a/sources/scala/dbc/statement/InsertionData.scala
+++ b/src/library/scala/dbc/statement/InsertionData.scala
diff --git a/sources/scala/dbc/statement/IsolationLevel.scala b/src/library/scala/dbc/statement/IsolationLevel.scala
index f63ebe39e8..f63ebe39e8 100644
--- a/sources/scala/dbc/statement/IsolationLevel.scala
+++ b/src/library/scala/dbc/statement/IsolationLevel.scala
diff --git a/sources/scala/dbc/statement/JoinType.scala b/src/library/scala/dbc/statement/JoinType.scala
index 60d14cf968..60d14cf968 100644
--- a/sources/scala/dbc/statement/JoinType.scala
+++ b/src/library/scala/dbc/statement/JoinType.scala
diff --git a/sources/scala/dbc/statement/Jointure.scala b/src/library/scala/dbc/statement/Jointure.scala
index b2ea55d5c9..b2ea55d5c9 100644
--- a/sources/scala/dbc/statement/Jointure.scala
+++ b/src/library/scala/dbc/statement/Jointure.scala
diff --git a/sources/scala/dbc/statement/Relation.scala b/src/library/scala/dbc/statement/Relation.scala
index 5e9c24025f..a6e1a283c9 100644
--- a/sources/scala/dbc/statement/Relation.scala
+++ b/src/library/scala/dbc/statement/Relation.scala
@@ -15,7 +15,6 @@ abstract class Relation extends Statement {
     ((dt,wdt)=>dt.isSubtypeOf(wdt));
 
   def typeCheck (relation: result.Relation): Unit = {
-    if (typeCheck != Nil) {
       val sameType: Boolean = (
 	relation.metadata.length == fieldTypes.length &&
 	(relation.metadata.zip(fieldTypes).forall({case Pair(field,expectedType) =>
@@ -23,7 +22,6 @@ abstract class Relation extends Statement {
       );
       if (!sameType)
 	throw new exception.IncompatibleSchema(fieldTypes,relation.metadata.map(field=>field.datatype));
-    }
   }
 
   def fieldTypes: List[DataType];
diff --git a/sources/scala/dbc/statement/Select.scala b/src/library/scala/dbc/statement/Select.scala
index 47c449d0e1..47c449d0e1 100644
--- a/sources/scala/dbc/statement/Select.scala
+++ b/src/library/scala/dbc/statement/Select.scala
diff --git a/sources/scala/dbc/statement/SetClause.scala b/src/library/scala/dbc/statement/SetClause.scala
index 292879d3d0..292879d3d0 100644
--- a/sources/scala/dbc/statement/SetClause.scala
+++ b/src/library/scala/dbc/statement/SetClause.scala
diff --git a/sources/scala/dbc/statement/SetQuantifier.scala b/src/library/scala/dbc/statement/SetQuantifier.scala
index a2fbbb854a..a2fbbb854a 100644
--- a/sources/scala/dbc/statement/SetQuantifier.scala
+++ b/src/library/scala/dbc/statement/SetQuantifier.scala
diff --git a/sources/scala/dbc/statement/Statement.scala b/src/library/scala/dbc/statement/Statement.scala
index 64f0967483..64f0967483 100644
--- a/sources/scala/dbc/statement/Statement.scala
+++ b/src/library/scala/dbc/statement/Statement.scala
diff --git a/sources/scala/dbc/statement/Status.scala b/src/library/scala/dbc/statement/Status.scala
index 61ab479199..61ab479199 100644
--- a/sources/scala/dbc/statement/Status.scala
+++ b/src/library/scala/dbc/statement/Status.scala
diff --git a/sources/scala/dbc/statement/Table.scala b/src/library/scala/dbc/statement/Table.scala
index 18a065e221..18a065e221 100644
--- a/sources/scala/dbc/statement/Table.scala
+++ b/src/library/scala/dbc/statement/Table.scala
diff --git a/sources/scala/dbc/statement/Transaction.scala b/src/library/scala/dbc/statement/Transaction.scala
index b87c0ccc35..b87c0ccc35 100644
--- a/sources/scala/dbc/statement/Transaction.scala
+++ b/src/library/scala/dbc/statement/Transaction.scala
diff --git a/sources/scala/dbc/statement/Update.scala b/src/library/scala/dbc/statement/Update.scala
index bc541200c4..bc541200c4 100644
--- a/sources/scala/dbc/statement/Update.scala
+++ b/src/library/scala/dbc/statement/Update.scala
diff --git a/sources/scala/dbc/statement/expression/Aggregate.scala b/src/library/scala/dbc/statement/expression/Aggregate.scala
index d0dfd6a133..d0dfd6a133 100644
--- a/sources/scala/dbc/statement/expression/Aggregate.scala
+++ b/src/library/scala/dbc/statement/expression/Aggregate.scala
diff --git a/sources/scala/dbc/statement/expression/BinaryOperator.scala b/src/library/scala/dbc/statement/expression/BinaryOperator.scala
index a0d964a798..a0d964a798 100644
--- a/sources/scala/dbc/statement/expression/BinaryOperator.scala
+++ b/src/library/scala/dbc/statement/expression/BinaryOperator.scala
diff --git a/sources/scala/dbc/statement/expression/Constant.scala b/src/library/scala/dbc/statement/expression/Constant.scala
index 12a089ea48..12a089ea48 100644
--- a/sources/scala/dbc/statement/expression/Constant.scala
+++ b/src/library/scala/dbc/statement/expression/Constant.scala
diff --git a/sources/scala/dbc/statement/expression/Default.scala b/src/library/scala/dbc/statement/expression/Default.scala
index 2b84a6ce4f..2b84a6ce4f 100644
--- a/sources/scala/dbc/statement/expression/Default.scala
+++ b/src/library/scala/dbc/statement/expression/Default.scala
diff --git a/sources/scala/dbc/statement/expression/Field.scala b/src/library/scala/dbc/statement/expression/Field.scala
index 55b7c96053..55b7c96053 100644
--- a/sources/scala/dbc/statement/expression/Field.scala
+++ b/src/library/scala/dbc/statement/expression/Field.scala
diff --git a/sources/scala/dbc/statement/expression/FunctionCall.scala b/src/library/scala/dbc/statement/expression/FunctionCall.scala
index 030b05812b..030b05812b 100644
--- a/sources/scala/dbc/statement/expression/FunctionCall.scala
+++ b/src/library/scala/dbc/statement/expression/FunctionCall.scala
diff --git a/sources/scala/dbc/statement/expression/Select.scala b/src/library/scala/dbc/statement/expression/Select.scala
index bce9a5d002..bce9a5d002 100644
--- a/sources/scala/dbc/statement/expression/Select.scala
+++ b/src/library/scala/dbc/statement/expression/Select.scala
diff --git a/sources/scala/dbc/statement/expression/SetFunction.scala b/src/library/scala/dbc/statement/expression/SetFunction.scala
index 6a3ba37d2d..6a3ba37d2d 100644
--- a/sources/scala/dbc/statement/expression/SetFunction.scala
+++ b/src/library/scala/dbc/statement/expression/SetFunction.scala
diff --git a/sources/scala/dbc/statement/expression/TypeCast.scala b/src/library/scala/dbc/statement/expression/TypeCast.scala
index 25d1874381..25d1874381 100644
--- a/sources/scala/dbc/statement/expression/TypeCast.scala
+++ b/src/library/scala/dbc/statement/expression/TypeCast.scala
diff --git a/sources/scala/dbc/statement/expression/UnaryOperator.scala b/src/library/scala/dbc/statement/expression/UnaryOperator.scala
index 1e7ab028f7..1e7ab028f7 100644
--- a/sources/scala/dbc/statement/expression/UnaryOperator.scala
+++ b/src/library/scala/dbc/statement/expression/UnaryOperator.scala
diff --git a/sources/scala/dbc/syntax/DataTypeUtil.scala b/src/library/scala/dbc/syntax/DataTypeUtil.scala
index 1df3d20317..1df3d20317 100644
--- a/sources/scala/dbc/syntax/DataTypeUtil.scala
+++ b/src/library/scala/dbc/syntax/DataTypeUtil.scala
diff --git a/sources/scala/dbc/syntax/Database.scala b/src/library/scala/dbc/syntax/Database.scala
index d819931e95..d819931e95 100644
--- a/sources/scala/dbc/syntax/Database.scala
+++ b/src/library/scala/dbc/syntax/Database.scala
diff --git a/sources/scala/dbc/syntax/Statement.scala b/src/library/scala/dbc/syntax/Statement.scala
index c4dd2e7434..c4dd2e7434 100644
--- a/sources/scala/dbc/syntax/Statement.scala
+++ b/src/library/scala/dbc/syntax/Statement.scala
diff --git a/sources/scala/dbc/syntax/StatementExpression.scala b/src/library/scala/dbc/syntax/StatementExpression.scala
index e03be2a476..e03be2a476 100644
--- a/sources/scala/dbc/syntax/StatementExpression.scala
+++ b/src/library/scala/dbc/syntax/StatementExpression.scala
diff --git a/sources/scala/dbc/value/ApproximateNumeric.scala b/src/library/scala/dbc/value/ApproximateNumeric.scala
index 4b0c495f54..4b0c495f54 100644
--- a/sources/scala/dbc/value/ApproximateNumeric.scala
+++ b/src/library/scala/dbc/value/ApproximateNumeric.scala
diff --git a/sources/scala/dbc/value/Boolean.scala b/src/library/scala/dbc/value/Boolean.scala
index fa20a066af..fa20a066af 100644
--- a/sources/scala/dbc/value/Boolean.scala
+++ b/src/library/scala/dbc/value/Boolean.scala
diff --git a/sources/scala/dbc/value/Character.scala b/src/library/scala/dbc/value/Character.scala
index 1d5433b991..1d5433b991 100644
--- a/sources/scala/dbc/value/Character.scala
+++ b/src/library/scala/dbc/value/Character.scala
diff --git a/sources/scala/dbc/value/CharacterLargeObject.scala b/src/library/scala/dbc/value/CharacterLargeObject.scala
index c4fb7097e0..c4fb7097e0 100644
--- a/sources/scala/dbc/value/CharacterLargeObject.scala
+++ b/src/library/scala/dbc/value/CharacterLargeObject.scala
diff --git a/sources/scala/dbc/value/CharacterVarying.scala b/src/library/scala/dbc/value/CharacterVarying.scala
index 61142e536c..61142e536c 100644
--- a/sources/scala/dbc/value/CharacterVarying.scala
+++ b/src/library/scala/dbc/value/CharacterVarying.scala
diff --git a/sources/scala/dbc/value/Conversion.scala b/src/library/scala/dbc/value/Conversion.scala
index 5c5dda4220..5c5dda4220 100644
--- a/sources/scala/dbc/value/Conversion.scala
+++ b/src/library/scala/dbc/value/Conversion.scala
diff --git a/sources/scala/dbc/value/ExactNumeric.scala b/src/library/scala/dbc/value/ExactNumeric.scala
index f3e1a54aac..f3e1a54aac 100644
--- a/sources/scala/dbc/value/ExactNumeric.scala
+++ b/src/library/scala/dbc/value/ExactNumeric.scala
diff --git a/sources/scala/dbc/value/Factory.scala b/src/library/scala/dbc/value/Factory.scala
index b24f985354..b24f985354 100644
--- a/sources/scala/dbc/value/Factory.scala
+++ b/src/library/scala/dbc/value/Factory.scala
diff --git a/sources/scala/dbc/value/Unknown.scala b/src/library/scala/dbc/value/Unknown.scala
index b40df69011..b40df69011 100644
--- a/sources/scala/dbc/value/Unknown.scala
+++ b/src/library/scala/dbc/value/Unknown.scala
diff --git a/sources/scala/dbc/vendor/PostgreSQL.scala b/src/library/scala/dbc/vendor/PostgreSQL.scala
index 2653ed714a..2653ed714a 100644
--- a/sources/scala/dbc/vendor/PostgreSQL.scala
+++ b/src/library/scala/dbc/vendor/PostgreSQL.scala
diff --git a/sources/scala/io/Position.scala b/src/library/scala/io/Position.scala
index ef61e01317..ef61e01317 100644
--- a/sources/scala/io/Position.scala
+++ b/src/library/scala/io/Position.scala
diff --git a/sources/scala/io/Source.scala b/src/library/scala/io/Source.scala
index a22657e4be..a22657e4be 100644
--- a/sources/scala/io/Source.scala
+++ b/src/library/scala/io/Source.scala
diff --git a/sources/scala/mobile/Code.scala b/src/library/scala/mobile/Code.scala
index 1ce9997a3d..1ce9997a3d 100644
--- a/sources/scala/mobile/Code.scala
+++ b/src/library/scala/mobile/Code.scala
diff --git a/sources/scala/mobile/Location.scala b/src/library/scala/mobile/Location.scala
index c6f7d57648..c6f7d57648 100644
--- a/sources/scala/mobile/Location.scala
+++ b/src/library/scala/mobile/Location.scala
diff --git a/sources/scala/reflect/Code.scala b/src/library/scala/reflect/Code.scala
index b354bd753f..b354bd753f 100644
--- a/sources/scala/reflect/Code.scala
+++ b/src/library/scala/reflect/Code.scala
diff --git a/sources/scala/reflect/Print.scala b/src/library/scala/reflect/Print.scala
index decfe933cc..decfe933cc 100644
--- a/sources/scala/reflect/Print.scala
+++ b/src/library/scala/reflect/Print.scala
diff --git a/sources/scala/reflect/Symbol.scala b/src/library/scala/reflect/Symbol.scala
index 14be8e9317..14be8e9317 100644
--- a/sources/scala/reflect/Symbol.scala
+++ b/src/library/scala/reflect/Symbol.scala
diff --git a/sources/scala/reflect/Type.scala b/src/library/scala/reflect/Type.scala
index c0b86162f6..c0b86162f6 100644
--- a/sources/scala/reflect/Type.scala
+++ b/src/library/scala/reflect/Type.scala
diff --git a/sources/scala/reflect/TypedCode.scala b/src/library/scala/reflect/TypedCode.scala
index 38ce0512c7..38ce0512c7 100644
--- a/sources/scala/reflect/TypedCode.scala
+++ b/src/library/scala/reflect/TypedCode.scala
diff --git a/sources/scala/remote.scala b/src/library/scala/remote.scala
index 825cfbdc44..825cfbdc44 100644
--- a/sources/scala/remote.scala
+++ b/src/library/scala/remote.scala
diff --git a/sources/scala/runtime/AtomicReference.java b/src/library/scala/runtime/AtomicReference.java
index 7eb4abdb0e..7eb4abdb0e 100644
--- a/sources/scala/runtime/AtomicReference.java
+++ b/src/library/scala/runtime/AtomicReference.java
diff --git a/sources/scala/runtime/BooleanRef.java b/src/library/scala/runtime/BooleanRef.java
index f0ebcabe97..f0ebcabe97 100644
--- a/sources/scala/runtime/BooleanRef.java
+++ b/src/library/scala/runtime/BooleanRef.java
diff --git a/sources/scala/runtime/BoxedAnyArray.scala b/src/library/scala/runtime/BoxedAnyArray.scala
index ac37a62427..ac37a62427 100644
--- a/sources/scala/runtime/BoxedAnyArray.scala
+++ b/src/library/scala/runtime/BoxedAnyArray.scala
diff --git a/sources/scala/runtime/BoxedArray.scala b/src/library/scala/runtime/BoxedArray.scala
index 29b4ccf0e2..29b4ccf0e2 100644
--- a/sources/scala/runtime/BoxedArray.scala
+++ b/src/library/scala/runtime/BoxedArray.scala
diff --git a/sources/scala/runtime/BoxedBoolean.java b/src/library/scala/runtime/BoxedBoolean.java
index ad7ec887e4..ad7ec887e4 100644
--- a/sources/scala/runtime/BoxedBoolean.java
+++ b/src/library/scala/runtime/BoxedBoolean.java
diff --git a/sources/scala/runtime/BoxedBooleanArray.scala b/src/library/scala/runtime/BoxedBooleanArray.scala
index 27b4af2643..27b4af2643 100644
--- a/sources/scala/runtime/BoxedBooleanArray.scala
+++ b/src/library/scala/runtime/BoxedBooleanArray.scala
diff --git a/sources/scala/runtime/BoxedByte.java b/src/library/scala/runtime/BoxedByte.java
index b29570081e..b29570081e 100644
--- a/sources/scala/runtime/BoxedByte.java
+++ b/src/library/scala/runtime/BoxedByte.java
diff --git a/sources/scala/runtime/BoxedByteArray.scala b/src/library/scala/runtime/BoxedByteArray.scala
index e011b8e805..e011b8e805 100644
--- a/sources/scala/runtime/BoxedByteArray.scala
+++ b/src/library/scala/runtime/BoxedByteArray.scala
diff --git a/sources/scala/runtime/BoxedChar.java b/src/library/scala/runtime/BoxedChar.java
index 02b81e111d..02b81e111d 100644
--- a/sources/scala/runtime/BoxedChar.java
+++ b/src/library/scala/runtime/BoxedChar.java
diff --git a/sources/scala/runtime/BoxedCharArray.scala b/src/library/scala/runtime/BoxedCharArray.scala
index 49e3cba25c..49e3cba25c 100644
--- a/sources/scala/runtime/BoxedCharArray.scala
+++ b/src/library/scala/runtime/BoxedCharArray.scala
diff --git a/sources/scala/runtime/BoxedDouble.java b/src/library/scala/runtime/BoxedDouble.java
index 98736f03a4..98736f03a4 100644
--- a/sources/scala/runtime/BoxedDouble.java
+++ b/src/library/scala/runtime/BoxedDouble.java
diff --git a/sources/scala/runtime/BoxedDoubleArray.scala b/src/library/scala/runtime/BoxedDoubleArray.scala
index 752ab99950..752ab99950 100644
--- a/sources/scala/runtime/BoxedDoubleArray.scala
+++ b/src/library/scala/runtime/BoxedDoubleArray.scala
diff --git a/sources/scala/runtime/BoxedFloat.java b/src/library/scala/runtime/BoxedFloat.java
index 630ee6bece..630ee6bece 100644
--- a/sources/scala/runtime/BoxedFloat.java
+++ b/src/library/scala/runtime/BoxedFloat.java
diff --git a/sources/scala/runtime/BoxedFloatArray.scala b/src/library/scala/runtime/BoxedFloatArray.scala
index bdf25b8f6b..bdf25b8f6b 100644
--- a/sources/scala/runtime/BoxedFloatArray.scala
+++ b/src/library/scala/runtime/BoxedFloatArray.scala
diff --git a/sources/scala/runtime/BoxedInt.java b/src/library/scala/runtime/BoxedInt.java
index 9842fde1ad..9842fde1ad 100644
--- a/sources/scala/runtime/BoxedInt.java
+++ b/src/library/scala/runtime/BoxedInt.java
diff --git a/sources/scala/runtime/BoxedIntArray.scala b/src/library/scala/runtime/BoxedIntArray.scala
index 9d0db5b233..9d0db5b233 100644
--- a/sources/scala/runtime/BoxedIntArray.scala
+++ b/src/library/scala/runtime/BoxedIntArray.scala
diff --git a/sources/scala/runtime/BoxedLong.java b/src/library/scala/runtime/BoxedLong.java
index ebc86e4c92..ebc86e4c92 100644
--- a/sources/scala/runtime/BoxedLong.java
+++ b/src/library/scala/runtime/BoxedLong.java
diff --git a/sources/scala/runtime/BoxedLongArray.scala b/src/library/scala/runtime/BoxedLongArray.scala
index 624e992e01..624e992e01 100644
--- a/sources/scala/runtime/BoxedLongArray.scala
+++ b/src/library/scala/runtime/BoxedLongArray.scala
diff --git a/sources/scala/runtime/BoxedNumber.java b/src/library/scala/runtime/BoxedNumber.java
index a21abab2db..a21abab2db 100644
--- a/sources/scala/runtime/BoxedNumber.java
+++ b/src/library/scala/runtime/BoxedNumber.java
diff --git a/sources/scala/runtime/BoxedObjectArray.scala b/src/library/scala/runtime/BoxedObjectArray.scala
index 12ff59da8c..12ff59da8c 100644
--- a/sources/scala/runtime/BoxedObjectArray.scala
+++ b/src/library/scala/runtime/BoxedObjectArray.scala
diff --git a/sources/scala/runtime/BoxedShort.java b/src/library/scala/runtime/BoxedShort.java
index f1074c7b7f..f1074c7b7f 100644
--- a/sources/scala/runtime/BoxedShort.java
+++ b/src/library/scala/runtime/BoxedShort.java
diff --git a/sources/scala/runtime/BoxedShortArray.scala b/src/library/scala/runtime/BoxedShortArray.scala
index 01e00c5a21..01e00c5a21 100644
--- a/sources/scala/runtime/BoxedShortArray.scala
+++ b/src/library/scala/runtime/BoxedShortArray.scala
diff --git a/sources/scala/runtime/BoxedUnit.java b/src/library/scala/runtime/BoxedUnit.java
index 91e5f5d03a..91e5f5d03a 100644
--- a/sources/scala/runtime/BoxedUnit.java
+++ b/src/library/scala/runtime/BoxedUnit.java
diff --git a/sources/scala/runtime/ByteRef.java b/src/library/scala/runtime/ByteRef.java
index f4a98b8ff6..f4a98b8ff6 100644
--- a/sources/scala/runtime/ByteRef.java
+++ b/src/library/scala/runtime/ByteRef.java
diff --git a/sources/scala/runtime/CharRef.java b/src/library/scala/runtime/CharRef.java
index 71d3666b4e..71d3666b4e 100644
--- a/sources/scala/runtime/CharRef.java
+++ b/src/library/scala/runtime/CharRef.java
diff --git a/sources/scala/runtime/DoubleRef.java b/src/library/scala/runtime/DoubleRef.java
index a0fd0ff68b..a0fd0ff68b 100644
--- a/sources/scala/runtime/DoubleRef.java
+++ b/src/library/scala/runtime/DoubleRef.java
diff --git a/sources/scala/ScalaObject.cs b/src/library/scala/runtime/ExceptionHandling.cs
index 7f2b7f693b..0a59308f99 100644
--- a/sources/scala/ScalaObject.cs
+++ b/src/library/scala/runtime/ExceptionHandling.cs
@@ -9,16 +9,25 @@
 // $Id$
 
 using System;
-using scala.runtime;
+using scala;
 
-namespace scala 
-{
-	[Meta("class extends scala.AnyRef;")]
-	public interface ScalaObject 
-	{
-		/** This method is needed for optimizing pattern matching expressions
-		 *  which match on constructors of case classes.
-		 */
-		int __tag();
-	}
-}
\ No newline at end of file
+namespace scala.runtime {
+
+	public abstract class RunTime {
+	
+    public interface Runnable {
+      void run();
+    }
+
+    public static Exception tryCatch(Runnable runnable) {
+      try {
+        runnable.run();
+        return null;
+      } catch (Exception exception) {
+        return exception;
+			}
+    }
+  
+  }
+
+}
diff --git a/sources/scala/runtime/types/LazyParents.java b/src/library/scala/runtime/ExceptionHandling.java
index 7f3e64575c..293d2cad8e 100644
--- a/sources/scala/runtime/types/LazyParents.java
+++ b/src/library/scala/runtime/ExceptionHandling.java
@@ -1,6 +1,6 @@
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2005, LAMP/EPFL             **
+**    / __/ __// _ | / /  / _ |    (c) 2002-2005, LAMP/EPFL             **
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
@@ -8,15 +8,17 @@
 
 // $Id$
 
-package scala.runtime.types;
+package scala.runtime;
 
-/**
- * Abstract superclass for suspended computations of parent classes.
- *
- * @author Michel Schinz
- * @version 1.0
- */
+public abstract class ExceptionHandling {
+
+  public static Throwable tryCatch(Runnable runnable) {
+    try {
+      runnable.run();
+      return null;
+    } catch (Throwable exception) {
+      return exception;
+    }
+  }
 
-public abstract class LazyParents {
-    abstract public ScalaClassType[] force();
 }
diff --git a/sources/scala/runtime/FNV_Hash.java b/src/library/scala/runtime/FNV_Hash.java
index 6259c33efb..6259c33efb 100644
--- a/sources/scala/runtime/FNV_Hash.java
+++ b/src/library/scala/runtime/FNV_Hash.java
diff --git a/sources/scala/runtime/FloatRef.java b/src/library/scala/runtime/FloatRef.java
index dc8c332b66..dc8c332b66 100644
--- a/sources/scala/runtime/FloatRef.java
+++ b/src/library/scala/runtime/FloatRef.java
diff --git a/sources/scala/runtime/IOMap.java b/src/library/scala/runtime/IOMap.java
index e93b3c4a9d..e93b3c4a9d 100644
--- a/sources/scala/runtime/IOMap.java
+++ b/src/library/scala/runtime/IOMap.java
diff --git a/sources/scala/runtime/IntRef.java b/src/library/scala/runtime/IntRef.java
index 1f5feacec7..1f5feacec7 100644
--- a/sources/scala/runtime/IntRef.java
+++ b/src/library/scala/runtime/IntRef.java
diff --git a/sources/scala/runtime/InterpreterSupport.java b/src/library/scala/runtime/InterpreterSupport.java
index 9272583ca1..9272583ca1 100644
--- a/sources/scala/runtime/InterpreterSupport.java
+++ b/src/library/scala/runtime/InterpreterSupport.java
diff --git a/sources/scala/runtime/LongRef.java b/src/library/scala/runtime/LongRef.java
index 863472c666..863472c666 100644
--- a/sources/scala/runtime/LongRef.java
+++ b/src/library/scala/runtime/LongRef.java
diff --git a/sources/scala/runtime/MetaAttribute.cs b/src/library/scala/runtime/MetaAttribute.cs
index 28ab499bdd..28ab499bdd 100644
--- a/sources/scala/runtime/MetaAttribute.cs
+++ b/src/library/scala/runtime/MetaAttribute.cs
diff --git a/sources/scala/runtime/ObjectRef.java b/src/library/scala/runtime/ObjectRef.java
index c5ba9fb640..c5ba9fb640 100644
--- a/sources/scala/runtime/ObjectRef.java
+++ b/src/library/scala/runtime/ObjectRef.java
diff --git a/sources/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index 8fe69a2f31..8bdabef3c0 100644
--- a/sources/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-// $Id$
+// $Id:ScalaRunTime.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 
 package scala.runtime;
 
@@ -29,7 +29,7 @@ object ScalaRunTime {
 
   def Try[a](block: => a): Try[a] = new Try[a] with Runnable {
     var result: a = _;
-    var exception: Throwable = RunTime.tryCatch(this);
+    var exception: Throwable = ExceptionHandling.tryCatch(this);
 
     def run(): Unit = result = block;
 
diff --git a/sources/scala/runtime/ShortRef.java b/src/library/scala/runtime/ShortRef.java
index 3cada1fab8..3cada1fab8 100644
--- a/sources/scala/runtime/ShortRef.java
+++ b/src/library/scala/runtime/ShortRef.java
diff --git a/sources/scala/runtime/SymtabAttribute.cs b/src/library/scala/runtime/SymtabAttribute.cs
index fcb273a857..fcb273a857 100644
--- a/sources/scala/runtime/SymtabAttribute.cs
+++ b/src/library/scala/runtime/SymtabAttribute.cs
diff --git a/sources/scala/runtime/compat/Math.scala b/src/library/scala/runtime/compat/Math.scala
index 147ffeb0f9..147ffeb0f9 100644
--- a/sources/scala/runtime/compat/Math.scala
+++ b/src/library/scala/runtime/compat/Math.scala
diff --git a/sources/scala/runtime/compat/Platform.scala b/src/library/scala/runtime/compat/Platform.scala
index 282421a981..282421a981 100644
--- a/sources/scala/runtime/compat/Platform.scala
+++ b/src/library/scala/runtime/compat/Platform.scala
diff --git a/sources/scala/runtime/compat/StringBuilder.scala b/src/library/scala/runtime/compat/StringBuilder.scala
index bfb790723e..bfb790723e 100644
--- a/sources/scala/runtime/compat/StringBuilder.scala
+++ b/src/library/scala/runtime/compat/StringBuilder.scala
diff --git a/sources/scala/runtime/matching/Address.scala b/src/library/scala/runtime/matching/Address.scala
index 3f548e402f..3f548e402f 100644
--- a/sources/scala/runtime/matching/Address.scala
+++ b/src/library/scala/runtime/matching/Address.scala
diff --git a/sources/scala/runtime/matching/NonTerm.scala b/src/library/scala/runtime/matching/NonTerm.scala
index 35bc0f60ce..35bc0f60ce 100644
--- a/sources/scala/runtime/matching/NonTerm.scala
+++ b/src/library/scala/runtime/matching/NonTerm.scala
diff --git a/sources/scala/runtime/matching/PatternTests.scala b/src/library/scala/runtime/matching/PatternTests.scala
index ea04481d58..ea04481d58 100644
--- a/sources/scala/runtime/matching/PatternTests.scala
+++ b/src/library/scala/runtime/matching/PatternTests.scala
diff --git a/sources/scala/runtime/matching/Rule.scala b/src/library/scala/runtime/matching/Rule.scala
index 7bd6d40fd1..7bd6d40fd1 100644
--- a/sources/scala/runtime/matching/Rule.scala
+++ b/src/library/scala/runtime/matching/Rule.scala
diff --git a/sources/scala/runtime/matching/TestAlphabet.scala b/src/library/scala/runtime/matching/TestAlphabet.scala
index 9ef4698ebc..9ef4698ebc 100644
--- a/sources/scala/runtime/matching/TestAlphabet.scala
+++ b/src/library/scala/runtime/matching/TestAlphabet.scala
diff --git a/sources/scala/serializable.scala b/src/library/scala/serializable.scala
index 2b9ad9f177..2b9ad9f177 100644
--- a/sources/scala/serializable.scala
+++ b/src/library/scala/serializable.scala
diff --git a/sources/scala/testing/Benchmark.scala b/src/library/scala/testing/Benchmark.scala
index f6523a7271..f6523a7271 100644
--- a/sources/scala/testing/Benchmark.scala
+++ b/src/library/scala/testing/Benchmark.scala
diff --git a/sources/scala/testing/SUnit.scala b/src/library/scala/testing/SUnit.scala
index 4faa0c9cd0..4faa0c9cd0 100644
--- a/sources/scala/testing/SUnit.scala
+++ b/src/library/scala/testing/SUnit.scala
diff --git a/sources/scala/testing/UnitTest.scala b/src/library/scala/testing/UnitTest.scala
index 2f8878b2eb..2f8878b2eb 100644
--- a/sources/scala/testing/UnitTest.scala
+++ b/src/library/scala/testing/UnitTest.scala
diff --git a/sources/scala/text/Document.scala b/src/library/scala/text/Document.scala
index 40d5a3a7c4..40d5a3a7c4 100644
--- a/sources/scala/text/Document.scala
+++ b/src/library/scala/text/Document.scala
diff --git a/sources/scala/transient.scala b/src/library/scala/transient.scala
index daeba17fa3..d051c80761 100644
--- a/sources/scala/transient.scala
+++ b/src/library/scala/transient.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:transient.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/util/automata/BaseBerrySethi.scala b/src/library/scala/util/automata/BaseBerrySethi.scala
index ec6a37b79f..ec6a37b79f 100644
--- a/sources/scala/util/automata/BaseBerrySethi.scala
+++ b/src/library/scala/util/automata/BaseBerrySethi.scala
diff --git a/sources/scala/util/automata/DetWordAutom.scala b/src/library/scala/util/automata/DetWordAutom.scala
index 12049e0012..12049e0012 100644
--- a/sources/scala/util/automata/DetWordAutom.scala
+++ b/src/library/scala/util/automata/DetWordAutom.scala
diff --git a/sources/scala/util/automata/Inclusion.scala b/src/library/scala/util/automata/Inclusion.scala
index 4b155c7f06..4b155c7f06 100644
--- a/sources/scala/util/automata/Inclusion.scala
+++ b/src/library/scala/util/automata/Inclusion.scala
diff --git a/sources/scala/util/automata/NondetWordAutom.scala b/src/library/scala/util/automata/NondetWordAutom.scala
index a0a2757233..a0a2757233 100644
--- a/sources/scala/util/automata/NondetWordAutom.scala
+++ b/src/library/scala/util/automata/NondetWordAutom.scala
diff --git a/sources/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala
index ddf122dbe3..ddf122dbe3 100644
--- a/sources/scala/util/automata/SubsetConstruction.scala
+++ b/src/library/scala/util/automata/SubsetConstruction.scala
diff --git a/sources/scala/util/automata/WordBerrySethi.scala b/src/library/scala/util/automata/WordBerrySethi.scala
index f361b6b174..f361b6b174 100644
--- a/sources/scala/util/automata/WordBerrySethi.scala
+++ b/src/library/scala/util/automata/WordBerrySethi.scala
diff --git a/sources/scala/util/grammar/HedgeRHS.scala b/src/library/scala/util/grammar/HedgeRHS.scala
index e435909eb9..e435909eb9 100644
--- a/sources/scala/util/grammar/HedgeRHS.scala
+++ b/src/library/scala/util/grammar/HedgeRHS.scala
diff --git a/sources/scala/util/grammar/TreeRHS.scala b/src/library/scala/util/grammar/TreeRHS.scala
index e4d391e12f..e4d391e12f 100644
--- a/sources/scala/util/grammar/TreeRHS.scala
+++ b/src/library/scala/util/grammar/TreeRHS.scala
diff --git a/sources/scala/util/logging/ConsoleLogger.scala b/src/library/scala/util/logging/ConsoleLogger.scala
index fabfa7a698..fabfa7a698 100644
--- a/sources/scala/util/logging/ConsoleLogger.scala
+++ b/src/library/scala/util/logging/ConsoleLogger.scala
diff --git a/sources/scala/util/logging/Logged.scala b/src/library/scala/util/logging/Logged.scala
index a19429c1f6..a19429c1f6 100644
--- a/sources/scala/util/logging/Logged.scala
+++ b/src/library/scala/util/logging/Logged.scala
diff --git a/sources/scala/util/parsing/CharInputStreamIterator.scala b/src/library/scala/util/parsing/CharInputStreamIterator.scala
index 16ba724619..16ba724619 100644
--- a/sources/scala/util/parsing/CharInputStreamIterator.scala
+++ b/src/library/scala/util/parsing/CharInputStreamIterator.scala
diff --git a/sources/scala/util/parsing/Parsers.scala b/src/library/scala/util/parsing/Parsers.scala
index e0064f12e5..e0064f12e5 100644
--- a/sources/scala/util/parsing/Parsers.scala
+++ b/src/library/scala/util/parsing/Parsers.scala
diff --git a/sources/scala/util/parsing/SimpleTokenizer.scala b/src/library/scala/util/parsing/SimpleTokenizer.scala
index 20a23a8492..20a23a8492 100644
--- a/sources/scala/util/parsing/SimpleTokenizer.scala
+++ b/src/library/scala/util/parsing/SimpleTokenizer.scala
diff --git a/sources/scala/util/regexp/Base.scala b/src/library/scala/util/regexp/Base.scala
index cfdaaac10f..cfdaaac10f 100644
--- a/sources/scala/util/regexp/Base.scala
+++ b/src/library/scala/util/regexp/Base.scala
diff --git a/sources/scala/util/regexp/PointedHedgeExp.scala b/src/library/scala/util/regexp/PointedHedgeExp.scala
index 27da6338db..27da6338db 100644
--- a/sources/scala/util/regexp/PointedHedgeExp.scala
+++ b/src/library/scala/util/regexp/PointedHedgeExp.scala
diff --git a/sources/scala/util/regexp/SyntaxError.scala b/src/library/scala/util/regexp/SyntaxError.scala
index c6599df75c..c6599df75c 100644
--- a/sources/scala/util/regexp/SyntaxError.scala
+++ b/src/library/scala/util/regexp/SyntaxError.scala
diff --git a/sources/scala/util/regexp/WordExp.scala b/src/library/scala/util/regexp/WordExp.scala
index 63817e0151..63817e0151 100644
--- a/sources/scala/util/regexp/WordExp.scala
+++ b/src/library/scala/util/regexp/WordExp.scala
diff --git a/sources/scala/volatile.scala b/src/library/scala/volatile.scala
index b62f7ca015..905d95371e 100644
--- a/sources/scala/volatile.scala
+++ b/src/library/scala/volatile.scala
@@ -4,7 +4,7 @@
 **  __\ \/ /__/ __ |/ /__/ __ |                                         **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
-** $Id$
+** $Id:volatile.scala 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $
 \*                                                                      */
 
 package scala;
diff --git a/sources/scala/xml/Atom.scala b/src/library/scala/xml/Atom.scala
index d37d6dbf56..d37d6dbf56 100644
--- a/sources/scala/xml/Atom.scala
+++ b/src/library/scala/xml/Atom.scala
diff --git a/sources/scala/xml/Comment.scala b/src/library/scala/xml/Comment.scala
index 4bf7a267f7..4bf7a267f7 100644
--- a/sources/scala/xml/Comment.scala
+++ b/src/library/scala/xml/Comment.scala
diff --git a/sources/scala/xml/Document.scala b/src/library/scala/xml/Document.scala
index 38503eb834..38503eb834 100644
--- a/sources/scala/xml/Document.scala
+++ b/src/library/scala/xml/Document.scala
diff --git a/sources/scala/xml/Elem.scala b/src/library/scala/xml/Elem.scala
index 6a6d70d1e6..6a6d70d1e6 100644
--- a/sources/scala/xml/Elem.scala
+++ b/src/library/scala/xml/Elem.scala
diff --git a/sources/scala/xml/EntityRef.scala b/src/library/scala/xml/EntityRef.scala
index 3ae1ef6866..3ae1ef6866 100644
--- a/sources/scala/xml/EntityRef.scala
+++ b/src/library/scala/xml/EntityRef.scala
diff --git a/sources/scala/xml/MalformedAttributeException.scala b/src/library/scala/xml/MalformedAttributeException.scala
index bcb4c0f393..bcb4c0f393 100644
--- a/sources/scala/xml/MalformedAttributeException.scala
+++ b/src/library/scala/xml/MalformedAttributeException.scala
diff --git a/sources/scala/xml/MetaData.scala b/src/library/scala/xml/MetaData.scala
index 285e3eb850..285e3eb850 100644
--- a/sources/scala/xml/MetaData.scala
+++ b/src/library/scala/xml/MetaData.scala
diff --git a/sources/scala/xml/Molecule.scala b/src/library/scala/xml/Molecule.scala
index d2141d069b..d2141d069b 100644
--- a/sources/scala/xml/Molecule.scala
+++ b/src/library/scala/xml/Molecule.scala
diff --git a/sources/scala/xml/NamespaceBinding.scala b/src/library/scala/xml/NamespaceBinding.scala
index 3ad7c49957..3ad7c49957 100644
--- a/sources/scala/xml/NamespaceBinding.scala
+++ b/src/library/scala/xml/NamespaceBinding.scala
diff --git a/sources/scala/xml/Node.scala b/src/library/scala/xml/Node.scala
index 2daf643d7a..2daf643d7a 100644
--- a/sources/scala/xml/Node.scala
+++ b/src/library/scala/xml/Node.scala
diff --git a/sources/scala/xml/NodeBuffer.scala b/src/library/scala/xml/NodeBuffer.scala
index b61e24181c..b61e24181c 100644
--- a/sources/scala/xml/NodeBuffer.scala
+++ b/src/library/scala/xml/NodeBuffer.scala
diff --git a/sources/scala/xml/NodeSeq.scala b/src/library/scala/xml/NodeSeq.scala
index 84d37d5790..84d37d5790 100644
--- a/sources/scala/xml/NodeSeq.scala
+++ b/src/library/scala/xml/NodeSeq.scala
diff --git a/sources/scala/xml/NodeTraverser.scala b/src/library/scala/xml/NodeTraverser.scala
index 690c85534d..690c85534d 100644
--- a/sources/scala/xml/NodeTraverser.scala
+++ b/src/library/scala/xml/NodeTraverser.scala
diff --git a/sources/scala/xml/Null.scala b/src/library/scala/xml/Null.scala
index 5790a2fdfd..5790a2fdfd 100644
--- a/sources/scala/xml/Null.scala
+++ b/src/library/scala/xml/Null.scala
diff --git a/sources/scala/xml/Parsing.scala b/src/library/scala/xml/Parsing.scala
index bc86d18e62..bc86d18e62 100644
--- a/sources/scala/xml/Parsing.scala
+++ b/src/library/scala/xml/Parsing.scala
diff --git a/sources/scala/xml/PrefixedAttribute.scala b/src/library/scala/xml/PrefixedAttribute.scala
index 4eb947e2c1..4eb947e2c1 100644
--- a/sources/scala/xml/PrefixedAttribute.scala
+++ b/src/library/scala/xml/PrefixedAttribute.scala
diff --git a/sources/scala/xml/PrettyPrinter.scala b/src/library/scala/xml/PrettyPrinter.scala
index 3410c5dd9a..3410c5dd9a 100644
--- a/sources/scala/xml/PrettyPrinter.scala
+++ b/src/library/scala/xml/PrettyPrinter.scala
diff --git a/sources/scala/xml/ProcInstr.scala b/src/library/scala/xml/ProcInstr.scala
index b4160139e6..b4160139e6 100644
--- a/sources/scala/xml/ProcInstr.scala
+++ b/src/library/scala/xml/ProcInstr.scala
diff --git a/sources/scala/xml/SpecialNode.scala b/src/library/scala/xml/SpecialNode.scala
index 1162287e2f..1162287e2f 100644
--- a/sources/scala/xml/SpecialNode.scala
+++ b/src/library/scala/xml/SpecialNode.scala
diff --git a/sources/scala/xml/Text.scala b/src/library/scala/xml/Text.scala
index 507239cc8b..507239cc8b 100644
--- a/sources/scala/xml/Text.scala
+++ b/src/library/scala/xml/Text.scala
diff --git a/sources/scala/xml/TextBuffer.scala b/src/library/scala/xml/TextBuffer.scala
index 448fd861d5..448fd861d5 100644
--- a/sources/scala/xml/TextBuffer.scala
+++ b/src/library/scala/xml/TextBuffer.scala
diff --git a/sources/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala
index ff3b3b7cba..ff3b3b7cba 100644
--- a/sources/scala/xml/TopScope.scala
+++ b/src/library/scala/xml/TopScope.scala
diff --git a/sources/scala/xml/TypeSymbol.scala b/src/library/scala/xml/TypeSymbol.scala
index 1d5fba7ae6..1d5fba7ae6 100644
--- a/sources/scala/xml/TypeSymbol.scala
+++ b/src/library/scala/xml/TypeSymbol.scala
diff --git a/sources/scala/xml/UnprefixedAttribute.scala b/src/library/scala/xml/UnprefixedAttribute.scala
index 82d30ac804..82d30ac804 100644
--- a/sources/scala/xml/UnprefixedAttribute.scala
+++ b/src/library/scala/xml/UnprefixedAttribute.scala
diff --git a/sources/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala
index 2737e75d58..2737e75d58 100644
--- a/sources/scala/xml/Utility.scala
+++ b/src/library/scala/xml/Utility.scala
diff --git a/sources/scala/xml/XML.scala b/src/library/scala/xml/XML.scala
index 1fadac7fe8..1fadac7fe8 100644
--- a/sources/scala/xml/XML.scala
+++ b/src/library/scala/xml/XML.scala
diff --git a/sources/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala
index 78132dcc4a..78132dcc4a 100644
--- a/sources/scala/xml/dtd/ContentModel.scala
+++ b/src/library/scala/xml/dtd/ContentModel.scala
diff --git a/sources/scala/xml/dtd/ContentModelParser.scala b/src/library/scala/xml/dtd/ContentModelParser.scala
index 08232d118d..08232d118d 100644
--- a/sources/scala/xml/dtd/ContentModelParser.scala
+++ b/src/library/scala/xml/dtd/ContentModelParser.scala
diff --git a/sources/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala
index 9cf55f7077..9cf55f7077 100644
--- a/sources/scala/xml/dtd/DTD.scala
+++ b/src/library/scala/xml/dtd/DTD.scala
diff --git a/sources/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala
index 1e151a5c84..1e151a5c84 100644
--- a/sources/scala/xml/dtd/Decl.scala
+++ b/src/library/scala/xml/dtd/Decl.scala
diff --git a/sources/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala
index 014c7046aa..014c7046aa 100644
--- a/sources/scala/xml/dtd/DocType.scala
+++ b/src/library/scala/xml/dtd/DocType.scala
diff --git a/sources/scala/xml/dtd/DtdTypeSymbol.scala b/src/library/scala/xml/dtd/DtdTypeSymbol.scala
index 633e11e646..633e11e646 100644
--- a/sources/scala/xml/dtd/DtdTypeSymbol.scala
+++ b/src/library/scala/xml/dtd/DtdTypeSymbol.scala
diff --git a/sources/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala
index 52ba82cb54..52ba82cb54 100644
--- a/sources/scala/xml/dtd/ElementValidator.scala
+++ b/src/library/scala/xml/dtd/ElementValidator.scala
diff --git a/sources/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala
index 965d330a99..965d330a99 100644
--- a/sources/scala/xml/dtd/ExternalID.scala
+++ b/src/library/scala/xml/dtd/ExternalID.scala
diff --git a/sources/scala/xml/dtd/Scanner.scala b/src/library/scala/xml/dtd/Scanner.scala
index c51ac7cbec..c51ac7cbec 100644
--- a/sources/scala/xml/dtd/Scanner.scala
+++ b/src/library/scala/xml/dtd/Scanner.scala
diff --git a/sources/scala/xml/dtd/Tokens.scala b/src/library/scala/xml/dtd/Tokens.scala
index 27935c1d08..27935c1d08 100644
--- a/sources/scala/xml/dtd/Tokens.scala
+++ b/src/library/scala/xml/dtd/Tokens.scala
diff --git a/sources/scala/xml/dtd/ValidationException.scala b/src/library/scala/xml/dtd/ValidationException.scala
index 337259ffb1..337259ffb1 100644
--- a/sources/scala/xml/dtd/ValidationException.scala
+++ b/src/library/scala/xml/dtd/ValidationException.scala
diff --git a/sources/scala/xml/factory/Binder.scala b/src/library/scala/xml/factory/Binder.scala
index d387e90139..d387e90139 100644
--- a/sources/scala/xml/factory/Binder.scala
+++ b/src/library/scala/xml/factory/Binder.scala
diff --git a/sources/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala
index cb57069ac2..cb57069ac2 100644
--- a/sources/scala/xml/factory/LoggedNodeFactory.scala
+++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala
diff --git a/sources/scala/xml/factory/NodeFactory.scala b/src/library/scala/xml/factory/NodeFactory.scala
index 7564659c1a..7564659c1a 100644
--- a/sources/scala/xml/factory/NodeFactory.scala
+++ b/src/library/scala/xml/factory/NodeFactory.scala
diff --git a/sources/scala/xml/parsing/ConstructingHandler.scala b/src/library/scala/xml/parsing/ConstructingHandler.scala
index fac22b7015..fac22b7015 100644
--- a/sources/scala/xml/parsing/ConstructingHandler.scala
+++ b/src/library/scala/xml/parsing/ConstructingHandler.scala
diff --git a/sources/scala/xml/parsing/ConstructingParser.scala b/src/library/scala/xml/parsing/ConstructingParser.scala
index fafabc916d..fafabc916d 100644
--- a/sources/scala/xml/parsing/ConstructingParser.scala
+++ b/src/library/scala/xml/parsing/ConstructingParser.scala
diff --git a/sources/scala/xml/parsing/DefaultMarkupHandler.scala b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala
index 14fd8ec9a7..14fd8ec9a7 100644
--- a/sources/scala/xml/parsing/DefaultMarkupHandler.scala
+++ b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala
diff --git a/sources/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala
index d4a1511e99..d4a1511e99 100644
--- a/sources/scala/xml/parsing/ExternalSources.scala
+++ b/src/library/scala/xml/parsing/ExternalSources.scala
diff --git a/sources/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala
index e23032ca70..e23032ca70 100644
--- a/sources/scala/xml/parsing/FactoryAdapter.scala
+++ b/src/library/scala/xml/parsing/FactoryAdapter.scala
diff --git a/sources/scala/xml/parsing/FatalError.scala b/src/library/scala/xml/parsing/FatalError.scala
index bd007d0df9..bd007d0df9 100644
--- a/sources/scala/xml/parsing/FatalError.scala
+++ b/src/library/scala/xml/parsing/FatalError.scala
diff --git a/sources/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala
index d90dea2752..d90dea2752 100644
--- a/sources/scala/xml/parsing/MarkupHandler.scala
+++ b/src/library/scala/xml/parsing/MarkupHandler.scala
diff --git a/sources/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala
index 09569bd106..09569bd106 100644
--- a/sources/scala/xml/parsing/MarkupParser.scala
+++ b/src/library/scala/xml/parsing/MarkupParser.scala
diff --git a/sources/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala
index d2400e33d3..d2400e33d3 100644
--- a/sources/scala/xml/parsing/NoBindingFactoryAdapter.scala
+++ b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala
diff --git a/sources/scala/xml/parsing/TokenTests.scala b/src/library/scala/xml/parsing/TokenTests.scala
index 86560fc12f..86560fc12f 100644
--- a/sources/scala/xml/parsing/TokenTests.scala
+++ b/src/library/scala/xml/parsing/TokenTests.scala
diff --git a/sources/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala
index 717ed52d79..717ed52d79 100644
--- a/sources/scala/xml/parsing/ValidatingMarkupHandler.scala
+++ b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala
diff --git a/sources/scala/xml/path/Expression.scala b/src/library/scala/xml/path/Expression.scala
index cf6c6d552f..cf6c6d552f 100644
--- a/sources/scala/xml/path/Expression.scala
+++ b/src/library/scala/xml/path/Expression.scala
diff --git a/sources/scala/xml/transform/BasicTransformer.scala b/src/library/scala/xml/transform/BasicTransformer.scala
index 56bbc16201..56bbc16201 100644
--- a/sources/scala/xml/transform/BasicTransformer.scala
+++ b/src/library/scala/xml/transform/BasicTransformer.scala
diff --git a/sources/scala/xml/transform/RewriteRule.scala b/src/library/scala/xml/transform/RewriteRule.scala
index c00d33aa96..c00d33aa96 100644
--- a/sources/scala/xml/transform/RewriteRule.scala
+++ b/src/library/scala/xml/transform/RewriteRule.scala
diff --git a/sources/scala/xml/transform/RuleTransformer.scala b/src/library/scala/xml/transform/RuleTransformer.scala
index 6a967105e7..6a967105e7 100644
--- a/sources/scala/xml/transform/RuleTransformer.scala
+++ b/src/library/scala/xml/transform/RuleTransformer.scala
diff --git a/sources/scala/xml/xsd/ContentModel.scala b/src/library/scala/xml/xsd/ContentModel.scala
index 11e513d26d..11e513d26d 100644
--- a/sources/scala/xml/xsd/ContentModel.scala
+++ b/src/library/scala/xml/xsd/ContentModel.scala
diff --git a/sources/scala/xml/xsd/Decl.scala b/src/library/scala/xml/xsd/Decl.scala
index 18a61f3b2b..18a61f3b2b 100644
--- a/sources/scala/xml/xsd/Decl.scala
+++ b/src/library/scala/xml/xsd/Decl.scala
diff --git a/sources/scala/xml/xsd/XsTypeSymbol.scala b/src/library/scala/xml/xsd/XsTypeSymbol.scala
index b553ad9f29..b553ad9f29 100644
--- a/sources/scala/xml/xsd/XsTypeSymbol.scala
+++ b/src/library/scala/xml/xsd/XsTypeSymbol.scala
diff --git a/sources/msil/AssemblyInfo.cs.tmpl b/src/msil-library/AssemblyInfo.cs.tmpl
index c32f40ff11..c32f40ff11 100644
--- a/sources/msil/AssemblyInfo.cs.tmpl
+++ b/src/msil-library/AssemblyInfo.cs.tmpl
diff --git a/sources/msil/scala/runtime/compat/Math.scala b/src/msil-library/scala/runtime/compat/Math.scala
index 5b9853e953..5b9853e953 100644
--- a/sources/msil/scala/runtime/compat/Math.scala
+++ b/src/msil-library/scala/runtime/compat/Math.scala
diff --git a/sources/msil/scala/runtime/compat/Platform.scala b/src/msil-library/scala/runtime/compat/Platform.scala
index fcdaa54e22..fcdaa54e22 100644
--- a/sources/msil/scala/runtime/compat/Platform.scala
+++ b/src/msil-library/scala/runtime/compat/Platform.scala
diff --git a/sources/msil/scala/runtime/compat/StringBuilder.scala b/src/msil-library/scala/runtime/compat/StringBuilder.scala
index 4154c0fb3a..4154c0fb3a 100644
--- a/sources/msil/scala/runtime/compat/StringBuilder.scala
+++ b/src/msil-library/scala/runtime/compat/StringBuilder.scala