diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-09-01 14:22:13 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-09-01 14:22:13 +0000 |
commit | 1c4a348aa34ec08d4a75dad3536b656d4c93994e (patch) | |
tree | 05683aa12fa66af4dc78b21108bfd5a37c5be2ec /test | |
parent | cc81e9fea64083aaf26cdf6eae1fc3510e3aedaf (diff) | |
download | scala-1c4a348aa34ec08d4a75dad3536b656d4c93994e.tar.gz scala-1c4a348aa34ec08d4a75dad3536b656d4c93994e.tar.bz2 scala-1c4a348aa34ec08d4a75dad3536b656d4c93994e.zip |
Merged revisions 22722,22732,22775-22776,22779-...
Merged revisions
22722,22732,22775-22776,22779-22780,22785-22786,22825-22827,22844-22845
via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22722 | rytz | 2010-08-10 13:46:49 +0200 (Tue, 10 Aug 2010) | 1 line
fix an msil bug (code gen of exception handlers). no review. ........
r22732 | rytz | 2010-08-11 14:32:07 +0200 (Wed, 11 Aug 2010) | 1 line
Correct fix for see #3726. no review, discussed with martin. ........
r22775 | rytz | 2010-08-16 19:29:36 +0200 (Mon, 16 Aug 2010) | 1 line
doc comment for scala package. (did not add comment on currentThread
because of see #3762). close #3750, no review. ........ r22776 | rytz |
2010-08-16 19:29:40 +0200 (Mon, 16 Aug 2010) | 1 line
documentation for scala.Array. thanks for the patches! close #3751, no
review. ........ r22779 | rytz | 2010-08-16 19:35:07 +0200 (Mon, 16 Aug
2010) | 1 line
use arraycopy instead of Array.copy in ArrayBuffer's sizeHint. close
#3766, review by extempore. ........ r22780 | rytz | 2010-08-16 20:40:54
+0200 (Mon, 16 Aug 2010) | 3 lines
Revert ArrayBuffer's sizeHint as I had a typo anyway and it needs more
thinking. see #3766, see #3767.
This reverts commit bf87118d701df2313a9f680e327ce066765c10d3. ........
r22785 | rytz | 2010-08-17 16:43:22 +0200 (Tue, 17 Aug 2010) | 1 line
use arraycopy not Array.copy in Arraybuffer.sizeHint. close #3766,
#3767. no review. ........ r22786 | rytz | 2010-08-17 19:15:08 +0200
(Tue, 17 Aug 2010) | 1 line
better fix for see #3667. not all objects are serializable, only
companions of case classes or other serializable classes. review by
polcinic. ........ r22825 | rytz | 2010-08-23 15:17:00 +0200 (Mon, 23
Aug 2010) | 1 line
test for #3667. no review
........
r22826 | rytz | 2010-08-23 15:17:03 +0200 (Mon, 23 Aug 2010) | 1 line
test for see #3769. no review.
........
r22827 | rytz | 2010-08-23 15:17:06 +0200 (Mon, 23 Aug 2010) | 1 line
in refchecks, visit the qualifier of irrefutable filters. close #3773.
review by moors. ........ r22844 | rytz | 2010-08-26 16:35:02 +0200
(Thu, 26 Aug 2010) | 1 line
documentation for scala.xml.pull, contribution by Dave Copeland. close
#3786, no review. ........ r22845 | rytz | 2010-08-26 16:35:05 +0200
(Thu, 26 Aug 2010) | 1 line
documentation for scala.collection package, contribution by Dave
Copeland. close #3793, no review. ........
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/t3769.check | 10 | ||||
-rw-r--r-- | test/files/neg/t3769.scala | 3 | ||||
-rw-r--r-- | test/files/neg/t3773.check | 4 | ||||
-rw-r--r-- | test/files/neg/t3773.flags | 1 | ||||
-rw-r--r-- | test/files/neg/t3773.scala | 5 | ||||
-rw-r--r-- | test/files/run/exceptions-nest.check | 1 | ||||
-rw-r--r-- | test/files/run/exceptions-nest.scala | 18 | ||||
-rw-r--r-- | test/files/run/t3667.scala | 8 | ||||
-rw-r--r-- | test/files/scalap/packageObject/result.test | 1 | ||||
-rw-r--r-- | test/files/scalap/traitObject/result.test | 1 |
10 files changed, 50 insertions, 2 deletions
diff --git a/test/files/neg/t3769.check b/test/files/neg/t3769.check new file mode 100644 index 0000000000..7537ed2ddf --- /dev/null +++ b/test/files/neg/t3769.check @@ -0,0 +1,10 @@ +t3769.scala:2: error: in XML literal: expected closing tag of a + val x = <b> <c><a></c> {"text"} </b> + ^ +t3769.scala:2: error: start tag was here: a> + val x = <b> <c><a></c> {"text"} </b> + ^ +t3769.scala:2: error: ';' expected but '{' found. + val x = <b> <c><a></c> {"text"} </b> + ^ +three errors found diff --git a/test/files/neg/t3769.scala b/test/files/neg/t3769.scala new file mode 100644 index 0000000000..0132b59edf --- /dev/null +++ b/test/files/neg/t3769.scala @@ -0,0 +1,3 @@ +object Test { + val x = <b> <c><a></c> {"text"} </b> +} diff --git a/test/files/neg/t3773.check b/test/files/neg/t3773.check new file mode 100644 index 0000000000..29a3e14d83 --- /dev/null +++ b/test/files/neg/t3773.check @@ -0,0 +1,4 @@ +t3773.scala:3: error: method elements in trait IterableLike is deprecated: use `iterator' instead + for ((v, t) <- m.elements) () + ^ +one error found diff --git a/test/files/neg/t3773.flags b/test/files/neg/t3773.flags new file mode 100644 index 0000000000..d1b831ea87 --- /dev/null +++ b/test/files/neg/t3773.flags @@ -0,0 +1 @@ +-deprecation -Xfatal-warnings
\ No newline at end of file diff --git a/test/files/neg/t3773.scala b/test/files/neg/t3773.scala new file mode 100644 index 0000000000..3b92ed2d23 --- /dev/null +++ b/test/files/neg/t3773.scala @@ -0,0 +1,5 @@ +object t { + val m = Map(1 -> "one") + for ((v, t) <- m.elements) () +} + diff --git a/test/files/run/exceptions-nest.check b/test/files/run/exceptions-nest.check index ae66da0a99..48725e4d27 100644 --- a/test/files/run/exceptions-nest.check +++ b/test/files/run/exceptions-nest.check @@ -10,3 +10,4 @@ OK 10 1 () +10 diff --git a/test/files/run/exceptions-nest.scala b/test/files/run/exceptions-nest.scala index 40b00988e4..d3f37452b5 100644 --- a/test/files/run/exceptions-nest.scala +++ b/test/files/run/exceptions-nest.scala @@ -11,6 +11,7 @@ object Test extends Application { println(test9) println(test10) println(test11) + println(test12) def test1 = { var x = 1 @@ -136,4 +137,21 @@ object Test extends Application { try { () } catch { case e => () } } + + class E1 extends Exception + class E2 extends Exception + class E3 extends Exception + + def test12_impl(op: => Int) = try { + op + } catch { + case e: E1 => 2 + case e: E2 => 3 + case e: E3 => 4 + } + def test12 = + test12_impl(1) + + test12_impl(throw new E1) + + test12_impl(throw new E2) + + test12_impl(throw new E3) } diff --git a/test/files/run/t3667.scala b/test/files/run/t3667.scala index 804432c516..7bd0b4ec5e 100644 --- a/test/files/run/t3667.scala +++ b/test/files/run/t3667.scala @@ -18,6 +18,14 @@ object Test { ser(new o3.Inner(1)) o3.Inner ser(new o3.Inner(1)) + + foo + } + + def foo { + case class C(x: Int) + ser(new C(1)) + ser(C) } def ser(o: AnyRef) { diff --git a/test/files/scalap/packageObject/result.test b/test/files/scalap/packageObject/result.test index 324992aae1..6a8d6ae1d5 100644 --- a/test/files/scalap/packageObject/result.test +++ b/test/files/scalap/packageObject/result.test @@ -2,5 +2,4 @@ package object PackageObject extends java.lang.Object with scala.ScalaObject { def this() = { /* compiled code */ } type A = scala.Predef.String def foo(i : scala.Int) : scala.Int = { /* compiled code */ } - protected def readResolve() : java.lang.Object = { /* compiled code */ } } diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test index 8978873fc7..0d7de1535d 100644 --- a/test/files/scalap/traitObject/result.test +++ b/test/files/scalap/traitObject/result.test @@ -5,5 +5,4 @@ trait TraitObject extends java.lang.Object with scala.ScalaObject { object TraitObject extends java.lang.Object with scala.ScalaObject { def this() = { /* compiled code */ } def bar : scala.Int = { /* compiled code */ } - protected def readResolve() : java.lang.Object = { /* compiled code */ } } |