summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2005-12-13 16:35:57 +0000
committermihaylov <mihaylov@epfl.ch>2005-12-13 16:35:57 +0000
commitf87ec7b728befe57af639e423b0b64d1e12edb92 (patch)
treee400fb6ee4018a4a9527cfcf2622fc580f77d891
parentf11d4d62162e13fed5a261550d01c85c2d4dcd64 (diff)
downloadscala-f87ec7b728befe57af639e423b0b64d1e12edb92.tar.gz
scala-f87ec7b728befe57af639e423b0b64d1e12edb92.tar.bz2
scala-f87ec7b728befe57af639e423b0b64d1e12edb92.zip
made serializable
-rwxr-xr-xsources/scala/runtime/BoxedAnyArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedBoolean.java4
-rwxr-xr-xsources/scala/runtime/BoxedBooleanArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedByte.java4
-rwxr-xr-xsources/scala/runtime/BoxedByteArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedChar.java4
-rwxr-xr-xsources/scala/runtime/BoxedCharArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedDouble.java4
-rwxr-xr-xsources/scala/runtime/BoxedDoubleArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedFloat.java4
-rwxr-xr-xsources/scala/runtime/BoxedFloatArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedInt.java4
-rwxr-xr-xsources/scala/runtime/BoxedIntArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedLong.java4
-rwxr-xr-xsources/scala/runtime/BoxedLongArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedShort.java4
-rwxr-xr-xsources/scala/runtime/BoxedShortArray.scala1
-rwxr-xr-xsources/scala/runtime/BoxedUnit.java4
-rw-r--r--sources/scala/runtime/compat/StringBuilder.scala4
-rw-r--r--sources/scala/runtime/matching/NonTerm.scala4
20 files changed, 42 insertions, 11 deletions
diff --git a/sources/scala/runtime/BoxedAnyArray.scala b/sources/scala/runtime/BoxedAnyArray.scala
index b2bafa00b1..ac37a62427 100755
--- a/sources/scala/runtime/BoxedAnyArray.scala
+++ b/sources/scala/runtime/BoxedAnyArray.scala
@@ -12,6 +12,7 @@ package scala.runtime;
/** Arrays created by new Array[T](length) where T is a type variable
*/
+[serializable]
final class BoxedAnyArray(val length: Int) extends BoxedArray {
private var boxed = new Array[Object](length);
diff --git a/sources/scala/runtime/BoxedBoolean.java b/sources/scala/runtime/BoxedBoolean.java
index 3b117e0c06..ad7ec887e4 100755
--- a/sources/scala/runtime/BoxedBoolean.java
+++ b/sources/scala/runtime/BoxedBoolean.java
@@ -10,7 +10,9 @@
package scala.runtime;
-public final class BoxedBoolean {
+public final class BoxedBoolean
+ implements java.io.Serializable
+{
private final static BoxedBoolean TRUE = new BoxedBoolean(true);
private final static BoxedBoolean FALSE = new BoxedBoolean(false);
diff --git a/sources/scala/runtime/BoxedBooleanArray.scala b/sources/scala/runtime/BoxedBooleanArray.scala
index 037ad3b9f2..27b4af2643 100755
--- a/sources/scala/runtime/BoxedBooleanArray.scala
+++ b/sources/scala/runtime/BoxedBooleanArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedBooleanArray(val value: Array[Boolean]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedByte.java b/sources/scala/runtime/BoxedByte.java
index 4a3b09ba5b..b29570081e 100755
--- a/sources/scala/runtime/BoxedByte.java
+++ b/sources/scala/runtime/BoxedByte.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public final class BoxedByte extends BoxedNumber {
+public final class BoxedByte extends BoxedNumber
+ implements java.io.Serializable
+{
private static final int MinHashed = -128;
private static final int MaxHashed = 127;
diff --git a/sources/scala/runtime/BoxedByteArray.scala b/sources/scala/runtime/BoxedByteArray.scala
index bdf3005b11..e011b8e805 100755
--- a/sources/scala/runtime/BoxedByteArray.scala
+++ b/sources/scala/runtime/BoxedByteArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedByteArray(val value: Array[Byte]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedChar.java b/sources/scala/runtime/BoxedChar.java
index a27ee676c4..02b81e111d 100755
--- a/sources/scala/runtime/BoxedChar.java
+++ b/sources/scala/runtime/BoxedChar.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public class BoxedChar extends BoxedNumber {
+public class BoxedChar extends BoxedNumber
+ implements java.io.Serializable
+{
private static final int MinHashed = 0;
private static final int MaxHashed = 255;
diff --git a/sources/scala/runtime/BoxedCharArray.scala b/sources/scala/runtime/BoxedCharArray.scala
index eec5925014..49e3cba25c 100755
--- a/sources/scala/runtime/BoxedCharArray.scala
+++ b/sources/scala/runtime/BoxedCharArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedCharArray(val value: Array[Char]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedDouble.java b/sources/scala/runtime/BoxedDouble.java
index 4521705c66..98736f03a4 100755
--- a/sources/scala/runtime/BoxedDouble.java
+++ b/sources/scala/runtime/BoxedDouble.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public class BoxedDouble extends BoxedNumber {
+public class BoxedDouble extends BoxedNumber
+ implements java.io.Serializable
+{
public static BoxedDouble box(double value) {
return new BoxedDouble(value);
diff --git a/sources/scala/runtime/BoxedDoubleArray.scala b/sources/scala/runtime/BoxedDoubleArray.scala
index 12e530987f..752ab99950 100755
--- a/sources/scala/runtime/BoxedDoubleArray.scala
+++ b/sources/scala/runtime/BoxedDoubleArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedDoubleArray(val value: Array[Double]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedFloat.java b/sources/scala/runtime/BoxedFloat.java
index 60d92469b2..630ee6bece 100755
--- a/sources/scala/runtime/BoxedFloat.java
+++ b/sources/scala/runtime/BoxedFloat.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public class BoxedFloat extends BoxedNumber {
+public class BoxedFloat extends BoxedNumber
+ implements java.io.Serializable
+{
public static BoxedFloat box(float value) {
return new BoxedFloat(value);
diff --git a/sources/scala/runtime/BoxedFloatArray.scala b/sources/scala/runtime/BoxedFloatArray.scala
index 0f438dc402..bdf25b8f6b 100755
--- a/sources/scala/runtime/BoxedFloatArray.scala
+++ b/sources/scala/runtime/BoxedFloatArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedFloatArray(val value: Array[Float]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedInt.java b/sources/scala/runtime/BoxedInt.java
index 0c34962829..9842fde1ad 100755
--- a/sources/scala/runtime/BoxedInt.java
+++ b/sources/scala/runtime/BoxedInt.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public final class BoxedInt extends BoxedNumber {
+public final class BoxedInt extends BoxedNumber
+ implements java.io.Serializable
+{
private static final int MinHashed = -128;
private static final int MaxHashed = 1024;
diff --git a/sources/scala/runtime/BoxedIntArray.scala b/sources/scala/runtime/BoxedIntArray.scala
index eb16a8068f..9d0db5b233 100755
--- a/sources/scala/runtime/BoxedIntArray.scala
+++ b/sources/scala/runtime/BoxedIntArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedIntArray(val value: Array[Int]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedLong.java b/sources/scala/runtime/BoxedLong.java
index 4843f87c1c..ebc86e4c92 100755
--- a/sources/scala/runtime/BoxedLong.java
+++ b/sources/scala/runtime/BoxedLong.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public class BoxedLong extends BoxedNumber {
+public class BoxedLong extends BoxedNumber
+ implements java.io.Serializable
+{
public static BoxedLong box(long value) {
return new BoxedLong(value);
diff --git a/sources/scala/runtime/BoxedLongArray.scala b/sources/scala/runtime/BoxedLongArray.scala
index 05179acc16..624e992e01 100755
--- a/sources/scala/runtime/BoxedLongArray.scala
+++ b/sources/scala/runtime/BoxedLongArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedLongArray(val value: Array[Long]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedShort.java b/sources/scala/runtime/BoxedShort.java
index 061c260018..f1074c7b7f 100755
--- a/sources/scala/runtime/BoxedShort.java
+++ b/sources/scala/runtime/BoxedShort.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public final class BoxedShort extends BoxedNumber {
+public final class BoxedShort extends BoxedNumber
+ implements java.io.Serializable
+{
private static final int MinHashed = -128;
private static final int MaxHashed = 127;
diff --git a/sources/scala/runtime/BoxedShortArray.scala b/sources/scala/runtime/BoxedShortArray.scala
index 973f7c067f..01e00c5a21 100755
--- a/sources/scala/runtime/BoxedShortArray.scala
+++ b/sources/scala/runtime/BoxedShortArray.scala
@@ -10,6 +10,7 @@
package scala.runtime;
+[serializable]
final class BoxedShortArray(val value: Array[Short]) extends BoxedArray {
def length: Int = value.length;
diff --git a/sources/scala/runtime/BoxedUnit.java b/sources/scala/runtime/BoxedUnit.java
index 52010f8991..91e5f5d03a 100755
--- a/sources/scala/runtime/BoxedUnit.java
+++ b/sources/scala/runtime/BoxedUnit.java
@@ -7,7 +7,9 @@
\* */
package scala.runtime;
-public final class BoxedUnit {
+public final class BoxedUnit
+ implements java.io.Serializable
+{
public final static BoxedUnit UNIT = new BoxedUnit();
diff --git a/sources/scala/runtime/compat/StringBuilder.scala b/sources/scala/runtime/compat/StringBuilder.scala
index f2dbab804c..bfb790723e 100644
--- a/sources/scala/runtime/compat/StringBuilder.scala
+++ b/sources/scala/runtime/compat/StringBuilder.scala
@@ -17,6 +17,10 @@ class StringBuilder {
str.append(x);
this
}
+ def append(x: String): StringBuilder = {
+ str.append(x);
+ this
+ }
def length(): Int = str.length();
override def toString() = str.toString();
}
diff --git a/sources/scala/runtime/matching/NonTerm.scala b/sources/scala/runtime/matching/NonTerm.scala
index 44831d3dd8..35bc0f60ce 100644
--- a/sources/scala/runtime/matching/NonTerm.scala
+++ b/sources/scala/runtime/matching/NonTerm.scala
@@ -46,7 +46,7 @@ case class HedgeNT(i:int) extends NonTerm with Ordered[HedgeNT] {
}
};
-object EMPTYHEDGE extends HedgeNT( 0, true ) ;
-object ANYHEDGE extends HedgeNT( 1, true ) ;
+//case object EMPTYHEDGE extends HedgeNT( 0, true ) ;
+//case object ANYHEDGE extends HedgeNT( 1, true ) ;
object ANYTREE extends TreeNT( 1 );