Refactor Future constructors.

sdk/lib/async/future.dart

Index: sdk/lib/async/future.dart
diff --git a/sdk/lib/async/future.dart b/sdk/lib/async/future.dart
index 96bf0cc4c107996bfb0e2c0de88a0eecd52bfb97..9b2cff468f153b57f6eb9504d1224597c0bef6d5 100644
--- a/sdk/lib/async/future.dart
+++ b/sdk/lib/async/future.dart
@@ -84,31 +84,45 @@ part of dart.async;
  */
 // TODO(floitsch): document chaining.
 abstract class Future<T> {
+
   /**
-   * Creates a future containing the result of calling [function].
+   * Creates a future containing the result of calling [computation]
+   * asynchronously with [runAsync].
    *
-   * The result of computing [:function():] is either a returned value or
-   * a throw.
+   * if the result of executing [computation] throws, the returned future is
+   * completed with the error. If a thrown value is an [AsyncError], it is used
+   * directly, instead of wrapping this error again in another [AsyncError].
    *
-   * If a value is returned, it becomes the result of the created future.
+   * If the returned value is itself a [Future], completion of
+   * the created future will wait until the returned future completes,
+   * and will then complete with the same result.
    *
-   * If calling [function] throws, the created [Future] will be completed
-   * with an async error containing the thrown value and a captured
-   * stacktrace.
+   * If a value is returned, it becomes the result of the created future.
+   */
+  factory Future(computation()) {
+    _ThenFuture<dynamic, T> future =
+        new _ThenFuture<dynamic, T>((_) => computation());

[Lasse Reichstein Nielsen, 2013/04/15 10:27:46]

I'd prefer using _FutureImpl directly instead of _ThenFuture, but I can see this
is shorter.

[floitsch, 2013/04/15 20:30:11]

Falls under "optimizations for later" category.

+    runAsync(() => future._sendValue(null));
+    return future;
+  }
+
+  /**
+   * Creates a future containing the result of immediately calling
+   * [computation].
    *
-   * However, if the result of calling [function] is already an asynchronous
-   * result, we treat it specially.
+   * if the result of executing [computation] throws, the returned future is
+   * completed with the error. If a thrown value is an [AsyncError], it is used
+   * directly, instead of wrapping this error again in another [AsyncError].
    *
    * If the returned value is itself a [Future], completion of
    * the created future will wait until the returned future completes,
    * and will then complete with the same result.
    *
-   * If a thrown value is an [AsyncError], it is used directly as the result
-   * of the created future.
+   * If a value is returned, it becomes the result of the created future.
    */
-  factory Future.of(function()) {
+  factory Future.sync(computation()) {

[Lasse Reichstein Nielsen, 2013/04/15 10:27:46]

I prefer Future.of.
The "sync" name (apart from being an abbreviation) isn't obvious. Nor is "of",
on the other hand, it's so bland it can mean anything.
So I guess it's down to: I don't like "sync"!

[floitsch, 2013/04/15 20:30:11]

A lot of users got this confused and thought that "of" would by asynchronous. At
least "sync" makes it really clear.

     try {
-      var result = function();
+      var result = computation();
       return new _FutureImpl<T>().._setOrChainValue(result);
     } catch (error, stackTrace) {
       return new _FutureImpl<T>.immediateError(error, stackTrace);
@@ -119,18 +133,18 @@ abstract class Future<T> {
    * A future whose value is available in the next event-loop iteration.
    *
    * If [value] is not a [Future], using this constructor is equivalent
-   * to [:new Future.of(() => value):].
+   * to [:new Future.sync(() => value):].
    *
    * See [Completer] to create a Future and complete it later.
    */
-  factory Future.immediate(T value) => new _FutureImpl<T>.immediate(value);
+  factory Future.value([T value]) => new _FutureImpl<T>.immediate(value);
 
   /**
    * A future that completes with an error in the next event-loop iteration.

[Anders Johnsen, 2013/04/15 08:59:06]

Write it's the same as new Future(() => throw new AsyncError(error,
stackTrace));?

[Lasse Reichstein Nielsen, 2013/04/15 10:27:46]

I hope not. You should never throw an AsyncError (but I guess we have accepted
it in places as a kind of rethrow).

[floitsch, 2013/04/15 20:30:11]

AsyncError is gone.

    *
    * See [Completer] to create a Future and complete it later.
    */
-  factory Future.immediateError(var error, [Object stackTrace]) {
+  factory Future.error(var error, [Object stackTrace]) {
     return new _FutureImpl<T>.immediateError(error, stackTrace);
   }
 
@@ -187,7 +201,7 @@ abstract class Future<T> {
     Iterator iterator = input.iterator;
     void nextElement(_) {
       if (iterator.moveNext()) {
-        new Future.of(() => f(iterator.current))
+        new Future.sync(() => f(iterator.current))
             .then(nextElement, onError: doneSignal._setError);
       } else {
         doneSignal._setValue(null);