summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-04-23 10:46:10 -0700
committerPaul Phillips <paulp@improving.org>2012-04-23 10:51:05 -0700
commitf4d7febab57f7cc172abebfb3233f0ab771cd72a (patch)
treea65471437cfdb8efaf47b8e861ad53324c11fcc5 /test
parentfe1110f2fe973781a595397c7f9bb379bfd78e66 (diff)
downloadscala-f4d7febab57f7cc172abebfb3233f0ab771cd72a.tar.gz
scala-f4d7febab57f7cc172abebfb3233f0ab771cd72a.tar.bz2
scala-f4d7febab57f7cc172abebfb3233f0ab771cd72a.zip
Removed FlatArray.
We thought better of it.
Diffstat (limited to 'test')
-rw-r--r--test/files/run/Meter.check8
-rw-r--r--test/files/run/Meter.scala36
-rw-r--r--test/files/run/MeterCaseClass.check8
-rw-r--r--test/files/run/MeterCaseClass.scala36
4 files changed, 36 insertions, 52 deletions
diff --git a/test/files/run/Meter.check b/test/files/run/Meter.check
index 7562f9a1bf..b7e2eac125 100644
--- a/test/files/run/Meter.check
+++ b/test/files/run/Meter.check
@@ -11,11 +11,3 @@ Array(1.0m, 2.0m)
1.0m
>>>1.0m<<< 1.0m
>>>2.0m<<< 2.0m
-testing wrapped arrays
-FlatArray(1.0m, 2.0m)
-1.0m
->>>1.0m<<< 1.0m
->>>2.0m<<< 2.0m
-FlatArray(2.0m, 3.0m)
-ArrayBuffer(1.0, 2.0)
-FlatArray(0.3048ft, 0.6096ft)
diff --git a/test/files/run/Meter.scala b/test/files/run/Meter.scala
index 515e46de24..d94f338ca9 100644
--- a/test/files/run/Meter.scala
+++ b/test/files/run/Meter.scala
@@ -80,23 +80,23 @@ object Test extends App {
println(m)
foo(arr)
}
-
- { println("testing wrapped arrays")
- import collection.mutable.FlatArray
- val arr = FlatArray(x, y + x)
- println(arr)
- def foo(x: FlatArray[Meter]) {
- for (i <- 0 until x.length) { x(i).print; println(" "+x(i)) }
- }
- val m = arr(0)
- println(m)
- foo(arr)
- val ys: Seq[Meter] = arr map (_ + new Meter(1))
- println(ys)
- val zs = arr map (_ / Meter(1))
- println(zs)
- val fs = arr map (_.toFoot)
- println(fs)
- }
+ //
+ // { println("testing wrapped arrays")
+ // import collection.mutable.FlatArray
+ // val arr = FlatArray(x, y + x)
+ // println(arr)
+ // def foo(x: FlatArray[Meter]) {
+ // for (i <- 0 until x.length) { x(i).print; println(" "+x(i)) }
+ // }
+ // val m = arr(0)
+ // println(m)
+ // foo(arr)
+ // val ys: Seq[Meter] = arr map (_ + new Meter(1))
+ // println(ys)
+ // val zs = arr map (_ / Meter(1))
+ // println(zs)
+ // val fs = arr map (_.toFoot)
+ // println(fs)
+ // }
}
diff --git a/test/files/run/MeterCaseClass.check b/test/files/run/MeterCaseClass.check
index 08370d2097..2528753657 100644
--- a/test/files/run/MeterCaseClass.check
+++ b/test/files/run/MeterCaseClass.check
@@ -11,11 +11,3 @@ Array(Meter(1.0), Meter(2.0))
Meter(1.0)
>>>Meter(1.0)<<< Meter(1.0)
>>>Meter(2.0)<<< Meter(2.0)
-testing wrapped arrays
-FlatArray(Meter(1.0), Meter(2.0))
-Meter(1.0)
->>>Meter(1.0)<<< Meter(1.0)
->>>Meter(2.0)<<< Meter(2.0)
-FlatArray(Meter(2.0), Meter(3.0))
-ArrayBuffer(1.0, 2.0)
-FlatArray(0.3048ft, 0.6096ft)
diff --git a/test/files/run/MeterCaseClass.scala b/test/files/run/MeterCaseClass.scala
index 8459163f31..e5979cf761 100644
--- a/test/files/run/MeterCaseClass.scala
+++ b/test/files/run/MeterCaseClass.scala
@@ -77,23 +77,23 @@ object Test extends App {
println(m)
foo(arr)
}
-
- { println("testing wrapped arrays")
- import collection.mutable.FlatArray
- val arr = FlatArray(x, y + x)
- println(arr)
- def foo(x: FlatArray[Meter]) {
- for (i <- 0 until x.length) { x(i).print; println(" "+x(i)) }
- }
- val m = arr(0)
- println(m)
- foo(arr)
- val ys: Seq[Meter] = arr map (_ + new Meter(1))
- println(ys)
- val zs = arr map (_ / Meter(1))
- println(zs)
- val fs = arr map (_.toFoot)
- println(fs)
- }
+ //
+ // { println("testing wrapped arrays")
+ // import collection.mutable.FlatArray
+ // val arr = FlatArray(x, y + x)
+ // println(arr)
+ // def foo(x: FlatArray[Meter]) {
+ // for (i <- 0 until x.length) { x(i).print; println(" "+x(i)) }
+ // }
+ // val m = arr(0)
+ // println(m)
+ // foo(arr)
+ // val ys: Seq[Meter] = arr map (_ + new Meter(1))
+ // println(ys)
+ // val zs = arr map (_ / Meter(1))
+ // println(zs)
+ // val fs = arr map (_.toFoot)
+ // println(fs)
+ // }
}