summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Pending test for SI-3943Paul Phillips2012-09-122-0/+22
| | | | |
| * | | | Test case for a bug fixed in M7.Paul Phillips2012-09-121-0/+16
| | | | |
* | | | | Merge pull request #1255 from Blaisorblade/issue/6306Josh Suereth2012-09-124-6/+46
|\ \ \ \ \ | |/ / / / |/| | | | Fix SI-6306 on testcase
| * | | | SI-6306 Remove incorrect eta-expansion optimization in UncurryPaolo Giarrusso2012-09-124-6/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix SI-6306 by removing the offending code. Moreover, clarify comment and add testcase. This pattern match only matches on testcases triggering SI-6306; the transformation it performs in that case is unsafe. The intended optimization is to undo eta-expansion of nullary functions, that is, transform `() => foo()` to `foo`. But that's only valid when `foo` is an instance of `Function0`, so the optimization is unsafe. Moreover, the pattern match will fail because at the end of typer that code has become `() => foo.apply()`, and `isExprSafeToInline(foo.apply)` always (correctly) fails the isExprSafeToInline test. The pattern match should thus be different - this code was dead even when it was introduced (45bcd02f6ba099277bedbf83ec2bda07435c7797), since it was not invoked either when building the compiler or when compiling function attempt2() in the included testcase. Thanks to all commenters on SI-6306 and https://github.com/scala/scala/pull/1255, in particular to Jason Zaugg for diagnosing the underlying fault and Lukas Rytz for understanding the goal of the code.
* | | | | Merge pull request #1247 from jsuereth/fix/SI-6114Josh Suereth2012-09-122-0/+68
|\ \ \ \ \ | | | | | | | | | | | | Fix t6114 - ++ on JList wrapper modifies underlying collection.
| * | | | | Fix t6114 - ++ on JList wrapper modifies underlying collection.Josh Suereth2012-09-112-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We solve this by overriding clone for JListWrapper to actually do a full clone. Note: This fix may need to be included other places, *but* we're not sure we've cloned the collection sensibly. I.e. is ArrayList a good default?
* | | | | | Merge pull request #1261 from rkuhn/fix-duration-issues-RKJosh Suereth2012-09-127-132/+764
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | several fixes to scala.concurrent.util.Duration
| * | | | | improve Promise.tryAwait by converting to match statementRoland2012-09-121-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - also use type FiniteDuration due to a previous change to Deadline’s type signature
| * | | | | Merge remote-tracking branch 'origin/2.10.x' into fix-duration-issues-RKRoland2012-09-12101-506/+1292
| |\ \ \ \ \
| * | | | | | restrict Deadline to finite durations (would have to throw otherwise)Roland2012-09-123-9/+33
| | | | | | |
| * | | | | | make private methods private[this] to avoid conflicts when importing Duration._Roland2012-09-121-15/+15
| | | | | | |
| * | | | | | retronym had one more improvement hidden up his sleeve for DurationRoland2012-09-121-7/+9
| | | | | | |
| * | | | | | factor out more constants in Duration, thanks paulp!Roland2012-09-121-8/+18
| | | | | | |
| * | | | | | two more minor cleanups to DurationRoland2012-09-113-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - copy partest TestUtil.intercept change from PR 1279 branch - add comment on non-obvious match cases
| * | | | | | fix two minor issues in DurationRoland2012-09-091-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make constants for fromNanos(Long) actually inlined constants - clarify origin of require() check constants in FiniteDuration
| * | | | | | fix some one more issue in DurationRoland2012-09-072-60/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Inf / Zero == Inf - add some more missing test cases - clarify magic constant - move exception descriptions into proper @throws docs
| * | | | | | second round of Duration cleanupRoland2012-09-072-176/+582
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make Duration behave consistent with Double's non-finite semantics - add ScalaDoc - add complete test suite - change overflow protection impl after review comments - clean up code
| * | | | | | several fixes to scala.concurrent.util.DurationRoland2012-09-054-33/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add test cases (migrated from Akka sources) - add overflow checking (will throw IllegalArgumentException instead of giving wrong results) - make string parsing more precise when giving >100days in nanoseconds - make method signatures more precise in retaining FiniteDuration throughout calculations - fix mul/div of infinities by negative number - add Ordering for Deadline (was accidentally left out earlier)
* | | | | | | Merge pull request #1288 from jsuereth/fix/SI-6268Josh Suereth2012-09-123-1/+34
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fixes SI-6268. Improper multistring setting unparse.
| * | | | | | Fixes SI-6268. Review by @paulp and @lrytz.Josh Suereth2012-09-123-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts a refactoring from https://github.com/scala/scala/commit/963aabbeb4 MultiString settings would not properly write an unparse string that could be reparsed, leading to failures when forking scalac in ant. Specifically, if a setting was empty, it was getting added to the unparse string and causing scalac to fail. This at least reverts to previous behavior (also more correct for multiple values). Whatever we do here has to work with the @file style argument reading and can't place empty options on the command line. Also, This assumes there are tests around the behvior the REPL needs. Note: The test is not automated yet, so unfortunately, we need to improve ANT testing capabilities to prevent regressons
* | | | | | | Merge pull request #1289 from retronym/ticket/6276-2Grzegorz Kossakowski2012-09-123-7/+33
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Avoid spurious warning for `def foo = x.foo`.
| * | | | | | Avoid spurious warning for `def foo = x.foo`.Jason Zaugg2012-09-113-7/+33
|/ / / / / / | | | | | | | | | | | | | | | | | | Followup to SI-6276.
* | | | | | Merge pull request #1279 from rkuhn/fix-duration-usageJosh Suereth2012-09-119-36/+110
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix usage of Duration in Promise impl
| * | | | | | improve docs and Promise implRoland2012-09-115-42/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - scaladoc the exceptions thrown by Await.* and Awaitable.* - move intercept[Exception] into partest’s TestUtil object - improve Promise.tryAwait implementation following Viktor’s comments and make use of Deadline to avoid calling System.nanoTime too often
| * | | | | | fix usage of Duration in Promise implRoland2012-09-108-15/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - correctly treat MinusInf and Undefined - don't toMillis in the timeout message (could be MinusInf) - also notice that Inf did not actually wait unbounded - and further notice that tryAwait swallows InterruptedException instead of bailing out early => changed to do so and added throws annotation - also removed some unused imports of Duration
* | | | | | | Merge pull request #1286 from paulp/topic/inliner-loggingJosh Suereth2012-09-1122-246/+270
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Topic/inliner logging
| * \ \ \ \ \ \ Merge branch '2.10.x' into topic/inliner-loggingPaul Phillips2012-09-11135-1142/+2176
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
| * | | | | | | | Large logging cleanup effort.Paul Phillips2012-09-0119-217/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quieted down many logging statements which contribute disproportionate noise. Made others emit something more sensible. Spent lots of time on the inliner trying to find a regular format to make the logs more readable. Long way to go here but it'd be so worth it to have readable logs instead of mind-numbing indiscriminate text dumps.
| * | | | | | | | Took measures to quiet down specialization logging.Paul Phillips2012-09-012-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While hopefully still hearing about certain things (like symbol renames) when it's not a specialized symbol.
| * | | | | | | | Worked around SI-6161 by annotating abstract type.Paul Phillips2012-09-015-9/+13
| | | | | | | | |
| * | | | | | | | Added a heuristic to the inliner.Paul Phillips2012-09-011-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But it's commented out because I want to get this logging code into 2.10 without including anything "interesting".
* | | | | | | | | Merge pull request #1287 from lrytz/disable-t2868Josh Suereth2012-09-115-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Disable test t2868
| * | | | | | | | | Disable test t2868Lukas Rytz2012-09-115-0/+0
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | it keeps failing randomly, e.g. http://scala-webapps.epfl.ch/artifacts/e3b0c7abbf637dacce7bcd7b69d5655820e8e714/buildLog.txt
* | | | | | | | | Merge pull request #1262 from jsuereth/fix/SI-6271Josh Suereth2012-09-112-0/+33
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fixes SI-6271 - Missing isEmpty override for views.
| * | | | | | | | Fixes SI-6271 - Missing isEmpty override for views.Josh Suereth2012-09-062-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GenIterableView didn't override isEmpty for views to look at *filtered* iterator, but was instead pulling unfiltered iterator and causing issues. Chalk up another bizzare bug to lack of insight/visibility into linearization and what havoc overriding new methods can spew on our library.
* | | | | | | | | Merge pull request #1274 from retronym/ticket/6335Grzegorz Kossakowski2012-09-114-2/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-6335 More precise location of the implicit class synthetic method.
| * | | | | | | | | More tests for SI-6335.Jason Zaugg2012-09-093-1/+31
| | | | | | | | | |
| * | | | | | | | | SI-6335 More precise location of the implicit class synthetic method.Jason Zaugg2012-09-092-2/+13
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One approach would be to disallow an implicit class in a template that already has a member with the same name. But this commit doesn't do this; instead it uses `isSynthetic` to find the synthesized implicit conversion method from the potentially overloaded alternatives.
* | | | | | | | | Merge pull request #1284 from retronym/topic/deprecated-inheritanceGrzegorz Kossakowski2012-09-1114-0/+129
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | SI-6162 Adds private[scala] @deprecatedInheritance/@deprecatedOverriding
| * | | | | | | | | Pull request feedbackJason Zaugg2012-09-111-1/+1
| | | | | | | | | |
| * | | | | | | | | Rescues @deprecated{Inheritance, Overriding}Jason Zaugg2012-09-118-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While they ought to be generalized to aribirary modifier changes before being offered in the standard library, the opportunity to use them in 2.10 is too important to pass up. So for now, they're private[scala]. En route: - made the error messages more concise - fix positioning of inheritance error - improve test coverage
| * | | | | | | | | Adds @deprecatedInheritance to BigInt and BigDecimalSimon Ochsenreither2012-09-102-0/+2
| | | | | | | | | |
| * | | | | | | | | SI-6162 Adds @deprecatedInheritance/@deprecatedOverridingSimon Ochsenreither2012-09-1012-0/+95
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These annotations are meant to warn from inheriting a class or from overriding a member, due to the reasons given in `msg`. The naming and placement of the methods is in line with @deprecated and @deprecatedName.
* | | | | | | | | Merge pull request #1275 from retronym/ticket/6276Grzegorz Kossakowski2012-09-116-2/+58
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | SI-6276 Warn on def or val that trivially loops infinitely
| * | | | | | | | SI-6276 Warn on def or val that trivially loops infinitelyJason Zaugg2012-09-096-2/+58
| |/ / / / / / /
* | | | | | | | Merge pull request #1282 from retronym/topic/erasure-cleanupJosh Suereth2012-09-103-8/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Minor cleanups of code/comments related to value classes
| * | | | | | | Minor cleanups of code/comments related to value classesJason Zaugg2012-09-103-8/+8
| |/ / / / / /
* | | | | | | Merge pull request #1270 from paulp/issue/6327Josh Suereth2012-09-103-7/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix for SI-6327, wrongness in Dynamic.
| * | | | | | | Fix for SI-6327, wrongness in Dynamic.Paul Phillips2012-09-083-7/+39
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #1269 from jsuereth/wip/si-6333Josh Suereth2012-09-102-23/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Wip/si 6333