diff options
author | michelou <michelou@epfl.ch> | 2004-09-29 16:05:57 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2004-09-29 16:05:57 +0000 |
commit | f9cda0d53a8f14cf2e28480563ace06fe2ed8c48 (patch) | |
tree | 8db3ce9fd4273260f87f69b378ab80db6738897f | |
parent | 52877fa8cb607d4b4f9825fca9f96dc0f4d1a35d (diff) | |
download | scala-f9cda0d53a8f14cf2e28480563ace06fe2ed8c48.tar.gz scala-f9cda0d53a8f14cf2e28480563ace06fe2ed8c48.tar.bz2 scala-f9cda0d53a8f14cf2e28480563ace06fe2ed8c48.zip |
- added java.io.Serializable.
-rw-r--r-- | sources/scala/AnyVal.java | 4 | ||||
-rw-r--r-- | sources/scala/CaseClass.scala | 4 | ||||
-rw-r--r-- | sources/scala/Function.java.tmpl | 4 | ||||
-rw-r--r-- | sources/scala/Option.scala | 77 | ||||
-rw-r--r-- | sources/scala/collection/mutable/HashTable.scala | 4 | ||||
-rw-r--r-- | sources/scala/collection/mutable/ResizableArray.scala | 4 |
6 files changed, 49 insertions, 48 deletions
diff --git a/sources/scala/AnyVal.java b/sources/scala/AnyVal.java index d3785c42c3..8dbbef50db 100644 --- a/sources/scala/AnyVal.java +++ b/sources/scala/AnyVal.java @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -11,4 +11,4 @@ package scala; /** @meta class extends scala.Any; */ -public abstract class AnyVal {} +public abstract class AnyVal implements java.io.Serializable {} diff --git a/sources/scala/CaseClass.scala b/sources/scala/CaseClass.scala index d34b376c75..8a975938f2 100644 --- a/sources/scala/CaseClass.scala +++ b/sources/scala/CaseClass.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -13,7 +13,7 @@ package scala; * * @author Burak Emir */ -trait CaseClass { +trait CaseClass with java.io.Serializable { /** for a case class A(x_0,...,x_(k-1)), returns x_i for 0 <= i < k, ** null otherwise diff --git a/sources/scala/Function.java.tmpl b/sources/scala/Function.java.tmpl index 312b53ba96..ed0e7ef30e 100644 --- a/sources/scala/Function.java.tmpl +++ b/sources/scala/Function.java.tmpl @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -11,7 +11,7 @@ package scala; /** @meta class [{#ClassScalaTParams#}] extends java.lang.Object; */ -public interface Function{#n#} { +public interface Function{#n#} extends java.io.Serializable { /** @meta method {#ApplyScalaSignature#}; */ public abstract java.lang.Object apply({#ApplyJavaVParams#}); } diff --git a/sources/scala/Option.scala b/sources/scala/Option.scala index bc997cc317..74611b804e 100644 --- a/sources/scala/Option.scala +++ b/sources/scala/Option.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2004, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -18,50 +18,51 @@ package scala; * @author Matthias Zenger * @version 1.0, 16/07/2003 */ -trait Option[+A] extends Iterable[A] { +trait Option[+A] extends Iterable[A] with java.io.Serializable { - def isEmpty: Boolean = this match { - case None => true - case _ => false - } + def isEmpty: Boolean = this match { + case None => true + case _ => false + } - def get: A = match { - case None => error("None.get") - case Some(x) => x - } + def get: A = match { + case None => error("None.get") + case Some(x) => x + } - def get[B >: A](default: B): B = match { - case None => default - case Some(x) => x - } + def get[B >: A](default: B): B = match { + case None => default + case Some(x) => x + } - def map[B](f: A => B): Option[B] = match { - case None => None - case Some(x) => Some(f(x)) - } + def map[B](f: A => B): Option[B] = match { + case None => None + case Some(x) => Some(f(x)) + } - def flatMap[B](f: A => Option[B]): Option[B] = match { - case None => None - case Some(x) => f(x) - } + def flatMap[B](f: A => Option[B]): Option[B] = match { + case None => None + case Some(x) => f(x) + } - def filter(p: A => Boolean): Option[A] = match { - case None => None - case Some(x) => if (p(x)) Some(x) else None - } + def filter(p: A => Boolean): Option[A] = match { + case None => None + case Some(x) => if (p(x)) Some(x) else None + } - override def foreach(f: A => Unit): Unit = match { - case None => () - case Some(x) => f(x) - } + override def foreach(f: A => Unit): Unit = match { + case None => () + case Some(x) => f(x) + } - def elements: Iterator[A] = match { - case None => Iterator.empty - case Some(x) => Iterator.fromValues(x) - } + def elements: Iterator[A] = match { + case None => Iterator.empty + case Some(x) => Iterator.fromValues(x) + } + + def toList: List[A] = match { + case None => List() + case Some(x) => List(x) + } - def toList: List[A] = match { - case None => List() - case Some(x) => List(x) - } } diff --git a/sources/scala/collection/mutable/HashTable.scala b/sources/scala/collection/mutable/HashTable.scala index 5d39d19162..68c19804a0 100644 --- a/sources/scala/collection/mutable/HashTable.scala +++ b/sources/scala/collection/mutable/HashTable.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -27,7 +27,7 @@ package scala.collection.mutable; * @author Matthias Zenger * @version 1.0, 08/07/2003 */ -abstract class HashTable[A] { +abstract class HashTable[A] with java.io.Serializable { /** The load factor for the hash table. */ diff --git a/sources/scala/collection/mutable/ResizableArray.scala b/sources/scala/collection/mutable/ResizableArray.scala index f2ea93b2fa..b632b3341f 100644 --- a/sources/scala/collection/mutable/ResizableArray.scala +++ b/sources/scala/collection/mutable/ResizableArray.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2004, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -16,7 +16,7 @@ package scala.collection.mutable; * @author Matthias Zenger * @version 1.0, 03/05/2004 */ -abstract class ResizableArray[A] with Iterable[A] { +abstract class ResizableArray[A] with Iterable[A] with java.io.Serializable { import java.lang.System.arraycopy; protected val initialSize: Int = 16; |