summaryrefslogtreecommitdiff
path: root/sources/msil
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2005-12-19 13:49:03 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2005-12-19 13:49:03 +0000
commitac849228490d5a0e2d3f048d649297d5c59b6ade (patch)
tree6314f2c06f37e67dec5827c3f94e25cf844a085c /sources/msil
parentd6c0efe5b4b89a0337f1cdcdabf8c607d81f4ae1 (diff)
downloadscala-ac849228490d5a0e2d3f048d649297d5c59b6ade.tar.gz
scala-ac849228490d5a0e2d3f048d649297d5c59b6ade.tar.bz2
scala-ac849228490d5a0e2d3f048d649297d5c59b6ade.zip
Switching to the new build system and to the ne...
Switching to the new build system and to the new build system. This is a MAJOR commit, so be careful when updating.
Diffstat (limited to 'sources/msil')
-rw-r--r--sources/msil/AssemblyInfo.cs.tmpl58
-rw-r--r--sources/msil/scala/runtime/compat/Math.scala36
-rw-r--r--sources/msil/scala/runtime/compat/Platform.scala38
-rw-r--r--sources/msil/scala/runtime/compat/StringBuilder.scala22
-rw-r--r--sources/msil/scala_part2.il.diff.tmpl21
5 files changed, 0 insertions, 175 deletions
diff --git a/sources/msil/AssemblyInfo.cs.tmpl b/sources/msil/AssemblyInfo.cs.tmpl
deleted file mode 100644
index c32f40ff11..0000000000
--- a/sources/msil/AssemblyInfo.cs.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("scala")]
-[assembly: AssemblyDescription("Scala Runtime Library")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("EPFL-LAMP")]
-[assembly: AssemblyProduct("Scala Language Distribution")]
-[assembly: AssemblyCopyright("2002-2005 EPFL-LAMP")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("SCALA_VERSION")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing.
-//
-// Notes:
-// (*) If no key is specified, the assembly is not signed.
-// (*) KeyName refers to a key that has been installed in the Crypto Service
-// Provider (CSP) on your machine. KeyFile refers to a file which contains
-// a key.
-// (*) If the KeyFile and the KeyName values are both specified, the
-// following processing occurs:
-// (1) If the KeyName can be found in the CSP, that key is used.
-// (2) If the KeyName does not exist and the KeyFile does exist, the key
-// in the KeyFile is installed into the CSP and used.
-// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-// When specifying the KeyFile, the location of the KeyFile should be
-// relative to the project output directory which is
-// %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-// located in the project directory, you would specify the AssemblyKeyFile
-// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-// documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("lamp.key")]
-[assembly: AssemblyKeyName("")]
diff --git a/sources/msil/scala/runtime/compat/Math.scala b/sources/msil/scala/runtime/compat/Math.scala
deleted file mode 100644
index 5b9853e953..0000000000
--- a/sources/msil/scala/runtime/compat/Math.scala
+++ /dev/null
@@ -1,36 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-// $Id$
-
-
-package scala.runtime.compat;
-
-object Math {
- val MIN_BYTE = System.SByte.MinValue;
- val MAX_BYTE = System.SByte.MaxValue;
- val MIN_SHORT = System.Int16.MinValue;
- val MAX_SHORT = System.Int16.MaxValue;
- val MIN_CHAR = System.Char.MinValue;
- val MAX_CHAR = System.Char.MaxValue;
- val MIN_INT = System.Int32.MinValue;
- val MAX_INT = System.Int32.MaxValue;
- val MIN_LONG = System.Int64.MinValue;
- val MAX_LONG = System.Int64.MaxValue;
- val MIN_FLOAT = System.Single.MinValue;
- val MAX_FLOAT = System.Single.MaxValue;
- val MIN_DOUBLE = System.Double.MinValue;
- val MAX_DOUBLE = System.Double.MaxValue;
-
- def max(x: Int, y: Int): Int = System.Math.Max(x, y);
-
- def ceil (x: Double): Double = System.Math.Ceiling(x);
- def floor(x: Double): Double = System.Math.Floor(x);
- def log (x: Double): Double = System.Math.Log(x);
- def sqrt (x: Double): Double = System.Math.Sqrt(x);
-}
diff --git a/sources/msil/scala/runtime/compat/Platform.scala b/sources/msil/scala/runtime/compat/Platform.scala
deleted file mode 100644
index fcdaa54e22..0000000000
--- a/sources/msil/scala/runtime/compat/Platform.scala
+++ /dev/null
@@ -1,38 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-// $Id$
-
-
-package scala.runtime.compat;
-
-object Platform {
- def arraycopy(src: AnyRef, srcPos: Int, dest: AnyRef, destPos: Int, length: int): Unit =
- System.Array.Copy(src.asInstanceOf[System.Array], srcPos, dest.asInstanceOf[System.Array], destPos, length);
- def getClass(obj: AnyRef) = obj.GetType();
- def getClassName(obj: AnyRef) = obj.GetType().FullName;
- def printStackTrace(exc: System.Exception) =
- System.Console.WriteLine(exc.StackTrace);
- def getMessage(exc: System.Exception) = exc.Message;
- def split(str: String, separator: Char): Array[String] = {
- val sep = new Array[Char](1);
- sep(0) = separator;
- str.Split(sep);
- }
-
- def currentThread = System.Threading.Thread.CurrentThread;
-
- def parseByte(s: String) : Byte = System.Byte.Parse(s);
- def parseShort(s: String) : Short = System.Int16.Parse(s);
- def parseInt(s: String) : Int = System.Int32.Parse(s);
- def parseLong(s: String) : Long = System.Int64.Parse(s);
- def parseFloat(s: String) : Float = System.Single.Parse(s);
- def parseDouble(s: String): Double = System.Double.Parse(s);
-
- def isDigit(c: Char): Boolean = System.Char.IsDigit(c);
-}
diff --git a/sources/msil/scala/runtime/compat/StringBuilder.scala b/sources/msil/scala/runtime/compat/StringBuilder.scala
deleted file mode 100644
index 4154c0fb3a..0000000000
--- a/sources/msil/scala/runtime/compat/StringBuilder.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-/* __ *\
-** ________ ___ / / ___ Scala API **
-** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL **
-** __\ \/ /__/ __ |/ /__/ __ | **
-** /____/\___/_/ |_/____/_/ | | **
-** |/ **
-\* */
-
-// $Id$
-
-
-package scala.runtime.compat;
-
-class StringBuilder {
- val str = new System.Text.StringBuilder();
- def append(x: Any): StringBuilder = {
- str.Append(x);
- this
- }
- def length(): Int = str.Length;
- override def toString() = str.toString();
-}
diff --git a/sources/msil/scala_part2.il.diff.tmpl b/sources/msil/scala_part2.il.diff.tmpl
deleted file mode 100644
index 8f63867b2b..0000000000
--- a/sources/msil/scala_part2.il.diff.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
---- scala_part2.il 2005-09-21 16:19:30.676754000 +0200
-+++ scala_part2.il.new 2005-09-21 16:21:58.522947000 +0200
-@@ -1,18 +1,3 @@
--.assembly extern 'mscorlib'
--{
-- .ver 1:0:3300:0
-- .publickeytoken = (b7 7a 5c 56 19 34 e0 89)
--}
--.assembly extern 'scala_part1'
--{
-- .ver SCALA_VERSION
-- .publickeytoken = (80 07 fc 78 8a 2e 53 08)
--}
--.assembly 'scala_part2'
--{
--}
--.module 'scala_part2.dll'
--
- .namespace 'scala'
- {
- .class public auto ansi interface 'Tuple1'