build target is now 1.5

case classes now generate objects not factory methods. some small
cleanups for type inference

1 files changed, 345 insertions, 0 deletions

diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
new file mode 100755
index 0000000000..3049d7815b
--- /dev/null
+++ b/test/files/jvm/serialization.scala
@@ -0,0 +1,345 @@
+//############################################################################
+// Serialization
+//############################################################################
+// $Id: serialization.scala 12990 2007-10-03 16:52:05Z michelou $
+
+import java.lang.System
+
+object EqualityTest {
+  def check[A, B](x: A, y: B) {
+    println("x = " + x)
+    println("y = " + y)
+    println("x equals y: " + (x equals y) + " - y equals x: " + (y equals x))
+    println()
+  }
+}
+
+object Serialize {
+  @throws(classOf[java.io.IOException])
+  def write[A](o: A): Array[Byte] = {
+    val ba = new java.io.ByteArrayOutputStream(512)
+    val out = new java.io.ObjectOutputStream(ba)
+    out.writeObject(o)
+    out.close()
+    ba.toByteArray()
+  }
+  @throws(classOf[java.io.IOException])
+  @throws(classOf[ClassNotFoundException])
+  def read[A](buffer: Array[Byte]): A = {
+    val in =
+      new java.io.ObjectInputStream(new java.io.ByteArrayInputStream(buffer))
+    in.readObject().asInstanceOf[A]
+  }
+}
+
+//############################################################################
+// Test classes in package "scala"
+
+@serializable
+object Test1_scala {
+
+  private def arrayToString[A](arr: Array[A]): String =
+    List.fromArray(arr).mkString("Array[",",","]")
+
+  private def arrayEquals[A, B](a1: Array[A], a2: Array[B]) =
+     (a1.length == a2.length) &&
+     (Iterator.range(0, a1.length) forall { i => a1(i) == a2(i) })
+
+  val x1 = Nil
+  val x2 = None
+  val x3 = Array(1, 2, 3)
+  val x4 = { x: Int => 2 * x }
+
+  try {
+    val y1: List[Nothing]      = Serialize.read(Serialize.write(x1))
+    val y2: Option[Nothing]    = Serialize.read(Serialize.write(x2))
+    val y3: Array[Int]         = Serialize.read(Serialize.write(x3))
+    val y4: Function[Int, Int] = Serialize.read(Serialize.write(x4))
+
+    println("x1 = " + x1)
+    println("y1 = " + y1)
+    println("x1 eq y1: " + (x1 eq y1) + " - y1 eq x1: " + (y1 eq x1))
+    println
+    println("x2 = " + x2)
+    println("y2 = " + y2)
+    println("x2 eq y2: " + (x2 eq y2) + " - y2 eq x2: " + (y2 eq x2))
+    println
+    println("x3 = " + arrayToString(x3))
+    println("y3 = " + arrayToString(y3))
+    println("arrayEquals(x3, y3): " + arrayEquals(x3, y3))
+    println
+    println("x4 = <na>")
+    println("y4 = <na>")
+    println("x4(2): " + x4(2) + " - y4(2): " + y4(2))
+    println
+  }
+  catch {
+    case e: Exception =>
+      e.printStackTrace()
+      println("Error in Test1_scala: " + e)
+  }
+}
+
+//############################################################################
+// Test classes in package "scala.collection.immutable"
+
+@serializable
+object Test2_immutable {
+  import scala.collection.immutable.{
+    BitSet, ListMap, ListSet, Queue, Stack, TreeSet, TreeMap}
+
+  val x1 = List(
+    Pair("buffers", 20),
+    Pair("layers", 2),
+    Pair("title", 3)
+  )
+
+  val x2 = new ListMap[String, Int]
+    .incl(Pair("buffers", 20))
+    .incl(Pair("layers", 2))
+    .incl(Pair("title", 3))
+
+  val x3 = {
+    val bs = new collection.mutable.BitSet()
+    bs += 2; bs += 3
+    bs.toImmutable
+  }
+
+  val x4 = new ListSet[Int]().incl(3).incl(5)
+
+  val x5 = new Queue("a", "b", "c")
+
+  val x6 = new Stack().push("a", "b", "c")
+
+  val x7 = new TreeMap[Int, String] + 42 -> "FortyTwo"
+
+  val x8 = new TreeSet[Int]().incl(2).incl(0)
+
+  try {
+    val y1: List[Pair[String, Int]] = Serialize.read(Serialize.write(x1))
+    val y2: ListMap[String, Int]    = Serialize.read(Serialize.write(x2))
+    val y3: BitSet                  = Serialize.read(Serialize.write(x3))
+    val y4: ListSet[Int]            = Serialize.read(Serialize.write(x4))
+    val y5: Queue[String]           = Serialize.read(Serialize.write(x5))
+    val y6: Stack[String]           = Serialize.read(Serialize.write(x6))
+    val y7: TreeMap[Int, String]    = Serialize.read(Serialize.write(x7))
+    val y8: TreeSet[Int]            = Serialize.read(Serialize.write(x8))
+
+    EqualityTest.check(x1, y1)
+    EqualityTest.check(x2, y2)
+    EqualityTest.check(x3, y3)
+    EqualityTest.check(x4, y4)
+    EqualityTest.check(x5, y5)
+    EqualityTest.check(x6, y6)
+    EqualityTest.check(x7, y7)
+    EqualityTest.check(x8, y8)
+  }
+  catch {
+    case e: Exception =>
+      println("Error in Test2_immutable: " + e)
+      throw e
+  }
+}
+
+//############################################################################
+// Test classes in package "scala.collection.mutable"
+
+object Test3_mutable {
+  import scala.collection.mutable.{
+    ArrayBuffer, BitSet, HashMap, HashSet, History, LinkedList, ListBuffer,
+    Publisher, Queue, RevertableHistory, Stack}
+
+  val x0 = new ArrayBuffer[String]
+  x0 ++= List("one", "two")
+
+  val x2 = new BitSet()
+  x2 += 0
+  x2 += 8
+  x2 += 9
+
+  val x1 = new HashMap[String, Int]
+  x1 ++= Test2_immutable.x1
+
+  val x3 = new HashSet[String]
+  x3 ++= Test2_immutable.x1.map(p => p._1)
+
+  @serializable
+  class Feed extends Publisher[String, Feed]
+
+  val x8 = new History[String, Feed]
+
+  val x4 = new LinkedList[Int](2, null)
+  x4.append(new LinkedList(3, null))
+
+  val x7 = new ListBuffer[String]
+  x7 ++= List("white", "black")
+
+  val x5 = new Queue[Int]
+  x5 ++= Test2_immutable.x1.map(p => p._2)
+
+  val x6 = new Stack[Int]
+  x6 ++= x5
+
+  try {
+    val y0: ArrayBuffer[String]   = Serialize.read(Serialize.write(x0))
+    val y1: HashMap[String, Int]  = Serialize.read(Serialize.write(x1))
+    val y2: BitSet                = Serialize.read(Serialize.write(x2))
+    val y3: HashSet[String]       = Serialize.read(Serialize.write(x3))
+    val y4: LinkedList[Int]       = Serialize.read(Serialize.write(x4))
+    val y5: Queue[Int]            = Serialize.read(Serialize.write(x5))
+    val y6: Stack[Int]            = Serialize.read(Serialize.write(x6))
+    val y7: ListBuffer[String]    = Serialize.read(Serialize.write(x7))
+    val y8: History[String, Feed] = Serialize.read(Serialize.write(x8))
+
+    EqualityTest.check(x0, y0)
+    EqualityTest.check(x1, y1)
+    EqualityTest.check(x2, y2)
+    EqualityTest.check(x3, y3)
+    EqualityTest.check(x4, y4)
+    EqualityTest.check(x5, y5)
+    EqualityTest.check(x6, y6)
+    EqualityTest.check(x7, y7)
+    //EqualityTest.check(x8, y8) //todo
+  }
+  catch {
+    case e: Exception =>
+      println("Error in Test3_mutable: " + e)
+  }
+}
+
+//############################################################################
+// Test classes in package "scala.xml"
+
+object Test4_xml {
+  import scala.xml.Elem
+
+  val x1 = <html><title>title</title><body></body></html>;
+
+  case class Person(name: String, age: Int)
+
+  class AddressBook(a: Person*) {
+    private val people: List[Person] = a.toList
+    def toXHTML =
+      <table cellpadding="2" cellspacing="0">
+        <tr>
+          <th>Last Name</th>
+          <th>First Name</th>
+        </tr>
+        { for (val p <- people) yield
+        <tr>
+          <td> { p.name } </td>
+          <td> { p.age.toString() } </td>
+        </tr> }
+      </table>;
+  }
+
+  val people = new AddressBook(
+    Person("Tom", 20),
+    Person("Bob", 22),
+    Person("James", 19))
+
+  val x2 =
+    <html>
+      <body>
+       { people.toXHTML }
+      </body>
+    </html>;
+
+  try {
+    val y1: scala.xml.Elem = Serialize.read(Serialize.write(x1))
+    val y2: scala.xml.Elem = Serialize.read(Serialize.write(x2))
+
+    EqualityTest.check(x1, y1)
+    EqualityTest.check(x2, y2)
+  }
+  catch {
+    case e: Exception =>
+      println("Error in Test4_xml: " + e)
+  }
+}
+
+//############################################################################
+// Test user-defined classes WITHOUT nesting
+
+@serializable
+class Person(_name: String) {
+  private var name = _name
+  override def toString() = name
+  override def equals(that: Any): Boolean =
+    that.isInstanceOf[Person] &&
+    (name == that.asInstanceOf[Person].name)
+}
+
+@serializable
+class Employee(_name: String) {
+  private var name = _name
+  override def toString() = name
+}
+@serializable
+object bob extends Employee("Bob")
+
+object Test5 {
+  val x1 = new Person("Tim")
+  val x2 = bob
+
+  try {
+    val y1: Person   = Serialize.read(Serialize.write(x1))
+    val y2: Employee = Serialize.read(Serialize.write(x2))
+
+    EqualityTest.check(x1, y1)
+    EqualityTest.check(x2, y2)
+  }
+  catch {
+    case e: Exception =>
+      println("Error in Test5: " + e)
+  }
+}
+
+//############################################################################
+// Test user-defined classes WITH nesting
+
+@serializable
+object Test6 {
+  @serializable
+  object bill extends Employee("Bill") {
+    val x = paul
+  }
+  @serializable
+  object paul extends Person("Paul") {
+    val x = 4  //  bill; => StackOverflowException !!!
+  }
+  val x1 = new Person("John")
+  val x2 = bill
+  val x3 = paul
+
+  try {
+    val y1: Person   = Serialize.read(Serialize.write(x1))
+    val y2: Employee = Serialize.read(Serialize.write(x2))
+    val y3: Person   = Serialize.read(Serialize.write(x3))
+
+    EqualityTest.check(x1, y1)
+    EqualityTest.check(x2, y2)
+    EqualityTest.check(x3, y3)
+  }
+  catch {
+    case e: Exception =>
+      println("Error in Test6: " + e)
+  }
+}
+
+//############################################################################
+// Test code
+
+object Test {
+  def main(args: Array[String]) {
+    Test1_scala
+    Test2_immutable
+    Test3_mutable
+    Test4_xml
+    Test5
+    Test6
+  }
+}
+
+//############################################################################
+