summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SI-6902 Check unreachability under @uncheckedJason Zaugg2013-01-195-9/+55
| | | | | | | | | | | Only exhaustiveness checking should be disabled if the scrutinee of a match as annotated as `: @unchecked`. This was the pre-2.10.x behaviour. This also fixes a variation of the closed ticket, SI-6011. The exhaustiveness check is needed to safely fallback from emitting a table switch if duplicate cases are detected.
* Merge pull request #1842 from adriaanm/backport-1821Paul Phillips2013-01-062-1/+6
|\ | | | | Backport 1821
| * avoid reflect overhead of certain array instantiationsAdriaan Moors2013-01-041-0/+5
| | | | | | | | | | | | | | | | the manifests for Any, Object/AnyRef, AnyVal, Null and Nothing now have their `newArray` methods overridden to avoid reflective overhead of array instantiation. (backport of 45ef0514e, part 2)
| * proper elementClass for WrappedArrayAdriaan Moors2013-01-041-1/+1
| | | | | | | | (backport of 45ef0514e, part 1)
* | Merge pull request #1834 from paulp/issue/6897Paul Phillips2013-01-062-1/+10
|\ \ | | | | | | SI-6897, lubs and varargs star.
| * | SI-6897, lubs and varargs star.Paul Phillips2012-12-312-1/+10
| | | | | | | | | | | | | | | Don't allow lubs to calculate refinement types which contain a varargs star outside of legal varargs star position.
* | | Merge pull request #1835 from paulp/issue/6896Paul Phillips2013-01-063-11/+21
|\ \ \ | | | | | | | | SI-6896, spurious warning with overloaded main.
| * | | SI-6896, spurious warning with overloaded main.Paul Phillips2012-12-313-11/+21
| |/ / | | | | | | | | | | | | Make sure there's no legit main signature before issuing any warnings about missing main methods.
* | | Merge pull request #1840 from paulp/issue/6911Paul Phillips2013-01-064-73/+122
|\ \ \ | | | | | | | | SI-6911, regression in generated case class equality.
| * | | SI-6911, regression in generated case class equality.Paul Phillips2013-01-034-73/+122
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caught out by the different semantics of isInstanceOf and pattern matching. trait K { case class CC(name: String) } object Foo extends K object Bar extends K Foo.CC("a") == Bar.CC("a") That expression is supposed to be false, and with this commit it is once again.
* | | Merge pull request #1841 from adriaanm/rebase-6827-2.10.xAdriaan Moors2013-01-043-2/+49
|\ \ \ | | | | | | | | Fix Iterator#copyToArray (fixes SI-6827).
| * | | Fix Iterator#copyToArray (fixes SI-6827).Erik Osheim2013-01-043-2/+49
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in #scala, when using a non-zero start it's possible to get an ArrayIndexOutOfBoundsException due to an incorrect bounds check. This patch fixes this, as well as another potential bounds error, and adds test cases. Incorporates some other suggestions by Som-Snytt to ensure that callers will get useful error messages in cases where the start parameter is wrong (negative or out-of-array-bounds). Review by @som-snytt.
* | | Merge pull request #1739 from jedesah/Array_optPaul Phillips2013-01-043-0/+29
|\ \ \ | |/ / |/| | SI-5017 Poor performance of :+ operator on Arrays
| * | SI-5017 Poor performance of :+ operator on ArraysJean-Remi Desjardins2012-12-233-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Control performance of :+ and +: operator on my machine were 700-800 ms After adding size hint on the implementation in SeqLike, it went down to 500-600 ms But with specialixed implementation in ArrayOps, brings it down to 300-400 ms Unfortunatly, this method will only be called when the Array object is being referenced directly as it's type, but that should be the case enough times to justify the extra method. I ended up removing the sizeHint in SeqLike because it made the execution of the "benchmark" slower when the Array was being manipulated as a Seq. Side note: Interestingly enough, the benchmark performed better on my virtualized Fedora 17 with JDK 7 than natively on Mac OS X with JDK 6
* | | Merge pull request #1822 from paulp/issue/6194Paul Phillips2013-01-033-2/+15
|\ \ \ | |_|/ |/| | SI-6194, repl crash.
| * | SI-6194, repl crash.Paul Phillips2012-12-273-2/+15
| | | | | | | | | | | | | | | | | | Always a bad idea to use replaceAll on unknown strings, as we saw here when windows classpaths arrived containing escape-requiring backslashes.
* | | Merge pull request #1824 from paulp/pr/partest-likes-deprecationPaul Phillips2012-12-319-5/+8
|\ \ \ | | | | | | | | Remove -deprecation from partest default options.
| * | | Remove -deprecation from partest default options.Paul Phillips2012-12-279-5/+8
| |/ / | | | | | | | | | | | | | | | | | | Who knows why it was ever like this; it's not like anyone sees the deprecation warnings. In PR #1807 there is now a test which depends on partest not making this move, so it's a good time to finally expunge it.
* | | Merge pull request #1720 from soc/SI-6746Paul Phillips2012-12-301-1/+1
|\ \ \ | | | | | | | | SI-6746 Fixes MANIFEST.MF package entry (s.r.makro -> s.r.macros)
| * | | SI-6746 Fixes MANIFEST.MF package entry (s.r.makro -> s.r.macros)Simon Ochsenreither2012-12-061-1/+1
| | | |
* | | | Merge pull request #1792 from ybr/minordocimprovementPaul Phillips2012-12-281-1/+1
|\ \ \ \ | | | | | | | | | | Stream.zip naturalsEx example does not compile => remove extra zip call
| * | | | Stream.zip naturalsEx example does not compile => remove extra zip callybr2012-12-201-1/+1
| | | | |
* | | | | Merge pull request #1828 from paulp/pr/stream-lengthComparePaul Phillips2012-12-286-23/+71
|\ \ \ \ \ | |_|_|/ / |/| | | | SI-6415, Stream#lengthCompare
| * | | | LinearSeq lengthCompare without an iterator.Paul Phillips2012-12-283-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Had to fix up an iffy test: not only was it testing undefined behavior, it demanded just the right numbers be printed in a context where all negative or positive numbers are equivalent. It's the ol' "get them coming and going" trick.
| * | | | SI-6415, overly eager evaluation in Stream.Jean-Remi Desjardins2012-12-284-13/+57
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | The lengthCompare method in LinearSeqOptimized was looking one step further than it needed to in order to give the correct result, which was creating some unwanted side effects related to Streams.
* | | | Merge pull request #1801 from paulp/issue/6829Paul Phillips2012-12-265-3/+121
|\ \ \ \ | | | | | | | | | | SI-6829, NPE during erroneous compilation.
| * | | | SI-6829, SI-6788, NPEs during erroneous compilation.Paul Phillips2012-12-245-3/+121
|/ / / / | | | | | | | | | | | | | | | | | | | | Have to intercept trees which have a null type due to errors before they leave the warm confines of 'def typed' because from that point everything assumes tree.tpe != null.
* | | | Merge pull request #1799 from paulp/pr/check-thread-accessPaul Phillips2012-12-231-1/+0
|\ \ \ \ | | | | | | | | | | Remove stray debugging output line.
| * | | | Remove stray debugging output line.Paul Phillips2012-12-221-1/+0
|/ / / / | | | | | | | | | | | | I finally reached my "CHECK THREAD ACCESS" limit.
* | | | Merge pull request #1687 from scalamacros/topic/unchecked-pattern-matchPaul Phillips2012-12-201-1/+5
|\ \ \ \ | | | | | | | | | | fixes the unchecked warning in quick.comp
| * | | | SI-6338 fixes the unchecked warning in quick.compEugene Burmako2012-12-061-1/+5
| | |/ / | |/| | | | | | | | | | | | | | All those months when I thought it was yet another spurious error in the new pattern matcher...
* | | | Merge pull request #1781 from vigdorchik/html_templateAdriaan Moors2012-12-201-70/+69
|\ \ \ \ | | | | | | | | | | scaladoc Template: remove duplicate code and several usages of Option.get.
| * | | | scaladoc Template: remove duplicate code and several usages of Option.get.Eugene Vigdorchik2012-12-171-70/+69
| | | | |
* | | | | Merge pull request #1790 from paulp/2.10.0-wip-mergeAdriaan Moors2012-12-204-6/+17
|\ \ \ \ \ | |_|_|/ / |/| | | | Merge 2.10.0-wip into 2.10.x
| * | | | Merge remote-tracking branch 'origin/2.10.0-wip' into 2.10.0-wip-mergePaul Phillips2012-12-194-6/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Eugene Burmako (1) and others # Via Adriaan Moors (2) and others * origin/2.10.0-wip: Fixing OSGi distribution. Fix for rangepos crasher. SI-6685 fixes error handling in typedApply
| | * \ \ \ Merge pull request #1704 from retronym/ticket/6754-2v2.10.0-RC5v2.10.0Adriaan Moors2012-12-053-2/+9
| | |\ \ \ \ | | | | | | | | | | | | | | Fix for rangepos crasher.
| | | * | | | Fix for rangepos crasher.Paul Phillips2012-12-043-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrapClassTagUnapply was generating an unpositioned tree which would crash under -Yrangepos. See SI-6338.
| | * | | | | Merge pull request #1712 from jsuereth/fix/osgi-distv2.10.0-RC4Adriaan Moors2012-12-051-1/+6
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | Fixing OSGi distribution.
| | | * | | | Fixing OSGi distribution.Josh Suereth2012-12-051-1/+6
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some kind of wierd filesystem issue where ANT would overwrite jars or not, depending on timestamps. It was a non-repeatable failure. Rather than overwrite JARs and rely on ANT, let's just spell out the non-OSGI bundles. While I had hoped to avoid hard-coding these, it's probably best we've done so.
| | * | | | Merge pull request #1686 from scalamacros/ticket/6685Eugene Burmako2012-12-021-3/+2
| | |\ \ \ \ | | | | | | | | | | | | | | Ticket/6685
| | | * | | | SI-6685 fixes error handling in typedApplyEugene Burmako2012-11-301-3/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MissingClassTagError doesn't lead to an exception, but rather silently sets an error, we need to bubble the resulting erroneous tree up the responsibility chain instead of mindlessly typechecking this again. This wasn't an issue before, because as far as I can guess the aforementioned error setter was always throwing exceptions in the most common usage scenarios (therefore the typecheck-again-fail-again vicious loop wasn't triggered).
* | | | | | Merge pull request #1788 from retronym/ticket/6848Paul Phillips2012-12-203-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Implicit vars should have non-implicit setters.
| * | | | | Implicit vars should have non-implicit setters.Jason Zaugg2012-12-193-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise they trigger spurious feature warnings. scala> trait T { implicit var a: Any } <console>:7: warning: implicit conversion method a_= should be enabled by making the implicit value language.implicitConversions visible.
* | | | | | Merge pull request #1778 from JamesIry/p_SI-6795_2.10.xAdriaan Moors2012-12-194-3/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | SI-6795 simplify "abstract override" errors on type members
| * | | | | | SI-6795 Simplify errors related to "abstract override" on type membersJames Iry2012-12-104-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of saying "only allowed on non-type members of traits" use separate errors for "not allowed on types" and "only allowed on members of traits"
| * | | | | | SI-6795 Adds negative check for "abstract override" on types in traitsJames Iry2012-12-104-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "abstract override" shouldn't was being allowed on types in traits but the result made no sense and the spec says that shouldn't be allowed.
* | | | | | | Merge pull request #1771 from vigdorchik/si_6605Adriaan Moors2012-12-195-46/+56
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Cleanup MemberLookup. Better explain ambiguous link targets.
| * | | | | | | Cleanup MemberLookup. Better explain ambiguous link targets.Eugene Vigdorchik2012-12-135-46/+56
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1772 from gkossakowski/global-deadcodeAdriaan Moors2012-12-192-2/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove dead code from `Global`.
| * | | | | | | Deprecate `scala.tools.nsc.Phases` because it's dead-code.Grzegorz Kossakowski2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 0a2022c made `scala.tools.nsc.Phases` dead-code. It's not private so it got deprecated instead of being removing right away. Review by @paulp.