summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #771 from retronym/ticket/4176-2Adriaan Moors2012-07-025-15/+35
|\ | | | | SI-4176 A repeat dose of repeated parameter type sanitization.
| * SI-4176 A repeat dose of repeated parameter type sanitization.Jason Zaugg2012-06-305-15/+35
| | | | | | | | | | | | | | - During eta expansion, treat parameters of type A* as Seq[A] - Do the same for method/class parameters as referred to by an Ident. Also fixes SI-5967, which shows up during pattern matching.
* | Merge pull request #800 from retronym/ticket/5932Adriaan Moors2012-07-023-1/+17
|\ \ | | | | | | SI-5932 Tone down non-sensible == warning with refinements.
| * | SI-5932 Tone down non-sensible == warning with refinements.Jason Zaugg2012-07-013-1/+17
| | | | | | | | | | | | Errs on the side of avoiding false positives.
* | | Merge pull request #804 from scalamacros/topic/reflectglobalAdriaan Moors2012-07-025-11/+20
|\ \ \ | |/ / |/| | moves reflective compiler into scala.tools.reflect
| * | moves reflective compiler into scala.tools.reflectEugene Burmako2012-07-025-11/+20
| | |
* | | Merge pull request #792 from jsuereth/fixup/from-reprJosh Suereth2012-06-296-55/+145
|\ \ \ | |/ / |/| | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike t...
| * | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike type ↵Josh Suereth2012-06-276-55/+145
| | | | | | | | | | | | class-ish things.
* | | Merge pull request #793 from jsuereth/fix/convert-toJosh Suereth2012-06-297-22/+22
|\ \ \ | | | | | | | | Renaming convertTo to to on GenTraversableOnce.
| * | | Renaming convertTo to to on GenTraversableOnce.Josh Suereth2012-06-287-22/+22
| | | |
* | | | Merge pull request #796 from axel22/issue/5846,4597,4027,4112Josh Suereth2012-06-2810-23/+124
|\ \ \ \ | | | | | | | | | | Issue/5846,4597,4027,4112
| * \ \ \ Merge branch 'master' into issue/5846,4597,4027,4112Aleksandar Prokopec2012-06-28271-4900/+5060
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/library/scala/collection/MapLike.scala src/library/scala/collection/SortedMapLike.scala
| * | | | | Fix SI-5846 and SI-4027.Aleksandar Prokopec2012-06-2810-33/+138
| | | | | |
* | | | | | Merge pull request #794 from odersky/pullreq/statisticsJosh Suereth2012-06-281-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fixed race condition that was caused by Statistics pushTimer.
| * | | | | Fixed race condition that was caused by Statistics pushTimer.Martin Odersky2012-06-281-2/+2
| | | | | |
* | | | | | Merge pull request #790 from axel22/issue/3326Josh Suereth2012-06-283-0/+90
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix SI-3326.
| * | | | | Fix SI-3326.Aleksandar Prokopec2012-06-273-0/+90
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The heart of the problem - we want to retain the ordering when using `++` on sorted maps. There are 2 `++` overloads - a generic one in traversables and a map-specific one in `MapLike` - which knows about the ordering. The problem here is that the expected return type for the expression in which `++` appears drives the decision of the overload that needs to be taken. The `collection.SortedMap` does not have `++` overridden to return `SortedMap`, but `immutable.Map` instead. This is why `collection.SortedMap` used to resort to the generic `TraversableLike.++` which knows nothing about the ordering. To avoid `collection.SortedMap`s resort to the more generic `TraverableLike.++`, we override the `MapLike.++` overload in `collection.SortedMap` to return the proper type `SortedMap`.
* | | | | Merge pull request #783 from phaller/topic/cps-return-revertAdriaan Moors2012-06-2813-208/+3
|\ \ \ \ \ | | | | | | | | | | | | Revert pull request #720 (CPS: enable return expressions in CPS code if ...
| * | | | | Revert pull request #720 (CPS: enable return expressions in CPS code if they ↵phaller2012-06-2713-208/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are in tail position) Reverts commit 0ada0706746c9c603bf5bc8a0e6780e5783297cf. Reverts commit 51c92f02229098d0b402a65a72267f7a17984022. Reverts commit cdfbe8e39fbbec00c969cd74f117ae410b98b40b. Reverts commit 796024c7429a03e974a7d8e1dc5c80b84f82467d.
* | | | | | Merge pull request #791 from axel22/issue/5336Josh Suereth2012-06-272-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5336.
| * | | | | | Fix SI-5336.Aleksandar Prokopec2012-06-272-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #786 from axel22/issue/5986-cherryJosh Suereth2012-06-276-22/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5986.
| * | | | | | Fix SI-5986.Aleksandar Prokopec2012-06-276-22/+74
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here we had an issue that RedBlack does not work the same way for sets - which are not supposed to replace an element if it is the same (wrt equals) and maps - which should replace the corresponding values. Adding an overwrite parameter which decides whether to overwrite added keys if they are the same in the ordering. Fix tests.
* | | | | | Merge pull request #785 from axel22/feature/to-parJosh Suereth2012-06-273-7/+33
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Parallelize convertTo in parallel collection.
| * | | | | Parallelize convertTo in parallel collection.Aleksandar Prokopec2012-06-273-7/+33
| | |/ / / | |/| | |
* | | | | Merge pull request #787 from axel22/issue/5971Josh Suereth2012-06-275-3/+30
|\ \ \ \ \ | | | | | | | | | | | | Fix SI-5971.
| * | | | | Fix SI-5971.Aleksandar Prokopec2012-06-275-3/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `AbstractTransformed` abstract inner class in views in order to force generating bridges, one must take care to push the corresponding collection trait (such as `Iterable` or `Seq`) as far as possible to the left in the linearization order -- otherwise, overridden methods from these traits can override the already overridden methods in view. This was the case with `takeWhile`.
* | | | | Merge pull request #757 from dragos/warn-when-swallowing-throwablesAdriaan Moors2012-06-271-3/+10
|\ \ \ \ \ | | | | | | | | | | | | Don't just swallow `Throwables` while parsing bytecode. Print a warning
| * | | | | Don't swallow `Throwables` while parsing bytecode. Print a warning and go on.Iulian Dragos2012-06-221-3/+10
| | | | | | | | | | | | | | | | | | This has caused hours of debugging, to find out that 'package X does not have a member Y' were caused by a `NullPointerException`.
* | | | | | Merge pull request #782 from hubertp/issue/5839Adriaan Moors2012-06-272-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Test that closes SI-5839. Bug itself most probably fixed by #602
| * | | | | | Test that closes SI-5839. Bug itself most probably fixed by #602Hubert Plociniczak2012-06-272-0/+13
| | | | | | |
* | | | | | | Merge pull request #754 from scalamacros/topic/removereflectcompatAdriaan Moors2012-06-276-39/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | removes pre-M4 compatibility stubs for the IDE
| * | | | | | | removes pre-M4 compatibility stubs for the IDEEugene Burmako2012-06-216-39/+5
| | | | | | | |
* | | | | | | | Merge pull request #780 from hubertp/topic/fix-rangepos-buildAdriaan Moors2012-06-273-1/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix range positions when applying anonymous classes.
| * | | | | | | | Fix range positions when applying anonymous classes. Review by @dragos or ↵Hubert Plociniczak2012-06-263-1/+11
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | @odersky
* | | | | | | | Merge pull request #778 from adriaanm/topic-virtpatmatAdriaan Moors2012-06-2713-80/+171
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | patmat bugfixes and minor clean ups
| * | | | | | | | make tests independent of compiler apiAdriaan Moors2012-06-274-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: t5899 should also be refactored, but I couldn't figure out how I tried the obvious Cake Light pattern with abstract types etc, but that didn't trigger it there must be something with indirection through paths as well
| * | | | | | | | SI-5899 exhaustiveness for non-class typesAdriaan Moors2012-06-263-5/+37
| | | | | | | | |
| * | | | | | | | exhaust unit: consider Unit as sealedAdriaan Moors2012-06-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one of the most boring sealed types imaginable, but a sealed type all the same
| * | | | | | | | SI-5914 handle null in classtag extractorAdriaan Moors2012-06-263-1/+11
| | | | | | | | |
| * | | | | | | | SI-2442 fixed by virtpatmat -- test files onlyAdriaan Moors2012-06-264-0/+18
| | | | | | | | |
| * | | | | | | | better fix for SI-5189 pt1Adriaan Moors2012-06-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the fix in 0cffdf38d9 was brain dead (only looking at the first argument of the ctor, rather than the first argument list) the reasoning was that we should not look at the MethodType of the constructor, but at the argument types directly (since going through the method type would flip variance, though the ctor arguments are conceptually in covariant positions here)
| * | | | | | | | minor cleanup in patmat and typersAdriaan Moors2012-06-262-71/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patmat: - remove Var's unused 'checked' member; subsumed by 'domain' - updated docs: no longer using isSuccess in __match typers: clean up indentation, swap ifs to failure-first
* | | | | | | | | Merge pull request #779 from hubertp/issue/5148Adriaan Moors2012-06-276-22/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | Closes SI-5148.
| * | | | | | | | Closes SI-5148.Hubert Plociniczak2012-06-276-22/+26
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately we have to wrap transform to catch all the MissingRequirementErrors exceptions (wrapped in TypeErrors). This is because we force the info of the symbol in a couple of places and we would have to catch all/some of them (and remove the duplicates as well which really becomes messy). Review by @axel22.
* | | | | | | | Merge pull request #781 from dragos/new-eclipse-project-filesAdriaan Moors2012-06-272-2/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Updated Eclipse project files for `asm`
| * | | | | | | Updated Eclipse project files for `asm`, correcting a small typo in linked ↵Iulian Dragos2012-06-272-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | source folders.
* | | | | | | | Merge pull request #776 from adriaanm/pullreq/fix-774Adriaan Moors2012-06-261-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-5761: fix up #774 (missing check file)
| * | | | | | | | SI-5761: fix up #774 (missing check file)Adriaan Moors2012-06-261-0/+16
|/ / / / / / / /
* | | | | | | | Merge pull request #759 from dragos/new-eclipse-project-filesAdriaan Moors2012-06-2612-13/+202
|\| | | | | | | | | | | | | | | | | | | | | | | Eclipse project files for library, reflect, fjbg & compiler