summaryrefslogtreecommitdiff
path: root/test/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #771 from retronym/ticket/4176-2Adriaan Moors2012-07-022-0/+11
|\ | | | | SI-4176 A repeat dose of repeated parameter type sanitization.
| * SI-4176 A repeat dose of repeated parameter type sanitization.Jason Zaugg2012-06-302-0/+11
| | | | | | | | | | | | | | - 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.
* | SI-5932 Tone down non-sensible == warning with refinements.Jason Zaugg2012-07-012-0/+16
| | | | | | | | Errs on the side of avoiding false positives.
* | Merge pull request #792 from jsuereth/fixup/from-reprJosh Suereth2012-06-292-22/+63
|\ \ | | | | | | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike t...
| * | Split @milessabin HasRepr into IsTraversableOnce and IsTraversableLike type ↵Josh Suereth2012-06-272-22/+63
| | | | | | | | | | | | class-ish things.
* | | Merge pull request #793 from jsuereth/fix/convert-toJosh Suereth2012-06-293-10/+10
|\ \ \ | | | | | | | | Renaming convertTo to to on GenTraversableOnce.
| * | | Renaming convertTo to to on GenTraversableOnce.Josh Suereth2012-06-283-10/+10
| | | |
* | | | Merge branch 'master' into issue/5846,4597,4027,4112Aleksandar Prokopec2012-06-28108-44/+2178
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/library/scala/collection/MapLike.scala src/library/scala/collection/SortedMapLike.scala
| * \ \ \ Merge pull request #790 from axel22/issue/3326Josh Suereth2012-06-282-0/+82
| |\ \ \ \ | | |/ / / | |/| | | Fix SI-3326.
| | * | | Fix SI-3326.Aleksandar Prokopec2012-06-272-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-288-134/+0
| |\ \ \ \ | | | | | | | | | | | | 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-278-134/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are in tail position) Reverts commit 0ada0706746c9c603bf5bc8a0e6780e5783297cf. Reverts commit 51c92f02229098d0b402a65a72267f7a17984022. Reverts commit cdfbe8e39fbbec00c969cd74f117ae410b98b40b. Reverts commit 796024c7429a03e974a7d8e1dc5c80b84f82467d.
| * | | | | Merge pull request #786 from axel22/issue/5986-cherryJosh Suereth2012-06-273-2/+53
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix SI-5986.
| | * | | | | Fix SI-5986.Aleksandar Prokopec2012-06-273-2/+53
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-1/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Parallelize convertTo in parallel collection.
| | * | | | Parallelize convertTo in parallel collection.Aleksandar Prokopec2012-06-272-1/+27
| | | |/ / | | |/| |
| * | | | Merge pull request #787 from axel22/issue/5971Josh Suereth2012-06-272-0/+27
| |\ \ \ \ | | | | | | | | | | | | Fix SI-5971.
| | * | | | Fix SI-5971.Aleksandar Prokopec2012-06-272-0/+27
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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-273-4/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | removes pre-M4 compatibility stubs for the IDE
| | * | | | | removes pre-M4 compatibility stubs for the IDEEugene Burmako2012-06-213-4/+3
| | | | | | |
| * | | | | | Merge pull request #780 from hubertp/topic/fix-rangepos-buildAdriaan Moors2012-06-272-0/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix range positions when applying anonymous classes.
| | * | | | | | Fix range positions when applying anonymous classes. Review by @dragos or ↵Hubert Plociniczak2012-06-262-0/+10
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | @odersky
| * | | | | | Merge pull request #778 from adriaanm/topic-virtpatmatAdriaan Moors2012-06-279-0/+78
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 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-262-0/+20
| | | | | | | |
| | * | | | | | SI-5914 handle null in classtag extractorAdriaan Moors2012-06-262-0/+10
| | | | | | | |
| | * | | | | | SI-2442 fixed by virtpatmat -- test files onlyAdriaan Moors2012-06-264-0/+18
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #779 from hubertp/issue/5148Adriaan Moors2012-06-274-4/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Closes SI-5148.
| | * | | | | Closes SI-5148.Hubert Plociniczak2012-06-274-4/+10
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | SI-5761: fix up #774 (missing check file)Adriaan Moors2012-06-261-0/+16
| | | | | |
| * | | | | Merge pull request #774 from hubertp/issue/5761Adriaan Moors2012-06-261-0/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | Added test for SI-5761.
| | * | | | | Added test for SI-5761.Hubert Plociniczak2012-06-261-0/+16
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Seems that my cleanup of SI-4842 also fixed that one. Review by @paulp or @retronym.
| * / / / / fix for SI-4935Miguel Garcia2012-06-263-0/+11
| |/ / / /
| * | | | Merge pull request #769 from hubertp/topic/t4842-followupAdriaan Moors2012-06-265-11/+11
| |\ \ \ \ | | | | | | | | | | | | Minor followup on SI-4842: remove awkward condition. Review by @retronym
| | * | | | Minor followup on SI-4842: remove awkward condition. Review by @retronym.Hubert Plociniczak2012-06-255-11/+11
| | | | | |
| * | | | | Merge pull request #760 from retronym/ticket/5966-3Adriaan Moors2012-06-252-0/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | SI-5966 Fix eta expansion for repeated parameters with zero arguments.
| | * | | | | SI-5966 Fix eta expansion for repeated parameters with zero arguments.Jason Zaugg2012-06-232-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworks part of e33901 / SI-5610, which was inserting an <empty> tree as an argument in this case, which turns into a null in icode.
| * | | | | | Merge pull request #767 from retronym/ticket/5968Adriaan Moors2012-06-252-0/+9
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | SI-5968 Eliminate spurious exhaustiveness warning with singleton types.
| | * | | | | SI-5968 Eliminate spurious exhaustiveness warning with singleton types.Jason Zaugg2012-06-232-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A singleton type is a type ripe for enumeration.
| * | | | | | Merge pull request #733 from retronym/ticket/4989-3Adriaan Moors2012-06-242-0/+75
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | SI-4989 Reject super.x if an intermediate class declares x abstract.
| | * | | | | SI-4989 Reject super.x if an intermediate class declares x abstract.Jason Zaugg2012-06-172-0/+75
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | This is in line with Java's treatment. Without this, an AbstractMethodError is thrown at runtime.
| * | | | | Merge pull request #756 from axel22/issue/4809Josh Suereth2012-06-221-0/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix SI-4809.
| | * | | | | Fix SI-4809.Aleksandar Prokopec2012-06-211-0/+34
| | |/ / / /
| * | | | | Merge pull request #755 from axel22/issue/5284-cherry-pickedAdriaan Moors2012-06-227-1/+87
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Fix SI-5284.
| | * | | | Fix SI-5284.Aleksandar Prokopec2012-06-217-1/+87
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was the false assumption that methods specialized on their type parameter, such as this one: class Foo[@spec(Int) T](val x: T) { def bar[@spec(Int) S >: T](f: S => S) = f(x) } have their normalized versions (`bar$mIc$sp`) never called from the base specialization class `Foo`. This meant that the implementation of `bar$mIc$sp` in `Foo` simply threw an exception. This assumption is not true, however. See this: object Baz { def apply[T]() = new Foo[T] } Calling `Baz.apply[Int]()` will create an instance of the base specialization class `Foo` at `Int`. Calling `bar` on this instance will be rewritten by specialization to calling `bar$mIc$sp`, hence the error. So, we have to emit a valid implementation for `bar`, obviously. Problem is, such an implementation would have conflicting type bounds in the base specialization class `Foo`, since we don't know if `T` is a subtype of `S = Int`. In other words, we cannot emit: def bar$mIc$sp(f: Int => Int) = f(x) // x: T without typechecking errors. However, notice that the bounds are valid if and only if `T = Int`. In the same time, invocations of `bar$mIc$sp` will only be emitted in callsites where the type bounds hold. This means we can cast the expressions in method applications to the required specialized type bound. The following changes have been made: 1) The decision of whether or not to create a normalized version of the specialized method is not done on the `conflicting` relation anymore. Instead, it's done based on the `satisfiable` relation, which is true if there is possibly an instantiation of the type parameters where the bounds hold. 2) The `satisfiable` method has a new variant called `satisfiableConstraints`, which does unification to figure out how the type parameters should be instantiated in order to satisfy the bounds. 3) The `Duplicators` are changed to transform a tree using the `castType` method which just returns the tree by default. In specialization, the `castType` in `Duplicators` is overridden, and uses a map from type parameters to types. This map is obtained by `satisfiableConstraints` from 2). If the type of the expression is not equal to the expected type, and this map contains a mapping to the expected type, then the tree is cast, as discussed above. Additional tests added. Review by @dragos Review by @VladUreche Conflicts: src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
| * | | | Merge pull request #752 from retronym/topic/warn-catch-all-4Adriaan Moors2012-06-224-3/+33
| |\ \ \ \ | | |_|_|/ | |/| | | SI-2807 Resurrect and refine the promiscuous catch warning.
| | * | | SI-2807 Resurrect and refine the promiscuous catch warning.Jason Zaugg2012-06-194-3/+33
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous incarnation didn't survive 4fb3473. This version can be cleared by using a typed pattern: `catch { case _: Throwable => }`. This is motivated by the recent appearance of such a catch in `util.Try`, and by battle scars left by one too many processes bravely but stupidly catching and logging OutOfMemoryErrors. -Y status has been skipped: this warning is enabled by default and can only be silenced with use of a typed pattern.
| * | | Merge pull request #753 from vjovanov/actor-tests-fixAdriaan Moors2012-06-2118-0/+1081
| |\ \ \ | | | | | | | | | | Making Actor Migration Tests deterministic.