summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merged revisions 24385 via svnmerge from Iulian Dragos2011-07-153-3/+2
| | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24385 | Joshua.Suereth | 2011-03-05 17:26:51 +0100 (Sat, 05 Mar 2011) | 1 line Upgraded to latest maven-ant-tasks jar ........
* | Worked around lazyAccessor binary compatibility...Paul Phillips2011-07-013-31/+10
| | | | | | | | | | | | Worked around lazyAccessor binary compatibility issue with reflection. MiMa now reports no differences between 2.8.1's library jar and 2.8.2.
* | 2.8.2.RC1Antonio Cunei2011-06-303-4/+4
| |
* | Use the correct encoding in the browsing loader...Paul Phillips2011-06-291-2/+2
| | | | | | | | | | | | Use the correct encoding in the browsing loader for the presentation compiler. This should be backported to 2.9 and 2.8. no review.
* | again: relax access boundry check for overridin...Paul Phillips2011-06-294-13/+7
| | | | | | | | | | | | again: relax access boundry check for overriding protected java members. review by eugenevigdorchik.
* | follow up on fix #3946.Paul Phillips2011-06-295-5/+16
| |
* | close #3946.Paul Phillips2011-06-297-31/+53
| |
* | Abandoning failing signature test.Paul Phillips2011-06-292-0/+0
| |
* | Revert "lazyAccessor."Paul Phillips2011-06-291-0/+5
| | | | | | | | | | This reverts commit 0763f4e0448c072188f28ebbdb2dfb40584fed84.
* | Updated a test checkfilePaul Phillips2011-06-291-1/+1
| |
* | lazyAccessor.Paul Phillips2011-06-291-5/+0
| |
* | Correcting minor detail: J => L, not L => J.Paul Phillips2011-06-291-1/+1
| |
* | Reverted the nested object changes which suppre...Paul Phillips2011-06-291-20/+2
| | | | | | | | | | | | Reverted the nested object changes which suppressed readResolve, for binary compatibility.
* | Forward-ported the 2.8.1 specialized naming logic.Paul Phillips2011-06-291-2/+11
| |
* | Test files/jvm/t2585 passing again.Paul Phillips2011-06-292-7/+15
| |
* | Fixed the broken build by my previous change.Paul Phillips2011-06-291-1/+1
| |
* | Fixed wrong tag for Longs, which caused bad jav...Paul Phillips2011-06-291-8/+10
| | | | | | | | | | | | Fixed wrong tag for Longs, which caused bad java signatures (and a crash building the Eclipse plugin). No review.
* | Undoing the cumulative effects of git cherry-pi...Paul Phillips2011-06-297-80/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Undoing the cumulative effects of git cherry-pick --strategy=recursive -Xtheirs. At this point there are two test failures: /scratch/trunk-full2/test/files/run/sigtp.scala [FAILED ] /scratch/trunk-full2/test/files/jvm/t2585 [FAILED ] This branch missed at least the following commits: e4f4c14ad84681a6a4377e6c75631100779b3a0e r24556 854fe5bb1bd09544c6989d207e1dce5df4008a84 r24363 c2acfc3c87f10f23527eb355c714d34b64909403 r24136 04e66fde897c7f3d46486e99c2a22d3dba35a0b6 r24391
* | rewrite of nested objects implementation.Paul Phillips2011-06-299-70/+69
| | | | | | | | | | review by odersky, dragos and whoever feels like it.
* | Figuring it couldn't hurt if more people had a ...Paul Phillips2011-06-295-149/+151
| | | | | | | | | | | | | | | | Figuring it couldn't hurt if more people had a command of some of our binary compatibility impacting code, I went over the ModuleDef elimination with my clarify stick and made the machinery more transparent, to me anyway. Review by plocinic.
* | Squashing the signature bugs.Paul Phillips2011-06-293-71/+113
| | | | | | | | | | Review by extempore.
* | Better signature avoidance. Review by extempore.Paul Phillips2011-06-292-6/+9
| |
* | Added test that signatures conform to their era...Paul Phillips2011-06-292-15/+88
| | | | | | | | | | | | Added test that signatures conform to their erasures. Work in progress. Review by extempore.
* | Seem to have made a breakthrough with signature...Paul Phillips2011-06-295-13/+81
| | | | | | | | | | | | | | | | Seem to have made a breakthrough with signature correctness. Most of the remaining troubles were due to inherited members and their foreign identifiers, but I think I found a simple way to make everyone happy. Closes #4238, review by moors.
* | Taking a ride from 106 invalid generic signatur...Paul Phillips2011-06-291-52/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taking a ride from 106 invalid generic signatures to zero. Closes #4067. Numbers 1-72: Problem: Primitive types appearing in generic bounds. Response: Use the boxed types. Numbers 73-105: Problem: Doubly nested classes can become Outer<T>.Inner.Inner2 Response: Don't allow dots except immediately following angle brackets. Number 106: Problem: Array may be being used as a higher kinded type, and in such cases should not receive the special Array treatment. Solution: args.nonEmpty Observe my claim is that 106/106 signatures have been made "valid", not "correct" or even "more nearly correct." As to that I would like a second opinion. And.... review by moors!
* | Adapt nested objects properly.Paul Phillips2011-06-291-6/+7
| |
* | Some further changes related to r23434.Paul Phillips2011-06-293-18/+12
| |
* | Don't crash the compiler for the 'companions in...Paul Phillips2011-06-294-15/+29
| | | | | | | | | | | | | | Don't crash the compiler for the 'companions in different files' error. This turned out to be pretty bad for the presentation compiler. References #1286. Review by extempore
* | Another attempt for #1591.Paul Phillips2011-06-2921-61/+206
| |
* | Revert changes related to #1591. no review.Paul Phillips2011-06-2914-156/+53
| |
* | Closes #1591.Paul Phillips2011-06-2915-71/+172
| |
* | Branch is not in a compilable state.Paul Phillips2011-06-293-20/+172
| | | | | | | | | | | | | | | | r24955 and compilation: this meant importing GenJVMUtil from master (I think iulian must have had some revision of the source file, but it never entered svn) and correcting for misc name drifting. Also updating a checkfile with some slightly bizarre output.
* | Ported the minimum necessary changes to the 2.8...Iulian Dragos2011-05-1410-215/+116
| | | | | | | | | | | | | | | | | | | | | | Ported the minimum necessary changes to the 2.8.x branch so that the IDE can build against it. Trunk has diverged way too much for any meaningful patch to apply cleanly, so after a few hours of frustration I abandoned svnmerge and did all the changes manually. There still one test failing, in neg/named-defaults-something. It's only about different output in error messages. I'll probably update the check file when I'm confident it's nothing else.
* | latest version of presentation managerMartin Odersky2011-05-0915-136/+297
| |
* | Made 2.8 branch compatible with new presentatio...Martin Odersky2011-05-0937-661/+2701
| | | | | | | | | | Made 2.8 branch compatible with new presentation compiler
* | Updating version number immediately after release,Antonio Cunei2010-11-093-5/+5
| | | | | | | | | | as per agreement with the Maven community.
* | Update to the version number, optimistically as...v2.8.1Antonio Cunei2010-11-053-4/+4
| | | | | | | | | | | | | | Update to the version number, optimistically assuming that RC4 will become the final. A release will probably be done early next week, unless something comes up at the last minute.
* | RC3 -> RC4Antonio Cunei2010-10-263-4/+4
| |
* | move hasAccessBoundary to compiler where binary...Adriaan Moors2010-10-262-2/+2
| | | | | | | | | | | | move hasAccessBoundary to compiler where binary compatibility is less of a concern
* | backported hasAccessBoundary, on which r23355 r...Adriaan Moors2010-10-261-0/+2
| | | | | | | | | | backported hasAccessBoundary, on which r23355 relies
* | Merged revisions 23355 via svnmerge from Adriaan Moors2010-10-267-36/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r23355 | extempore | 2010-10-26 06:37:09 +0200 (Tue, 26 Oct 2010) | 4 lines A modifier's work is never done. Another mortal embrace with protected and its bevy of corner cases. Closes #3939, #3947. This patch is intended for both trunk and 2.8.1. Already reviewed and co-authored by moors, and review by oderksy. ........
* | [scaladoc] Fixed class filter (event handler wa...Gilles Dubochet2010-10-251-2/+2
| | | | | | | | | | | | [scaladoc] Fixed class filter (event handler was attached to wrong element). No review.
* | Temporarily undid port of r23254, just in case,Antonio Cunei2010-10-141-10/+8
| | | | | | | | | | | | while waiting for feedback from Iulian and/or Paul.
* | Merged revisions 23252 via svnmerge from Antonio Cunei2010-10-141-8/+10
| | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r23252 | dragos | 2010-10-14 08:49:46 +0200 (Thu, 14 Oct 2010) | 1 line Fixed wrong tag for Longs, which caused bad java signatures (and a crash building the Eclipse plugin). No review. ........
* | 2.8.1.RC2 -> 2.8.1.RC3Antonio Cunei2010-10-133-4/+4
| |
* | Merged revisions 23246 via svnmerge from Antonio Cunei2010-10-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r23246 | odersky | 2010-10-13 21:01:25 +0200 (Wed, 13 Oct 2010) | 1 line Closes #3894. Review by dubochet. ........
* | Merged revisions 23235 via svnmerge from Adriaan Moors2010-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r23235 | moors | 2010-10-12 17:53:40 +0200 (Tue, 12 Oct 2010) | 1 line closes #3915. needed to quote replacement string for regex replace. no review ........
* | Merged revisions 23144 via svnmerge from Antonio Cunei2010-09-292-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r23144 | odersky | 2010-09-29 17:42:39 +0200 (Wed, 29 Sep 2010) | 1 line Reverted an earlier binary incompatible change rolled into r23139. Now, the presentation compiler should have no binary incompatibilties with 2.8.0 ........
* | Merged revisions 23129 via svnmerge from Antonio Cunei2010-09-292-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r23129 | moors | 2010-09-28 22:20:21 +0200 (Tue, 28 Sep 2010) | 3 lines partial revert of r23128 ("see #3859. need to instantiate type parameters to nothing explicitly in manifestOfType's searchresult rather than relying on later calls to instantiate."): the isArray_apply test cleanup was not a good idea (my pre-commit automated testing turned out to be broken.. me.gitfu--) no review ........
* | Merged revisions 23127-23128,23139,23141 via sv...Antonio Cunei2010-09-298-42/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged revisions 23127-23128,23139,23141 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r23127 | moors | 2010-09-28 17:46:36 +0200 (Tue, 28 Sep 2010) | 3 lines closes #3865: scaladoc now prints anonymous type functions since they may occur due to normalization of type constructor arguments of inferred types review by dubochet ........ r23128 | moors | 2010-09-28 17:46:41 +0200 (Tue, 28 Sep 2010) | 3 lines closes #3859. need to instantiate type parameters to nothing explicitly in manifestOfType's searchresult rather than relying on later calls to instantiate. review by odersky ........ r23139 | odersky | 2010-09-29 11:57:49 +0200 (Wed, 29 Sep 2010) | 1 line Closes #3875. Review by vigdorchick. ........ r23141 | odersky | 2010-09-29 15:42:47 +0200 (Wed, 29 Sep 2010) | 1 line Changed Response so that get does what it did before, and get(TIMEOUT) returns provisional results if it can. Review by vigdorchick. ........