diff --git a/README b/README new file mode 100644 index 000000000..837d5170a --- /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 430aa8aa9..000000000 --- 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= -# -# DO NOT EDIT. Automatically generated file! -############################################################################## -1.4.0.4 diff --git a/build.readme b/build.readme deleted file mode 100644 index 925093061..000000000 --- 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 4fc5401fc..e570ccd1c 100644 --- a/build.xml +++ b/build.xml @@ -1,744 +1,494 @@ - + - - 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. - - - This is SABBUS, your helpful build script for new Scala. + + 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. + + + Running Sabbus for Scala-core - - - + + + + + + + + Sabbus requires additional memory. Please set the 'ANT_OPTS' environment + property to '-Xmx256M' or more. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + starr.lib.jar=${starr.lib.jar} + + + + + + + + starr.comp.jar=${starr.comp.jar} + + + + + + fjbg.jar=${fjbg.jar} + + + + + + msil.jar=${msil.jar} + + + + + + jaco.jar=${jaco.jar} + + + + + + ant.jar=${ant.jar} + + + + + + + + + + - SABBUS requires additional memory. Please set the 'ANT_OPTS' environment property to '-Xmx256M' or more. - - - - - - - SABBUS is too unstable when used with a non-empty classpath. Unset your classpath environment variable. - - - - - - Loading properties from '${basedir}/config/build.base.properties' - - - - Loading properties from '${config.dir}/build.${user.name}.properties' - - Loading properties from '${build.support.dir}/build.${user.name}.properties' - - Loading properties from '${config.dir}/build.default.properties' - - - - - - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - oslib.jar=${oslib.jar} - oslib.src=${oslib.src} - ostools.jar=${ostools.jar} - fjbg.jar=${fjbg.jar} - msil.jar=${msil.jar} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jaco.jar=${jaco.jar} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - scala.dll=${scala.dll} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A full distribution cannot be build when skipping NSC. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - izpack.home=${izpack.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Windows-specific IzPack installer is not generated yet. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Build is stable + - - - - + + + + Docs is not available yet. + - - - - oslib.jar=${oslib.jar} - oslib.src=${oslib.src} - ostools.jar=${ostools.jar} - - - - - - - - - - - - - - Generating API documentation to ${build.dir}/doc/api - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Execute 'ant -projecthelp' for build file help. - Execute 'ant -help' for Ant help. - + + + + Dist is not available yet. + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/build.TEMPLATE.properties b/config/build.TEMPLATE.properties deleted file mode 100644 index 2606ac462..000000000 --- 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 25ef7417e..000000000 --- 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 8f9788f4d..000000000 --- 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 7dd733694..000000000 --- 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 a02527bf1..000000000 --- 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 3ef12c77d..000000000 --- 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 8d0e8389c..000000000 Binary files a/config/izpack/images/Splash.png and /dev/null differ diff --git a/config/izpack/images/install.png b/config/izpack/images/install.png deleted file mode 100644 index f75b7fb2c..000000000 Binary files a/config/izpack/images/install.png and /dev/null differ diff --git a/config/izpack/install-nsc.xml b/config/izpack/install-nsc.xml deleted file mode 100644 index 08737a42f..000000000 --- a/config/izpack/install-nsc.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - Scala - @VERSION@ - @URL@ - 1.4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Installing the Scala software. - - - - - - - - - - - - - - - - - - - - - -Djava.library.path=$INSTALL_PATH\Uninstaller - -cp - $INSTALL_PATH\Uninstaller\registry.jar;$INSTALL_PATH\Uninstaller\setenv.jar - Main - @VERSION@ - - - - - diff --git a/config/izpack/izpack_process.xml b/config/izpack/izpack_process.xml deleted file mode 100644 index ed5982707..000000000 --- a/config/izpack/izpack_process.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - $INSTALL_PATH/Uninstaller - - - - - Create symbolic links - - - ../share/@PREFIX@/bin/.scala_wrapper - - - .scala_wrapper - - - - Clean up - - - -f - $INSTALL_PATH/bin/.nsc_symlink - $INSTALL_PATH/share/@PREFIX@/bin/.nsc_symlink - - - - - - - Add the SCALA_HOME variable to the user environment - - - -Djava.library.path=$INSTALL_PATH\Uninstaller - -cp - $INSTALL_PATH\Uninstaller\registry.jar;$INSTALL_PATH\Uninstaller\setenv.jar - Main - @VERSION@ - $INSTALL_PATH - - - - diff --git a/config/izpack/izpack_scala.xml b/config/izpack/izpack_scala.xml deleted file mode 100644 index 282ed59e3..000000000 --- a/config/izpack/izpack_scala.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - Scala - 1.4.0.1 - - http://scala.epfl.ch/ - 1.4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Installing the Scala software. - - - - - - - - - - - - - diff --git a/config/izpack/izpack_shortcut.xml b/config/izpack/izpack_shortcut.xml deleted file mode 100644 index 4d396dea1..000000000 --- a/config/izpack/izpack_shortcut.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/config/izpack/locales/INFO_de.html b/config/izpack/locales/INFO_de.html deleted file mode 100644 index 8ca5c531c..000000000 --- a/config/izpack/locales/INFO_de.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -

- IzPack führt Sie durch - die Installation von Scala @VERSION@. -

-

- Scala erfordert Sun JDK/JRE - version 1.4 oder neuer. -

-

- Sie können die Installation jederzeit abbrechen, indem - Sie auf 'Beenden' klicken. -

- - diff --git a/config/izpack/locales/INFO_en.html b/config/izpack/locales/INFO_en.html deleted file mode 100644 index 3112960fe..000000000 --- a/config/izpack/locales/INFO_en.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -

- IzPack will guide you through - the installation of Scala @VERSION@. -

-

- Scala requires Sun JDK/JRE - version 1.4 or newer. -

-

- You may cancel this installation at any time by clicking the - 'Quit' button. -

- - diff --git a/config/izpack/locales/INFO_fr.html b/config/izpack/locales/INFO_fr.html deleted file mode 100644 index 9edfe4455..000000000 --- a/config/izpack/locales/INFO_fr.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -

- IzPack will guide you through - the installation of Scala @VERSION@. -

-

- Scala requiert Sun JDK/JRE - version 1.4 ou plus récent. -

-

- Vous pouvez abandonner l'installation à tout moment - en cliquant sur 'Quitter'. -

- - diff --git a/config/izpack/locales/LICENSE_de.html b/config/izpack/locales/LICENSE_de.html deleted file mode 100644 index 90b5da193..000000000 --- a/config/izpack/locales/LICENSE_de.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - -
-SCALA LIZENZ -
- -

-Copyright © 2002-05 EPFL, Lausanne. -Alle Rechte vorbehalten. -

- -

-Diese Software wurde von der Gruppe Methoden der Programmierung an -der Eidgenössiche Technische Hochschule von Lausanne, Schweiz, -entwickelt. -

- -

-Die Genehmigung zum Verwenden, Kopieren, Ändern and Weitervertreiben -dieser Software im Quell- und Binärformat zu einem beliebigen Zweck -wird hiermit ohne Gebühr erteilt, sofern folgende Konditionen -erfüllt sind: -

- -
    -
  1. - Bei Weitervertrieb des Quellcodes müssen vorstehender - Urheberrechtshinweis, diese Liste der Konditionen und die folgende - Verzichtserklärung beibehalten werden. -
    2. -
  2. - Bei Weitervertrieb im Binärformat müssen in der Dokumentation - und/oder anderen Materialien, die vertrieben werden, vorstehender - Urheberrechtshinweis, diese Liste der Konditionen und die folgende - Verzichtserklärung reproduziert werden. -
    3. -
  3. - 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. -
    4. -
- -

-DIESE SOFTWARE WIRD VON DEN AUTOREN WIE BESEHEN UND UNTER AUSSCHLUSS ALLER -AUSDRÜCKLICHEN ODER KONKLUDENTEN GARANTIEN ZUR VERFÜGUNG GESTELLT, -EINSCHLIESSLICH, ABER NICHT BESCHRÄNKT AUF KONKLUDENTE GARANTIEN DER -HANDELSÜBLICHKEIT UND/ODER EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. -UNTER KEINEN UMSTÄNDEN KÖNNEN DIE AUTOREN FÜR DIREKTE, INDIREKTE, -ZUFÄLLIGE, BESONDERE, EXEMPLARISCHE ODER FOLGESCHÄDEN (EINSCHLIESSLICH -VON, ABER NICHT BESCHRÄNKT AUF, BESCHAFFUNG VON ERSATZWAREN ODER -ERSATZLEISTUNGEN, ENTGANGENEM NUTZEN, VERLUST VON DATEN, ENTGANGENEM GEWINN -ODER GESCHÄFTSAUSFALL) HAFTBAR GEMACHT WERDEN, DIE AUS EINER BELIEBIGEN -URSACHE UND AUF GRUNDLAGE IRGENDEINES HAFTBARKEITSVERSTÄNDNISSES ENTSTEHEN, -UNABHÄNGIG VON VERTRÄGEN, DER GEFÄHRDUNGSHAFTUNG ODER UNERLAUBTEN -HANDLUNGEN (EINSCHLIESSLICH FAHRLÄSSIGKEIT ODER ANDERWEITIG), DIE IN -IRGENDEINER WEISE DURCH DIE VERWENDUNG DIESER SOFTWARE ENTSTEHEN, AUCH DANN, -WENN DIE AUTOREN ÜBER DIE MÖGLICHKEIT SOLCHER SCHÄDEN UNTERRICHTET WURDEN. -

- - - - diff --git a/config/izpack/locales/LICENSE_en.html b/config/izpack/locales/LICENSE_en.html deleted file mode 100644 index 59ef4cc4e..000000000 --- a/config/izpack/locales/LICENSE_en.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - -
-SCALA LICENSE -
- -

-Copyright © 2002-05 EPFL, Lausanne. -All rights reserved. -

- -

-This software was developed by the Programming Methods Laboratory of -the Swiss Federal Institute of Technology, Lausanne, Switzerland. -

- -

-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: -

- -
    -
  1. - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -
    2. -
  2. - 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. -
    3. -
  3. - 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. -
    4. -
- -

-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. -

- - - diff --git a/config/izpack/locales/LICENSE_fr.html b/config/izpack/locales/LICENSE_fr.html deleted file mode 100644 index dab0ccd67..000000000 --- a/config/izpack/locales/LICENSE_fr.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - -
-LICENCE SCALA -
- -

-Copyright © 2002-05 EPFL, Lausanne. -Tous droits réservés. -

- -

-Ce logiciel a été développé par le Laboratoire -des Méthodes de Programmation de l'Ecole Polytechnique -Fédérale de Lausanne (EPFL), Suisse. -

- -

-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 -étant entendu que les conditions suivantes sont satisfaites: -

- -
    -
  1. - Toute redistribution du code source doit contenir la notice de droits - d'auteur ci-dessus, la présente liste des conditions - d'utilisation et l'avis de non-responsabilité mentionné - plus bas. -
    2. -
  2. - Toute redistribution du code binaire doit contenir la notice de droits - d'auteur ci-dessus, la présente liste des conditions d'utilisation - et l'avis de non-responsabilité mentionné plus bas dans - la documentation et/ou tout autre support fourni dans la distribution. -
    3. -
  3. - Ni le nom de l'EPFL, ni celui des personnes qui ont - contribué au développement de ce logiciel ne peuvent - être utilisés dans le but de promouvoir des produits - dérivés de ce logiciel sans permission écrite - préalable. -
    4. -
- -

-CE LOGICIEL EST FOURNI "EN L'ÉTAT" SANS GARANTIE AUCUNE QUANT -À 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É OU QUICONQUE AYANT -CONTRIBUÉ AU DÉVELOPPEMENT DU LOGICIEL NE SAURAIT ÊTRE -TENU RESPONSABLE DE TOUS DOMMAGES DIRECTS OU INDIRECTS, CONSÉCUTIFS -À L'UTILISATION DU LOGICIEL ET, NOTAMMENT DE TOUTES PERTES DE PROFITS -OU MANQUES À GAGNER, PERTE D'INFORMATION, DÉFAILLANCE -D'ORDINATEUR, INTERRUPTION DE TRAVAIL OU AUTRES DÉGÂTS, ET -CELA QUAND BIEN MÊME UN REPRÉSENTANT DE L'UNIVERSITÉ -AURAIT ÉTÉ INFORMÉ DE LA POSSIBILITÉ DE TELS -DOMMAGES. -

- -

-Seule la version anglaise de ce contrat fait foi juridiquement. -Les traductions en d'autres langues sont fournies aux usagers à -titre indicatif, mais elles ne sont pas nécessairement exactes -d'un point de vue juridique. -

