summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix for a little last minute breakage.Paul Phillips2012-03-071-1/+1
|
* Merge remote-tracking branch 'origin/develop'Paul Phillips2012-03-074-9/+10
|\
| * Changed printlns to use debugwarn.Paul Phillips2012-03-072-5/+5
| | | | | | | | | | | | | | | | | | | | If you write something like if (settings.debug.value) println("...") Consider debugwarn("...") instead, which amounts to the same thing except that it's much better because naked printlns can't be managed with any uniformity.
| * Merge remote-tracking branch 'hubertp/issue/5554' into developPaul Phillips2012-03-073-6/+7
| |\
| | * Closes #SI-5554Hubert Plociniczak2012-03-063-6/+7
| | |
* | | Fix for public final fields.Paul Phillips2012-03-071-0/+2
|/ / | | | | | | References SI-3569. Probably needs refinement.
* | Fix for -Xcheckinit failure.Paul Phillips2012-03-061-1/+1
| |
* | Merge remote-tracking branch 'VladUreche/issue/5545-clean' into developPaul Phillips2012-03-061-1/+11
|\ \
| * | Force .info before creating new synthetic symsVlad Ureche2012-03-061-1/+11
| | | | | | | | | | | | | | | | | | Closes SI-5545. In the long run this should be generalized, as other phases might suffer from the same problem. Full explanation here: https://issues.scala-lang.org/browse/SI-5545
* | | Merge remote-tracking branches 'adriaanm/ticket/5546' and ↵Paul Phillips2012-03-061-1/+2
|\ \ \ | | | | | | | | | | | | 'hubertp/issue/5553' into develop
| * | | Closes #5553, review by dragosHubert Plociniczak2012-03-061-1/+2
| | |/ | |/|
* | | #SI-5546 fixed: refine refined typing for getClassAdriaan Moors2012-03-061-18/+14
| | |
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge remote-tracking branches 'dragos/master', ↵Paul Phillips2012-03-055-13/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 'axel22/feature/pc-execution-contexts', 'VladUreche/issue/5527-noPos' and 'retronym/topic/tolerant-interpolator' into develop
| | | | * | | Handle empty format specifiers in the formatting interpolator.Jason Zaugg2012-03-031-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | f"${foo}" is treated like f"${foo}%s".
| | | * | | | Fixes scaladoc rangeposVlad Ureche2012-03-051-3/+4
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | By making the comment tree node transparent. Reverts previous change in cfb04ef065. Will mark the bug 5527 as WONTFIX, because the effort of fixing leaking comments is too great.
| | * | | | Make task support implementations public.Aleksandar Prokopec2012-03-051-3/+23
| | | | | |
| * | | | | Fix deadlocks occurring during presentation compiler shutdown.Iulian Dragos2012-03-052-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During shutdown, other threads can still post work items on the work queue. They will never be serviced, leading to clients waiting forever. The fix is to replace the implementation of the queue with a 'always fail' implementation during shutdown. Review by @odersky.
* | | | | | Fix for phase-based logging.Paul Phillips2012-03-051-1/+1
| |_|/ / / |/| | | |
* | | | | Revert attempt to limit private types in lubs.Paul Phillips2012-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has to be somewhere more directly tied to structural refinements. See run/lub-visibility.scala before/after output for motivation. Closes SI-5534.
* | | | | Overcame trait/protected/java limitation.Paul Phillips2012-03-041-69/+86
|/ / / / | | | | | | | | | | | | | | | | | | | | I think this fixes SI-2296, the inability to access java protected members from a trait which extends a java class. Counterexamples appreciated. Closes SI-2296. Review by @dragos.
* | / / An old patch on pattern matcher exhaustivity.Paul Phillips2012-03-036-47/+50
| |/ / |/| | | | | | | | Simplifies the implementation a bit.
* | | Fix for corner case in type printing.Paul Phillips2012-03-021-1/+8
| | | | | | | | | | | | Closes SI-5537.
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge remote-tracking branches 'ctalau/master', ↵Paul Phillips2012-03-0235-411/+582
|\ \ \ \ \ | | | |/ / | | |/| | | | | | | 'axel22/feature/pc-execution-contexts' and 'TiarkRompf/SI-5538'; commit 'd92bcb5302be04104abe2db6cf92620c4cd7255e' into develop
| | | * | Fix for cps regression. Closes 5538. Closes 5445.Tiark Rompf2012-03-022-15/+21
| | | | |
| | * | | Adding execution context based task support implementation.Aleksandar Prokopec2012-03-024-51/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parallel collections now get the execution context task support which by default picks the execution context from the scala concurrent package. This execution context task support forwards calls to either a fork join task support or the thread pool task support. Additionally, the default execution context now uses either a fork join pool or a thread pool executor, depending on the JVM vendor and version.
| | * | | Merge branch 'master' into feature/pc-execution-contextsAleksandar Prokopec2012-03-02220-5253/+6969
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/library/scala/collection/parallel/Combiner.scala src/library/scala/collection/parallel/ParIterableLike.scala src/library/scala/collection/parallel/mutable/ParCtrie.scala
| | | * | More consistent use of atPhase.Paul Phillips2012-03-0113-98/+120
| | | | |
| | | * | Another try to quiet the inliner.Paul Phillips2012-03-011-10/+10
| | | | |
| | | * | Merge branch 'develop'Paul Phillips2012-03-012-12/+25
| | | |\ \
| | | | | \
| | | | | \
| | | | *-. \ Merge remote-tracking branches 'scalamacros/ticket/5530', ↵Paul Phillips2012-03-011-9/+18
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'szabolcsberecz/SI-5380' and 'scalamacros/ticket/5532' into develop
| | | | | | * | Fixes SI-5532Eugene Burmako2012-03-011-4/+10
| | | | | | | |
| | | | | * | | Fixes SI-5530Eugene Burmako2012-02-291-5/+8
| | | | | |/ /
| | | | * | | Merge remote-tracking branch 'szabolcsberecz/SI-5380' into developPaul Phillips2012-03-011-3/+7
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/transform/UnCurry.scala
| | | | | * | Lift only *non-local* returns of try expressions.Szabolcs Berecz2012-02-291-5/+7
| | | | | | |
| | | | | * | Fixes SI-5380: non-local return of try expressionSzabolcs Berecz2012-02-281-0/+3
| | | | | | |
| | | * | | | Changes to appease the inliner.Paul Phillips2012-03-012-11/+13
| | | |/ / / | | | | | | | | | | | | | | | | | | It's unfortunate the things one must do to see @inline go through.
| | * | | | Add tasksupport as a configurable field in parallel collections.Aleksandar Prokopec2012-02-2315-220/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required a bit of refactoring in the tasks objects and implementations of various operations. Combiners now hold a reference to a tasksupport object and pass it on to their result if `resultWithTaskSupport` is called. Additionally, several bugs that have to do with CanBuildFrom and combiner resolution have been fixed.
| * | | | | calling a side-effecting boolean-returning method last in conditionMiguel Garcia2012-03-021-3/+4
| | |/ / / | |/| | |
* / | | | Fixed Issue 5321Cristian Tălău2012-03-011-1/+1
|/ / / /
* | | | Merge remote-tracking branches 'VladUreche/issue/5527' and 'dragos/master' ↵Paul Phillips2012-02-295-7/+68
| | | | | | | | | | | | | | | | into develop
* | | | Whitespace commit.Paul Phillips2012-02-29177-1168/+1167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed all the trailing whitespace to make eugene happier. Will try to keep it that way by protecting at the merge level. Left the tabs in place because they can't be uniformly changed to spaces, some are 2, some are 4, some are 8, whee.
* | | | Reworking synchronized patch.Paul Phillips2012-02-2811-62/+33
| | | | | | | | | | | | | | | | Eliminated annotation and custom phase. Kept SYNCHRONIZED flag.
* | | | Merge remote-tracking branch 'szabolcsberecz/SI-64' into SI-64-freshPaul Phillips2012-02-289-5/+55
|\ \ \ \ | |_|/ / |/| | |
| * | | replace methods containing a synchronized body with synchronized methodsSzabolcs Berecz2012-02-166-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following: def f = synchronized { ... } will be rewritten to: <synchronized> def f = ... which is then emitted to the classfile with the synchronized flag set. Inlining of such transformed methods are disabled for now This transformation is not done on methods defined in a trait.
| * | | let fjbg know about the synchronized flagSzabolcs Berecz2012-02-153-0/+6
| | | |
* | | | Don't print underlying type of modules.Paul Phillips2012-02-281-1/+1
| | | | | | | | | | | | | | | | Since there is no useful information in such a message.
* | | | Fix for typing of objects in patterns.Paul Phillips2012-02-281-1/+6
| | | | | | | | | | | | | | | | | | | | An object in a pattern should have type "Foo.type" just as objects not in patterns do. Closes SI-5406. Review by @moors.
* | | | Improving error message.Paul Phillips2012-02-281-5/+15
| | | | | | | | | | | | | | | | | | | | Hacked filename into message to alleviate meaningless "_$1 defined twice" error condition. References SI-4893.
* | | | Specialized NonLocalReturnControl.Paul Phillips2012-02-2711-56/+60
| | | | | | | | | | | | | | | | From the extempore archive of already implemented things.
* | | | Fix for "." appearing on classpath.Paul Phillips2012-02-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Have to pass an empty classpath to java if we put the boot libs on the classpath, otherwise it puts the default "." on there. Closes SI-5528.