summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Change promise method signature.aleksandar2011-12-131-1/+1
* Add test cases for blocking. Fix in the failed projection.aleksandar2011-12-132-6/+10
* Rename block->await. Add more tck test cases.aleksandar2011-12-135-20/+21
* Fix default.ExecutionContextImpl.promise. Add promise test.Philipp Haller2011-12-131-3/+3
* Change promise fulfill and break to success and failure.aleksandar2011-12-124-17/+20
* Merge branch 'execution-context' of github.com:phaller/scala into execution-c...aleksandar2011-12-123-3/+109
|\
| * Add global scheduler with default implementationPhilipp Haller2011-12-093-3/+109
* | Syntax changes for the scala.concurrent package and some cleanup.aleksandar2011-12-124-44/+45
|/
* A minor doc issue with timeouts.Aleksandar Prokopec2011-12-081-3/+0
* Fixed the build.aleksandar2011-12-085-31/+41
* Added Future companion object, with all method.Heather Miller2011-12-081-8/+34
* Merge branch 'execution-context' of https://github.com/phaller/scala into exe...Aleksandar Prokopec2011-12-075-202/+286
|\
| * Fix merge conflictPhilipp Haller2011-12-072-12/+20
| |\
| * | Add promise implementation. Move fork/join implementation into default packag...Philipp Haller2011-12-075-204/+285
* | | Some docs fixes.Aleksandar Prokopec2011-12-072-7/+27
| |/ |/|
* | Merge branch 'execution-context' of https://github.com/phaller/scala into exe...Aleksandar Prokopec2011-12-073-16/+26
|\|
| * Merge branch 'execution-context' of https://github.com/phaller/scala into exe...Philipp Haller2011-12-071-5/+9
| |\
| * | Add future method to ExecutionContext trait. Log uncaught exceptions to stderr.Philipp Haller2011-12-073-16/+26
* | | Minor changes with the docs.Aleksandar Prokopec2011-12-072-15/+20
| |/ |/|
* | Fixed the docs a bit.Aleksandar Prokopec2011-12-071-5/+9
|/
* Fixing match errors in the on* callback methods in future.Aleksandar Prokopec2011-12-071-7/+8
* The isTimedout on fj futures fixed.Aleksandar Prokopec2011-12-071-1/+1
* Got the futures and execution contexts related code to compile.Aleksandar Prokopec2011-12-076-55/+132
* Merge branch 'master' of https://github.com/scala/scala into execution-contextAleksandar Prokopec2011-12-0749-36/+150
|\
| * Merge remote-tracking branch 'soc/scaladoc-spacing' into developPaul Phillips2011-12-061-4/+3
| |\
| | * Fixes the annoying spaces between name, type params and params in ScalaDoc.Simon Ochsenreither2011-12-061-4/+3
| * | Merge branch 'master' of /scala/trunk into developPaul Phillips2011-12-061-0/+5
| |\ \
| | * | Gave Option its own nonEmpty.Paul Phillips2011-12-061-0/+5
| * | | Fix documentation stutters.Blair Zajac2011-12-0616-18/+18
| |/ /
| * | Update scaladoc links to collections overview.Josh Marcus2011-12-0628-38/+34
| | |
| | \
| *-. \ Merge remote-tracking branches 'kepler/topic/dumpclasses' and 'joshmarcus/col...Paul Phillips2011-12-0530-3/+93
| |\ \ \
| | | * | Enhanced scaladoc of collection classes with links to the relevant pages of "...Josh Marcus2011-12-0527-0/+68
| | * | | -Ydump-classes: the option to dump the generated bytecodeluajalla2011-12-053-3/+25
| | | | |
| | \ \ \
| *-. \ \ \ Merge remote-tracking branches 'kepler/topic/reifycopypaste' and 'kepler/topi...Paul Phillips2011-12-051-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | A minor fix to -Yreify-copypaste.Eugene Burmako2011-12-051-1/+1
| | |/ / /
| * | | | Don't generate redundant interfaces.Paul Phillips2011-12-051-1/+13
| * | | | Fix path mangling for 'scala' shell script on MinGW/MSYS.Stefan Zeiger2011-12-051-5/+17
| |/ / /
* | | | Implementation of the fj task and future.Aleksandar Prokopec2011-12-076-109/+175
* | | | A slight refactoring in promise and task factory methods.Aleksandar Prokopec2011-12-071-2/+2
* | | | Adding some comments to block on. Removing timeout parameters.Aleksandar Prokopec2011-12-064-9/+31
* | | | Completed default implementations of monadic ops on futures.Aleksandar Prokopec2011-12-051-6/+50
* | | | Merge branch 'execution-context' of https://github.com/phaller/scala into exe...Aleksandar Prokopec2011-12-051-0/+1051
|\ \ \ \
| * | | | Add Akka's future implementation for referencePhilipp Haller2011-12-051-0/+1051
* | | | | The default implementations for some of the future methods.Aleksandar Prokopec2011-12-054-15/+85
|/ / / /
* / / / Migration of scala.concurrent to clean fork of new Scala repo.Philipp Haller2011-12-058-0/+968
|/ / /
* | | Enabled continuations plugin by default.Paul Phillips2011-12-042-12/+9
| | |
| \ \
*-. \ \ Merge remote-tracking branches 'kepler/topic/reifyclasses' and 'ijuma/feature...Paul Phillips2011-12-045-11/+19
|\ \ \ \
| | * | | Delegate to Java's implementation of signum for Long and Int.Ismael Juma2011-12-031-9/+3
| * | | | Reification of classes now produces trees that can be compiled and run.Eugene Burmako2011-12-044-2/+16
* | | | | Add a mnemonic to help remember what's the difference between +:Daniel C. Sobral2011-12-042-0/+8