summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | Merge branch 'master' into execution-contextVojin Jovanovic2012-01-09177-3476/+5449
| | | |\ \ \ \ \
| | * | | | | | | Changing trait CanBlock name to CanAwait.aleksandar2012-01-123-3/+5
| | |/ / / / / /
| | * | | | | | 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
| | |\ \ \ \ \ \
| | * | | | | | | 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
* | | | | | | | | Optimizations.Paul Phillips2012-02-172-8/+14
|/ / / / / / / /
* | | | | | | | Merge branch 'develop'Paul Phillips2012-02-1712-545/+995
|\ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| | \ \ \ \ \ \ \
| *---. \ \ \ \ \ \ \ Merge remote-tracking branches 'VladUreche/issue/5005', 'adriaanm/topic/virtp...Paul Phillips2012-02-1712-545/+995
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | | | * | | | | | | significantly faster Inliner, with extensive documentation.Miguel Garcia2012-02-173-336/+635
| | |_|/ / / / / / / | |/| | | | | | | |
| | | * | | | | | | Move code to a better place.Daniel C. Sobral2012-02-171-2/+3
| | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | [vpm] simpler implementation of switch emissionAdriaan Moors2012-02-171-30/+13
| | * | | | | | | [vpm] PF's missingCase, cleaned up isDefinedAt genAdriaan Moors2012-02-174-94/+122
| | * | | | | | | [vpm] avoid triggering virtualized matchingAdriaan Moors2012-02-171-9/+9
| | * | | | | | | [vpm] generate proper isDefinedAt for switchesAdriaan Moors2012-02-171-2/+9
| | * | | | | | | [vpm] working type switch for try/catchAdriaan Moors2012-02-175-106/+238
| | * | | | | | | remove unused `tree` argument from typedCasesAdriaan Moors2012-02-173-6/+6
| |/ / / / / / /
* / / / / / / / Fixed AnyRef specialization.Paul Phillips2012-02-173-30/+40
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'erikrozendaal/SI-5331' into developPaul Phillips2012-02-154-57/+627
|\ \ \ \ \ \ \
| * | | | | | | Removed TODOs.Erik Rozendaal2012-01-241-2/+2
| * | | | | | | Custom implementations of drop/take/slice.Erik Rozendaal2012-01-233-7/+44
| * | | | | | | Custom coded version of range/from/to/until.Erik Rozendaal2012-01-213-26/+49