summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change promise method signature.aleksandar2011-12-132-2/+2
|
* Add test cases for blocking. Fix in the failed projection.aleksandar2011-12-133-9/+37
|
* Rename block->await. Add more tck test cases.aleksandar2011-12-136-28/+108
|
* Add stubs for future combinator tests.Philipp Haller2011-12-131-1/+67
|
* Fix default.ExecutionContextImpl.promise. Add promise test.Philipp Haller2011-12-132-4/+27
|
* Change promise fulfill and break to success and failure.aleksandar2011-12-124-17/+20
|
* Adding the tck test file.aleksandar2011-12-121-0/+166
|
* Merge branch 'execution-context' of github.com:phaller/scala into ↵aleksandar2011-12-124-11/+116
|\ | | | | | | | | | | | | execution-context Conflicts: test/files/jvm/concurrent-future.scala
| * Add global scheduler with default implementationPhilipp Haller2011-12-093-3/+109
| |
| * Fix future testsPhilipp Haller2011-12-091-5/+5
| |
* | Syntax changes for the scala.concurrent package and some cleanup.aleksandar2011-12-125-49/+55
|/ | | | | | | | | | block on { } is now changed to: block(timeout) { }
* 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 ↵Aleksandar Prokopec2011-12-075-202/+286
|\ | | | | | | | | | | | | execution-context Conflicts: src/library/scala/concurrent/Future.scala
| * Fix merge conflictPhilipp Haller2011-12-072-12/+20
| |\
| * | Add promise implementation. Move fork/join implementation into default ↵Philipp Haller2011-12-075-204/+285
| | | | | | | | | | | | package. Factor commonalities of promises and tasks into Completable.
* | | Some docs fixes.Aleksandar Prokopec2011-12-072-7/+27
| |/ |/|
* | Merge branch 'execution-context' of https://github.com/phaller/scala into ↵Aleksandar Prokopec2011-12-075-16/+160
|\| | | | | | | execution-context
| * Add tests for future callbacksPhilipp Haller2011-12-072-0/+134
| |
| * Merge branch 'execution-context' of https://github.com/phaller/scala into ↵Philipp Haller2011-12-071-5/+9
| |\ | | | | | | | | | execution-context
| * | 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-07176-55/+1375
|\
| * Merge remote-tracking branch 'soc/scaladoc-spacing' into developPaul Phillips2011-12-062-11/+10
| |\
| | * Fixes the annoying spaces between name, type params and params in ScalaDoc.Simon Ochsenreither2011-12-062-11/+10
| | |
| * | Merge branch 'master' of /scala/trunk into developPaul Phillips2011-12-061-0/+5
| |\ \
| | * | Gave Option its own nonEmpty.Paul Phillips2011-12-061-0/+5
| | | | | | | | | | | | | | | | | | | | A bit further down Option's slippery slope of collections methods, but those sudden implicit conversions to Iterable are legitimately annoying.
| * | | Merge remote-tracking branches 'blair/documentation-typo-fix' and ↵Paul Phillips2011-12-0622-25/+25
| |\ \ \ | | | | | | | | | | | | | | | 'blair/remove-documentation-stutters' into develop
| | * | | Fix documentation stutters.Blair Zajac2011-12-0622-25/+25
| | |/ /
| * / / Fix documentation typo.Blair Zajac2011-12-061-1/+1
| |/ /
| * | Update scaladoc links to collections overview.Josh Marcus2011-12-0628-38/+34
| | | | | | | | | | | | | | | | | | Change scaladoc links in collection classes to point at re-formatted Collections Overview on docs.scala-lang.org. Fix minor typo: s/Ummutable/Immutable
| | |
| | \
| *-. \ Merge remote-tracking branches 'kepler/topic/dumpclasses' and ↵Paul Phillips2011-12-0530-3/+93
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'joshmarcus/collections_docs' into develop Closes SI-5280.
| | | * | Enhanced scaladoc of collection classes with links to the relevant pages of ↵Josh Marcus2011-12-0527-0/+68
| | | | | | | | | | | | | | | | | | | | "The Scala 2.8 Collections API" overview.
| | * | | -Ydump-classes: the option to dump the generated bytecodeluajalla2011-12-053-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Ydump-classes option is intended to dump the compiler generated bytecode to the .class files in given directory. It can be pretty useful for reflective compilation that utilizes in-memory classloaders, for example to check the files if compiler produces invalid bytecode. In this case the dump helps to understand what exactly is wrong with the emitted class. The option format is -Ydump-classes <dir>.
| * | | | Disabled non-deterministic tests.Paul Phillips2011-12-0561-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everyone's favorite "will they or won't they" tests, akka and timeofday. They will be welcomed back into the fold once they can stick to a decision on whether to pass or fail.
| | | | |
| | \ \ \
| *-. \ \ \ Merge remote-tracking branches 'kepler/topic/reifycopypaste' and ↵Paul Phillips2011-12-0560-1/+1201
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | 'kepler/topic/reifytests' into develop
| | | * | | Another test pack for reflectionEugene Burmako2011-12-0559-0/+1200
| | | | | | | | | | | | | | | | | | | | | | | | Also see https://github.com/scala/scala/pull/25.
| | * | | | A minor fix to -Yreify-copypaste.Eugene Burmako2011-12-051-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty modifiers are now correctly printed out as "Modifiers()" instead of annoyingly verbose "Modifiers(Set(), newTermName(""), List())". No review.
| * | | | Don't generate redundant interfaces.Paul Phillips2011-12-051-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Dropped redundant parents during bytecode generation to ease trouble on android. Closes SI-5278.
| * | | | Merge remote-tracking branch 'szeiger/fix/scala-script-on-mingw'Paul Phillips2011-12-051-5/+17
| |\ \ \ \
| | * | | | Fix path mangling for 'scala' shell script on MinGW/MSYS.Stefan Zeiger2011-12-051-5/+17
| | |/ / /
| * | | | Merge remote-tracking branch 'szeiger/fix/windows-git-revision'Paul Phillips2011-12-051-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tools/get-scala-revision.bat should have the same logic as tools/get-scala-revision, but I'm afraid to try to implement an if/then/else in a windows batch file. Contributions welcome.
| | * | | | Fix build on Windows.Stefan Zeiger2011-12-051-1/+0
| | |/ / / | | | | | | | | | | | | | | | a289465c70630719cbd3a74edf5502a156ef83c4 broke get-scala-revision.bat.
| * / / / Tweaks to get-scala-revision.Paul Phillips2011-12-052-3/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference to git head is supposed to be HEAD, not head. Also apparently [[ <test> ]] is a bashism so it's [ <test> ]. Made name generation robust against the absence of the dev tag; it will generate a similar name even if it's not there, minus the part it can't determine without it.
* | | | Implementation of the fj task and future.Aleksandar Prokopec2011-12-076-109/+175
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-19 22:32:27 +0000