diff options
34 files changed, 3 insertions, 2257 deletions
@@ -49,9 +49,6 @@ PROPERTIES <property name="jaco.jar" value="${lib.dir}/jaco.jar"/> <property name="fjbg.name" value="fjbg.jar"/> <property name="fjbg.jar" value="${lib.dir}/${fjbg.name}"/> - <property name="msil.name" value="msil.jar"/> - <property name="msil.jar" value="${lib.dir}/${msil.name}"/> - <property name="scala.dll" value="${lib.dir}/scala.dll"/> <property name="ant.jar" value="${ant.home}/lib/ant.jar"/> <property name="ant-contrib.jar" value="${lib.dir}/ant-contrib.jar"/> <!-- Location of build products properties --> @@ -118,13 +115,6 @@ INITIALISATION classpath="${fjbg.jar}"/> </not></condition> </fail> - <echo level="verbose">msil.jar=${msil.jar}</echo> - <fail message="MSIL library in 'lib/' is not available"> - <condition><not> - <available classname="ch.epfl.lamp.compiler.msil.Assembly" - classpath="${msil.jar}"/> - </not></condition> - </fail> <echo level="verbose">jaco.jar=${jaco.jar}</echo> <fail message="JaCo compiler in 'lib/' is not available"> <condition><not> @@ -142,7 +132,6 @@ INITIALISATION <!-- Creating class-pathes --> <path id="common.classpath"> <pathelement location="${fjbg.jar}"/> - <pathelement location="${msil.jar}"/> </path> <path id="starr.classpath"> <pathelement location="${starr.lib.jar}"/> @@ -306,7 +295,6 @@ BUILD SUPPORT MACROS <if> <not><and> <available file="@{build.dir}/${fjbg.name}"/> - <available file="@{build.dir}/${msil.name}"/> </and></not> <then> <if><isset property="os.unix"/> @@ -315,14 +303,9 @@ BUILD SUPPORT MACROS resource="${fjbg.jar}" overwrite="yes" failonerror="no"/> - <symlink link="@{build.dir}/${msil.name}" - resource="${msil.jar}" - overwrite="yes" - failonerror="no"/> </then> <else> <copy file="${fjbg.jar}" tofile="@{build.dir}/${fjbg.name}"/> - <copy file="${msil.jar}" tofile="@{build.dir}/${msil.name}"/> </else> </if> </then> @@ -404,7 +387,7 @@ BUILD LOCAL REFERENCE (LOCKER) LAYER class="scala.tools.nsc.Main" version="${version.number}" copyright="${copyright}" - classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}:#SCALA_HOME#/${msil.name}" + classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}" properties="scala.boot.class.path=#CLASSPATH#" javaFlags="-Xmx256M -Xms16M"/> <chmod file="${locker.dir}/${exec.dir.name}/${scalac.exec.name}" @@ -491,7 +474,7 @@ BUILD QUICK-TEST LAYER class="scala.tools.nsc.Main" version="${version.number}" copyright="${copyright}" - classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}:#SCALA_HOME#/${msil.name}" + classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}" properties="scala.boot.class.path=#CLASSPATH#" javaFlags="-Xmx256M -Xms16M"/> <chmod file="${quick.dir}/${exec.dir.name}/${scalac.exec.name}" @@ -590,7 +573,7 @@ TEST class="scala.tools.nsc.Main" version="${version.number}" copyright="${copyright}" - classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}:#SCALA_HOME#/${msil.name}" + classpath="#SCALA_HOME#/${lib.dir.name}:#SCALA_HOME#/${comp.dir.name}:#SCALA_HOME#/${fjbg.name}" properties="scala.boot.class.path=#CLASSPATH#" javaFlags="-Xmx256M -Xms16M"/> <chmod file="${strap.dir}/${exec.dir.name}/${scalac.exec.name}" @@ -672,7 +655,6 @@ GENERATES A DISTRIBUTION </manifest> </jar> <copy file="${fjbg.jar}" todir="${dist.current.dir}/lib"/> - <copy file="${msil.jar}" todir="${dist.current.dir}/lib"/> <mkdir dir="${dist.current.dir}/bin"/> <!-- Build executable files --> <mkdir dir="${dist.current.dir}/bin"/> diff --git a/docs/development/scala.tools.ant/test.xsd b/docs/development/scala.tools.ant/test.xsd deleted file mode 100644 index 153b1630ea..0000000000 --- a/docs/development/scala.tools.ant/test.xsd +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:complexType name="pathlist"> - <xs:sequence> - <xs:element name="path" type="xs:anyURI"/> - </xs:sequence> - </xs:complexType> - <xs:complexType name="empty"> - <xs:complexContent> - <xs:restriction base="xs:anyType"/> - </xs:complexContent> - </xs:complexType> - <xs:element name="test"> - <xs:complexType> - <xs:all> - <xs:element name="name" type="xs:string"/> - <xs:element name="description" minOccurs="0" type="xs:string"/> - <xs:element name="root" minOccurs="0" type="xs:anyURI"/> - <xs:element name="libs" minOccurs="0" type="pathlist"/> - <xs:element name="expectfailure" minOccurs="0" type="empty"/> - <xs:element name="action"> - <xs:complexType> - <xs:sequence> - <xs:element name="compile"> - <xs:complexType> - <xs:all> - <xs:element name="sources" type="pathlist"/> - <xs:element name="result"> - <xs:complexType> - <xs:choice> - <xs:element name="suceeds" type="empty"/> - <xs:element name="fails" type="xs:string"/> - </xs:choice> - </xs:complexType> - </xs:element> - </xs:all> - </xs:complexType> - </xs:element> - <xs:element name="execute"> - <xs:complexType> - <xs:all> - <xs:element name="params" minOccurs="0" type="xs:string"/> - <xs:element name="result"> - <xs:complexType> - <xs:choice> - <xs:element name="prints" minOccurs="0" type="xs:string"/> - </xs:choice> - </xs:complexType> - </xs:element> - </xs:all> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:all> - </xs:complexType> - </xs:element> -</xs:schema>
\ No newline at end of file diff --git a/lib/msil.jar.desired.sha1 b/lib/msil.jar.desired.sha1 deleted file mode 100644 index 90c937b347..0000000000 --- a/lib/msil.jar.desired.sha1 +++ /dev/null @@ -1 +0,0 @@ -eee44b93d8b1936061e55ec9207e8c4151198e08 ?msil.jar diff --git a/lib/scala.dll b/lib/scala.dll Binary files differdeleted file mode 100644 index 22c2e372e9..0000000000 --- a/lib/scala.dll +++ /dev/null diff --git a/src/compiler/scala/tools/util/ByteArrayFile.java b/src/compiler/scala/tools/util/ByteArrayFile.java deleted file mode 100644 index afbc9ce089..0000000000 --- a/src/compiler/scala/tools/util/ByteArrayFile.java +++ /dev/null @@ -1,54 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util; - -/** - * This class implements an abstract regular file backed by a - * character array. - */ -public class ByteArrayFile extends VirtualFile { - - //######################################################################## - // Private Fields - - /** The character array */ - private final byte[] bytes; - - //######################################################################## - // Public Constructors - - /** - * Initializes this instance with the specified name, an identical - * path and the specified character array. - */ - public ByteArrayFile(String name, byte[] bytes) { - this(name, name, bytes); - } - - /** - * Initializes this instance with the specified name, path and - * character array. - */ - public ByteArrayFile(String name, String path, byte[] bytes) { - super(name, path); - this.bytes = bytes; - } - - //######################################################################## - // Public Methods - - /** Reads the content of this abstract file into a byte array. */ - public byte[] read() { - byte[] newBytes = new byte[bytes.length]; - System.arraycopy(bytes, 0, newBytes, 0, bytes.length); - return newBytes; - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/DirectoryPath.java b/src/compiler/scala/tools/util/DirectoryPath.java deleted file mode 100644 index 2b114f8efe..0000000000 --- a/src/compiler/scala/tools/util/DirectoryPath.java +++ /dev/null @@ -1,222 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map.Entry; -import java.util.NoSuchElementException; - -/** - * This class implements an abstract directory backed by a list of - * abstract directories. The content of the directories are merged - * together. If a subfile occurs in several directories, then the - * first occurrence hides the next ones. If a subdirectory occurs in - * several directories then the content of the different occurrences - * are merged together in the same way. - */ -public class DirectoryPath extends VirtualDirectory { - - //######################################################################## - // Public Factories - - /** - * Returns an abstract directory with the specified name and - * backed by the specified array of abstract directories. - */ - public static AbstractFile fromArray(String name, AbstractFile[] dirs) { - if (dirs.length == 0) return new VirtualDirectory(name, ""); - if (dirs.length == 1 && dirs[0].getName().equals(name)) return dirs[1]; - return new DirectoryPath(name, dirs); - } - - //######################################################################## - // Private Fields - - /** The directories composing this directory path */ - private final AbstractFile[] dirs; - - //######################################################################## - // Protected Constructor - - /** Initializes this instance with given name and directories. */ - protected DirectoryPath(String name, AbstractFile[] dirs) { - super(name); - this.dirs = dirs; - for (int i = 0; i < dirs.length; i++) - assert dirs[i].isDirectory(): dirs[i]; - } - - //######################################################################## - // Public Methods - - /** Returns the path of this abstract file. */ - public String getPath() { - StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < dirs.length; i++) { - if (i > 0) buffer.append(File.pathSeparator); - buffer.append(dirs[i]); - } - return buffer.toString(); - } - - /** Returns all abstract subfiles of this abstract directory. */ - public Iterator/*<AbstractFile>*/ list() { - return new ListIterator(); - } - - /** - * Returns the abstract file in this abstract directory with the - * specified name. If there is no such file, returns null. The - * argument "directory" tells whether to look for a directory or - * or a regular file. - */ - public AbstractFile lookupName(String name, boolean directory) { - if (directory) { - AbstractFile first = null; - AbstractFile[] subdirs = null; - int count = 0; - for (int i = 0; i < dirs.length; i++) { - AbstractFile subdir = dirs[i].lookupName(name, directory); - if (subdir == null) continue; - if (count == 0) { - first = subdir; - count++; - } else { - if (count == 1) { - subdirs = new AbstractFile[dirs.length]; - subdirs[0] = first; - } - subdirs[count++] = subdir; - } - } - if (count == 0) return null; - if (count == 1) return first; - if (count != subdirs.length) { - AbstractFile[] array = new AbstractFile[count]; - for (int i = 0; i < array.length; i++) array[i] = subdirs[i]; - subdirs = array; - } - return new DirectoryPath(name, subdirs); - } else { - for (int i = 0; i < dirs.length; i++) { - AbstractFile file = dirs[i].lookupName(name, directory); - if (file != null) return file; - } - return null; - } - } - - //######################################################################## - // Private Class - ListIterator - - /** An iterator over the files contained in this directory. */ - private class ListIterator implements Iterator { - - /** The type of the values in the subdirectory table */ - // type SubDirs = AbstractFile | ArrayList<AbstractFile> - - /** A table to collect subdirectories */ - private final HashMap/*<String,SubDirs>*/ subdirs = new HashMap(); - - /** A table to track already returned regular subfiles */ - private final HashSet/*<String>*/ subfiles = new HashSet(); - - /** The current iterator */ - private Iterator iterator; - - /** The index of the current directory */ - private int index; - - /** The next iteration value or null if no more */ - private Object next; - - /** Initializes this instance. */ - public ListIterator() { - this.next = getNextValue(); - } - - /** Does this iteration have more elements? */ - public boolean hasNext() { - return next != null; - } - - /** Returns the next element in this iteration. */ - public Object next() { - if (next == null) throw new NoSuchElementException(); - Object value = next; - next = getNextValue(); - return value; - } - - /** Throws UnsupportedOperationException. */ - public void remove() { - throw new UnsupportedOperationException(); - } - - /** Returns the next iteration value or null if no more. */ - private AbstractFile getNextValue() { - for (; index < dirs.length; iterator = null, index++) { - // iterate over the files of directory "index" - if (iterator == null) iterator = dirs[index].list(); - while (iterator.hasNext()) { - AbstractFile subfile = (AbstractFile)iterator.next(); - String name = subfile.getName(); - if (subfile.isDirectory()) { - addSubDir(name, subfile); - } else if (!subfiles.contains(name)) { - subfiles.add(name); - return subfile; - } - } - } - // iterate over the collected subdirectories - if (iterator == null) iterator = subdirs.entrySet().iterator(); - if (iterator.hasNext()) return getSubDir((Entry)iterator.next()); - return null; - } - - /** Adds given subdirectory to the subdirectory table. */ - private void addSubDir(String name, AbstractFile subdir) { - Object value = subdirs.get(name); - if (value == null) { - subdirs.put(name, subdir); - } else { - ArrayList list; - if (value instanceof ArrayList) { - list = (ArrayList)value; - } else { - list = new ArrayList(); - subdirs.put(name, list); - list.add(value); - } - list.add(subdir); - } - } - - /** Turns given entry into an abstract directory. */ - private AbstractFile getSubDir(Entry/*<String,SubDirs>*/ entry) { - Object value = entry.getValue(); - if (value instanceof ArrayList) { - ArrayList list = (ArrayList)value; - AbstractFile[] array = new AbstractFile[list.size()]; - list.toArray(array); - return new DirectoryPath((String)entry.getKey(), array); - } else { - return (AbstractFile)value; - } - } - - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/DummyTimer.java b/src/compiler/scala/tools/util/DummyTimer.java deleted file mode 100644 index e16c44b6be..0000000000 --- a/src/compiler/scala/tools/util/DummyTimer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util; - -import java.util.ArrayList; - -/** This class implements a timer that does nothing. */ -public class DummyTimer implements Timer { - - //######################################################################## - // Public Constants - - /** The unique instance of this class. */ - public static final DummyTimer object = new DummyTimer(); - - //######################################################################## - // Private Constructors - - /** Initializes this instance. */ - private DummyTimer() {} - - //######################################################################## - // Public Methods - - /** Starts a new timer. */ - public void start() { - } - - /** Ends the current timer. */ - public void stop(String message) { - } - - /** Drops the current timer. */ - public void drop() { - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/StringBufferWriter.java b/src/compiler/scala/tools/util/StringBufferWriter.java deleted file mode 100644 index 3e239b08cb..0000000000 --- a/src/compiler/scala/tools/util/StringBufferWriter.java +++ /dev/null @@ -1,69 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util; - -import java.io.Writer; -import java.io.PrintWriter; - -/** This class implements a writer that writes to a string buffer. */ -public class StringBufferWriter extends Writer { - - //######################################################################## - // Private Fields - - private final StringBuffer buffer; - - //######################################################################## - // Public Constructors - - /** Initializes this instance with the specified string buffer. */ - public StringBufferWriter(StringBuffer buffer) { - this.buffer = buffer; - } - - //######################################################################## - // Public Methods - - /** Returns the underlying string buffer. */ - public StringBuffer getStringBuffer() { - return buffer; - } - - public void close() { - } - - public void flush() { - } - - public void write(int c) { - buffer.append((char)c); - } - - public void write(char[] cs) { - buffer.append(cs); - } - - public void write(char[] cs, int start, int count) { - buffer.append(cs, start, count); - } - - public void write(String string) { - buffer.append(string); - } - - public void write(String string, int start, int count) { - buffer.append(string.substring(start, start + count)); - } - - public String toString() { - return buffer.toString(); - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/VirtualDirectory.java b/src/compiler/scala/tools/util/VirtualDirectory.java deleted file mode 100644 index 597f52d14b..0000000000 --- a/src/compiler/scala/tools/util/VirtualDirectory.java +++ /dev/null @@ -1,39 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util; - -/** This class implements an empty abstract directory. */ -public class VirtualDirectory extends VirtualFile { - - //######################################################################## - // Public Constructors - - /** - * Initializes this instance with the specified name and an - * identical path. - */ - public VirtualDirectory(String name) { - this(name, name); - } - - /** Initializes this instance with the specified name and path. */ - public VirtualDirectory(String name, String path) { - super(name, path); - } - - //######################################################################## - // Public Methods - - /** Is this abstract file a directory? */ - public boolean isDirectory() { - return true; - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/debug/AbortError.java b/src/compiler/scala/tools/util/debug/AbortError.java deleted file mode 100644 index e3c84a7cda..0000000000 --- a/src/compiler/scala/tools/util/debug/AbortError.java +++ /dev/null @@ -1,43 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util.debug; - -/** - * This class implements an error that can be used to abort an - * application after an internal error. - */ -public class AbortError extends Error { - - //######################################################################## - // Protected Constructors - - /** Initializes this instance. */ - protected AbortError() { - super(); - } - - /** Initializes this instance with the specified message. */ - protected AbortError(String message) { - super(message); - } - - /** Initializes this instance with the specified cause. */ - protected AbortError(Throwable cause) { - super(cause); - } - - /** - * Initializes this instance with the specified message and cause. - */ - protected AbortError(String message, Throwable cause) { - super(message, cause); - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/debug/ArrayDebugger.java b/src/compiler/scala/tools/util/debug/ArrayDebugger.java deleted file mode 100644 index 6bc6621ab4..0000000000 --- a/src/compiler/scala/tools/util/debug/ArrayDebugger.java +++ /dev/null @@ -1,94 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util.debug; - -/** This class implements a debugger that appends arrays. */ -public class ArrayDebugger implements Debugger { - - //######################################################################## - // Public Constants - - /** The unique instance of this class. */ - public static final ArrayDebugger object = new ArrayDebugger(); - - //######################################################################## - // Protected Constructors - - /** Initializes this instance. */ - protected ArrayDebugger() {} - - //######################################################################## - // Public Methods - - public boolean canAppend(Object object) { - return object.getClass().isArray(); - } - - public void append(StringBuffer buffer, Object object) { - buffer.append('['); - if (object instanceof Object[]) { - Object[] array = (Object[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - Debug.append(buffer, array[i]); - } - } else if (object instanceof boolean[]) { - boolean[] array = (boolean[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } else if (object instanceof byte[]) { - byte[] array = (byte[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } else if (object instanceof short[]) { - short[] array = (short[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } else if (object instanceof char[]) { - char[] array = (char[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } else if (object instanceof int[]) { - int[] array = (int[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } else if (object instanceof long[]) { - long[] array = (long[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } else if (object instanceof float[]) { - float[] array = (float[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } else if (object instanceof double[]) { - double[] array = (double[])object; - for (int i = 0; i < array.length; i++) { - if (i > 0) buffer.append(','); - buffer.append(array[i]); - } - } - buffer.append(']'); - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/debug/Debug.java b/src/compiler/scala/tools/util/debug/Debug.java deleted file mode 100644 index 38ee3c7b9a..0000000000 --- a/src/compiler/scala/tools/util/debug/Debug.java +++ /dev/null @@ -1,244 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util.debug; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; - -/** - * This class is intended to help debugging applications. It provides - * functions to abort the application and to turn objects into - * strings. - * - * In order to turn objects into strings, the class maintains a list - * of debuggers. An application using this class should configure it - * by adding debuggers for its data types (see method "addDebugger"). - * - * Each time an object has to be transformed into a string, the list - * of debuggers is searched from the last added one to the first one - * for a debugger that is able to make that transformation. The first - * that is found, is then used to make the transformation. - */ -public class Debug { - - //######################################################################## - // Private Variables - - /** The list of all available debuggers */ - private static final ArrayList/*<Debugger>*/ debuggers = new ArrayList(); - - static { - addDebugger(ObjectDebugger.object); - addDebugger(ArrayDebugger.object); - addDebugger(ThrowableDebugger.object); - addDebugger(new ToStringDebugger(String.class)); - } - - //######################################################################## - // Public Methods - Configuring - - /** Adds the specified debugger to the list of debuggers. */ - public static void addDebugger(Debugger debugger) { - debuggers.add(debugger); - } - - //######################################################################## - // Public Methods - Aborting - - /** Aborts the application by throwing an AbortError. */ - public static Error abort() { - throw new AbortError(); - } - public static Error abort(Throwable cause) { - throw new AbortError(cause); - } - public static Error abort(Object object) { - return abort(show(object)); - } - public static Error abort(Object object, Throwable cause) { - return abort(show(object), cause); - } - public static Error abort(String message) { - throw new AbortError(message); - } - public static Error abort(String message, Throwable cause) { - throw new AbortError(message, cause); - } - public static Error abort(String message, Object object) { - return abort(message + ": " + show(object)); - } - public static Error abort(String message, Object object, Throwable cause) { - return abort(message + ": " + show(object), cause); - } - - /** Aborts the application by throwing an AbortError. */ - public static Error abortIllegalCase(int value) { - return abort("illegal case: " + value); - } - public static Error abortIllegalCase(Object object) { - return abort("illegal case", object); - } - - //######################################################################## - // Public Methods - Showing - - /** - * Makes a string out of the object(s) using for each the first - * matching debugger and separating them with dash(es). - */ - public static String show(Object a) { - return showAll(new Object[] {a}); - } - public static String show(Object a, Object b) { - return showAll(new Object[] {a, b}); - } - public static String show(Object a, Object b, Object c) { - return showAll(new Object[] {a, b, c}); - } - public static String show(Object a, Object b, Object c, Object d) { - return showAll(new Object[] {a, b, c, d}); - } - public static String show(Object a, Object b, Object c, Object d, Object e) - { - return showAll(new Object[] {a, b, c, d, e}); - } - public static String show(Object a, Object b, Object c, Object d, Object e, - Object f) - { - return showAll(new Object[] {a, b, c, d, e, f}); - } - public static String show(Object a, Object b, Object c, Object d, Object e, - Object f, Object g) - { - return showAll(new Object[] {a, b, c, d, e, f, g}); - } - public static String show(Object a, Object b, Object c, Object d, Object e, - Object f, Object g, Object h) - { - return showAll(new Object[] {a, b, c, d, e, f, g, h}); - } - public static String show(Object a, Object b, Object c, Object d, Object e, - Object f, Object g, Object h, Object i) - { - return showAll(new Object[] {a, b, c, d, e, f, g, h, i}); - } - public static String show(Object a, Object b, Object c, Object d, Object e, - Object f, Object g, Object h, Object i, Object j) - { - return showAll(new Object[] {a, b, c, d, e, f, g, h, i, j}); - } - public static String show(Object a, Object b, Object c, Object d, Object e, - Object f, Object g, Object h, Object i, Object j, Object k) - { - return showAll(new Object[] {a, b, c, d, e, f, g, h, i, j, k}); - } - public static String show(Object a, Object b, Object c, Object d, Object e, - Object f, Object g, Object h, Object i, Object j, Object k, Object l) - { - return showAll(new Object[] {a, b, c, d, e, f, g, h, i, j, k, l}); - } - - /** - * Makes a string out of all objects using for each the first - * matching debugger and separating them with dashes. - */ - public static String showAll(Object[] objects) { - return showAll(objects, " - "); - } - - /** - * Makes a string out of all objects using for each the first - * matching debugger and separating them with the specified - * separator if it is non-null and by nothing otherwise. - */ - public static String showAll(Object[] objects, String separator) { - StringBuffer buffer = new StringBuffer(); - appendAll(buffer, objects, separator); - return buffer.toString(); - } - - //######################################################################## - // Public Methods - Appending - - /** - * Appends the object to the buffer using the first matching - * debugger. - */ - public static void append(StringBuffer buffer, Object object) { - if (object != null) { - for (int i = debuggers.size() - 1; i >= 0; i--) { - Debugger debugger = (Debugger)debuggers.get(i); - if (!debugger.canAppend(object)) continue; - debugger.append(buffer, object); - return; - } - } - buffer.append(object); - } - - /** - * Appends all the objects to the buffer using for each the first - * matching debugger. The object are separated by the specified - * separator if it is non-null and by nothing otherwise. - */ - public static void appendAll(StringBuffer buffer, Object[] objects, - String separator) - { - for (int i = 0; i < objects.length; i++) { - if (i > 0 && separator != null) buffer.append(separator); - append(buffer, objects[i]); - } - } - - //######################################################################## - // Public Methods - Miscellaneous - - /** - * Returns the class name of the object. Does some pretty printing - * for parameterless pico case classes. - */ - public static String getClassNameOf(Object object) { - if (object == null) return "null"; - Class clasz = object.getClass(); - String name = clasz.getName(); - if (!name.endsWith("$$Var")) return name; - Class superclass = clasz.getSuperclass(); - Field[] fields = superclass.getDeclaredFields(); - for (int i = 0; i < fields.length; i++) { - try { - Field field = fields[i]; - if (field.getType() != clasz) continue; - if (!Modifier.isStatic(field.getModifiers())) continue; - Object value = field.get(null); - if (value != object) continue; - return name + "[" + field.getName() + "]"; - } catch (IllegalAccessException exception) { - // continue - } - } - return name; - } - - /** Returns true iff the object overrides "Object.toString()". */ - public static boolean overridesToString(Object object) { - try { - Class clasz = object.getClass(); - Method toString = clasz.getMethod("toString", new Class[0]); - return toString.getDeclaringClass() != Object.class; - } catch (NoSuchMethodException exception) { - return false; - } catch (SecurityException exception) { - return false; - } - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/debug/Debugger.java b/src/compiler/scala/tools/util/debug/Debugger.java deleted file mode 100644 index 0a40f74768..0000000000 --- a/src/compiler/scala/tools/util/debug/Debugger.java +++ /dev/null @@ -1,34 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util.debug; - -/** - * This interface defines methods used by the class Debug to turn - * objects into strings. - */ -public interface Debugger { - - //######################################################################## - // Public Methods - - /** - * Returns "true" if the specified object may be passed as an - * argument to the method "append". - */ - public boolean canAppend(Object object); - - /** - * Appends the object to the string buffer. This method must be - * invoked only with objects for which the method "canAppend" - * returns "true". - */ - public void append(StringBuffer buffer, Object object); - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/debug/ObjectDebugger.java b/src/compiler/scala/tools/util/debug/ObjectDebugger.java deleted file mode 100644 index 7edcdbd0f0..0000000000 --- a/src/compiler/scala/tools/util/debug/ObjectDebugger.java +++ /dev/null @@ -1,54 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util.debug; - -/** - * This class implements a debugger that appends any object. It - * appends the class name of the object and either the string returned - * by its method "toString" if it overridden or its identity hash code - * otherwise. - */ -public class ObjectDebugger implements Debugger { - - //######################################################################## - // Public Constants - - /** The unique instance of this class. */ - public static final ObjectDebugger object = new ObjectDebugger(); - - //######################################################################## - // Protected Constructors - - /** Initializes this instance. */ - protected ObjectDebugger() {} - - //######################################################################## - // Public Methods - - public boolean canAppend(Object object) { - return true; - } - - public void append(StringBuffer buffer, Object object) { - buffer.append(Debug.getClassNameOf(object)); - Class owner = null; - if (Debug.overridesToString(object)) { - buffer.append('('); - buffer.append(object); - buffer.append(')'); - } else { - String code = Integer.toHexString(System.identityHashCode(object)); - buffer.append('@'); - for (int i = code.length(); i < 8; i++) buffer.append('0'); - buffer.append(code); - } - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/debug/ThrowableDebugger.java b/src/compiler/scala/tools/util/debug/ThrowableDebugger.java deleted file mode 100644 index 8bdf93cbcb..0000000000 --- a/src/compiler/scala/tools/util/debug/ThrowableDebugger.java +++ /dev/null @@ -1,48 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util.debug; - -import java.io.Writer; -import java.io.PrintWriter; - -import scala.tools.util.StringBufferWriter; - -/** - * This class implements a debugger that appends instances of - * Throwable. - */ -public class ThrowableDebugger implements Debugger { - - //######################################################################## - // Public Constants - - /** The unique instance of this class. */ - public static final ThrowableDebugger object = new ThrowableDebugger(); - - //######################################################################## - // Protected Constructors - - /** Initializes this instance. */ - protected ThrowableDebugger() {} - - //######################################################################## - // Public Methods - - public boolean canAppend(Object object) { - return object instanceof Throwable; - } - - public void append(StringBuffer buffer, Object object) { - PrintWriter writer = new PrintWriter(new StringBufferWriter(buffer)); - ((Throwable)object).printStackTrace(writer); - writer.close(); - } - - //######################################################################## -} diff --git a/src/compiler/scala/tools/util/debug/ToStringDebugger.java b/src/compiler/scala/tools/util/debug/ToStringDebugger.java deleted file mode 100644 index 85e0e18776..0000000000 --- a/src/compiler/scala/tools/util/debug/ToStringDebugger.java +++ /dev/null @@ -1,44 +0,0 @@ -/* ____ ____ ____ ____ ______ *\ -** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala ** -** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL ** -** /_____/\____/\___/\____/____/ ** -\* */ - -// $Id$ - -package scala.tools.util.debug; - -/** - * This class implements a debugger that appends objects that are - * instances of a specified class (or of one of its subclass) by - * simply appending the string returned by their method "toString". - */ -public class ToStringDebugger implements Debugger { - - //######################################################################## - // Private Fields - - /** The class whose instances can be appended */ - private final Class clasz; - - //######################################################################## - // Public Constructors - - /** Initializes this instance. */ - public ToStringDebugger(Class clasz) { - this.clasz = clasz; - } - - //######################################################################## - // Public Methods - - public boolean canAppend(Object object) { - return clasz.isInstance(object); - } - - public void append(StringBuffer buffer, Object object) { - buffer.append(object.toString()); - } - - //######################################################################## -} diff --git a/src/library/scala/AnyVal.cs b/src/library/scala/AnyVal.cs deleted file mode 100644 index 13cf2f3e2c..0000000000 --- a/src/library/scala/AnyVal.cs +++ /dev/null @@ -1,18 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:AnyVal.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.Any;")] - public abstract class AnyVal {} -} diff --git a/src/library/scala/Boolean.cs b/src/library/scala/Boolean.cs deleted file mode 100644 index 73e72935ed..0000000000 --- a/src/library/scala/Boolean.cs +++ /dev/null @@ -1,61 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Boolean.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - [Serializable] - public abstract class Boolean : AnyVal - { - - public readonly bool value; - - public Boolean(bool value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return other is Boolean && value == ((Boolean)other).value; - } - public override int GetHashCode() - { - return value ? 1231 : 1237; - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Boolean;")] - public bool __bang ( ) { return !value ; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (bool that) { return value == that; } - public bool __bang__eq (bool that) { return value != that; } - public bool __bar__bar (bool that) { return value || that; } - public bool __amp__amp (bool that) { return value && that; } - public bool __bar (bool that) { return value | that; } - public bool __amp (bool that) { return value & that; } - public bool __up (bool that) { return value ^ that; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Byte.cs b/src/library/scala/Byte.cs deleted file mode 100644 index a8faa7080e..0000000000 --- a/src/library/scala/Byte.cs +++ /dev/null @@ -1,132 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Byte.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - [Serializable] - public abstract class Byte : AnyVal { - - public readonly sbyte value; - - public Byte(sbyte value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return (other is Byte) && (value == ((Byte)other).value); - } - public override int GetHashCode() - { - return value; - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Int;")] - public int __plus ( ) { return +value ; } - [Meta("method []scala.Int;")] - public int __minus ( ) { return -value ; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (double that) { return value == that; } - public bool __bang__eq (double that) { return value != that; } - public bool __less (double that) { return value < that; } - public bool __greater (double that) { return value > that; } - public bool __less__eq (double that) { return value <= that; } - public bool __greater__eq(double that) { return value >= that; } - public double __plus (double that) { return value + that; } - public double __minus (double that) { return value - that; } - public double __times (double that) { return value * that; } - public double __div (double that) { return value / that; } - public double __percent (double that) { return value % that; } - - [Meta("method []scala.Double;")] - public double coerce ( ) { return value ; } - - public bool __eq__eq (float that) { return value == that; } - public bool __bang__eq (float that) { return value != that; } - public bool __less (float that) { return value < that; } - public bool __greater (float that) { return value > that; } - public bool __less__eq (float that) { return value <= that; } - public bool __greater__eq(float that) { return value >= that; } - public float __plus (float that) { return value + that; } - public float __minus (float that) { return value - that; } - public float __times (float that) { return value * that; } - public float __div (float that) { return value / that; } - public float __percent (float that) { return value % that; } - - [Meta("method []scala.Float;")] - public float coerce (float dummy) { return value ; } - [Meta("method []scala.Int;")] - public int __tilde ( ) { return ~value ; } - - public int __less__less (int that) { return value << that; } - public int __less__less (long that) { return value << (int)that; } - public int __greater__greater(int that) { return value >> that; } - public int __greater__greater(long that) { return value >> (int)that; } - public int __greater__greater__greater(int that) { return (int)((uint)value >>that); } - public int __greater__greater__greater(long that) { return (int)((uint)value >>(int)that); } - - public bool __eq__eq (long that) { return value == that; } - public bool __bang__eq (long that) { return value != that; } - public bool __less (long that) { return value < that; } - public bool __greater (long that) { return value > that; } - public bool __less__eq (long that) { return value <= that; } - public bool __greater__eq(long that) { return value >= that; } - public long __plus (long that) { return value + that; } - public long __minus (long that) { return value - that; } - public long __times (long that) { return value * that; } - public long __div (long that) { return value / that; } - public long __percent (long that) { return value % that; } - public long __bar (long that) { return value | that; } - public long __amp (long that) { return value & that; } - public long __up (long that) { return value ^ that; } - - [Meta("method []scala.Long;")] - public long coerce (long dummy) { return value ; } - - public bool __eq__eq (int that) { return value == that; } - public bool __bang__eq (int that) { return value != that; } - public bool __less (int that) { return value < that; } - public bool __greater (int that) { return value > that; } - public bool __less__eq (int that) { return value <= that; } - public bool __greater__eq(int that) { return value >= that; } - public int __plus (int that) { return value + that; } - public int __minus (int that) { return value - that; } - public int __times (int that) { return value * that; } - public int __div (int that) { return value / that; } - public int __percent (int that) { return value % that; } - public int __bar (int that) { return value | that; } - public int __amp (int that) { return value & that; } - public int __up (int that) { return value ^ that; } - - [Meta("method []scala.Int;")] - public int coerce (int dummy) { return value ; } - - [Meta("method []scala.Short;")] - public short coerce (short dummy) { return value ; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Char.cs b/src/library/scala/Char.cs deleted file mode 100644 index 3afde58dfd..0000000000 --- a/src/library/scala/Char.cs +++ /dev/null @@ -1,128 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Char.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - public abstract class Char : AnyVal { - - public readonly char value; - - public Char(char value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return other is Char && value == ((Char)other).value; - } - public override int GetHashCode() - { - return value; - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Int;")] - public int __plus ( ) { return +value ; } - [Meta("method []scala.Int;")] - public int __minus ( ) { return -value ; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (double that) { return value == that; } - public bool __bang__eq (double that) { return value != that; } - public bool __less (double that) { return value < that; } - public bool __greater (double that) { return value > that; } - public bool __less__eq (double that) { return value <= that; } - public bool __greater__eq(double that) { return value >= that; } - public double __plus (double that) { return value + that; } - public double __minus (double that) { return value - that; } - public double __times (double that) { return value * that; } - public double __div (double that) { return value / that; } - public double __percent (double that) { return value % that; } - - [Meta("method []scala.Double;")] - public double coerce ( ) { return value ; } - - public bool __eq__eq (float that) { return value == that; } - public bool __bang__eq (float that) { return value != that; } - public bool __less (float that) { return value < that; } - public bool __greater (float that) { return value > that; } - public bool __less__eq (float that) { return value <= that; } - public bool __greater__eq(float that) { return value >= that; } - public float __plus (float that) { return value + that; } - public float __minus (float that) { return value - that; } - public float __times (float that) { return value * that; } - public float __div (float that) { return value / that; } - public float __percent (float that) { return value % that; } - - [Meta("method []scala.Float;")] - public float coerce (float dummy) { return value; } - [Meta("method []scala.Int;")] - public int __tilde ( ) { return ~value; } - - public int __less__less (int that) { return value << that; } - public int __less__less (long that) { return value << (int)that; } - public int __greater__greater(int that) { return value >> that; } - public int __greater__greater(long that) { return value >> (int)that; } - public int __greater__greater__greater(int that) { return (int)((uint)value >>that); } - public int __greater__greater__greater(long that) { return (int)((uint)value >>(int)that); } - - public bool __eq__eq (long that) { return value == that; } - public bool __bang__eq (long that) { return value != that; } - public bool __less (long that) { return value < that; } - public bool __greater (long that) { return value > that; } - public bool __less__eq (long that) { return value <= that; } - public bool __greater__eq(long that) { return value >= that; } - public long __plus (long that) { return value + that; } - public long __minus (long that) { return value - that; } - public long __times (long that) { return value * that; } - public long __div (long that) { return value / that; } - public long __percent (long that) { return value % that; } - public long __bar (long that) { return value | that; } - public long __amp (long that) { return value & that; } - public long __up (long that) { return value ^ that; } - - [Meta("method []scala.Long;")] - public long coerce (long dummy) { return value ; } - - public bool __eq__eq (int that) { return value == that; } - public bool __bang__eq (int that) { return value != that; } - public bool __less (int that) { return value < that; } - public bool __greater (int that) { return value > that; } - public bool __less__eq (int that) { return value <= that; } - public bool __greater__eq(int that) { return value >= that; } - public int __plus (int that) { return value + that; } - public int __minus (int that) { return value - that; } - public int __times (int that) { return value * that; } - public int __div (int that) { return value / that; } - public int __percent (int that) { return value % that; } - public int __bar (int that) { return value | that; } - public int __amp (int that) { return value & that; } - public int __up (int that) { return value ^ that; } - - [Meta("method []scala.Int;")] - public int coerce (int dummy) { return value ; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Double.cs b/src/library/scala/Double.cs deleted file mode 100644 index 30b9293c47..0000000000 --- a/src/library/scala/Double.cs +++ /dev/null @@ -1,66 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Double.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - [Serializable] - public abstract class Double : AnyVal { - - public readonly double value; - - public Double (double value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return other is Double && value == ((Double )other).value; - } - public override int GetHashCode() - { - return value.GetHashCode(); - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Double;")] - public double __plus (object dummy) { return +value; } - [Meta("method []scala.Double;")] - public double __minus ( ) { return -value; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (double that) { return value == that; } - public bool __bang__eq (double that) { return value != that; } - public bool __less (double that) { return value < that; } - public bool __greater (double that) { return value > that; } - public bool __less__eq (double that) { return value <= that; } - public bool __greater__eq(double that) { return value >= that; } - public double __plus (double that) { return value + that; } - public double __minus (double that) { return value - that; } - public double __times (double that) { return value * that; } - public double __div (double that) { return value / that; } - public double __percent (double that) { return value % that; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Float.cs b/src/library/scala/Float.cs deleted file mode 100644 index 5a3a162de9..0000000000 --- a/src/library/scala/Float.cs +++ /dev/null @@ -1,81 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Float.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - [Serializable] - public abstract class Float : AnyVal { - - public readonly float value; - - public Float(float value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return (other is Float) && (value == ((Float)other).value); - } - public override int GetHashCode() - { - return value.GetHashCode(); - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq(object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Float;")] - public float __plus ( ) { return +value ; } - [Meta("method []scala.Float;")] - public float __minus ( ) { return -value ; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (double that) { return value == that; } - public bool __bang__eq (double that) { return value != that; } - public bool __less (double that) { return value < that; } - public bool __greater (double that) { return value > that; } - public bool __less__eq (double that) { return value <= that; } - public bool __greater__eq(double that) { return value >= that; } - public double __plus (double that) { return value + that; } - public double __minus (double that) { return value - that; } - public double __times (double that) { return value * that; } - public double __div (double that) { return value / that; } - public double __percent (double that) { return value % that; } - - [Meta("method []scala.Double;")] - public double coerce ( ) { return value; } - - public bool __eq__eq (float that) { return value == that; } - public bool __bang__eq (float that) { return value != that; } - public bool __less (float that) { return value < that; } - public bool __greater (float that) { return value > that; } - public bool __less__eq (float that) { return value <= that; } - public bool __greater__eq(float that) { return value >= that; } - public float __plus (float that) { return value + that; } - public float __minus (float that) { return value - that; } - public float __times (float that) { return value * that; } - public float __div (float that) { return value / that; } - public float __percent (float that) { return value % that; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Int.cs b/src/library/scala/Int.cs deleted file mode 100644 index 1c909df500..0000000000 --- a/src/library/scala/Int.cs +++ /dev/null @@ -1,127 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Int.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - [Serializable] - public abstract class Int : AnyVal { - - public readonly int value; - - public Int(int value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return (other is Int) && (value == ((Int)other).value); - } - public override int GetHashCode() - { - return value; - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Int;")] - public int __plus ( ) { return +value ; } - - [Meta("method []scala.Int;")] - public int __minus ( ) { return -value ; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (double that) { return value == that; } - public bool __bang__eq (double that) { return value != that; } - public bool __less (double that) { return value < that; } - public bool __greater (double that) { return value > that; } - public bool __less__eq (double that) { return value <= that; } - public bool __greater__eq(double that) { return value >= that; } - public double __plus (double that) { return value + that; } - public double __minus (double that) { return value - that; } - public double __times (double that) { return value * that; } - public double __div (double that) { return value / that; } - public double __percent (double that) { return value % that; } - - [Meta("method []scala.Double;")] - public double coerce (double dummy) { return value; } - - public bool __eq__eq (float that) { return value == that; } - public bool __bang__eq (float that) { return value != that; } - public bool __less (float that) { return value < that; } - public bool __greater (float that) { return value > that; } - public bool __less__eq (float that) { return value <= that; } - public bool __greater__eq(float that) { return value >= that; } - public float __plus (float that) { return value + that; } - public float __minus (float that) { return value - that; } - public float __times (float that) { return value * that; } - public float __div (float that) { return value / that; } - public float __percent (float that) { return value % that; } - - [Meta("method []scala.Float;")] - public float coerce (float dummy) { return value; } - [Meta("method []scala.Int;")] - public int __tilde ( ) { return ~value; } - - public int __less__less (int that) { return value << that; } - public int __less__less (long that) { return value << (int)that; } - public int __greater__greater(int that) { return value >> that; } - public int __greater__greater(long that) { return value >> (int)that; } - public int __greater__greater__greater(int that) { return (int)((uint)value >>that); } - public int __greater__greater__greater(long that) { return (int)((uint)value >>(int)that); } - - public bool __eq__eq (long that) { return value == that; } - public bool __bang__eq (long that) { return value != that; } - public bool __less (long that) { return value < that; } - public bool __greater (long that) { return value > that; } - public bool __less__eq (long that) { return value <= that; } - public bool __greater__eq(long that) { return value >= that; } - public long __plus (long that) { return value + that; } - public long __minus (long that) { return value - that; } - public long __times (long that) { return value * that; } - public long __div (long that) { return value / that; } - public long __percent (long that) { return value % that; } - public long __bar (long that) { return value | that; } - public long __amp (long that) { return value & that; } - public long __up (long that) { return value ^ that; } - - [Meta("method []scala.Long;")] - public long coerce (object dummy) { return value ; } - - public bool __eq__eq (int that) { return value == that; } - public bool __bang__eq (int that) { return value != that; } - public bool __less (int that) { return value < that; } - public bool __greater (int that) { return value > that; } - public bool __less__eq (int that) { return value <= that; } - public bool __greater__eq(int that) { return value >= that; } - public int __plus (int that) { return value + that; } - public int __minus (int that) { return value - that; } - public int __times (int that) { return value * that; } - public int __div (int that) { return value / that; } - public int __percent (int that) { return value % that; } - public int __bar (int that) { return value | that; } - public int __amp (int that) { return value & that; } - public int __up (int that) { return value ^ that; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Long.cs b/src/library/scala/Long.cs deleted file mode 100644 index cf147b04b3..0000000000 --- a/src/library/scala/Long.cs +++ /dev/null @@ -1,108 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Long.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - [Serializable] - public abstract class Long : AnyVal { - - public readonly long value; - - public Long (long value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return (other is Long) && value == ((Long)other).value; - } - public override int GetHashCode() - { - return value.GetHashCode(); - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Long;")] - public long __plus ( ) { return +value ; } - [Meta("method []scala.Long;")] - public long __minus ( ) { return -value ; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (double that) { return value == that; } - public bool __bang__eq (double that) { return value != that; } - public bool __less (double that) { return value < that; } - public bool __greater (double that) { return value > that; } - public bool __less__eq (double that) { return value <= that; } - public bool __greater__eq(double that) { return value >= that; } - public double __plus (double that) { return value + that; } - public double __minus (double that) { return value - that; } - public double __times (double that) { return value * that; } - public double __div (double that) { return value / that; } - public double __percent (double that) { return value % that; } - - [Meta("method []scala.Double;")] - public double coerce ( ) { return value ; } - - public bool __eq__eq (float that) { return value == that; } - public bool __bang__eq (float that) { return value != that; } - public bool __less (float that) { return value < that; } - public bool __greater (float that) { return value > that; } - public bool __less__eq (float that) { return value <= that; } - public bool __greater__eq(float that) { return value >= that; } - public float __plus (float that) { return value + that; } - public float __minus (float that) { return value - that; } - public float __times (float that) { return value * that; } - public float __div (float that) { return value / that; } - public float __percent (float that) { return value % that; } - - [Meta("method []scala.Float;")] - public float coerce (object dummy) { return value ; } - [Meta("method []scala.Long;")] - public long __tilde ( ) { return ~value ; } - - public long __less__less (int that) { return value << that; } - public long __less__less (long that) { return value << (int)that; } - public long __greater__greater(int that) { return value >> that; } - public long __greater__greater(long that) { return value >> (int)that; } - public long __greater__greater__greater(int that) { return (int)((ulong)value >>that); } - public long __greater__greater__greater(long that) { return (int)((ulong)value >>(int)that); } - - public bool __eq__eq (long that) { return value == that; } - public bool __bang__eq (long that) { return value != that; } - public bool __less (long that) { return value < that; } - public bool __greater (long that) { return value > that; } - public bool __less__eq (long that) { return value <= that; } - public bool __greater__eq(long that) { return value >= that; } - public long __plus (long that) { return value + that; } - public long __minus (long that) { return value - that; } - public long __times (long that) { return value * that; } - public long __div (long that) { return value / that; } - public long __percent (long that) { return value % that; } - public long __bar (long that) { return value | that; } - public long __amp (long that) { return value & that; } - public long __up (long that) { return value ^ that; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Ref.cs b/src/library/scala/Ref.cs deleted file mode 100644 index 660b07321c..0000000000 --- a/src/library/scala/Ref.cs +++ /dev/null @@ -1,31 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $OldId: Ref.java,v 1.2 2002/03/12 13:16:04 zenger Exp $ -// $Id:Ref.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class [?T] extends scala.AnyRef;")] - [Serializable] - public class Ref : object { - - [Meta("field ?T;")] - public object elem = null; - - [Meta("constr (?T);")] - public Ref(object x) - { - elem = x; - } - } -}
\ No newline at end of file diff --git a/src/library/scala/Short.cs b/src/library/scala/Short.cs deleted file mode 100644 index 5503b9360a..0000000000 --- a/src/library/scala/Short.cs +++ /dev/null @@ -1,129 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Short.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - [Meta("class extends scala.AnyVal;")] - [Serializable] - public abstract class Short : AnyVal { - - public readonly short value; - - public Short(short value) - { - this.value = value; - } - - public override bool Equals(object other) - { - return (other is Short) && value == ((Short)other).value; - } - public override int GetHashCode() - { - return value; - } - public override string ToString() - { - return value.ToString(); - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - [Meta("method []scala.Int;")] - public int __plus () { return +value; } - [Meta("method []scala.Int;")] - public int __minus () { return -value; } - - public string __plus (string that) { return value + that; } - - public bool __eq__eq (double that) { return value == that; } - public bool __bang__eq (double that) { return value != that; } - public bool __less (double that) { return value < that; } - public bool __greater (double that) { return value > that; } - public bool __less__eq (double that) { return value <= that; } - public bool __greater__eq(double that) { return value >= that; } - public double __plus (double that) { return value + that; } - public double __minus (double that) { return value - that; } - public double __times (double that) { return value * that; } - public double __div (double that) { return value / that; } - public double __percent (double that) { return value % that; } - - [Meta("method []scala.Double;")] - public double coerce ( ) { return value; } - - public bool __eq__eq (float that) { return value == that; } - public bool __bang__eq (float that) { return value != that; } - public bool __less (float that) { return value < that; } - public bool __greater (float that) { return value > that; } - public bool __less__eq (float that) { return value <= that; } - public bool __greater__eq(float that) { return value >= that; } - public float __plus (float that) { return value + that; } - public float __minus (float that) { return value - that; } - public float __times (float that) { return value * that; } - public float __div (float that) { return value / that; } - public float __percent (float that) { return value % that; } - - [Meta("method []scala.Float;")] - public float coerce (float dummy) { return value ; } - [Meta("method []scala.Int;")] - public int __tilde ( ) { return ~value ; } - - public int __less__less (int that) { return value << that; } - public int __less__less (long that) { return value << (int)that; } - public int __greater__greater(int that) { return value >> that; } - public int __greater__greater(long that) { return value >> (int)that; } - public int __greater__greater__greater(int that) { return (int)((uint)value >>that); } - public int __greater__greater__greater(long that) { return (int)((uint)value >>(int)that); } - - public bool __eq__eq (long that) { return value == that; } - public bool __bang__eq (long that) { return value != that; } - public bool __less (long that) { return value < that; } - public bool __greater (long that) { return value > that; } - public bool __less__eq (long that) { return value <= that; } - public bool __greater__eq(long that) { return value >= that; } - public long __plus (long that) { return value + that; } - public long __minus (long that) { return value - that; } - public long __times (long that) { return value * that; } - public long __div (long that) { return value / that; } - public long __percent (long that) { return value % that; } - public long __bar (long that) { return value | that; } - public long __amp (long that) { return value & that; } - public long __up (long that) { return value ^ that; } - - [Meta("method []scala.Long;")] - public long coerce (long dummy) { return value ; } - - public bool __eq__eq (int that) { return value == that; } - public bool __bang__eq (int that) { return value != that; } - public bool __less (int that) { return value < that; } - public bool __greater (int that) { return value > that; } - public bool __less__eq (int that) { return value <= that; } - public bool __greater__eq(int that) { return value >= that; } - public int __plus (int that) { return value + that; } - public int __minus (int that) { return value - that; } - public int __times (int that) { return value * that; } - public int __div (int that) { return value / that; } - public int __percent (int that) { return value % that; } - public int __bar (int that) { return value | that; } - public int __amp (int that) { return value & that; } - public int __up (int that) { return value ^ that; } - - [Meta("method []scala.Int;")] - public int coerce (int dummy) { return value ; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/Unit.cs b/src/library/scala/Unit.cs deleted file mode 100644 index 44fd1aa3ca..0000000000 --- a/src/library/scala/Unit.cs +++ /dev/null @@ -1,45 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id:Unit.cs 5359 2005-12-16 16:33:49 +0100 (Fri, 16 Dec 2005) dubochet $ - -using System; -using scala.runtime; - -namespace scala -{ - - public abstract class Unit : AnyVal { - - public void value() {} - - public Unit() {} - - public override bool Equals(object other) - { - return other is Unit; - } - public override int GetHashCode() - { - int bits = 4041; - return bits; - } - public override string ToString() - { - return "()"; - } - - [Meta("method (scala.Any)scala.Boolean;")] - public bool __eq__eq (object other) { return Equals(other); } - [Meta("method (scala.Any)scala.Boolean;")] - public bool __bang__eq(object other) { return !Equals(other); } - - public string __plus (string that) { return this + that; } - - } -}
\ No newline at end of file diff --git a/src/library/scala/runtime/ExceptionHandling.cs b/src/library/scala/runtime/ExceptionHandling.cs deleted file mode 100644 index 0a59308f99..0000000000 --- a/src/library/scala/runtime/ExceptionHandling.cs +++ /dev/null @@ -1,33 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - -using System; -using scala; - -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/src/library/scala/runtime/MetaAttribute.cs b/src/library/scala/runtime/MetaAttribute.cs deleted file mode 100644 index 28ab499bdd..0000000000 --- a/src/library/scala/runtime/MetaAttribute.cs +++ /dev/null @@ -1,34 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - -using System; - -namespace scala.runtime -{ - /// <summary> - /// Stores additional meta-information about classes and members. - /// Used to augment type information in classes from the scala - /// library written in Java. - /// </summary> - - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Field - | AttributeTargets.Constructor | AttributeTargets.Method, - AllowMultiple = false, Inherited = false)] - public class MetaAttribute : Attribute - { - // keeps a textual representation of the pico-style attributes - // used in some classes of the runtime library - public readonly string meta; - public MetaAttribute(string meta) - { - this.meta = meta; - } - } -} diff --git a/src/library/scala/runtime/SymtabAttribute.cs b/src/library/scala/runtime/SymtabAttribute.cs deleted file mode 100644 index fcb273a857..0000000000 --- a/src/library/scala/runtime/SymtabAttribute.cs +++ /dev/null @@ -1,40 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2005, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id$ - -using System; - -namespace scala.runtime -{ - /// <summary> - /// Stores the symbol table for every top-level Scala class. - /// </summary> - - [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)] - public class SymtabAttribute : Attribute - { - // stores scalac symbol table - public readonly byte[] symtab; - - // indicates if the type should be considered by the compiler; - // used for synthetic classes introduced by the Scala compiler - public readonly bool shouldLoadClass; - - public SymtabAttribute(byte[] symtab) - { - this.symtab = symtab; - this.shouldLoadClass = true; - } - - public SymtabAttribute() { - this.symtab = new byte[0]; - this.shouldLoadClass = false; - } - } -} diff --git a/src/msil-library/AssemblyInfo.cs.tmpl b/src/msil-library/AssemblyInfo.cs.tmpl deleted file mode 100644 index c32f40ff11..0000000000 --- a/src/msil-library/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/src/msil-library/scala/runtime/compat/Math.scala b/src/msil-library/scala/runtime/compat/Math.scala deleted file mode 100644 index 5b9853e953..0000000000 --- a/src/msil-library/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/src/msil-library/scala/runtime/compat/Platform.scala b/src/msil-library/scala/runtime/compat/Platform.scala deleted file mode 100644 index fcdaa54e22..0000000000 --- a/src/msil-library/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/src/msil-library/scala/runtime/compat/StringBuilder.scala b/src/msil-library/scala/runtime/compat/StringBuilder.scala deleted file mode 100644 index 4154c0fb3a..0000000000 --- a/src/msil-library/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(); -} |