summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2011-04-26 08:44:22 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2011-04-26 08:44:22 +0000
commit15d477697395ff93c3065b7f2c7db06160662851 (patch)
tree0000b0c73bbf5a9541135364f92bb62c10e007c2 /lib
parentf5faa91d3d6ed21a2849f090c40082f95e7dc121 (diff)
downloadscala-15d477697395ff93c3065b7f2c7db06160662851.tar.gz
scala-15d477697395ff93c3065b7f2c7db06160662851.tar.bz2
scala-15d477697395ff93c3065b7f2c7db06160662851.zip
Merged revisions 24803-24820 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24803 | odersky | 2011-04-21 19:21:28 +0200 (Thu, 21 Apr 2011) | 1 line Added bridge method capability to compiler. Some tweaks to reflect generic. No review (yet). ........ r24804 | odersky | 2011-04-22 00:41:20 +0200 (Fri, 22 Apr 2011) | 1 line Some more tweaks to the bridge scheme. ........ r24805 | extempore | 2011-04-22 03:47:32 +0200 (Fri, 22 Apr 2011) | 1 line New starr based on r24804, no review. ........ r24806 | odersky | 2011-04-22 11:21:28 +0200 (Fri, 22 Apr 2011) | 1 line Fixed spurious qualification of types that are locally quantified. Review by extempore. ........ r24807 | extempore | 2011-04-23 00:01:22 +0200 (Sat, 23 Apr 2011) | 2 lines Fixing a BaseBerrySethi bug I introduced in r19842. Patch by buraq, no review. ........ r24808 | eugenevigdorchik | 2011-04-23 14:18:53 +0200 (Sat, 23 Apr 2011) | 1 line Introduce new request for informing the presentation compiler of files deletion. Review by odersky. ........ r24809 | extempore | 2011-04-23 17:14:59 +0200 (Sat, 23 Apr 2011) | 2 lines Strip unused pattern variable bindings out before performing match translation. Closes #4269, no review. ........ r24810 | extempore | 2011-04-23 18:56:32 +0200 (Sat, 23 Apr 2011) | 1 line Reverted a jline commit which had broken history search, no review. ........ r24811 | pedrofurla | 2011-04-23 23:11:32 +0200 (Sat, 23 Apr 2011) | 1 line Shows migration and it's message. Contributed by Simon Ochsenreither (soc). Review by malayeri. ........ r24812 | extempore | 2011-04-24 00:04:36 +0200 (Sun, 24 Apr 2011) | 5 lines Working my way through pattern matcher sequence issues mostly caused by the special handling of Lists. Also deleting all kinds of useless or almost useless code which is presently only clutter. Closes #2756, #2800, #3050, #3530, #3972, no review. ........ r24813 | odersky | 2011-04-24 12:18:44 +0200 (Sun, 24 Apr 2011) | 1 line Refined handling fo @bridge methods. Review by extempore. ........ r24814 | extempore | 2011-04-24 18:19:21 +0200 (Sun, 24 Apr 2011) | 1 line Updated a bunch of @deprecated annotations to have a version, no review. ........ r24815 | extempore | 2011-04-24 19:10:26 +0200 (Sun, 24 Apr 2011) | 1 line New starr based on r24814, no review. ........ r24816 | extempore | 2011-04-24 21:15:19 +0200 (Sun, 24 Apr 2011) | 1 line Enclosed the out of bounds index with some IOOB exceptions, no review. ........ r24817 | extempore | 2011-04-24 21:15:46 +0200 (Sun, 24 Apr 2011) | 2 lines Removed restriction on case classes having only two parameter lists. Closes #1333, no review. ........ r24818 | extempore | 2011-04-24 21:16:10 +0200 (Sun, 24 Apr 2011) | 2 lines Added warning when someone tries to return a non-Unit value from a Unit method, no review. ........ r24819 | odersky | 2011-04-24 22:13:40 +0200 (Sun, 24 Apr 2011) | 1 line Added a bunch of bridges to make ameliorate binary compatibility of new collections. Review by prokopec. Review by extempore. ........ r24820 | odersky | 2011-04-25 12:37:48 +0200 (Mon, 25 Apr 2011) | 1 line Temporarily moving interpreter.scala to pending. We need a more robust solution wrt heap size before we can bring it back. (interpreter scala randomly fails with OutOfMemoryError because it starts a new java process with default heap size. Depending on the configuration, default heap size is sometimes not enough.) ........
Diffstat (limited to 'lib')
-rw-r--r--lib/jline.jar.desired.sha12
-rw-r--r--lib/scala-compiler.jar.desired.sha12
-rw-r--r--lib/scala-library-src.jar.desired.sha12
-rw-r--r--lib/scala-library.jar.desired.sha12
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/jline.jar.desired.sha1 b/lib/jline.jar.desired.sha1
index a0f97c4d7a..74b0d9d91e 100644
--- a/lib/jline.jar.desired.sha1
+++ b/lib/jline.jar.desired.sha1
@@ -1 +1 @@
-115e0f58e2ffa089c083c466b0161216dd4c916e ?jline.jar
+5eade2bafa228aab1f5abc63e6062ce8052e4f6d ?jline.jar
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index d2eb0e93e3..41809695eb 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-e0382dfa2712e567b49f5826ac50eae59cf03cb3 ?scala-compiler.jar
+5f31fab985a3efc21229297810c625b0a2593757 ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index 1b5b949434..3370299a4a 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-5ad90238f4fc57e8147fb69496c68d02ca073ca0 ?scala-library-src.jar
+364c3b992bdebeac9fafb187e1acbece45644de7 ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index b0aa256cb4..4993fe9421 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-678ada3690dd149c2bd302407e315a74de0bfd42 ?scala-library.jar
+c52dbed261e4870a504cef24518484b335a38067 ?scala-library.jar