Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Change promise fulfill and break to success and failure. | aleksandar | 2011-12-12 | 4 | -17/+20 | |
| | ||||||
* | Adding the tck test file. | aleksandar | 2011-12-12 | 1 | -0/+166 | |
| | ||||||
* | Merge branch 'execution-context' of github.com:phaller/scala into ↵ | aleksandar | 2011-12-12 | 4 | -11/+116 | |
|\ | | | | | | | | | | | | | execution-context Conflicts: test/files/jvm/concurrent-future.scala | |||||
| * | Add global scheduler with default implementation | Philipp Haller | 2011-12-09 | 3 | -3/+109 | |
| | | ||||||
| * | Fix future tests | Philipp Haller | 2011-12-09 | 1 | -5/+5 | |
| | | ||||||
* | | Syntax changes for the scala.concurrent package and some cleanup. | aleksandar | 2011-12-12 | 5 | -49/+55 | |
|/ | | | | | | | | | | block on { } is now changed to: block(timeout) { } | |||||
* | A minor doc issue with timeouts. | Aleksandar Prokopec | 2011-12-08 | 1 | -3/+0 | |
| | ||||||
* | Fixed the build. | aleksandar | 2011-12-08 | 5 | -31/+41 | |
| | ||||||
* | Added Future companion object, with all method. | Heather Miller | 2011-12-08 | 1 | -8/+34 | |
| | ||||||
* | Merge branch 'execution-context' of https://github.com/phaller/scala into ↵ | Aleksandar Prokopec | 2011-12-07 | 5 | -202/+286 | |
|\ | | | | | | | | | | | | | execution-context Conflicts: src/library/scala/concurrent/Future.scala | |||||
| * | Fix merge conflict | Philipp Haller | 2011-12-07 | 2 | -12/+20 | |
| |\ | ||||||
| * | | Add promise implementation. Move fork/join implementation into default ↵ | Philipp Haller | 2011-12-07 | 5 | -204/+285 | |
| | | | | | | | | | | | | package. Factor commonalities of promises and tasks into Completable. | |||||
* | | | Some docs fixes. | Aleksandar Prokopec | 2011-12-07 | 2 | -7/+27 | |
| |/ |/| | ||||||
* | | Merge branch 'execution-context' of https://github.com/phaller/scala into ↵ | Aleksandar Prokopec | 2011-12-07 | 5 | -16/+160 | |
|\| | | | | | | | execution-context | |||||
| * | Add tests for future callbacks | Philipp Haller | 2011-12-07 | 2 | -0/+134 | |
| | | ||||||
| * | Merge branch 'execution-context' of https://github.com/phaller/scala into ↵ | Philipp Haller | 2011-12-07 | 1 | -5/+9 | |
| |\ | | | | | | | | | | execution-context | |||||
| * | | Add future method to ExecutionContext trait. Log uncaught exceptions to stderr. | Philipp Haller | 2011-12-07 | 3 | -16/+26 | |
| | | | ||||||
* | | | Minor changes with the docs. | Aleksandar Prokopec | 2011-12-07 | 2 | -15/+20 | |
| |/ |/| | ||||||
* | | Fixed the docs a bit. | Aleksandar Prokopec | 2011-12-07 | 1 | -5/+9 | |
|/ | ||||||
* | Fixing match errors in the on* callback methods in future. | Aleksandar Prokopec | 2011-12-07 | 1 | -7/+8 | |
| | ||||||
* | The isTimedout on fj futures fixed. | Aleksandar Prokopec | 2011-12-07 | 1 | -1/+1 | |
| | ||||||
* | Got the futures and execution contexts related code to compile. | Aleksandar Prokopec | 2011-12-07 | 6 | -55/+132 | |
| | ||||||
* | Merge branch 'master' of https://github.com/scala/scala into execution-context | Aleksandar Prokopec | 2011-12-07 | 176 | -55/+1375 | |
|\ | ||||||
| * | Merge remote-tracking branch 'soc/scaladoc-spacing' into develop | Paul Phillips | 2011-12-06 | 2 | -11/+10 | |
| |\ | ||||||
| | * | Fixes the annoying spaces between name, type params and params in ScalaDoc. | Simon Ochsenreither | 2011-12-06 | 2 | -11/+10 | |
| | | | ||||||
| * | | Merge branch 'master' of /scala/trunk into develop | Paul Phillips | 2011-12-06 | 1 | -0/+5 | |
| |\ \ | ||||||
| | * | | Gave Option its own nonEmpty. | Paul Phillips | 2011-12-06 | 1 | -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 Phillips | 2011-12-06 | 22 | -25/+25 | |
| |\ \ \ | | | | | | | | | | | | | | | | 'blair/remove-documentation-stutters' into develop | |||||
| | * | | | Fix documentation stutters. | Blair Zajac | 2011-12-06 | 22 | -25/+25 | |
| | |/ / | ||||||
| * / / | Fix documentation typo. | Blair Zajac | 2011-12-06 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Update scaladoc links to collections overview. | Josh Marcus | 2011-12-06 | 28 | -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 Phillips | 2011-12-05 | 30 | -3/+93 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | 'joshmarcus/collections_docs' into develop Closes SI-5280. | |||||
| | | * | | Enhanced scaladoc of collection classes with links to the relevant pages of ↵ | Josh Marcus | 2011-12-05 | 27 | -0/+68 | |
| | | | | | | | | | | | | | | | | | | | | "The Scala 2.8 Collections API" overview. | |||||
| | * | | | -Ydump-classes: the option to dump the generated bytecode | luajalla | 2011-12-05 | 3 | -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 Phillips | 2011-12-05 | 61 | -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 Phillips | 2011-12-05 | 60 | -1/+1201 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | 'kepler/topic/reifytests' into develop | |||||
| | | * | | | Another test pack for reflection | Eugene Burmako | 2011-12-05 | 59 | -0/+1200 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Also see https://github.com/scala/scala/pull/25. | |||||
| | * | | | | A minor fix to -Yreify-copypaste. | Eugene Burmako | 2011-12-05 | 1 | -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 Phillips | 2011-12-05 | 1 | -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 Phillips | 2011-12-05 | 1 | -5/+17 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix path mangling for 'scala' shell script on MinGW/MSYS. | Stefan Zeiger | 2011-12-05 | 1 | -5/+17 | |
| | |/ / / | ||||||
| * | | | | Merge remote-tracking branch 'szeiger/fix/windows-git-revision' | Paul Phillips | 2011-12-05 | 1 | -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 Zeiger | 2011-12-05 | 1 | -1/+0 | |
| | |/ / / | | | | | | | | | | | | | | | | a289465c70630719cbd3a74edf5502a156ef83c4 broke get-scala-revision.bat. | |||||
| * / / / | Tweaks to get-scala-revision. | Paul Phillips | 2011-12-05 | 2 | -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 Prokopec | 2011-12-07 | 6 | -109/+175 | |
| | | | | ||||||
* | | | | A slight refactoring in promise and task factory methods. | Aleksandar Prokopec | 2011-12-07 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Adding some comments to block on. Removing timeout parameters. | Aleksandar Prokopec | 2011-12-06 | 4 | -9/+31 | |
| | | | | ||||||
* | | | | Completed default implementations of monadic ops on futures. | Aleksandar Prokopec | 2011-12-05 | 1 | -6/+50 | |
| | | | | ||||||
* | | | | Merge branch 'execution-context' of https://github.com/phaller/scala into ↵ | Aleksandar Prokopec | 2011-12-05 | 1 | -0/+1051 | |
|\ \ \ \ | | | | | | | | | | | | | | | | execution-context | |||||
| * | | | | Add Akka's future implementation for reference | Philipp Haller | 2011-12-05 | 1 | -0/+1051 | |
| | | | | |