- - - diff --git a/config/izpack/registry/bin/ICE_JNIRegistry.dll b/config/izpack/registry/bin/ICE_JNIRegistry.dll deleted file mode 100644 index 5463a70a4..000000000 Binary files a/config/izpack/registry/bin/ICE_JNIRegistry.dll and /dev/null differ diff --git a/config/izpack/registry/bin/readme.txt b/config/izpack/registry/bin/readme.txt deleted file mode 100644 index 19b873193..000000000 --- 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. - - - View The Source Code - -You can now directly view the JNIRegistry source code - and -source code documentation - -online via the Giant Java Tree. - - - Downloads - -Download the WinZip-ed package. (FTP) - - -Download the WinZip-ed package. (HTTP) - - - ------------------------------------------------------------------------- -* 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 b/config/izpack/registry/bin/registry.jar deleted file mode 100644 index 2aefa0f39..000000000 Binary files a/config/izpack/registry/bin/registry.jar and /dev/null differ diff --git a/config/izpack/registry/bin/setenv.jar b/config/izpack/registry/bin/setenv.jar deleted file mode 100644 index a0ce208fd..000000000 Binary files a/config/izpack/registry/bin/setenv.jar and /dev/null differ diff --git a/config/izpack/registry/src/MANIFEST.MF b/config/izpack/registry/src/MANIFEST.MF deleted file mode 100644 index a99365f10..000000000 --- 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 ab7b7a7a7..000000000 --- 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 [ ]\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 bbae42e6b..000000000 --- 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 bbae42e6b..000000000 --- a/config/izpack/targets/path_unix.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/local/ diff --git a/newsources/scala/CaseClass.scala b/newsources/scala/CaseClass.scala deleted file mode 100644 index e644a0375..000000000 --- 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 <= i < 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 009f8b6ee..000000000 --- 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 8f63867b2..000000000 --- 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 f48f18d5e..000000000 --- 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 df8588851..000000000 --- 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 1ce0b37b0..000000000 --- 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 8f53ce9c7..000000000 --- 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 c958960a0..000000000 --- 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 288bb634f..000000000 --- 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 eadb95bac..000000000 --- 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 452ca595f..000000000 --- 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 b0fb83b79..000000000 --- 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 4dcb830b0..000000000 --- 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 5a73641e5..000000000 --- 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/**/ 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 2b25592f7..000000000 --- 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 47b7b7f4d..000000000 --- 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 44093475d..000000000 --- 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 6c2527570..000000000 --- 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 db3317370..000000000 --- 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 9c79646c6..000000000 --- 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 e037a340f..000000000 --- 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 6a2a5483a..000000000 --- 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 9fe397b57..000000000 --- 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 69788a975..000000000 --- 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 cafab096f..000000000 --- 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 19d42a288..000000000 --- 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 b1a71916c..000000000 --- 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/**/ 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 "." + 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 0bc22709e..000000000 --- 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 5f0e18898..000000000 --- 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 3c29b70c0..000000000 --- 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 cc03d72e8..000000000 --- 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 286a51859..000000000 --- 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 29edaa325..000000000 --- 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 0cffb9c85..000000000 --- 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 similarity index 100% rename from sources/scala/tools/nsc/CompilationUnits.scala rename to src/compiler/scala/tools/nsc/CompilationUnits.scala diff --git a/sources/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala similarity index 100% rename from sources/scala/tools/nsc/CompilerCommand.scala rename to src/compiler/scala/tools/nsc/CompilerCommand.scala diff --git a/sources/scala/tools/nsc/CompilerRun.scala b/src/compiler/scala/tools/nsc/CompilerRun.scala similarity index 100% rename from sources/scala/tools/nsc/CompilerRun.scala rename to src/compiler/scala/tools/nsc/CompilerRun.scala diff --git a/sources/scala/tools/nsc/EvalLoop.scala b/src/compiler/scala/tools/nsc/EvalLoop.scala similarity index 100% rename from sources/scala/tools/nsc/EvalLoop.scala rename to src/compiler/scala/tools/nsc/EvalLoop.scala diff --git a/sources/scala/tools/nsc/FatalError.scala b/src/compiler/scala/tools/nsc/FatalError.scala similarity index 100% rename from sources/scala/tools/nsc/FatalError.scala rename to src/compiler/scala/tools/nsc/FatalError.scala diff --git a/sources/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala similarity index 100% rename from sources/scala/tools/nsc/Global.scala rename to src/compiler/scala/tools/nsc/Global.scala diff --git a/sources/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala similarity index 100% rename from sources/scala/tools/nsc/Interpreter.scala rename to src/compiler/scala/tools/nsc/Interpreter.scala diff --git a/sources/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala similarity index 100% rename from sources/scala/tools/nsc/Main.scala rename to src/compiler/scala/tools/nsc/Main.scala diff --git a/sources/scala/tools/nsc/MainInterpreter.scala b/src/compiler/scala/tools/nsc/MainInterpreter.scala similarity index 100% rename from sources/scala/tools/nsc/MainInterpreter.scala rename to src/compiler/scala/tools/nsc/MainInterpreter.scala diff --git a/sources/scala/tools/nsc/MainTokenMetric.scala b/src/compiler/scala/tools/nsc/MainTokenMetric.scala similarity index 100% rename from sources/scala/tools/nsc/MainTokenMetric.scala rename to src/compiler/scala/tools/nsc/MainTokenMetric.scala diff --git a/sources/scala/tools/nsc/NoPhase.scala b/src/compiler/scala/tools/nsc/NoPhase.scala similarity index 100% rename from sources/scala/tools/nsc/NoPhase.scala rename to src/compiler/scala/tools/nsc/NoPhase.scala diff --git a/sources/scala/tools/nsc/Phase.scala b/src/compiler/scala/tools/nsc/Phase.scala similarity index 100% rename from sources/scala/tools/nsc/Phase.scala rename to src/compiler/scala/tools/nsc/Phase.scala diff --git a/sources/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala similarity index 100% rename from sources/scala/tools/nsc/Settings.scala rename to src/compiler/scala/tools/nsc/Settings.scala diff --git a/sources/scala/tools/nsc/SubComponent.scala b/src/compiler/scala/tools/nsc/SubComponent.scala similarity index 100% rename from sources/scala/tools/nsc/SubComponent.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ant/NSC.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/TreeBrowsers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/TreeGen.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/TreeInfo.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/TreePrinters.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/Trees.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/parser/MarkupParsers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/parser/Parsers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/parser/Scanners.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/parser/SymbolicXMLBuilder.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/parser/SyntaxAnalyzer.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/parser/Tokens.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/ast/parser/TreeBuilder.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/ScalaPrimitives.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/WorklistAlgorithm.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/BasicBlocks.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/CheckerError.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/Checkers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/ExceptionHandlers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/GenICode.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/ICodes.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/Linearizers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/Members.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/Opcodes.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/Primitives.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/Printers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/TypeKinds.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/icode/TypeStacks.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/backend/jvm/GenJVM.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/AlgebraicMatchers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/Autom2.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/BerrySethis.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/CodeFactory.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/DetWordAutoms.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/LeftTracers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/MatcherLabels.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/NondetWordAutoms.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/Npair.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/PatternMatchers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/PatternNodeCreator.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/PatternNodes.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/RightTracers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/SequenceMatchers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/StateSetComparator.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/TransMatcher.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/matching/WordAutoms.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/models/Models.scala.xxx rename to 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 similarity index 100% rename from sources/scala/tools/nsc/models/SemanticTokens.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/models/Signatures.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/reporters/AbstractReporter.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/reporters/ConsoleReporter.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/reporters/Reporter.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/reporters/ReporterTimer.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/reporters/StoreReporter.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/Constants.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/Definitions.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/Flags.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/InfoTransformers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/Names.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/Scopes.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/StdNames.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/SymbolLoaders.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/SymbolTable.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/Symbols.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/Types.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/ClassfileConstants.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/ClassfileParser.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/MetaParser.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/PickleBuffer.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/PickleFormat.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/Pickler.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/SymblfileParser.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/symtab/classfile/UnPickler.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/AddInterfaces.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/Constructors.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/Erasure.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/ExplicitOuter.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/Flatten.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/InfoTransform.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/LambdaLift.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/Mixin.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/OverridingPairs.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/SampleTransform.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/TailCalls.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/Transform.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/transform/UnCurry.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/Analyzer.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/Codification.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/ConstantFolder.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/Contexts.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/EtaExpansion.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/Infer.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/Namers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/RefChecks.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/SuperAccessors.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/SyntheticMethods.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/TreeCheckers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/Typers.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/typechecker/Variances.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/CharArrayReader.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/FreshNameCreator.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/HashSet.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/LinkedList.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/ListBuffer.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/NameTransformer.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/Position.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/Set.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/ShowPickled.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/SourceFile.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/Statistics.scala rename to 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 similarity index 100% rename from sources/scala/tools/nsc/util/TreeSet.scala rename to 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 similarity index 100% rename from sources/scala/tools/util/AbstractFile.java rename to src/compiler/scala/tools/util/AbstractFile.java diff --git a/sources/scala/tools/util/AbstractFileReader.java b/src/compiler/scala/tools/util/AbstractFileReader.java similarity index 100% rename from sources/scala/tools/util/AbstractFileReader.java rename to src/compiler/scala/tools/util/AbstractFileReader.java diff --git a/sources/scala/tools/util/AbstractReporter.java b/src/compiler/scala/tools/util/AbstractReporter.java similarity index 100% rename from sources/scala/tools/util/AbstractReporter.java rename to src/compiler/scala/tools/util/AbstractReporter.java diff --git a/sources/scala/tools/util/AbstractTimer.java b/src/compiler/scala/tools/util/AbstractTimer.java similarity index 100% rename from sources/scala/tools/util/AbstractTimer.java rename to src/compiler/scala/tools/util/AbstractTimer.java diff --git a/sources/scala/tools/util/ByteArrayFile.java b/src/compiler/scala/tools/util/ByteArrayFile.java similarity index 100% rename from sources/scala/tools/util/ByteArrayFile.java rename to src/compiler/scala/tools/util/ByteArrayFile.java diff --git a/sources/scala/tools/util/CharArrayFile.java b/src/compiler/scala/tools/util/CharArrayFile.java similarity index 100% rename from sources/scala/tools/util/CharArrayFile.java rename to src/compiler/scala/tools/util/CharArrayFile.java diff --git a/sources/scala/tools/util/ClassPath.java b/src/compiler/scala/tools/util/ClassPath.java similarity index 100% rename from sources/scala/tools/util/ClassPath.java rename to src/compiler/scala/tools/util/ClassPath.java diff --git a/sources/scala/tools/util/ConsoleReporter.java b/src/compiler/scala/tools/util/ConsoleReporter.java similarity index 100% rename from sources/scala/tools/util/ConsoleReporter.java rename to src/compiler/scala/tools/util/ConsoleReporter.java diff --git a/sources/scala/tools/util/DirectoryPath.java b/src/compiler/scala/tools/util/DirectoryPath.java similarity index 100% rename from sources/scala/tools/util/DirectoryPath.java rename to src/compiler/scala/tools/util/DirectoryPath.java diff --git a/sources/scala/tools/util/DummyTimer.java b/src/compiler/scala/tools/util/DummyTimer.java similarity index 100% rename from sources/scala/tools/util/DummyTimer.java rename to src/compiler/scala/tools/util/DummyTimer.java diff --git a/sources/scala/tools/util/EmptyIterator.java b/src/compiler/scala/tools/util/EmptyIterator.java similarity index 100% rename from sources/scala/tools/util/EmptyIterator.java rename to src/compiler/scala/tools/util/EmptyIterator.java diff --git a/sources/scala/tools/util/PlainFile.java b/src/compiler/scala/tools/util/PlainFile.java similarity index 100% rename from sources/scala/tools/util/PlainFile.java rename to src/compiler/scala/tools/util/PlainFile.java diff --git a/sources/scala/tools/util/Position.java b/src/compiler/scala/tools/util/Position.java similarity index 100% rename from sources/scala/tools/util/Position.java rename to src/compiler/scala/tools/util/Position.java diff --git a/sources/scala/tools/util/Reporter.java b/src/compiler/scala/tools/util/Reporter.java similarity index 100% rename from sources/scala/tools/util/Reporter.java rename to src/compiler/scala/tools/util/Reporter.java diff --git a/sources/scala/tools/util/ReporterTimer.java b/src/compiler/scala/tools/util/ReporterTimer.java similarity index 100% rename from sources/scala/tools/util/ReporterTimer.java rename to src/compiler/scala/tools/util/ReporterTimer.java diff --git a/sources/scala/tools/util/SourceFile.java b/src/compiler/scala/tools/util/SourceFile.java similarity index 100% rename from sources/scala/tools/util/SourceFile.java rename to src/compiler/scala/tools/util/SourceFile.java diff --git a/sources/scala/tools/util/SourceReader.java b/src/compiler/scala/tools/util/SourceReader.java similarity index 100% rename from sources/scala/tools/util/SourceReader.java rename to src/compiler/scala/tools/util/SourceReader.java diff --git a/sources/scala/tools/util/StringBufferWriter.java b/src/compiler/scala/tools/util/StringBufferWriter.java similarity index 100% rename from sources/scala/tools/util/StringBufferWriter.java rename to src/compiler/scala/tools/util/StringBufferWriter.java diff --git a/sources/scala/tools/util/Timer.java b/src/compiler/scala/tools/util/Timer.java similarity index 100% rename from sources/scala/tools/util/Timer.java rename to src/compiler/scala/tools/util/Timer.java diff --git a/sources/scala/tools/util/UTF8Codec.java b/src/compiler/scala/tools/util/UTF8Codec.java similarity index 100% rename from sources/scala/tools/util/UTF8Codec.java rename to src/compiler/scala/tools/util/UTF8Codec.java diff --git a/sources/scala/tools/util/VirtualDirectory.java b/src/compiler/scala/tools/util/VirtualDirectory.java similarity index 100% rename from sources/scala/tools/util/VirtualDirectory.java rename to src/compiler/scala/tools/util/VirtualDirectory.java diff --git a/sources/scala/tools/util/VirtualFile.java b/src/compiler/scala/tools/util/VirtualFile.java similarity index 100% rename from sources/scala/tools/util/VirtualFile.java rename to src/compiler/scala/tools/util/VirtualFile.java diff --git a/sources/scala/tools/util/ZipArchive.java b/src/compiler/scala/tools/util/ZipArchive.java similarity index 100% rename from sources/scala/tools/util/ZipArchive.java rename to 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 similarity index 100% rename from sources/scala/tools/util/debug/AbortError.java rename to 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 similarity index 100% rename from sources/scala/tools/util/debug/ArrayDebugger.java rename to 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 similarity index 100% rename from sources/scala/tools/util/debug/Debug.java rename to 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 similarity index 100% rename from sources/scala/tools/util/debug/Debugger.java rename to 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 similarity index 100% rename from sources/scala/tools/util/debug/ObjectDebugger.java rename to 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 similarity index 100% rename from sources/scala/tools/util/debug/ThrowableDebugger.java rename to 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 similarity index 100% rename from sources/scala/tools/util/debug/ToStringDebugger.java rename to src/compiler/scala/tools/util/debug/ToStringDebugger.java diff --git a/sources/bin/nscala-tool.win.tmpl b/src/exec/nscala-tool.win.tmpl similarity index 100% rename from sources/bin/nscala-tool.win.tmpl rename to src/exec/nscala-tool.win.tmpl diff --git a/sources/bin/nscala.unix.tmpl b/src/exec/nscala.unix.tmpl similarity index 81% rename from sources/bin/nscala.unix.tmpl rename to src/exec/nscala.unix.tmpl index 8288bde38..759450b7c 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 similarity index 100% rename from sources/bin/nscala.win.tmpl rename to src/exec/nscala.win.tmpl diff --git a/sources/scala/All$.java b/src/library/scala/All$.java similarity index 100% rename from sources/scala/All$.java rename to src/library/scala/All$.java diff --git a/sources/scala/AllRef$.java b/src/library/scala/AllRef$.java similarity index 100% rename from sources/scala/AllRef$.java rename to src/library/scala/AllRef$.java diff --git a/sources/scala/AnyVal.cs b/src/library/scala/AnyVal.cs similarity index 89% rename from sources/scala/AnyVal.cs rename to src/library/scala/AnyVal.cs index 2178416e4..13cf2f3e2 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 similarity index 100% rename from sources/scala/AnyVal.java rename to src/library/scala/AnyVal.java diff --git a/sources/scala/Application.scala b/src/library/scala/Application.scala similarity index 95% rename from sources/scala/Application.scala rename to src/library/scala/Application.scala index 80fc41acb..b536c8a31 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 similarity index 100% rename from newsources/scala/Array.scala rename to src/library/scala/Array.scala diff --git a/sources/scala/Attribute.scala b/src/library/scala/Attribute.scala similarity index 87% rename from sources/scala/Attribute.scala rename to src/library/scala/Attribute.scala index 999e5fdce..9cb11143f 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 similarity index 95% rename from sources/scala/Boolean.cs rename to src/library/scala/Boolean.cs index add1f882f..73e72935e 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 similarity index 100% rename from sources/scala/Boolean.java rename to src/library/scala/Boolean.java diff --git a/sources/scala/BufferedIterator.scala b/src/library/scala/BufferedIterator.scala similarity index 90% rename from sources/scala/BufferedIterator.scala rename to src/library/scala/BufferedIterator.scala index e17093e1d..6ee72ee78 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 similarity index 98% rename from sources/scala/Byte.cs rename to src/library/scala/Byte.cs index 4fd649345..a8faa7080 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 similarity index 100% rename from sources/scala/Byte.java rename to src/library/scala/Byte.java diff --git a/sources/scala/CaseClass.scala b/src/library/scala/CaseClass.scala similarity index 92% rename from sources/scala/CaseClass.scala rename to src/library/scala/CaseClass.scala index 0180efe26..07b766ede 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 similarity index 91% rename from sources/scala/Cell.scala rename to src/library/scala/Cell.scala index 8a5146a3a..77ee7015c 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 similarity index 98% rename from sources/scala/Char.cs rename to src/library/scala/Char.cs index b3e28a454..3afde58df 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 similarity index 100% rename from sources/scala/Char.java rename to src/library/scala/Char.java diff --git a/sources/scala/Console.scala b/src/library/scala/Console.scala similarity index 99% rename from sources/scala/Console.scala rename to src/library/scala/Console.scala index f9ec8fc49..f7175d1e1 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 similarity index 96% rename from sources/scala/Double.cs rename to src/library/scala/Double.cs index 59da22040..30b9293c4 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 similarity index 100% rename from sources/scala/Double.java rename to src/library/scala/Double.java diff --git a/sources/scala/Enumeration.scala b/src/library/scala/Enumeration.scala similarity index 98% rename from sources/scala/Enumeration.scala rename to src/library/scala/Enumeration.scala index 81d6107f3..9a8fa14af 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 similarity index 97% rename from sources/scala/Float.cs rename to src/library/scala/Float.cs index 13832f3f1..5a3a162de 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 similarity index 100% rename from sources/scala/Float.java rename to src/library/scala/Float.java diff --git a/sources/scala/Function0.scala b/src/library/scala/Function0.scala similarity index 100% rename from sources/scala/Function0.scala rename to src/library/scala/Function0.scala diff --git a/sources/scala/Function1.scala b/src/library/scala/Function1.scala similarity index 100% rename from sources/scala/Function1.scala rename to src/library/scala/Function1.scala diff --git a/sources/scala/Function2.scala b/src/library/scala/Function2.scala similarity index 100% rename from sources/scala/Function2.scala rename to src/library/scala/Function2.scala diff --git a/sources/scala/Function3.scala b/src/library/scala/Function3.scala similarity index 100% rename from sources/scala/Function3.scala rename to src/library/scala/Function3.scala diff --git a/sources/scala/Function4.scala b/src/library/scala/Function4.scala similarity index 100% rename from sources/scala/Function4.scala rename to src/library/scala/Function4.scala diff --git a/sources/scala/Function5.scala b/src/library/scala/Function5.scala similarity index 100% rename from sources/scala/Function5.scala rename to src/library/scala/Function5.scala diff --git a/sources/scala/Function6.scala b/src/library/scala/Function6.scala similarity index 100% rename from sources/scala/Function6.scala rename to src/library/scala/Function6.scala diff --git a/sources/scala/Function7.scala b/src/library/scala/Function7.scala similarity index 100% rename from sources/scala/Function7.scala rename to src/library/scala/Function7.scala diff --git a/sources/scala/Function8.scala b/src/library/scala/Function8.scala similarity index 100% rename from sources/scala/Function8.scala rename to src/library/scala/Function8.scala diff --git a/sources/scala/Function9.scala b/src/library/scala/Function9.scala similarity index 100% rename from sources/scala/Function9.scala rename to src/library/scala/Function9.scala diff --git a/sources/scala/Int.cs b/src/library/scala/Int.cs similarity index 98% rename from sources/scala/Int.cs rename to src/library/scala/Int.cs index 001ee900d..1c909df50 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 similarity index 100% rename from sources/scala/Int.java rename to src/library/scala/Int.java diff --git a/sources/scala/Iterable.scala b/src/library/scala/Iterable.scala similarity index 98% rename from sources/scala/Iterable.scala rename to src/library/scala/Iterable.scala index dead34f3c..0621b080b 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 similarity index 97% rename from sources/scala/IterableProxy.scala rename to src/library/scala/IterableProxy.scala index 2d238f684..07dbccb75 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 similarity index 99% rename from sources/scala/Iterator.scala rename to src/library/scala/Iterator.scala index f9fbbad0c..349bd4375 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 similarity index 99% rename from sources/scala/List.scala rename to src/library/scala/List.scala index d3b3be565..1271c4980 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 similarity index 98% rename from sources/scala/Long.cs rename to src/library/scala/Long.cs index 01995f7d0..cf147b04b 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 similarity index 100% rename from sources/scala/Long.java rename to src/library/scala/Long.java diff --git a/newsources/scala/MatchError.scala b/src/library/scala/MatchError.scala similarity index 100% rename from newsources/scala/MatchError.scala rename to src/library/scala/MatchError.scala diff --git a/sources/scala/None.scala b/src/library/scala/None.scala similarity index 89% rename from sources/scala/None.scala rename to src/library/scala/None.scala index 9905889ac..337426b1e 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 similarity index 95% rename from sources/scala/Option.scala rename to src/library/scala/Option.scala index 7d9dbce45..c19748c87 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 similarity index 94% rename from sources/scala/Ordered.scala rename to src/library/scala/Ordered.scala index adef57ad2..e12d3aa2b 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 similarity index 92% rename from sources/scala/PartialFunction.scala rename to src/library/scala/PartialFunction.scala index 470f9c571..9bea5386c 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 similarity index 95% rename from sources/scala/PartiallyOrdered.scala rename to src/library/scala/PartiallyOrdered.scala index 04c8afc50..b03e00e4e 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 similarity index 99% rename from sources/scala/Predef.scala rename to src/library/scala/Predef.scala index 25c45b78a..91139f7dd 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 similarity index 92% rename from sources/scala/Proxy.scala rename to src/library/scala/Proxy.scala index 5129f0eb0..5bf65c2ed 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 similarity index 91% rename from sources/scala/Ref.cs rename to src/library/scala/Ref.cs index 3a10a7c64..660b07321 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 similarity index 100% rename from sources/scala/Ref.java rename to src/library/scala/Ref.java diff --git a/newsources/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala similarity index 100% rename from newsources/scala/ScalaObject.scala rename to src/library/scala/ScalaObject.scala diff --git a/sources/scala/Seq.scala b/src/library/scala/Seq.scala similarity index 98% rename from sources/scala/Seq.scala rename to src/library/scala/Seq.scala index aa24f67a1..67f136b45 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 similarity index 97% rename from sources/scala/SeqProxy.scala rename to src/library/scala/SeqProxy.scala index b529f3cf9..b8ac98b96 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 similarity index 85% rename from sources/scala/SerialVersionUID.scala rename to src/library/scala/SerialVersionUID.scala index c86da7b66..9b42c0941 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 similarity index 98% rename from sources/scala/Short.cs rename to src/library/scala/Short.cs index 0e03090d5..5503b9360 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 similarity index 100% rename from sources/scala/Short.java rename to src/library/scala/Short.java diff --git a/sources/scala/Some.scala b/src/library/scala/Some.scala similarity index 90% rename from sources/scala/Some.scala rename to src/library/scala/Some.scala index 4f0bd7ea3..4d5d210ab 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 similarity index 98% rename from sources/scala/Stream.scala rename to src/library/scala/Stream.scala index 546f6ef5b..0097aaae1 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 similarity index 92% rename from sources/scala/Symbol.scala rename to src/library/scala/Symbol.scala index e6560370c..790dbb5c5 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 similarity index 100% rename from sources/scala/Tuple1.scala rename to src/library/scala/Tuple1.scala diff --git a/sources/scala/Tuple2.scala b/src/library/scala/Tuple2.scala similarity index 100% rename from sources/scala/Tuple2.scala rename to src/library/scala/Tuple2.scala diff --git a/sources/scala/Tuple3.scala b/src/library/scala/Tuple3.scala similarity index 100% rename from sources/scala/Tuple3.scala rename to src/library/scala/Tuple3.scala diff --git a/sources/scala/Tuple4.scala b/src/library/scala/Tuple4.scala similarity index 100% rename from sources/scala/Tuple4.scala rename to src/library/scala/Tuple4.scala diff --git a/sources/scala/Tuple5.scala b/src/library/scala/Tuple5.scala similarity index 100% rename from sources/scala/Tuple5.scala rename to src/library/scala/Tuple5.scala diff --git a/sources/scala/Tuple6.scala b/src/library/scala/Tuple6.scala similarity index 100% rename from sources/scala/Tuple6.scala rename to src/library/scala/Tuple6.scala diff --git a/sources/scala/Tuple7.scala b/src/library/scala/Tuple7.scala similarity index 100% rename from sources/scala/Tuple7.scala rename to src/library/scala/Tuple7.scala diff --git a/sources/scala/Tuple8.scala b/src/library/scala/Tuple8.scala similarity index 100% rename from sources/scala/Tuple8.scala rename to src/library/scala/Tuple8.scala diff --git a/sources/scala/Tuple9.scala b/src/library/scala/Tuple9.scala similarity index 100% rename from sources/scala/Tuple9.scala rename to src/library/scala/Tuple9.scala diff --git a/sources/scala/Unit.cs b/src/library/scala/Unit.cs similarity index 93% rename from sources/scala/Unit.cs rename to src/library/scala/Unit.cs index 0acb8db74..44fd1aa3c 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 similarity index 100% rename from sources/scala/Unit.java rename to src/library/scala/Unit.java diff --git a/sources/scala/_trait_.scala b/src/library/scala/_trait_.scala similarity index 90% rename from sources/scala/_trait_.scala rename to src/library/scala/_trait_.scala index a9a0e3f53..41c6d56d7 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 similarity index 85% rename from sources/scala/cloneable.scala rename to src/library/scala/cloneable.scala index 8369799be..4067a3d73 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 similarity index 100% rename from sources/scala/collection/BitSet.scala rename to src/library/scala/collection/BitSet.scala diff --git a/sources/scala/collection/Map.scala b/src/library/scala/collection/Map.scala similarity index 100% rename from sources/scala/collection/Map.scala rename to src/library/scala/collection/Map.scala diff --git a/sources/scala/collection/MapProxy.scala b/src/library/scala/collection/MapProxy.scala similarity index 100% rename from sources/scala/collection/MapProxy.scala rename to src/library/scala/collection/MapProxy.scala diff --git a/sources/scala/collection/Set.scala b/src/library/scala/collection/Set.scala similarity index 100% rename from sources/scala/collection/Set.scala rename to src/library/scala/collection/Set.scala diff --git a/sources/scala/collection/SetProxy.scala b/src/library/scala/collection/SetProxy.scala similarity index 100% rename from sources/scala/collection/SetProxy.scala rename to src/library/scala/collection/SetProxy.scala diff --git a/sources/scala/collection/immutable/BitSet.scala b/src/library/scala/collection/immutable/BitSet.scala similarity index 100% rename from sources/scala/collection/immutable/BitSet.scala rename to src/library/scala/collection/immutable/BitSet.scala diff --git a/sources/scala/collection/immutable/ListMap.scala b/src/library/scala/collection/immutable/ListMap.scala similarity index 100% rename from sources/scala/collection/immutable/ListMap.scala rename to src/library/scala/collection/immutable/ListMap.scala diff --git a/sources/scala/collection/immutable/ListSet.scala b/src/library/scala/collection/immutable/ListSet.scala similarity index 100% rename from sources/scala/collection/immutable/ListSet.scala rename to src/library/scala/collection/immutable/ListSet.scala diff --git a/sources/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala similarity index 100% rename from sources/scala/collection/immutable/Map.scala rename to src/library/scala/collection/immutable/Map.scala diff --git a/sources/scala/collection/immutable/Queue.scala b/src/library/scala/collection/immutable/Queue.scala similarity index 100% rename from sources/scala/collection/immutable/Queue.scala rename to src/library/scala/collection/immutable/Queue.scala diff --git a/sources/scala/collection/immutable/Set.scala b/src/library/scala/collection/immutable/Set.scala similarity index 100% rename from sources/scala/collection/immutable/Set.scala rename to src/library/scala/collection/immutable/Set.scala diff --git a/sources/scala/collection/immutable/Stack.scala b/src/library/scala/collection/immutable/Stack.scala similarity index 100% rename from sources/scala/collection/immutable/Stack.scala rename to src/library/scala/collection/immutable/Stack.scala diff --git a/sources/scala/collection/immutable/Tree.scala b/src/library/scala/collection/immutable/Tree.scala similarity index 100% rename from sources/scala/collection/immutable/Tree.scala rename to src/library/scala/collection/immutable/Tree.scala diff --git a/sources/scala/collection/immutable/TreeMap.scala b/src/library/scala/collection/immutable/TreeMap.scala similarity index 100% rename from sources/scala/collection/immutable/TreeMap.scala rename to src/library/scala/collection/immutable/TreeMap.scala diff --git a/sources/scala/collection/immutable/TreeSet.scala b/src/library/scala/collection/immutable/TreeSet.scala similarity index 100% rename from sources/scala/collection/immutable/TreeSet.scala rename to src/library/scala/collection/immutable/TreeSet.scala diff --git a/sources/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala similarity index 100% rename from sources/scala/collection/mutable/ArrayBuffer.scala rename to src/library/scala/collection/mutable/ArrayBuffer.scala diff --git a/sources/scala/collection/mutable/BitSet.scala b/src/library/scala/collection/mutable/BitSet.scala similarity index 100% rename from sources/scala/collection/mutable/BitSet.scala rename to src/library/scala/collection/mutable/BitSet.scala diff --git a/sources/scala/collection/mutable/Buffer.scala b/src/library/scala/collection/mutable/Buffer.scala similarity index 100% rename from sources/scala/collection/mutable/Buffer.scala rename to src/library/scala/collection/mutable/Buffer.scala diff --git a/sources/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala similarity index 100% rename from sources/scala/collection/mutable/BufferProxy.scala rename to src/library/scala/collection/mutable/BufferProxy.scala diff --git a/sources/scala/collection/mutable/DefaultMapModel.scala b/src/library/scala/collection/mutable/DefaultMapModel.scala similarity index 100% rename from sources/scala/collection/mutable/DefaultMapModel.scala rename to src/library/scala/collection/mutable/DefaultMapModel.scala diff --git a/sources/scala/collection/mutable/DoubleLinkedList.scala b/src/library/scala/collection/mutable/DoubleLinkedList.scala similarity index 100% rename from sources/scala/collection/mutable/DoubleLinkedList.scala rename to src/library/scala/collection/mutable/DoubleLinkedList.scala diff --git a/sources/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala similarity index 100% rename from sources/scala/collection/mutable/HashMap.scala rename to src/library/scala/collection/mutable/HashMap.scala diff --git a/sources/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala similarity index 100% rename from sources/scala/collection/mutable/HashSet.scala rename to src/library/scala/collection/mutable/HashSet.scala diff --git a/sources/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala similarity index 100% rename from sources/scala/collection/mutable/HashTable.scala rename to src/library/scala/collection/mutable/HashTable.scala diff --git a/sources/scala/collection/mutable/History.scala b/src/library/scala/collection/mutable/History.scala similarity index 100% rename from sources/scala/collection/mutable/History.scala rename to src/library/scala/collection/mutable/History.scala diff --git a/sources/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala similarity index 100% rename from sources/scala/collection/mutable/ImmutableMapAdaptor.scala rename to src/library/scala/collection/mutable/ImmutableMapAdaptor.scala diff --git a/sources/scala/collection/mutable/ImmutableSetAdaptor.scala b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala similarity index 100% rename from sources/scala/collection/mutable/ImmutableSetAdaptor.scala rename to src/library/scala/collection/mutable/ImmutableSetAdaptor.scala diff --git a/sources/scala/collection/mutable/JavaMapAdaptor.scala b/src/library/scala/collection/mutable/JavaMapAdaptor.scala similarity index 100% rename from sources/scala/collection/mutable/JavaMapAdaptor.scala rename to src/library/scala/collection/mutable/JavaMapAdaptor.scala diff --git a/sources/scala/collection/mutable/JavaSetAdaptor.scala b/src/library/scala/collection/mutable/JavaSetAdaptor.scala similarity index 100% rename from sources/scala/collection/mutable/JavaSetAdaptor.scala rename to src/library/scala/collection/mutable/JavaSetAdaptor.scala diff --git a/sources/scala/collection/mutable/LinkedList.scala b/src/library/scala/collection/mutable/LinkedList.scala similarity index 100% rename from sources/scala/collection/mutable/LinkedList.scala rename to src/library/scala/collection/mutable/LinkedList.scala diff --git a/sources/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala similarity index 100% rename from sources/scala/collection/mutable/ListBuffer.scala rename to src/library/scala/collection/mutable/ListBuffer.scala diff --git a/sources/scala/collection/mutable/Location.scala b/src/library/scala/collection/mutable/Location.scala similarity index 100% rename from sources/scala/collection/mutable/Location.scala rename to src/library/scala/collection/mutable/Location.scala diff --git a/sources/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala similarity index 100% rename from sources/scala/collection/mutable/Map.scala rename to src/library/scala/collection/mutable/Map.scala diff --git a/sources/scala/collection/mutable/MapProxy.scala b/src/library/scala/collection/mutable/MapProxy.scala similarity index 100% rename from sources/scala/collection/mutable/MapProxy.scala rename to src/library/scala/collection/mutable/MapProxy.scala diff --git a/sources/scala/collection/mutable/Message.scala b/src/library/scala/collection/mutable/Message.scala similarity index 100% rename from sources/scala/collection/mutable/Message.scala rename to src/library/scala/collection/mutable/Message.scala diff --git a/sources/scala/collection/mutable/MultiMap.scala b/src/library/scala/collection/mutable/MultiMap.scala similarity index 100% rename from sources/scala/collection/mutable/MultiMap.scala rename to src/library/scala/collection/mutable/MultiMap.scala diff --git a/sources/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala similarity index 100% rename from sources/scala/collection/mutable/MutableList.scala rename to src/library/scala/collection/mutable/MutableList.scala diff --git a/sources/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala similarity index 100% rename from sources/scala/collection/mutable/ObservableBuffer.scala rename to src/library/scala/collection/mutable/ObservableBuffer.scala diff --git a/sources/scala/collection/mutable/ObservableMap.scala b/src/library/scala/collection/mutable/ObservableMap.scala similarity index 100% rename from sources/scala/collection/mutable/ObservableMap.scala rename to src/library/scala/collection/mutable/ObservableMap.scala diff --git a/sources/scala/collection/mutable/ObservableSet.scala b/src/library/scala/collection/mutable/ObservableSet.scala similarity index 100% rename from sources/scala/collection/mutable/ObservableSet.scala rename to src/library/scala/collection/mutable/ObservableSet.scala diff --git a/sources/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala similarity index 100% rename from sources/scala/collection/mutable/PriorityQueue.scala rename to src/library/scala/collection/mutable/PriorityQueue.scala diff --git a/sources/scala/collection/mutable/PriorityQueueProxy.scala b/src/library/scala/collection/mutable/PriorityQueueProxy.scala similarity index 100% rename from sources/scala/collection/mutable/PriorityQueueProxy.scala rename to src/library/scala/collection/mutable/PriorityQueueProxy.scala diff --git a/sources/scala/collection/mutable/Publisher.scala b/src/library/scala/collection/mutable/Publisher.scala similarity index 100% rename from sources/scala/collection/mutable/Publisher.scala rename to src/library/scala/collection/mutable/Publisher.scala diff --git a/sources/scala/collection/mutable/Queue.scala b/src/library/scala/collection/mutable/Queue.scala similarity index 100% rename from sources/scala/collection/mutable/Queue.scala rename to src/library/scala/collection/mutable/Queue.scala diff --git a/sources/scala/collection/mutable/QueueProxy.scala b/src/library/scala/collection/mutable/QueueProxy.scala similarity index 100% rename from sources/scala/collection/mutable/QueueProxy.scala rename to src/library/scala/collection/mutable/QueueProxy.scala diff --git a/sources/scala/collection/mutable/ResizableArray.scala b/src/library/scala/collection/mutable/ResizableArray.scala similarity index 100% rename from sources/scala/collection/mutable/ResizableArray.scala rename to src/library/scala/collection/mutable/ResizableArray.scala diff --git a/sources/scala/collection/mutable/RevertableHistory.scala b/src/library/scala/collection/mutable/RevertableHistory.scala similarity index 100% rename from sources/scala/collection/mutable/RevertableHistory.scala rename to src/library/scala/collection/mutable/RevertableHistory.scala diff --git a/sources/scala/collection/mutable/Scriptable.scala b/src/library/scala/collection/mutable/Scriptable.scala similarity index 100% rename from sources/scala/collection/mutable/Scriptable.scala rename to src/library/scala/collection/mutable/Scriptable.scala diff --git a/sources/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala similarity index 100% rename from sources/scala/collection/mutable/Set.scala rename to src/library/scala/collection/mutable/Set.scala diff --git a/sources/scala/collection/mutable/SetProxy.scala b/src/library/scala/collection/mutable/SetProxy.scala similarity index 100% rename from sources/scala/collection/mutable/SetProxy.scala rename to src/library/scala/collection/mutable/SetProxy.scala diff --git a/sources/scala/collection/mutable/SingleLinkedList.scala b/src/library/scala/collection/mutable/SingleLinkedList.scala similarity index 100% rename from sources/scala/collection/mutable/SingleLinkedList.scala rename to src/library/scala/collection/mutable/SingleLinkedList.scala diff --git a/sources/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala similarity index 100% rename from sources/scala/collection/mutable/Stack.scala rename to src/library/scala/collection/mutable/Stack.scala diff --git a/sources/scala/collection/mutable/StackProxy.scala b/src/library/scala/collection/mutable/StackProxy.scala similarity index 100% rename from sources/scala/collection/mutable/StackProxy.scala rename to src/library/scala/collection/mutable/StackProxy.scala diff --git a/sources/scala/collection/mutable/Subscriber.scala b/src/library/scala/collection/mutable/Subscriber.scala similarity index 100% rename from sources/scala/collection/mutable/Subscriber.scala rename to src/library/scala/collection/mutable/Subscriber.scala diff --git a/sources/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala similarity index 100% rename from sources/scala/collection/mutable/SynchronizedBuffer.scala rename to src/library/scala/collection/mutable/SynchronizedBuffer.scala diff --git a/sources/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala similarity index 100% rename from sources/scala/collection/mutable/SynchronizedMap.scala rename to src/library/scala/collection/mutable/SynchronizedMap.scala diff --git a/sources/scala/collection/mutable/SynchronizedPriorityQueue.scala b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala similarity index 100% rename from sources/scala/collection/mutable/SynchronizedPriorityQueue.scala rename to src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala diff --git a/sources/scala/collection/mutable/SynchronizedQueue.scala b/src/library/scala/collection/mutable/SynchronizedQueue.scala similarity index 100% rename from sources/scala/collection/mutable/SynchronizedQueue.scala rename to src/library/scala/collection/mutable/SynchronizedQueue.scala diff --git a/sources/scala/collection/mutable/SynchronizedSet.scala b/src/library/scala/collection/mutable/SynchronizedSet.scala similarity index 100% rename from sources/scala/collection/mutable/SynchronizedSet.scala rename to src/library/scala/collection/mutable/SynchronizedSet.scala diff --git a/sources/scala/collection/mutable/SynchronizedStack.scala b/src/library/scala/collection/mutable/SynchronizedStack.scala similarity index 100% rename from sources/scala/collection/mutable/SynchronizedStack.scala rename to src/library/scala/collection/mutable/SynchronizedStack.scala diff --git a/sources/scala/collection/mutable/Undoable.scala b/src/library/scala/collection/mutable/Undoable.scala similarity index 100% rename from sources/scala/collection/mutable/Undoable.scala rename to src/library/scala/collection/mutable/Undoable.scala diff --git a/sources/scala/concurrent/Actor.scala b/src/library/scala/concurrent/Actor.scala similarity index 100% rename from sources/scala/concurrent/Actor.scala rename to src/library/scala/concurrent/Actor.scala diff --git a/sources/scala/concurrent/Channel.scala b/src/library/scala/concurrent/Channel.scala similarity index 100% rename from sources/scala/concurrent/Channel.scala rename to src/library/scala/concurrent/Channel.scala diff --git a/sources/scala/concurrent/Lock.scala b/src/library/scala/concurrent/Lock.scala similarity index 100% rename from sources/scala/concurrent/Lock.scala rename to src/library/scala/concurrent/Lock.scala diff --git a/sources/scala/concurrent/MailBox.scala b/src/library/scala/concurrent/MailBox.scala similarity index 100% rename from sources/scala/concurrent/MailBox.scala rename to src/library/scala/concurrent/MailBox.scala diff --git a/sources/scala/concurrent/NameServer.scala b/src/library/scala/concurrent/NameServer.scala similarity index 100% rename from sources/scala/concurrent/NameServer.scala rename to src/library/scala/concurrent/NameServer.scala diff --git a/sources/scala/concurrent/Process.scala b/src/library/scala/concurrent/Process.scala similarity index 100% rename from sources/scala/concurrent/Process.scala rename to src/library/scala/concurrent/Process.scala diff --git a/sources/scala/concurrent/SyncChannel.scala b/src/library/scala/concurrent/SyncChannel.scala similarity index 100% rename from sources/scala/concurrent/SyncChannel.scala rename to src/library/scala/concurrent/SyncChannel.scala diff --git a/sources/scala/concurrent/SyncVar.scala b/src/library/scala/concurrent/SyncVar.scala similarity index 100% rename from sources/scala/concurrent/SyncVar.scala rename to src/library/scala/concurrent/SyncVar.scala diff --git a/sources/scala/concurrent/TIMEOUT.scala b/src/library/scala/concurrent/TIMEOUT.scala similarity index 100% rename from sources/scala/concurrent/TIMEOUT.scala rename to src/library/scala/concurrent/TIMEOUT.scala diff --git a/sources/scala/concurrent/jolib.scala b/src/library/scala/concurrent/jolib.scala similarity index 100% rename from sources/scala/concurrent/jolib.scala rename to src/library/scala/concurrent/jolib.scala diff --git a/sources/scala/concurrent/ops.scala b/src/library/scala/concurrent/ops.scala similarity index 100% rename from sources/scala/concurrent/ops.scala rename to src/library/scala/concurrent/ops.scala diff --git a/sources/scala/concurrent/pilib.scala b/src/library/scala/concurrent/pilib.scala similarity index 100% rename from sources/scala/concurrent/pilib.scala rename to src/library/scala/concurrent/pilib.scala diff --git a/sources/scala/dbc/DataType.scala b/src/library/scala/dbc/DataType.scala similarity index 100% rename from sources/scala/dbc/DataType.scala rename to src/library/scala/dbc/DataType.scala diff --git a/sources/scala/dbc/Database.scala b/src/library/scala/dbc/Database.scala similarity index 100% rename from sources/scala/dbc/Database.scala rename to src/library/scala/dbc/Database.scala diff --git a/sources/scala/dbc/Syntax.scala b/src/library/scala/dbc/Syntax.scala similarity index 100% rename from sources/scala/dbc/Syntax.scala rename to src/library/scala/dbc/Syntax.scala diff --git a/sources/scala/dbc/Utilities.scala b/src/library/scala/dbc/Utilities.scala similarity index 100% rename from sources/scala/dbc/Utilities.scala rename to src/library/scala/dbc/Utilities.scala diff --git a/sources/scala/dbc/Value.scala b/src/library/scala/dbc/Value.scala similarity index 100% rename from sources/scala/dbc/Value.scala rename to src/library/scala/dbc/Value.scala diff --git a/sources/scala/dbc/Vendor.scala b/src/library/scala/dbc/Vendor.scala similarity index 100% rename from sources/scala/dbc/Vendor.scala rename to src/library/scala/dbc/Vendor.scala diff --git a/sources/scala/dbc/datatype/ApproximateNumeric.scala b/src/library/scala/dbc/datatype/ApproximateNumeric.scala similarity index 100% rename from sources/scala/dbc/datatype/ApproximateNumeric.scala rename to src/library/scala/dbc/datatype/ApproximateNumeric.scala diff --git a/sources/scala/dbc/datatype/Boolean.scala b/src/library/scala/dbc/datatype/Boolean.scala similarity index 100% rename from sources/scala/dbc/datatype/Boolean.scala rename to src/library/scala/dbc/datatype/Boolean.scala diff --git a/sources/scala/dbc/datatype/Character.scala b/src/library/scala/dbc/datatype/Character.scala similarity index 100% rename from sources/scala/dbc/datatype/Character.scala rename to src/library/scala/dbc/datatype/Character.scala diff --git a/sources/scala/dbc/datatype/CharacterLargeObject.scala b/src/library/scala/dbc/datatype/CharacterLargeObject.scala similarity index 100% rename from sources/scala/dbc/datatype/CharacterLargeObject.scala rename to src/library/scala/dbc/datatype/CharacterLargeObject.scala diff --git a/sources/scala/dbc/datatype/CharacterString.scala b/src/library/scala/dbc/datatype/CharacterString.scala similarity index 100% rename from sources/scala/dbc/datatype/CharacterString.scala rename to src/library/scala/dbc/datatype/CharacterString.scala diff --git a/sources/scala/dbc/datatype/CharacterVarying.scala b/src/library/scala/dbc/datatype/CharacterVarying.scala similarity index 100% rename from sources/scala/dbc/datatype/CharacterVarying.scala rename to src/library/scala/dbc/datatype/CharacterVarying.scala diff --git a/sources/scala/dbc/datatype/ExactNumeric.scala b/src/library/scala/dbc/datatype/ExactNumeric.scala similarity index 100% rename from sources/scala/dbc/datatype/ExactNumeric.scala rename to src/library/scala/dbc/datatype/ExactNumeric.scala diff --git a/sources/scala/dbc/datatype/Factory.scala b/src/library/scala/dbc/datatype/Factory.scala similarity index 100% rename from sources/scala/dbc/datatype/Factory.scala rename to src/library/scala/dbc/datatype/Factory.scala diff --git a/sources/scala/dbc/datatype/Numeric.scala b/src/library/scala/dbc/datatype/Numeric.scala similarity index 100% rename from sources/scala/dbc/datatype/Numeric.scala rename to src/library/scala/dbc/datatype/Numeric.scala diff --git a/sources/scala/dbc/datatype/String.scala b/src/library/scala/dbc/datatype/String.scala similarity index 100% rename from sources/scala/dbc/datatype/String.scala rename to src/library/scala/dbc/datatype/String.scala diff --git a/sources/scala/dbc/datatype/Unknown.scala b/src/library/scala/dbc/datatype/Unknown.scala similarity index 100% rename from sources/scala/dbc/datatype/Unknown.scala rename to src/library/scala/dbc/datatype/Unknown.scala diff --git a/sources/scala/dbc/exception/IncompatibleSchema.scala b/src/library/scala/dbc/exception/IncompatibleSchema.scala similarity index 100% rename from sources/scala/dbc/exception/IncompatibleSchema.scala rename to src/library/scala/dbc/exception/IncompatibleSchema.scala diff --git a/sources/scala/dbc/exception/UnsupportedFeature.scala b/src/library/scala/dbc/exception/UnsupportedFeature.scala similarity index 100% rename from sources/scala/dbc/exception/UnsupportedFeature.scala rename to src/library/scala/dbc/exception/UnsupportedFeature.scala diff --git a/sources/scala/dbc/result/Field.scala b/src/library/scala/dbc/result/Field.scala similarity index 100% rename from sources/scala/dbc/result/Field.scala rename to src/library/scala/dbc/result/Field.scala diff --git a/sources/scala/dbc/result/FieldMetadata.scala b/src/library/scala/dbc/result/FieldMetadata.scala similarity index 100% rename from sources/scala/dbc/result/FieldMetadata.scala rename to src/library/scala/dbc/result/FieldMetadata.scala diff --git a/sources/scala/dbc/result/Relation.scala b/src/library/scala/dbc/result/Relation.scala similarity index 100% rename from sources/scala/dbc/result/Relation.scala rename to src/library/scala/dbc/result/Relation.scala diff --git a/sources/scala/dbc/result/Status.scala b/src/library/scala/dbc/result/Status.scala similarity index 100% rename from sources/scala/dbc/result/Status.scala rename to src/library/scala/dbc/result/Status.scala diff --git a/sources/scala/dbc/result/Tuple.scala b/src/library/scala/dbc/result/Tuple.scala similarity index 100% rename from sources/scala/dbc/result/Tuple.scala rename to src/library/scala/dbc/result/Tuple.scala diff --git a/sources/scala/dbc/statement/AccessMode.scala b/src/library/scala/dbc/statement/AccessMode.scala similarity index 100% rename from sources/scala/dbc/statement/AccessMode.scala rename to src/library/scala/dbc/statement/AccessMode.scala diff --git a/sources/scala/dbc/statement/DerivedColumn.scala b/src/library/scala/dbc/statement/DerivedColumn.scala similarity index 100% rename from sources/scala/dbc/statement/DerivedColumn.scala rename to src/library/scala/dbc/statement/DerivedColumn.scala diff --git a/sources/scala/dbc/statement/Expression.scala b/src/library/scala/dbc/statement/Expression.scala similarity index 100% rename from sources/scala/dbc/statement/Expression.scala rename to src/library/scala/dbc/statement/Expression.scala diff --git a/sources/scala/dbc/statement/Insert.scala b/src/library/scala/dbc/statement/Insert.scala similarity index 100% rename from sources/scala/dbc/statement/Insert.scala rename to src/library/scala/dbc/statement/Insert.scala diff --git a/sources/scala/dbc/statement/InsertionData.scala b/src/library/scala/dbc/statement/InsertionData.scala similarity index 100% rename from sources/scala/dbc/statement/InsertionData.scala rename to src/library/scala/dbc/statement/InsertionData.scala diff --git a/sources/scala/dbc/statement/IsolationLevel.scala b/src/library/scala/dbc/statement/IsolationLevel.scala similarity index 100% rename from sources/scala/dbc/statement/IsolationLevel.scala rename to src/library/scala/dbc/statement/IsolationLevel.scala diff --git a/sources/scala/dbc/statement/JoinType.scala b/src/library/scala/dbc/statement/JoinType.scala similarity index 100% rename from sources/scala/dbc/statement/JoinType.scala rename to src/library/scala/dbc/statement/JoinType.scala diff --git a/sources/scala/dbc/statement/Jointure.scala b/src/library/scala/dbc/statement/Jointure.scala similarity index 100% rename from sources/scala/dbc/statement/Jointure.scala rename to src/library/scala/dbc/statement/Jointure.scala diff --git a/sources/scala/dbc/statement/Relation.scala b/src/library/scala/dbc/statement/Relation.scala similarity index 98% rename from sources/scala/dbc/statement/Relation.scala rename to src/library/scala/dbc/statement/Relation.scala index 61f1c8e94..a992adea1 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 similarity index 100% rename from sources/scala/dbc/statement/Select.scala rename to src/library/scala/dbc/statement/Select.scala diff --git a/sources/scala/dbc/statement/SetClause.scala b/src/library/scala/dbc/statement/SetClause.scala similarity index 100% rename from sources/scala/dbc/statement/SetClause.scala rename to src/library/scala/dbc/statement/SetClause.scala diff --git a/sources/scala/dbc/statement/SetQuantifier.scala b/src/library/scala/dbc/statement/SetQuantifier.scala similarity index 100% rename from sources/scala/dbc/statement/SetQuantifier.scala rename to src/library/scala/dbc/statement/SetQuantifier.scala diff --git a/sources/scala/dbc/statement/Statement.scala b/src/library/scala/dbc/statement/Statement.scala similarity index 100% rename from sources/scala/dbc/statement/Statement.scala rename to src/library/scala/dbc/statement/Statement.scala diff --git a/sources/scala/dbc/statement/Status.scala b/src/library/scala/dbc/statement/Status.scala similarity index 100% rename from sources/scala/dbc/statement/Status.scala rename to src/library/scala/dbc/statement/Status.scala diff --git a/sources/scala/dbc/statement/Table.scala b/src/library/scala/dbc/statement/Table.scala similarity index 100% rename from sources/scala/dbc/statement/Table.scala rename to src/library/scala/dbc/statement/Table.scala diff --git a/sources/scala/dbc/statement/Transaction.scala b/src/library/scala/dbc/statement/Transaction.scala similarity index 100% rename from sources/scala/dbc/statement/Transaction.scala rename to src/library/scala/dbc/statement/Transaction.scala diff --git a/sources/scala/dbc/statement/Update.scala b/src/library/scala/dbc/statement/Update.scala similarity index 100% rename from sources/scala/dbc/statement/Update.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/Aggregate.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/BinaryOperator.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/Constant.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/Default.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/Field.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/FunctionCall.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/Select.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/SetFunction.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/TypeCast.scala rename to 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 similarity index 100% rename from sources/scala/dbc/statement/expression/UnaryOperator.scala rename to 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 similarity index 100% rename from sources/scala/dbc/syntax/DataTypeUtil.scala rename to src/library/scala/dbc/syntax/DataTypeUtil.scala diff --git a/sources/scala/dbc/syntax/Database.scala b/src/library/scala/dbc/syntax/Database.scala similarity index 100% rename from sources/scala/dbc/syntax/Database.scala rename to src/library/scala/dbc/syntax/Database.scala diff --git a/sources/scala/dbc/syntax/Statement.scala b/src/library/scala/dbc/syntax/Statement.scala similarity index 100% rename from sources/scala/dbc/syntax/Statement.scala rename to src/library/scala/dbc/syntax/Statement.scala diff --git a/sources/scala/dbc/syntax/StatementExpression.scala b/src/library/scala/dbc/syntax/StatementExpression.scala similarity index 100% rename from sources/scala/dbc/syntax/StatementExpression.scala rename to src/library/scala/dbc/syntax/StatementExpression.scala diff --git a/sources/scala/dbc/value/ApproximateNumeric.scala b/src/library/scala/dbc/value/ApproximateNumeric.scala similarity index 100% rename from sources/scala/dbc/value/ApproximateNumeric.scala rename to src/library/scala/dbc/value/ApproximateNumeric.scala diff --git a/sources/scala/dbc/value/Boolean.scala b/src/library/scala/dbc/value/Boolean.scala similarity index 100% rename from sources/scala/dbc/value/Boolean.scala rename to src/library/scala/dbc/value/Boolean.scala diff --git a/sources/scala/dbc/value/Character.scala b/src/library/scala/dbc/value/Character.scala similarity index 100% rename from sources/scala/dbc/value/Character.scala rename to src/library/scala/dbc/value/Character.scala diff --git a/sources/scala/dbc/value/CharacterLargeObject.scala b/src/library/scala/dbc/value/CharacterLargeObject.scala similarity index 100% rename from sources/scala/dbc/value/CharacterLargeObject.scala rename to src/library/scala/dbc/value/CharacterLargeObject.scala diff --git a/sources/scala/dbc/value/CharacterVarying.scala b/src/library/scala/dbc/value/CharacterVarying.scala similarity index 100% rename from sources/scala/dbc/value/CharacterVarying.scala rename to src/library/scala/dbc/value/CharacterVarying.scala diff --git a/sources/scala/dbc/value/Conversion.scala b/src/library/scala/dbc/value/Conversion.scala similarity index 100% rename from sources/scala/dbc/value/Conversion.scala rename to src/library/scala/dbc/value/Conversion.scala diff --git a/sources/scala/dbc/value/ExactNumeric.scala b/src/library/scala/dbc/value/ExactNumeric.scala similarity index 100% rename from sources/scala/dbc/value/ExactNumeric.scala rename to src/library/scala/dbc/value/ExactNumeric.scala diff --git a/sources/scala/dbc/value/Factory.scala b/src/library/scala/dbc/value/Factory.scala similarity index 100% rename from sources/scala/dbc/value/Factory.scala rename to src/library/scala/dbc/value/Factory.scala diff --git a/sources/scala/dbc/value/Unknown.scala b/src/library/scala/dbc/value/Unknown.scala similarity index 100% rename from sources/scala/dbc/value/Unknown.scala rename to src/library/scala/dbc/value/Unknown.scala diff --git a/sources/scala/dbc/vendor/PostgreSQL.scala b/src/library/scala/dbc/vendor/PostgreSQL.scala similarity index 100% rename from sources/scala/dbc/vendor/PostgreSQL.scala rename to src/library/scala/dbc/vendor/PostgreSQL.scala diff --git a/sources/scala/io/Position.scala b/src/library/scala/io/Position.scala similarity index 100% rename from sources/scala/io/Position.scala rename to src/library/scala/io/Position.scala diff --git a/sources/scala/io/Source.scala b/src/library/scala/io/Source.scala similarity index 100% rename from sources/scala/io/Source.scala rename to src/library/scala/io/Source.scala diff --git a/sources/scala/mobile/Code.scala b/src/library/scala/mobile/Code.scala similarity index 100% rename from sources/scala/mobile/Code.scala rename to src/library/scala/mobile/Code.scala diff --git a/sources/scala/mobile/Location.scala b/src/library/scala/mobile/Location.scala similarity index 100% rename from sources/scala/mobile/Location.scala rename to src/library/scala/mobile/Location.scala diff --git a/sources/scala/reflect/Code.scala b/src/library/scala/reflect/Code.scala similarity index 100% rename from sources/scala/reflect/Code.scala rename to src/library/scala/reflect/Code.scala diff --git a/sources/scala/reflect/Print.scala b/src/library/scala/reflect/Print.scala similarity index 100% rename from sources/scala/reflect/Print.scala rename to src/library/scala/reflect/Print.scala diff --git a/sources/scala/reflect/Symbol.scala b/src/library/scala/reflect/Symbol.scala similarity index 100% rename from sources/scala/reflect/Symbol.scala rename to src/library/scala/reflect/Symbol.scala diff --git a/sources/scala/reflect/Type.scala b/src/library/scala/reflect/Type.scala similarity index 100% rename from sources/scala/reflect/Type.scala rename to src/library/scala/reflect/Type.scala diff --git a/sources/scala/reflect/TypedCode.scala b/src/library/scala/reflect/TypedCode.scala similarity index 100% rename from sources/scala/reflect/TypedCode.scala rename to src/library/scala/reflect/TypedCode.scala diff --git a/sources/scala/remote.scala b/src/library/scala/remote.scala similarity index 100% rename from sources/scala/remote.scala rename to src/library/scala/remote.scala diff --git a/sources/scala/runtime/AtomicReference.java b/src/library/scala/runtime/AtomicReference.java similarity index 100% rename from sources/scala/runtime/AtomicReference.java rename to src/library/scala/runtime/AtomicReference.java diff --git a/sources/scala/runtime/BooleanRef.java b/src/library/scala/runtime/BooleanRef.java similarity index 100% rename from sources/scala/runtime/BooleanRef.java rename to src/library/scala/runtime/BooleanRef.java diff --git a/sources/scala/runtime/BoxedAnyArray.scala b/src/library/scala/runtime/BoxedAnyArray.scala similarity index 100% rename from sources/scala/runtime/BoxedAnyArray.scala rename to src/library/scala/runtime/BoxedAnyArray.scala diff --git a/sources/scala/runtime/BoxedArray.scala b/src/library/scala/runtime/BoxedArray.scala similarity index 100% rename from sources/scala/runtime/BoxedArray.scala rename to src/library/scala/runtime/BoxedArray.scala diff --git a/sources/scala/runtime/BoxedBoolean.java b/src/library/scala/runtime/BoxedBoolean.java similarity index 100% rename from sources/scala/runtime/BoxedBoolean.java rename to src/library/scala/runtime/BoxedBoolean.java diff --git a/sources/scala/runtime/BoxedBooleanArray.scala b/src/library/scala/runtime/BoxedBooleanArray.scala similarity index 100% rename from sources/scala/runtime/BoxedBooleanArray.scala rename to src/library/scala/runtime/BoxedBooleanArray.scala diff --git a/sources/scala/runtime/BoxedByte.java b/src/library/scala/runtime/BoxedByte.java similarity index 100% rename from sources/scala/runtime/BoxedByte.java rename to src/library/scala/runtime/BoxedByte.java diff --git a/sources/scala/runtime/BoxedByteArray.scala b/src/library/scala/runtime/BoxedByteArray.scala similarity index 100% rename from sources/scala/runtime/BoxedByteArray.scala rename to src/library/scala/runtime/BoxedByteArray.scala diff --git a/sources/scala/runtime/BoxedChar.java b/src/library/scala/runtime/BoxedChar.java similarity index 100% rename from sources/scala/runtime/BoxedChar.java rename to src/library/scala/runtime/BoxedChar.java diff --git a/sources/scala/runtime/BoxedCharArray.scala b/src/library/scala/runtime/BoxedCharArray.scala similarity index 100% rename from sources/scala/runtime/BoxedCharArray.scala rename to src/library/scala/runtime/BoxedCharArray.scala diff --git a/sources/scala/runtime/BoxedDouble.java b/src/library/scala/runtime/BoxedDouble.java similarity index 100% rename from sources/scala/runtime/BoxedDouble.java rename to src/library/scala/runtime/BoxedDouble.java diff --git a/sources/scala/runtime/BoxedDoubleArray.scala b/src/library/scala/runtime/BoxedDoubleArray.scala similarity index 100% rename from sources/scala/runtime/BoxedDoubleArray.scala rename to src/library/scala/runtime/BoxedDoubleArray.scala diff --git a/sources/scala/runtime/BoxedFloat.java b/src/library/scala/runtime/BoxedFloat.java similarity index 100% rename from sources/scala/runtime/BoxedFloat.java rename to src/library/scala/runtime/BoxedFloat.java diff --git a/sources/scala/runtime/BoxedFloatArray.scala b/src/library/scala/runtime/BoxedFloatArray.scala similarity index 100% rename from sources/scala/runtime/BoxedFloatArray.scala rename to src/library/scala/runtime/BoxedFloatArray.scala diff --git a/sources/scala/runtime/BoxedInt.java b/src/library/scala/runtime/BoxedInt.java similarity index 100% rename from sources/scala/runtime/BoxedInt.java rename to src/library/scala/runtime/BoxedInt.java diff --git a/sources/scala/runtime/BoxedIntArray.scala b/src/library/scala/runtime/BoxedIntArray.scala similarity index 100% rename from sources/scala/runtime/BoxedIntArray.scala rename to src/library/scala/runtime/BoxedIntArray.scala diff --git a/sources/scala/runtime/BoxedLong.java b/src/library/scala/runtime/BoxedLong.java similarity index 100% rename from sources/scala/runtime/BoxedLong.java rename to src/library/scala/runtime/BoxedLong.java diff --git a/sources/scala/runtime/BoxedLongArray.scala b/src/library/scala/runtime/BoxedLongArray.scala similarity index 100% rename from sources/scala/runtime/BoxedLongArray.scala rename to src/library/scala/runtime/BoxedLongArray.scala diff --git a/sources/scala/runtime/BoxedNumber.java b/src/library/scala/runtime/BoxedNumber.java similarity index 100% rename from sources/scala/runtime/BoxedNumber.java rename to src/library/scala/runtime/BoxedNumber.java diff --git a/sources/scala/runtime/BoxedObjectArray.scala b/src/library/scala/runtime/BoxedObjectArray.scala similarity index 100% rename from sources/scala/runtime/BoxedObjectArray.scala rename to src/library/scala/runtime/BoxedObjectArray.scala diff --git a/sources/scala/runtime/BoxedShort.java b/src/library/scala/runtime/BoxedShort.java similarity index 100% rename from sources/scala/runtime/BoxedShort.java rename to src/library/scala/runtime/BoxedShort.java diff --git a/sources/scala/runtime/BoxedShortArray.scala b/src/library/scala/runtime/BoxedShortArray.scala similarity index 100% rename from sources/scala/runtime/BoxedShortArray.scala rename to src/library/scala/runtime/BoxedShortArray.scala diff --git a/sources/scala/runtime/BoxedUnit.java b/src/library/scala/runtime/BoxedUnit.java similarity index 100% rename from sources/scala/runtime/BoxedUnit.java rename to src/library/scala/runtime/BoxedUnit.java diff --git a/sources/scala/runtime/ByteRef.java b/src/library/scala/runtime/ByteRef.java similarity index 100% rename from sources/scala/runtime/ByteRef.java rename to src/library/scala/runtime/ByteRef.java diff --git a/sources/scala/runtime/CharRef.java b/src/library/scala/runtime/CharRef.java similarity index 100% rename from sources/scala/runtime/CharRef.java rename to src/library/scala/runtime/CharRef.java diff --git a/sources/scala/runtime/DoubleRef.java b/src/library/scala/runtime/DoubleRef.java similarity index 100% rename from sources/scala/runtime/DoubleRef.java rename to src/library/scala/runtime/DoubleRef.java diff --git a/sources/scala/ScalaObject.cs b/src/library/scala/runtime/ExceptionHandling.cs similarity index 62% rename from sources/scala/ScalaObject.cs rename to src/library/scala/runtime/ExceptionHandling.cs index 7f2b7f693..0a59308f9 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 similarity index 60% rename from sources/scala/runtime/types/LazyParents.java rename to src/library/scala/runtime/ExceptionHandling.java index 7f3e64575..293d2cad8 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 similarity index 100% rename from sources/scala/runtime/FNV_Hash.java rename to src/library/scala/runtime/FNV_Hash.java diff --git a/sources/scala/runtime/FloatRef.java b/src/library/scala/runtime/FloatRef.java similarity index 100% rename from sources/scala/runtime/FloatRef.java rename to src/library/scala/runtime/FloatRef.java diff --git a/sources/scala/runtime/IOMap.java b/src/library/scala/runtime/IOMap.java similarity index 100% rename from sources/scala/runtime/IOMap.java rename to src/library/scala/runtime/IOMap.java diff --git a/sources/scala/runtime/IntRef.java b/src/library/scala/runtime/IntRef.java similarity index 100% rename from sources/scala/runtime/IntRef.java rename to src/library/scala/runtime/IntRef.java diff --git a/sources/scala/runtime/InterpreterSupport.java b/src/library/scala/runtime/InterpreterSupport.java similarity index 100% rename from sources/scala/runtime/InterpreterSupport.java rename to src/library/scala/runtime/InterpreterSupport.java diff --git a/sources/scala/runtime/LongRef.java b/src/library/scala/runtime/LongRef.java similarity index 100% rename from sources/scala/runtime/LongRef.java rename to src/library/scala/runtime/LongRef.java diff --git a/sources/scala/runtime/MetaAttribute.cs b/src/library/scala/runtime/MetaAttribute.cs similarity index 100% rename from sources/scala/runtime/MetaAttribute.cs rename to src/library/scala/runtime/MetaAttribute.cs diff --git a/sources/scala/runtime/ObjectRef.java b/src/library/scala/runtime/ObjectRef.java similarity index 100% rename from sources/scala/runtime/ObjectRef.java rename to src/library/scala/runtime/ObjectRef.java diff --git a/sources/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala similarity index 94% rename from sources/scala/runtime/ScalaRunTime.scala rename to src/library/scala/runtime/ScalaRunTime.scala index e42f9efa5..458e6be61 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 similarity index 100% rename from sources/scala/runtime/ShortRef.java rename to src/library/scala/runtime/ShortRef.java diff --git a/sources/scala/runtime/SymtabAttribute.cs b/src/library/scala/runtime/SymtabAttribute.cs similarity index 100% rename from sources/scala/runtime/SymtabAttribute.cs rename to src/library/scala/runtime/SymtabAttribute.cs diff --git a/sources/scala/runtime/compat/Math.scala b/src/library/scala/runtime/compat/Math.scala similarity index 100% rename from sources/scala/runtime/compat/Math.scala rename to src/library/scala/runtime/compat/Math.scala diff --git a/sources/scala/runtime/compat/Platform.scala b/src/library/scala/runtime/compat/Platform.scala similarity index 100% rename from sources/scala/runtime/compat/Platform.scala rename to src/library/scala/runtime/compat/Platform.scala diff --git a/sources/scala/runtime/compat/StringBuilder.scala b/src/library/scala/runtime/compat/StringBuilder.scala similarity index 100% rename from sources/scala/runtime/compat/StringBuilder.scala rename to src/library/scala/runtime/compat/StringBuilder.scala diff --git a/sources/scala/runtime/matching/Address.scala b/src/library/scala/runtime/matching/Address.scala similarity index 100% rename from sources/scala/runtime/matching/Address.scala rename to src/library/scala/runtime/matching/Address.scala diff --git a/sources/scala/runtime/matching/NonTerm.scala b/src/library/scala/runtime/matching/NonTerm.scala similarity index 100% rename from sources/scala/runtime/matching/NonTerm.scala rename to src/library/scala/runtime/matching/NonTerm.scala diff --git a/sources/scala/runtime/matching/PatternTests.scala b/src/library/scala/runtime/matching/PatternTests.scala similarity index 100% rename from sources/scala/runtime/matching/PatternTests.scala rename to src/library/scala/runtime/matching/PatternTests.scala diff --git a/sources/scala/runtime/matching/Rule.scala b/src/library/scala/runtime/matching/Rule.scala similarity index 100% rename from sources/scala/runtime/matching/Rule.scala rename to src/library/scala/runtime/matching/Rule.scala diff --git a/sources/scala/runtime/matching/TestAlphabet.scala b/src/library/scala/runtime/matching/TestAlphabet.scala similarity index 100% rename from sources/scala/runtime/matching/TestAlphabet.scala rename to src/library/scala/runtime/matching/TestAlphabet.scala diff --git a/sources/scala/serializable.scala b/src/library/scala/serializable.scala similarity index 100% rename from sources/scala/serializable.scala rename to src/library/scala/serializable.scala diff --git a/sources/scala/testing/Benchmark.scala b/src/library/scala/testing/Benchmark.scala similarity index 100% rename from sources/scala/testing/Benchmark.scala rename to src/library/scala/testing/Benchmark.scala diff --git a/sources/scala/testing/SUnit.scala b/src/library/scala/testing/SUnit.scala similarity index 100% rename from sources/scala/testing/SUnit.scala rename to src/library/scala/testing/SUnit.scala diff --git a/sources/scala/testing/UnitTest.scala b/src/library/scala/testing/UnitTest.scala similarity index 100% rename from sources/scala/testing/UnitTest.scala rename to src/library/scala/testing/UnitTest.scala diff --git a/sources/scala/text/Document.scala b/src/library/scala/text/Document.scala similarity index 100% rename from sources/scala/text/Document.scala rename to src/library/scala/text/Document.scala diff --git a/sources/scala/transient.scala b/src/library/scala/transient.scala similarity index 87% rename from sources/scala/transient.scala rename to src/library/scala/transient.scala index 6b18785a5..e94744bf4 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 similarity index 100% rename from sources/scala/util/automata/BaseBerrySethi.scala rename to src/library/scala/util/automata/BaseBerrySethi.scala diff --git a/sources/scala/util/automata/DetWordAutom.scala b/src/library/scala/util/automata/DetWordAutom.scala similarity index 100% rename from sources/scala/util/automata/DetWordAutom.scala rename to src/library/scala/util/automata/DetWordAutom.scala diff --git a/sources/scala/util/automata/Inclusion.scala b/src/library/scala/util/automata/Inclusion.scala similarity index 100% rename from sources/scala/util/automata/Inclusion.scala rename to src/library/scala/util/automata/Inclusion.scala diff --git a/sources/scala/util/automata/NondetWordAutom.scala b/src/library/scala/util/automata/NondetWordAutom.scala similarity index 100% rename from sources/scala/util/automata/NondetWordAutom.scala rename to src/library/scala/util/automata/NondetWordAutom.scala diff --git a/sources/scala/util/automata/SubsetConstruction.scala b/src/library/scala/util/automata/SubsetConstruction.scala similarity index 100% rename from sources/scala/util/automata/SubsetConstruction.scala rename to src/library/scala/util/automata/SubsetConstruction.scala diff --git a/sources/scala/util/automata/WordBerrySethi.scala b/src/library/scala/util/automata/WordBerrySethi.scala similarity index 100% rename from sources/scala/util/automata/WordBerrySethi.scala rename to src/library/scala/util/automata/WordBerrySethi.scala diff --git a/sources/scala/util/grammar/HedgeRHS.scala b/src/library/scala/util/grammar/HedgeRHS.scala similarity index 100% rename from sources/scala/util/grammar/HedgeRHS.scala rename to src/library/scala/util/grammar/HedgeRHS.scala diff --git a/sources/scala/util/grammar/TreeRHS.scala b/src/library/scala/util/grammar/TreeRHS.scala similarity index 100% rename from sources/scala/util/grammar/TreeRHS.scala rename to src/library/scala/util/grammar/TreeRHS.scala diff --git a/sources/scala/util/logging/ConsoleLogger.scala b/src/library/scala/util/logging/ConsoleLogger.scala similarity index 100% rename from sources/scala/util/logging/ConsoleLogger.scala rename to src/library/scala/util/logging/ConsoleLogger.scala diff --git a/sources/scala/util/logging/Logged.scala b/src/library/scala/util/logging/Logged.scala similarity index 100% rename from sources/scala/util/logging/Logged.scala rename to src/library/scala/util/logging/Logged.scala diff --git a/sources/scala/util/parsing/CharInputStreamIterator.scala b/src/library/scala/util/parsing/CharInputStreamIterator.scala similarity index 100% rename from sources/scala/util/parsing/CharInputStreamIterator.scala rename to src/library/scala/util/parsing/CharInputStreamIterator.scala diff --git a/sources/scala/util/parsing/Parsers.scala b/src/library/scala/util/parsing/Parsers.scala similarity index 100% rename from sources/scala/util/parsing/Parsers.scala rename to src/library/scala/util/parsing/Parsers.scala diff --git a/sources/scala/util/parsing/SimpleTokenizer.scala b/src/library/scala/util/parsing/SimpleTokenizer.scala similarity index 100% rename from sources/scala/util/parsing/SimpleTokenizer.scala rename to src/library/scala/util/parsing/SimpleTokenizer.scala diff --git a/sources/scala/util/regexp/Base.scala b/src/library/scala/util/regexp/Base.scala similarity index 100% rename from sources/scala/util/regexp/Base.scala rename to src/library/scala/util/regexp/Base.scala diff --git a/sources/scala/util/regexp/PointedHedgeExp.scala b/src/library/scala/util/regexp/PointedHedgeExp.scala similarity index 100% rename from sources/scala/util/regexp/PointedHedgeExp.scala rename to src/library/scala/util/regexp/PointedHedgeExp.scala diff --git a/sources/scala/util/regexp/SyntaxError.scala b/src/library/scala/util/regexp/SyntaxError.scala similarity index 100% rename from sources/scala/util/regexp/SyntaxError.scala rename to src/library/scala/util/regexp/SyntaxError.scala diff --git a/sources/scala/util/regexp/WordExp.scala b/src/library/scala/util/regexp/WordExp.scala similarity index 100% rename from sources/scala/util/regexp/WordExp.scala rename to src/library/scala/util/regexp/WordExp.scala diff --git a/sources/scala/volatile.scala b/src/library/scala/volatile.scala similarity index 87% rename from sources/scala/volatile.scala rename to src/library/scala/volatile.scala index b60e4bbe3..ab8b2e780 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 similarity index 100% rename from sources/scala/xml/Atom.scala rename to src/library/scala/xml/Atom.scala diff --git a/sources/scala/xml/Comment.scala b/src/library/scala/xml/Comment.scala similarity index 100% rename from sources/scala/xml/Comment.scala rename to src/library/scala/xml/Comment.scala diff --git a/sources/scala/xml/Document.scala b/src/library/scala/xml/Document.scala similarity index 100% rename from sources/scala/xml/Document.scala rename to src/library/scala/xml/Document.scala diff --git a/sources/scala/xml/Elem.scala b/src/library/scala/xml/Elem.scala similarity index 100% rename from sources/scala/xml/Elem.scala rename to src/library/scala/xml/Elem.scala diff --git a/sources/scala/xml/EntityRef.scala b/src/library/scala/xml/EntityRef.scala similarity index 100% rename from sources/scala/xml/EntityRef.scala rename to src/library/scala/xml/EntityRef.scala diff --git a/sources/scala/xml/MalformedAttributeException.scala b/src/library/scala/xml/MalformedAttributeException.scala similarity index 100% rename from sources/scala/xml/MalformedAttributeException.scala rename to src/library/scala/xml/MalformedAttributeException.scala diff --git a/sources/scala/xml/MetaData.scala b/src/library/scala/xml/MetaData.scala similarity index 100% rename from sources/scala/xml/MetaData.scala rename to src/library/scala/xml/MetaData.scala diff --git a/sources/scala/xml/Molecule.scala b/src/library/scala/xml/Molecule.scala similarity index 100% rename from sources/scala/xml/Molecule.scala rename to src/library/scala/xml/Molecule.scala diff --git a/sources/scala/xml/NamespaceBinding.scala b/src/library/scala/xml/NamespaceBinding.scala similarity index 100% rename from sources/scala/xml/NamespaceBinding.scala rename to src/library/scala/xml/NamespaceBinding.scala diff --git a/sources/scala/xml/Node.scala b/src/library/scala/xml/Node.scala similarity index 100% rename from sources/scala/xml/Node.scala rename to src/library/scala/xml/Node.scala diff --git a/sources/scala/xml/NodeBuffer.scala b/src/library/scala/xml/NodeBuffer.scala similarity index 100% rename from sources/scala/xml/NodeBuffer.scala rename to src/library/scala/xml/NodeBuffer.scala diff --git a/sources/scala/xml/NodeSeq.scala b/src/library/scala/xml/NodeSeq.scala similarity index 100% rename from sources/scala/xml/NodeSeq.scala rename to src/library/scala/xml/NodeSeq.scala diff --git a/sources/scala/xml/NodeTraverser.scala b/src/library/scala/xml/NodeTraverser.scala similarity index 100% rename from sources/scala/xml/NodeTraverser.scala rename to src/library/scala/xml/NodeTraverser.scala diff --git a/sources/scala/xml/Null.scala b/src/library/scala/xml/Null.scala similarity index 100% rename from sources/scala/xml/Null.scala rename to src/library/scala/xml/Null.scala diff --git a/sources/scala/xml/Parsing.scala b/src/library/scala/xml/Parsing.scala similarity index 100% rename from sources/scala/xml/Parsing.scala rename to src/library/scala/xml/Parsing.scala diff --git a/sources/scala/xml/PrefixedAttribute.scala b/src/library/scala/xml/PrefixedAttribute.scala similarity index 100% rename from sources/scala/xml/PrefixedAttribute.scala rename to src/library/scala/xml/PrefixedAttribute.scala diff --git a/sources/scala/xml/PrettyPrinter.scala b/src/library/scala/xml/PrettyPrinter.scala similarity index 100% rename from sources/scala/xml/PrettyPrinter.scala rename to src/library/scala/xml/PrettyPrinter.scala diff --git a/sources/scala/xml/ProcInstr.scala b/src/library/scala/xml/ProcInstr.scala similarity index 100% rename from sources/scala/xml/ProcInstr.scala rename to src/library/scala/xml/ProcInstr.scala diff --git a/sources/scala/xml/SpecialNode.scala b/src/library/scala/xml/SpecialNode.scala similarity index 100% rename from sources/scala/xml/SpecialNode.scala rename to src/library/scala/xml/SpecialNode.scala diff --git a/sources/scala/xml/Text.scala b/src/library/scala/xml/Text.scala similarity index 100% rename from sources/scala/xml/Text.scala rename to src/library/scala/xml/Text.scala diff --git a/sources/scala/xml/TextBuffer.scala b/src/library/scala/xml/TextBuffer.scala similarity index 100% rename from sources/scala/xml/TextBuffer.scala rename to src/library/scala/xml/TextBuffer.scala diff --git a/sources/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala similarity index 100% rename from sources/scala/xml/TopScope.scala rename to src/library/scala/xml/TopScope.scala diff --git a/sources/scala/xml/TypeSymbol.scala b/src/library/scala/xml/TypeSymbol.scala similarity index 100% rename from sources/scala/xml/TypeSymbol.scala rename to src/library/scala/xml/TypeSymbol.scala diff --git a/sources/scala/xml/UnprefixedAttribute.scala b/src/library/scala/xml/UnprefixedAttribute.scala similarity index 100% rename from sources/scala/xml/UnprefixedAttribute.scala rename to src/library/scala/xml/UnprefixedAttribute.scala diff --git a/sources/scala/xml/Utility.scala b/src/library/scala/xml/Utility.scala similarity index 100% rename from sources/scala/xml/Utility.scala rename to src/library/scala/xml/Utility.scala diff --git a/sources/scala/xml/XML.scala b/src/library/scala/xml/XML.scala similarity index 100% rename from sources/scala/xml/XML.scala rename to src/library/scala/xml/XML.scala diff --git a/sources/scala/xml/dtd/ContentModel.scala b/src/library/scala/xml/dtd/ContentModel.scala similarity index 100% rename from sources/scala/xml/dtd/ContentModel.scala rename to src/library/scala/xml/dtd/ContentModel.scala diff --git a/sources/scala/xml/dtd/ContentModelParser.scala b/src/library/scala/xml/dtd/ContentModelParser.scala similarity index 100% rename from sources/scala/xml/dtd/ContentModelParser.scala rename to src/library/scala/xml/dtd/ContentModelParser.scala diff --git a/sources/scala/xml/dtd/DTD.scala b/src/library/scala/xml/dtd/DTD.scala similarity index 100% rename from sources/scala/xml/dtd/DTD.scala rename to src/library/scala/xml/dtd/DTD.scala diff --git a/sources/scala/xml/dtd/Decl.scala b/src/library/scala/xml/dtd/Decl.scala similarity index 100% rename from sources/scala/xml/dtd/Decl.scala rename to src/library/scala/xml/dtd/Decl.scala diff --git a/sources/scala/xml/dtd/DocType.scala b/src/library/scala/xml/dtd/DocType.scala similarity index 100% rename from sources/scala/xml/dtd/DocType.scala rename to src/library/scala/xml/dtd/DocType.scala diff --git a/sources/scala/xml/dtd/DtdTypeSymbol.scala b/src/library/scala/xml/dtd/DtdTypeSymbol.scala similarity index 100% rename from sources/scala/xml/dtd/DtdTypeSymbol.scala rename to src/library/scala/xml/dtd/DtdTypeSymbol.scala diff --git a/sources/scala/xml/dtd/ElementValidator.scala b/src/library/scala/xml/dtd/ElementValidator.scala similarity index 100% rename from sources/scala/xml/dtd/ElementValidator.scala rename to src/library/scala/xml/dtd/ElementValidator.scala diff --git a/sources/scala/xml/dtd/ExternalID.scala b/src/library/scala/xml/dtd/ExternalID.scala similarity index 100% rename from sources/scala/xml/dtd/ExternalID.scala rename to src/library/scala/xml/dtd/ExternalID.scala diff --git a/sources/scala/xml/dtd/Scanner.scala b/src/library/scala/xml/dtd/Scanner.scala similarity index 100% rename from sources/scala/xml/dtd/Scanner.scala rename to src/library/scala/xml/dtd/Scanner.scala diff --git a/sources/scala/xml/dtd/Tokens.scala b/src/library/scala/xml/dtd/Tokens.scala similarity index 100% rename from sources/scala/xml/dtd/Tokens.scala rename to src/library/scala/xml/dtd/Tokens.scala diff --git a/sources/scala/xml/dtd/ValidationException.scala b/src/library/scala/xml/dtd/ValidationException.scala similarity index 100% rename from sources/scala/xml/dtd/ValidationException.scala rename to src/library/scala/xml/dtd/ValidationException.scala diff --git a/sources/scala/xml/factory/Binder.scala b/src/library/scala/xml/factory/Binder.scala similarity index 100% rename from sources/scala/xml/factory/Binder.scala rename to src/library/scala/xml/factory/Binder.scala diff --git a/sources/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala similarity index 100% rename from sources/scala/xml/factory/LoggedNodeFactory.scala rename to src/library/scala/xml/factory/LoggedNodeFactory.scala diff --git a/sources/scala/xml/factory/NodeFactory.scala b/src/library/scala/xml/factory/NodeFactory.scala similarity index 100% rename from sources/scala/xml/factory/NodeFactory.scala rename to src/library/scala/xml/factory/NodeFactory.scala diff --git a/sources/scala/xml/parsing/ConstructingHandler.scala b/src/library/scala/xml/parsing/ConstructingHandler.scala similarity index 100% rename from sources/scala/xml/parsing/ConstructingHandler.scala rename to src/library/scala/xml/parsing/ConstructingHandler.scala diff --git a/sources/scala/xml/parsing/ConstructingParser.scala b/src/library/scala/xml/parsing/ConstructingParser.scala similarity index 100% rename from sources/scala/xml/parsing/ConstructingParser.scala rename to src/library/scala/xml/parsing/ConstructingParser.scala diff --git a/sources/scala/xml/parsing/DefaultMarkupHandler.scala b/src/library/scala/xml/parsing/DefaultMarkupHandler.scala similarity index 100% rename from sources/scala/xml/parsing/DefaultMarkupHandler.scala rename to src/library/scala/xml/parsing/DefaultMarkupHandler.scala diff --git a/sources/scala/xml/parsing/ExternalSources.scala b/src/library/scala/xml/parsing/ExternalSources.scala similarity index 100% rename from sources/scala/xml/parsing/ExternalSources.scala rename to src/library/scala/xml/parsing/ExternalSources.scala diff --git a/sources/scala/xml/parsing/FactoryAdapter.scala b/src/library/scala/xml/parsing/FactoryAdapter.scala similarity index 100% rename from sources/scala/xml/parsing/FactoryAdapter.scala rename to src/library/scala/xml/parsing/FactoryAdapter.scala diff --git a/sources/scala/xml/parsing/FatalError.scala b/src/library/scala/xml/parsing/FatalError.scala similarity index 100% rename from sources/scala/xml/parsing/FatalError.scala rename to src/library/scala/xml/parsing/FatalError.scala diff --git a/sources/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala similarity index 100% rename from sources/scala/xml/parsing/MarkupHandler.scala rename to src/library/scala/xml/parsing/MarkupHandler.scala diff --git a/sources/scala/xml/parsing/MarkupParser.scala b/src/library/scala/xml/parsing/MarkupParser.scala similarity index 100% rename from sources/scala/xml/parsing/MarkupParser.scala rename to src/library/scala/xml/parsing/MarkupParser.scala diff --git a/sources/scala/xml/parsing/NoBindingFactoryAdapter.scala b/src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala similarity index 100% rename from sources/scala/xml/parsing/NoBindingFactoryAdapter.scala rename to src/library/scala/xml/parsing/NoBindingFactoryAdapter.scala diff --git a/sources/scala/xml/parsing/TokenTests.scala b/src/library/scala/xml/parsing/TokenTests.scala similarity index 100% rename from sources/scala/xml/parsing/TokenTests.scala rename to src/library/scala/xml/parsing/TokenTests.scala diff --git a/sources/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala similarity index 100% rename from sources/scala/xml/parsing/ValidatingMarkupHandler.scala rename to src/library/scala/xml/parsing/ValidatingMarkupHandler.scala diff --git a/sources/scala/xml/path/Expression.scala b/src/library/scala/xml/path/Expression.scala similarity index 100% rename from sources/scala/xml/path/Expression.scala rename to src/library/scala/xml/path/Expression.scala diff --git a/sources/scala/xml/transform/BasicTransformer.scala b/src/library/scala/xml/transform/BasicTransformer.scala similarity index 100% rename from sources/scala/xml/transform/BasicTransformer.scala rename to src/library/scala/xml/transform/BasicTransformer.scala diff --git a/sources/scala/xml/transform/RewriteRule.scala b/src/library/scala/xml/transform/RewriteRule.scala similarity index 100% rename from sources/scala/xml/transform/RewriteRule.scala rename to src/library/scala/xml/transform/RewriteRule.scala diff --git a/sources/scala/xml/transform/RuleTransformer.scala b/src/library/scala/xml/transform/RuleTransformer.scala similarity index 100% rename from sources/scala/xml/transform/RuleTransformer.scala rename to src/library/scala/xml/transform/RuleTransformer.scala diff --git a/sources/scala/xml/xsd/ContentModel.scala b/src/library/scala/xml/xsd/ContentModel.scala similarity index 100% rename from sources/scala/xml/xsd/ContentModel.scala rename to src/library/scala/xml/xsd/ContentModel.scala diff --git a/sources/scala/xml/xsd/Decl.scala b/src/library/scala/xml/xsd/Decl.scala similarity index 100% rename from sources/scala/xml/xsd/Decl.scala rename to src/library/scala/xml/xsd/Decl.scala diff --git a/sources/scala/xml/xsd/XsTypeSymbol.scala b/src/library/scala/xml/xsd/XsTypeSymbol.scala similarity index 100% rename from sources/scala/xml/xsd/XsTypeSymbol.scala rename to src/library/scala/xml/xsd/XsTypeSymbol.scala diff --git a/sources/msil/AssemblyInfo.cs.tmpl b/src/msil-library/AssemblyInfo.cs.tmpl similarity index 100% rename from sources/msil/AssemblyInfo.cs.tmpl rename to 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 similarity index 100% rename from sources/msil/scala/runtime/compat/Math.scala rename to 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 similarity index 100% rename from sources/msil/scala/runtime/compat/Platform.scala rename to 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 similarity index 100% rename from sources/msil/scala/runtime/compat/StringBuilder.scala rename to src/msil-library/scala/runtime/compat/StringBuilder.scala