diff Implab/Deferred.cs @ 249:d82909310094 v3

Implab.Test moved to xunit Complete set of PromiseHelpers (Then, Catch, Finally) Removed obsolete types ICancellable, ICancellationToken
author cin
date Wed, 31 Jan 2018 11:28:38 +0300
parents 5cb4826c2c2a
children 7c7e9ad6fe4a
line wrap: on
line diff
--- a/Implab/Deferred.cs	Tue Jan 30 01:37:17 2018 +0300
+++ b/Implab/Deferred.cs	Wed Jan 31 11:28:38 2018 +0300
@@ -8,51 +8,46 @@
     public class Deferred : IResolvable {
 
         readonly Promise m_promise;
-        readonly IDispatcher m_dispatcher;
-
-        internal Deferred(IDispatcher dispatcher) : this(new Promise(), dispatcher) {
+        internal Deferred() {
+            m_promise = new Promise();
         }
 
         internal Deferred(Promise promise, IDispatcher dispatcher) {
             Debug.Assert(promise != null);
             m_promise = promise;
-            m_dispatcher = dispatcher;
         }
 
         public IPromise Promise {
             get { return m_promise; }
         }
 
-        public void Reject(Exception error) {
+        public void Cancel() {
+            Reject(new OperationCanceledException());
+        }
+
+        public virtual void Reject(Exception error) {
             if (error is PromiseTransientException)
                 error = ((PromiseTransientException)error).InnerException;
 
             m_promise.RejectPromise(error);
         }
 
-        public void Resolve() {
+        public virtual void Resolve() {
             m_promise.ResolvePromise();
         }
 
-        public void Resolve(IPromise thenable) {
+        public virtual void Resolve(IPromise thenable) {
             if (thenable == null)
                 Reject(new Exception("The promise or task are expected"));
             if (thenable == m_promise)
                 Reject(new Exception("The promise cannot be resolved with oneself"));
 
-            else if (m_dispatcher != null)
-                // dispatch (see ecma-262/6.0: 25.4.1.3.2 Promise Resolve Functions)
-                m_dispatcher.Enqueue(Chain, thenable);
-            else
-                Chain(thenable);
-        }
-
-        void Chain(IPromise thenable) {
             try {
                 thenable.Then(this);
             } catch (Exception err) {
                 Reject(err);
             }
         }
+
     }
 }
\ No newline at end of file