summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-05-03 17:11:30 -0700
committerPaul Phillips <paulp@improving.org>2012-05-03 17:15:31 -0700
commit8bc8b83f0bd7daef62b41b4a0c87b4e9b7344284 (patch)
tree4f445792891bd6945ce8132b97a0231a8cf54392
parent58f6a1346093db2f407879246884d480ff8d7904 (diff)
downloadscala-8bc8b83f0bd7daef62b41b4a0c87b4e9b7344284.tar.gz
scala-8bc8b83f0bd7daef62b41b4a0c87b4e9b7344284.tar.bz2
scala-8bc8b83f0bd7daef62b41b4a0c87b4e9b7344284.zip
Moved passing tests from pending to files.
Most are pattern matcher bugs fixed by virtpatmat. A few are reifier, package object, or miscellaneous. I threw in an original test for SI-2337, to go with those for SI-1697, SI-3705, SI-4415, and SI-1357, all of which (in the interests of making sure this basket has all the eggs) I am closing.
-rw-r--r--test/files/neg/dbldef.check (renamed from test/pending/neg/dbldef.check)0
-rw-r--r--test/files/neg/dbldef.scala (renamed from test/pending/neg/dbldef.scala)0
-rw-r--r--test/files/pos/no-widen-locals.scala (renamed from test/pending/pos/no-widen-locals.scala)0
-rw-r--r--test/files/pos/t1357.scala (renamed from test/pending/pos/t1357.scala)0
-rw-r--r--test/files/pos/t5240.scala (renamed from test/pending/pos/t5240.scala)0
-rw-r--r--test/files/run/reify_csv.check (renamed from test/pending/run/reify_csv.check)0
-rw-r--r--test/files/run/reify_csv.scala (renamed from test/pending/run/reify_csv.scala)0
-rw-r--r--test/files/run/reify_lazyevaluation.check (renamed from test/pending/run/reify_lazyevaluation.check)0
-rw-r--r--test/files/run/reify_lazyevaluation.scala (renamed from test/pending/run/reify_lazyevaluation.scala)0
-rw-r--r--test/files/run/reify_properties.check (renamed from test/pending/run/reify_properties.check)0
-rw-r--r--test/files/run/reify_properties.scala (renamed from test/pending/run/reify_properties.scala)0
-rw-r--r--test/files/run/t1697.scala (renamed from test/pending/run/t1697.scala)0
-rw-r--r--test/files/run/t2337.check4
-rw-r--r--test/files/run/t2337.scala21
-rw-r--r--test/files/run/t3705.scala (renamed from test/pending/run/t3705.scala)0
-rw-r--r--test/files/run/t4415.scala (renamed from test/pending/run/t4415.scala)0
-rw-r--r--test/files/run/t5258a.check (renamed from test/pending/run/t5258a.check)0
-rw-r--r--test/files/run/t5258a.scala (renamed from test/pending/run/t5258a.scala)0
18 files changed, 25 insertions, 0 deletions
diff --git a/test/pending/neg/dbldef.check b/test/files/neg/dbldef.check
index 3ee63475e4..3ee63475e4 100644
--- a/test/pending/neg/dbldef.check
+++ b/test/files/neg/dbldef.check
diff --git a/test/pending/neg/dbldef.scala b/test/files/neg/dbldef.scala
index c70fb97b2c..c70fb97b2c 100644
--- a/test/pending/neg/dbldef.scala
+++ b/test/files/neg/dbldef.scala
diff --git a/test/pending/pos/no-widen-locals.scala b/test/files/pos/no-widen-locals.scala
index 013e63f0a2..013e63f0a2 100644
--- a/test/pending/pos/no-widen-locals.scala
+++ b/test/files/pos/no-widen-locals.scala
diff --git a/test/pending/pos/t1357.scala b/test/files/pos/t1357.scala
index 7bc6d45034..7bc6d45034 100644
--- a/test/pending/pos/t1357.scala
+++ b/test/files/pos/t1357.scala
diff --git a/test/pending/pos/t5240.scala b/test/files/pos/t5240.scala
index 2db689c27d..2db689c27d 100644
--- a/test/pending/pos/t5240.scala
+++ b/test/files/pos/t5240.scala
diff --git a/test/pending/run/reify_csv.check b/test/files/run/reify_csv.check
index b56f4bb50b..b56f4bb50b 100644
--- a/test/pending/run/reify_csv.check
+++ b/test/files/run/reify_csv.check
diff --git a/test/pending/run/reify_csv.scala b/test/files/run/reify_csv.scala
index 966521575c..966521575c 100644
--- a/test/pending/run/reify_csv.scala
+++ b/test/files/run/reify_csv.scala
diff --git a/test/pending/run/reify_lazyevaluation.check b/test/files/run/reify_lazyevaluation.check
index 1c7f96cd96..1c7f96cd96 100644
--- a/test/pending/run/reify_lazyevaluation.check
+++ b/test/files/run/reify_lazyevaluation.check
diff --git a/test/pending/run/reify_lazyevaluation.scala b/test/files/run/reify_lazyevaluation.scala
index 1a0c858914..1a0c858914 100644
--- a/test/pending/run/reify_lazyevaluation.scala
+++ b/test/files/run/reify_lazyevaluation.scala
diff --git a/test/pending/run/reify_properties.check b/test/files/run/reify_properties.check
index d769bea4b0..d769bea4b0 100644
--- a/test/pending/run/reify_properties.check
+++ b/test/files/run/reify_properties.check
diff --git a/test/pending/run/reify_properties.scala b/test/files/run/reify_properties.scala
index 5cacc262ac..5cacc262ac 100644
--- a/test/pending/run/reify_properties.scala
+++ b/test/files/run/reify_properties.scala
diff --git a/test/pending/run/t1697.scala b/test/files/run/t1697.scala
index 01590dd405..01590dd405 100644
--- a/test/pending/run/t1697.scala
+++ b/test/files/run/t1697.scala
diff --git a/test/files/run/t2337.check b/test/files/run/t2337.check
new file mode 100644
index 0000000000..18f1f66fc3
--- /dev/null
+++ b/test/files/run/t2337.check
@@ -0,0 +1,4 @@
+(Both Int,-1,-1)
+(Both Float,1,1)
+(Float then Int,0,0)
+(Int then Float,0,0)
diff --git a/test/files/run/t2337.scala b/test/files/run/t2337.scala
new file mode 100644
index 0000000000..86a372ce56
--- /dev/null
+++ b/test/files/run/t2337.scala
@@ -0,0 +1,21 @@
+
+object Test {
+
+ def compare(first: Any, second: Any): Any = {
+ (first, second) match {
+ case (k: Int, o: Int) => k compare o
+ //why the next case matches (Float, Int) but does not match (Int, Float) ???
+ case (k: Number, o: Number) => k.doubleValue() compare o.doubleValue()
+ case _ => "BOGON"
+ // throw new Exception("Unsupported compare " + first + "; " + second)
+ }
+ }
+
+ def main(args: Array[String]): Unit = {
+ println("Both Int", -1, compare(0, 1))
+ println("Both Float", 1, compare(1.0, 0.0))
+ println("Float then Int", 0, compare(10.0, 10))
+ println("Int then Float", 0, compare(10, 10.0)) //this fails with an exception
+ }
+}
+
diff --git a/test/pending/run/t3705.scala b/test/files/run/t3705.scala
index fcc020f28c..fcc020f28c 100644
--- a/test/pending/run/t3705.scala
+++ b/test/files/run/t3705.scala
diff --git a/test/pending/run/t4415.scala b/test/files/run/t4415.scala
index f96031d650..f96031d650 100644
--- a/test/pending/run/t4415.scala
+++ b/test/files/run/t4415.scala
diff --git a/test/pending/run/t5258a.check b/test/files/run/t5258a.check
index 4e0b2da04c..4e0b2da04c 100644
--- a/test/pending/run/t5258a.check
+++ b/test/files/run/t5258a.check
diff --git a/test/pending/run/t5258a.scala b/test/files/run/t5258a.scala
index 127829c724..127829c724 100644
--- a/test/pending/run/t5258a.scala
+++ b/test/files/run/t5258a.scala