implab/ImplabNet Commit - r72:d67b95eddaf4

promises refactoring

cin -

r72:d67b95eddaf4 v2

parent child

Context file:

r72:d67b95eddaf4

Collapse all files

Implab.Fx/ControlBoundPromise.cs created 644 +30 0

@@ -0,0 +1,30
	1	using System.Windows.Forms;
	2	using System;
	3
	4
	5	namespace Implab.Fx {
	6	public class ControlBoundPromise<T> : Promise<T> {
	7	readonly Control m_target;
	8
	9	public ControlBoundPromise(Control target) {
	10	Safe.ArgumentNotNull(target, "target");
	11
	12	m_target = target;
	13	}
	14
	15	public ControlBoundPromise(Control target, IPromise parent, bool cancellable)
	16	: base(parent, cancellable) {
	17	Safe.ArgumentNotNull(target, "target");
	18
	19	m_target = target;
	20	}
	21
	22	protected override void InvokeHandler(HandlerDescriptor handler) {
	23	if (m_target.InvokeRequired)
	24	m_target.BeginInvoke(new Action<HandlerDescriptor>(base.InvokeHandler), handler);
	25	else
	26	base.InvokeHandler(handler);
	27	}
	28	}
	29	}
	30

Implab/PromiseExtensions.cs created 644 +38 0

@@ -0,0 +1,38
	1	using System.Threading;
	2
	3	namespace Implab {
	4	public static class PromiseExtensions {
	5	public static IPromise<T> DispatchToCurrentContext<T>(this IPromise<T> that) {
	6	var context = SynchronizationContext.Current;
	7	if (context == null)
	8	return that;
	9
	10	var p = new SyncContextPromise<T>(context, that, true);
	11
	12	that.Then(
	13	x => p.Resolve(x),
	14	e => {
	15	p.Reject(e);
	16	return default(T);
	17	}
	18	);
	19	return p;
	20	}
	21
	22	public static IPromise<T> DispatchToContext<T>(this IPromise<T> that, SynchronizationContext context) {
	23	Safe.ArgumentNotNull(context, "context");
	24
	25	var p = new SyncContextPromise<T>(context, that, true);
	26
	27	that.Then(
	28	x => p.Resolve(x),
	29	e => {
	30	p.Reject(e);
	31	return default(T);
	32	}
	33	);
	34	return p;
	35	}
	36	}
	37	}
	38

Implab/SyncContextPromise.cs created 644 +22 0

@@ -0,0 +1,22
	1	using System.Threading;
	2
	3	namespace Implab {
	4	public class SyncContextPromise<T> : Promise<T> {
	5	readonly SynchronizationContext m_context;
	6
	7	public SyncContextPromise(SynchronizationContext context) {
	8	Safe.ArgumentNotNull(context, "context");
	9	m_context = context;
	10	}
	11
	12	public SyncContextPromise(SynchronizationContext context, IPromise parent, bool cancellable)
	13	: base(parent, cancellable) {
	14	Safe.ArgumentNotNull(context, "context");
	15	m_context = context;
	16	}
	17	protected override void InvokeHandler(HandlerDescriptor handler) {
	18	m_context.Post(x => base.InvokeHandler(handler),null);
	19	}
	20	}
	21	}
	22

Implab/TransientPromiseException.cs created 644 +33 0

@@ -0,0 +1,33
	1	using System;
	2
	3	namespace Implab {
	4
	5	[Serializable]
	6	public class TransientPromiseException : Exception {
	7	/// <summary>
	8	/// Initializes a new instance of the <see cref="PromiseFailedException"/> class.
	9	/// </summary>
	10	/// <param name="inner">The exception that is the cause of the current exception.</param>
	11	public TransientPromiseException(Exception inner) : base("The preceding promise has failed", inner) {
	12	}
	13
	14	/// <summary>
	15	/// Initializes a new instance of the <see cref="PromiseFailedException"/> class
	16	/// </summary>
	17	/// <param name="message">A <see cref="T:System.String"/> that describes the exception. </param>
	18	/// <param name="inner">The exception that is the cause of the current exception. </param>
	19	public TransientPromiseException(string message, Exception inner)
	20	: base(message, inner) {
	21	}
	22
	23	/// <summary>
	24	/// Initializes a new instance of the <see cref="PromiseFailedException"/> class
	25	/// </summary>
	26	/// <param name="context">The contextual information about the source or destination.</param>
	27	/// <param name="info">The object that holds the serialized object data.</param>
	28	protected TransientPromiseException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
	29	: base(info, context) {
	30	}
	31	}
	32	}
	33

Implab.Fx.Test/Implab.Fx.Test.csproj +5 -7

               <PropertyGroup>
                 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
                 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-                <ProductVersion>
+                <ProductVersion>8.0.30703</ProductVersion>
-                </ProductVersion>
                 <SchemaVersion>2.0</SchemaVersion>
                 <ProjectGuid>{2F31E405-E267-4195-A05D-574093C21209}</ProjectGuid>
                 <OutputType>Library</OutputType>
                 <Reference Include="WindowsBase" />
               </ItemGroup>
               <ItemGroup>
-                <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-                  <Visible>False</Visible>
-                </CodeAnalysisDependentAssemblyPaths>
-              </ItemGroup>
-              <ItemGroup>
                 <Compile Include="Properties\AssemblyInfo.cs" />
                 <Compile Include="OverlayTest.cs" />
                 <Compile Include="Sample\MainForm.cs">
               <ItemGroup>
                 <EmbeddedResource Include="Sample\MainForm.resx">
                   <DependentUpon>MainForm.cs</DependentUpon>
+                  <LogicalName>
+                  </LogicalName>
                 </EmbeddedResource>
                 <EmbeddedResource Include="Sample\OverlayForm.resx">
                   <DependentUpon>OverlayForm.cs</DependentUpon>
+                  <LogicalName>
+                  </LogicalName>
                 </EmbeddedResource>
               </ItemGroup>
               <ItemGroup>

Implab.Fx/Implab.Fx.csproj +2 -1

                 <Compile Include="AnimationHelpers.cs" />
                 <Compile Include="PromiseHelpers.cs" />
                 <Compile Include="Properties\AssemblyInfo.cs" />
+                <Compile Include="ControlBoundPromise.cs" />
               </ItemGroup>
               <ItemGroup>
                 <ProjectReference Include="..\Implab\Implab.csproj">
-                  <Project>{99B95D0D-9CF9-4F70-8ADF-F4D0AA5CB0D9}</Project>
+                  <Project>{F550F1F8-8746-4AD0-9614-855F4C4B7F05}</Project>
                   <Name>Implab</Name>
                 </ProjectReference>
               </ItemGroup>

Implab.Fx/PromiseHelpers.cs +8 -16

             using System;
-            using System.Collections.Generic;
-            using System.Linq;
-            using System.Text;
             using System.Windows.Forms;
             using System.Threading;
                         if (ctl == null)
                             throw new ArgumentNullException("ctl");
-                        var directed = new Promise<T>();
+                        var directed = new ControlBoundPromise<T>(ctl,that,true);
                         that.Then(
-                            res =>
+                            directed.Resolve,
-                                if (ctl.InvokeRequired)
-                                    ctl.Invoke(new Action<T>(directed.Resolve), res);
-                                else
-                                    directed.Resolve(res);
-                            },
                             err =>
                             {
-                                if (ctl.InvokeRequired)
+                                directed.Reject(err);
-                                    ctl.Invoke(new Action<Exception>(directed.Reject), err);
+                                return default(T);
-                                else
-                                    directed.Reject(err);
                             }
                         );
                         that.Then(
                             res => sync.Post(state => d.Resolve(res), null),
-                            err => sync.Post(state => d.Reject(err), null)
+                            err => {
+                                sync.Post(state => d.Reject(err), null);
+                                return default(T);
+                            }
                         );
                         return d;

Implab.Test/Implab.Test.csproj +1 -7

               <PropertyGroup>
                 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
                 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-                <ProductVersion>
+                <ProductVersion>8.0.30703</ProductVersion>
-                </ProductVersion>
                 <SchemaVersion>2.0</SchemaVersion>
                 <ProjectGuid>{63F92C0C-61BF-48C0-A377-8D67C3C661D0}</ProjectGuid>
                 <OutputType>Library</OutputType>
                 </Reference>
               </ItemGroup>
               <ItemGroup>
-                <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-                  <Visible>False</Visible>
-                </CodeAnalysisDependentAssemblyPaths>
-              </ItemGroup>
-              <ItemGroup>
                 <Compile Include="AsyncTests.cs" />
                 <Compile Include="PromiseHelper.cs" />
                 <Compile Include="Properties\AssemblyInfo.cs" />

Implab.sln +215 -14

@@ -17,22 +17,11 EndProject
17	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Fx.Test", "Implab.Fx.Test\Implab.Fx.Test.csproj", "{2F31E405-E267-4195-A05D-574093C21209}"	17	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Fx.Test", "Implab.Fx.Test\Implab.Fx.Test.csproj", "{2F31E405-E267-4195-A05D-574093C21209}"
18	EndProject	18	EndProject
19	Global	19	Global
20	GlobalSection(TestCaseManagementSettings) = postSolution
21	CategoryFile = Implab.vsmdi
22	EndGlobalSection
23	GlobalSection(SolutionConfigurationPlatforms) = preSolution	20	GlobalSection(SolutionConfigurationPlatforms) = preSolution
24	Debug\|Any CPU = Debug\|Any CPU	21	Debug\|Any CPU = Debug\|Any CPU
25	Release\|Any CPU = Release\|Any CPU	22	Release\|Any CPU = Release\|Any CPU
26	EndGlobalSection	23	EndGlobalSection
27	GlobalSection(ProjectConfigurationPlatforms) = postSolution	24	GlobalSection(ProjectConfigurationPlatforms) = postSolution
28	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
29	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
30	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
31	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release\|Any CPU.Build.0 = Release\|Any CPU
32	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
33	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
34	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
35	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release\|Any CPU.Build.0 = Release\|Any CPU
36	{06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	25	{06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
37	{06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	26	{06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
38	{06E706F8-6881-43EB-927E-FFC503AF6ABC}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	27	{06E706F8-6881-43EB-927E-FFC503AF6ABC}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
@@ -41,11 +30,223 Global
41	{2F31E405-E267-4195-A05D-574093C21209}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	30	{2F31E405-E267-4195-A05D-574093C21209}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
42	{2F31E405-E267-4195-A05D-574093C21209}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	31	{2F31E405-E267-4195-A05D-574093C21209}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
43	{2F31E405-E267-4195-A05D-574093C21209}.Release\|Any CPU.Build.0 = Release\|Any CPU	32	{2F31E405-E267-4195-A05D-574093C21209}.Release\|Any CPU.Build.0 = Release\|Any CPU
		33	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
		34	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
		35	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
		36	{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release\|Any CPU.Build.0 = Release\|Any CPU
		37	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
		38	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
		39	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
		40	{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release\|Any CPU.Build.0 = Release\|Any CPU
		41	EndGlobalSection
		42	GlobalSection(NestedProjects) = preSolution
		43	EndGlobalSection
		44	GlobalSection(MonoDevelopProperties) = preSolution
		45	StartupItem = Implab\Implab.csproj
		46	Policies = $0
		47	$0.CSharpFormattingPolicy = $1
		48	$1.IndentSwitchBody = True
		49	$1.NamespaceBraceStyle = EndOfLine
		50	$1.ClassBraceStyle = EndOfLine
		51	$1.InterfaceBraceStyle = EndOfLine
		52	$1.StructBraceStyle = EndOfLine
		53	$1.EnumBraceStyle = EndOfLine
		54	$1.MethodBraceStyle = EndOfLine
		55	$1.ConstructorBraceStyle = EndOfLine
		56	$1.DestructorBraceStyle = EndOfLine
		57	$1.BeforeMethodDeclarationParentheses = False
		58	$1.BeforeMethodCallParentheses = False
		59	$1.BeforeConstructorDeclarationParentheses = False
		60	$1.NewLineBeforeConstructorInitializerColon = NewLine
		61	$1.NewLineAfterConstructorInitializerColon = SameLine
		62	$1.BeforeIndexerDeclarationBracket = False
		63	$1.BeforeDelegateDeclarationParentheses = False
		64	$1.NewParentheses = False
		65	$1.SpacesBeforeBrackets = False
		66	$1.inheritsSet = Mono
		67	$1.inheritsScope = text/x-csharp
		68	$1.scope = text/x-csharp
		69	$0.TextStylePolicy = $2
		70	$2.FileWidth = 120
		71	$2.EolMarker = Unix
		72	$2.inheritsSet = VisualStudio
		73	$2.inheritsScope = text/plain
		74	$2.scope = text/x-csharp
		75	$0.DotNetNamingPolicy = $3
		76	$3.DirectoryNamespaceAssociation = PrefixedHierarchical
		77	$3.ResourceNamePolicy = MSBuild
		78	$0.TextStylePolicy = $4
		79	$4.FileWidth = 120
		80	$4.TabsToSpaces = False
		81	$4.inheritsSet = VisualStudio
		82	$4.inheritsScope = text/plain
		83	$4.scope = application/xml
		84	$0.XmlFormattingPolicy = $5
		85	$5.inheritsSet = Mono
		86	$5.inheritsScope = application/xml
		87	$5.scope = application/xml
		88	$0.TextStylePolicy = $6
		89	$6.FileWidth = 120
		90	$6.TabsToSpaces = False
		91	$6.inheritsSet = VisualStudio
		92	$6.inheritsScope = text/plain
		93	$6.scope = text/plain
		94	$0.NameConventionPolicy = $7
		95	$7.Rules = $8
		96	$8.NamingRule = $9
		97	$9.Name = Namespaces
		98	$9.AffectedEntity = Namespace
		99	$9.VisibilityMask = VisibilityMask
		100	$9.NamingStyle = PascalCase
		101	$9.IncludeInstanceMembers = True
		102	$9.IncludeStaticEntities = True
		103	$8.NamingRule = $10
		104	$10.Name = Types
		105	$10.AffectedEntity = Class, Struct, Enum, Delegate
		106	$10.VisibilityMask = VisibilityMask
		107	$10.NamingStyle = PascalCase
		108	$10.IncludeInstanceMembers = True
		109	$10.IncludeStaticEntities = True
		110	$8.NamingRule = $11
		111	$11.Name = Interfaces
		112	$11.RequiredPrefixes = $12
		113	$12.String = I
		114	$11.AffectedEntity = Interface
		115	$11.VisibilityMask = VisibilityMask
		116	$11.NamingStyle = PascalCase
		117	$11.IncludeInstanceMembers = True
		118	$11.IncludeStaticEntities = True
		119	$8.NamingRule = $13
		120	$13.Name = Attributes
		121	$13.RequiredSuffixes = $14
		122	$14.String = Attribute
		123	$13.AffectedEntity = CustomAttributes
		124	$13.VisibilityMask = VisibilityMask
		125	$13.NamingStyle = PascalCase
		126	$13.IncludeInstanceMembers = True
		127	$13.IncludeStaticEntities = True
		128	$8.NamingRule = $15
		129	$15.Name = Event Arguments
		130	$15.RequiredSuffixes = $16
		131	$16.String = EventArgs
		132	$15.AffectedEntity = CustomEventArgs
		133	$15.VisibilityMask = VisibilityMask
		134	$15.NamingStyle = PascalCase
		135	$15.IncludeInstanceMembers = True
		136	$15.IncludeStaticEntities = True
		137	$8.NamingRule = $17
		138	$17.Name = Exceptions
		139	$17.RequiredSuffixes = $18
		140	$18.String = Exception
		141	$17.AffectedEntity = CustomExceptions
		142	$17.VisibilityMask = VisibilityMask
		143	$17.NamingStyle = PascalCase
		144	$17.IncludeInstanceMembers = True
		145	$17.IncludeStaticEntities = True
		146	$8.NamingRule = $19
		147	$19.Name = Methods
		148	$19.AffectedEntity = Methods
		149	$19.VisibilityMask = VisibilityMask
		150	$19.NamingStyle = PascalCase
		151	$19.IncludeInstanceMembers = True
		152	$19.IncludeStaticEntities = True
		153	$8.NamingRule = $20
		154	$20.Name = Static Readonly Fields
		155	$20.AffectedEntity = ReadonlyField
		156	$20.VisibilityMask = Internal, Protected, Public
		157	$20.NamingStyle = CamelCase
		158	$20.IncludeInstanceMembers = False
		159	$20.IncludeStaticEntities = True
		160	$8.NamingRule = $21
		161	$21.Name = Fields (Non Private)
		162	$21.AffectedEntity = Field
		163	$21.VisibilityMask = Internal, Public
		164	$21.NamingStyle = CamelCase
		165	$21.IncludeInstanceMembers = True
		166	$21.IncludeStaticEntities = True
		167	$8.NamingRule = $22
		168	$22.Name = ReadOnly Fields (Non Private)
		169	$22.AffectedEntity = ReadonlyField
		170	$22.VisibilityMask = Internal, Public
		171	$22.NamingStyle = CamelCase
		172	$22.IncludeInstanceMembers = True
		173	$22.IncludeStaticEntities = False
		174	$8.NamingRule = $23
		175	$23.Name = Fields (Private)
		176	$23.RequiredPrefixes = $24
		177	$24.String = m_
		178	$23.AffectedEntity = Field, ReadonlyField
		179	$23.VisibilityMask = Private, Protected
		180	$23.NamingStyle = CamelCase
		181	$23.IncludeInstanceMembers = True
		182	$23.IncludeStaticEntities = False
		183	$8.NamingRule = $25
		184	$25.Name = Static Fields (Private)
		185	$25.RequiredPrefixes = $26
		186	$26.String = _
		187	$25.AffectedEntity = Field
		188	$25.VisibilityMask = Private
		189	$25.NamingStyle = CamelCase
		190	$25.IncludeInstanceMembers = False
		191	$25.IncludeStaticEntities = True
		192	$8.NamingRule = $27
		193	$27.Name = ReadOnly Fields (Private)
		194	$27.RequiredPrefixes = $28
		195	$28.String = m_
		196	$27.AffectedEntity = ReadonlyField
		197	$27.VisibilityMask = Private, Protected
		198	$27.NamingStyle = CamelCase
		199	$27.IncludeInstanceMembers = True
		200	$27.IncludeStaticEntities = False
		201	$8.NamingRule = $29
		202	$29.Name = Constant Fields
		203	$29.AffectedEntity = ConstantField
		204	$29.VisibilityMask = VisibilityMask
		205	$29.NamingStyle = AllUpper
		206	$29.IncludeInstanceMembers = True
		207	$29.IncludeStaticEntities = True
		208	$8.NamingRule = $30
		209	$30.Name = Properties
		210	$30.AffectedEntity = Property
		211	$30.VisibilityMask = VisibilityMask
		212	$30.NamingStyle = PascalCase
		213	$30.IncludeInstanceMembers = True
		214	$30.IncludeStaticEntities = True
		215	$8.NamingRule = $31
		216	$31.Name = Events
		217	$31.AffectedEntity = Event
		218	$31.VisibilityMask = VisibilityMask
		219	$31.NamingStyle = PascalCase
		220	$31.IncludeInstanceMembers = True
		221	$31.IncludeStaticEntities = True
		222	$8.NamingRule = $32
		223	$32.Name = Enum Members
		224	$32.AffectedEntity = EnumMember
		225	$32.VisibilityMask = VisibilityMask
		226	$32.NamingStyle = PascalCase
		227	$32.IncludeInstanceMembers = True
		228	$32.IncludeStaticEntities = True
		229	$8.NamingRule = $33
		230	$33.Name = Parameters
		231	$33.AffectedEntity = Parameter, LocalVariable
		232	$33.VisibilityMask = VisibilityMask
		233	$33.NamingStyle = CamelCase
		234	$33.IncludeInstanceMembers = True
		235	$33.IncludeStaticEntities = True
		236	$8.NamingRule = $34
		237	$34.Name = Type Parameters
		238	$34.RequiredPrefixes = $35
		239	$35.String = T
		240	$34.AffectedEntity = TypeParameter
		241	$34.VisibilityMask = VisibilityMask
		242	$34.NamingStyle = PascalCase
		243	$34.IncludeInstanceMembers = True
		244	$34.IncludeStaticEntities = True
		245	EndGlobalSection
		246	GlobalSection(TestCaseManagementSettings) = postSolution
		247	CategoryFile = Implab.vsmdi
44	EndGlobalSection	248	EndGlobalSection
45	GlobalSection(SolutionProperties) = preSolution	249	GlobalSection(SolutionProperties) = preSolution
46	HideSolutionNode = FALSE	250	HideSolutionNode = FALSE
47	EndGlobalSection	251	EndGlobalSection
48	GlobalSection(MonoDevelopProperties) = preSolution
49	StartupItem = Implab\Implab.csproj
50	EndGlobalSection
51	EndGlobal	252	EndGlobal

Implab/IPromiseT.cs +2 -4

                     new T Join();
                     new T Join(int timeout);
-                    IPromise<T> Then(ResultHandler<T> success, ErrorHandler error);
                     IPromise<T> Then(ResultHandler<T> success, ErrorHandler<T> error);
                     IPromise<T> Then(ResultHandler<T> success);
-                    new IPromise<T> Error(ErrorHandler error);
                     IPromise<T> Error(ErrorHandler<T> error);
-                    IPromise<T2> Map<T2>(ResultMapper<T,T2> mapper, ErrorHandler error);
+                    IPromise<T2> Map<T2>(ResultMapper<T,T2> mapper, ErrorHandler<T> error);
                     IPromise<T2> Map<T2>(ResultMapper<T, T2> mapper);
-                    IPromise<T2> Chain<T2>(ChainedOperation<T, T2> chained, ErrorHandler error);
+                    IPromise<T2> Chain<T2>(ChainedOperation<T, T2> chained, ErrorHandler<T> error);
                     IPromise<T2> Chain<T2>(ChainedOperation<T, T2> chained);
                     new IPromise<T> Cancelled(Action handler);

Implab/Implab.csproj +74 0

@@ -7,6 +7,8
7	<OutputType>Library</OutputType>	7	<OutputType>Library</OutputType>
8	<RootNamespace>Implab</RootNamespace>	8	<RootNamespace>Implab</RootNamespace>
9	<AssemblyName>Implab</AssemblyName>	9	<AssemblyName>Implab</AssemblyName>
		10	<ProductVersion>8.0.30703</ProductVersion>
		11	<SchemaVersion>2.0</SchemaVersion>
10	</PropertyGroup>	12	</PropertyGroup>
11	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' ">	13	<PropertyGroup Condition=" '$(Configuration)\|$(Platform)' == 'Debug\|AnyCPU' ">
12	<DebugSymbols>true</DebugSymbols>	14	<DebugSymbols>true</DebugSymbols>
@@ -99,7 +101,79
99	<Compile Include="Parallels\AsyncPool.cs" />	101	<Compile Include="Parallels\AsyncPool.cs" />
100	<Compile Include="Safe.cs" />	102	<Compile Include="Safe.cs" />
101	<Compile Include="ValueEventArgs.cs" />	103	<Compile Include="ValueEventArgs.cs" />
		104	<Compile Include="PromiseExtensions.cs" />
		105	<Compile Include="TransientPromiseException.cs" />
		106	<Compile Include="SyncContextPromise.cs" />
102	</ItemGroup>	107	</ItemGroup>
103	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />	108	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
104	<ItemGroup />	109	<ItemGroup />
		110	<ProjectExtensions>
		111	<MonoDevelop>
		112	<Properties>
		113	<Policies>
		114	<CSharpFormattingPolicy IndentSwitchBody="True" NamespaceBraceStyle="EndOfLine" ClassBraceStyle="EndOfLine" InterfaceBraceStyle="EndOfLine" StructBraceStyle="EndOfLine" EnumBraceStyle="EndOfLine" MethodBraceStyle="EndOfLine" ConstructorBraceStyle="EndOfLine" DestructorBraceStyle="EndOfLine" BeforeMethodDeclarationParentheses="False" BeforeMethodCallParentheses="False" BeforeConstructorDeclarationParentheses="False" NewLineBeforeConstructorInitializerColon="NewLine" NewLineAfterConstructorInitializerColon="SameLine" BeforeIndexerDeclarationBracket="False" BeforeDelegateDeclarationParentheses="False" NewParentheses="False" SpacesBeforeBrackets="False" inheritsSet="Mono" inheritsScope="text/x-csharp" scope="text/x-csharp" />
		115	<TextStylePolicy FileWidth="120" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp" />
		116	<DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild" />
		117	<TextStylePolicy FileWidth="120" TabsToSpaces="False" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="application/xml" />
		118	<XmlFormattingPolicy inheritsSet="Mono" inheritsScope="application/xml" scope="application/xml" />
		119	<TextStylePolicy FileWidth="120" TabsToSpaces="False" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
		120	<NameConventionPolicy>
		121	<Rules>
		122	<NamingRule Name="Namespaces" AffectedEntity="Namespace" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		123	<NamingRule Name="Types" AffectedEntity="Class, Struct, Enum, Delegate" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		124	<NamingRule Name="Interfaces" AffectedEntity="Interface" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
		125	<RequiredPrefixes>
		126	<String>I</String>
		127	</RequiredPrefixes>
		128	</NamingRule>
		129	<NamingRule Name="Attributes" AffectedEntity="CustomAttributes" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
		130	<RequiredSuffixes>
		131	<String>Attribute</String>
		132	</RequiredSuffixes>
		133	</NamingRule>
		134	<NamingRule Name="Event Arguments" AffectedEntity="CustomEventArgs" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
		135	<RequiredSuffixes>
		136	<String>EventArgs</String>
		137	</RequiredSuffixes>
		138	</NamingRule>
		139	<NamingRule Name="Exceptions" AffectedEntity="CustomExceptions" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
		140	<RequiredSuffixes>
		141	<String>Exception</String>
		142	</RequiredSuffixes>
		143	</NamingRule>
		144	<NamingRule Name="Methods" AffectedEntity="Methods" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		145	<NamingRule Name="Static Readonly Fields" AffectedEntity="ReadonlyField" VisibilityMask="Internal, Protected, Public" NamingStyle="CamelCase" IncludeInstanceMembers="False" IncludeStaticEntities="True" />
		146	<NamingRule Name="Fields (Non Private)" AffectedEntity="Field" VisibilityMask="Internal, Public" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		147	<NamingRule Name="ReadOnly Fields (Non Private)" AffectedEntity="ReadonlyField" VisibilityMask="Internal, Public" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="False" />
		148	<NamingRule Name="Fields (Private)" AffectedEntity="Field, ReadonlyField" VisibilityMask="Private, Protected" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="False">
		149	<RequiredPrefixes>
		150	<String>m_</String>
		151	</RequiredPrefixes>
		152	</NamingRule>
		153	<NamingRule Name="Static Fields (Private)" AffectedEntity="Field" VisibilityMask="Private" NamingStyle="CamelCase" IncludeInstanceMembers="False" IncludeStaticEntities="True">
		154	<RequiredPrefixes>
		155	<String>_</String>
		156	</RequiredPrefixes>
		157	</NamingRule>
		158	<NamingRule Name="ReadOnly Fields (Private)" AffectedEntity="ReadonlyField" VisibilityMask="Private, Protected" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="False">
		159	<RequiredPrefixes>
		160	<String>m_</String>
		161	</RequiredPrefixes>
		162	</NamingRule>
		163	<NamingRule Name="Constant Fields" AffectedEntity="ConstantField" VisibilityMask="VisibilityMask" NamingStyle="AllUpper" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		164	<NamingRule Name="Properties" AffectedEntity="Property" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		165	<NamingRule Name="Events" AffectedEntity="Event" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		166	<NamingRule Name="Enum Members" AffectedEntity="EnumMember" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		167	<NamingRule Name="Parameters" AffectedEntity="Parameter, LocalVariable" VisibilityMask="VisibilityMask" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
		168	<NamingRule Name="Type Parameters" AffectedEntity="TypeParameter" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
		169	<RequiredPrefixes>
		170	<String>T</String>
		171	</RequiredPrefixes>
		172	</NamingRule>
		173	</Rules>
		174	</NameConventionPolicy>
		175	</Policies>
		176	</Properties>
		177	</MonoDevelop>
		178	</ProjectExtensions>
105	</Project> No newline at end of file	179	</Project>

Implab/JSON/JSONGrammar.cs +2 -12

             namespace Implab.JSON {
                 internal class JSONGrammar : Grammar<JSONGrammar> {
-                    public enum TokenType : int{
+                    public enum TokenType : int {
                         None,
                         BeginObject,
                         EndObject,
                         var backSlash = SymbolToken('\\');
                         var specialEscapeChars = SymbolSetToken('\\', '"', '/', 'b', 'f', 't', 'n', 'r');
                         var unicodeEspace = SymbolToken('u').Cat(hexDigit.Repeat(4));
-                        var escape = backSlash.Cat(specialEscapeChars.Or(unicodeEspace));
                         var whitespace = SymbolSetToken('\n', '\r', '\t', ' ').EClosure();
                         var beginObject = whitespace.Cat(SymbolToken('{')).Cat(whitespace);
                         var endObject = whitespace.Cat(SymbolToken('}')).Cat(whitespace);
                         var number = minus.Optional().Cat(integer).Cat(frac.Optional()).Cat(exp.Optional());
                         var literal = letters.Closure();
                         var unescaped = SymbolTokenExcept(Enumerable.Range(0, 0x20).Union(new int[] { '\\', '"' }).Select(x => (char)x));
-                        var character = unescaped.Or(escape);
-                        var str = quote.Cat(character.EClosure()).Cat(quote);
                         var jsonExpression =
                             number.Tag(TokenType.Number)
                             .Or(backSlash.Cat(specialEscapeChars).Tag(TokenType.EscapedChar))
                             .Or(backSlash.Cat(unicodeEspace).Tag(TokenType.EscapedUnicode))
                             .Or(unescaped.Closure().Tag(TokenType.UnescapedChar));
-                        var jsonNumberExpression =
-                            minus.Tag(TokenType.Minus)
-                            .Or(SymbolToken('+').Tag(TokenType.Plus))
-                            .Or(digit.Closure().Tag(TokenType.Integer))
-                            .Or(dot.Tag(TokenType.Dot))
-                            .Or(expSign.Tag(TokenType.Exp));
                         m_jsonDFA = BuildDFA(jsonExpression);
                         m_stringDFA = BuildDFA(jsonStringExpression);

Implab/JSON/JSONWriter.cs +48 -19

                     Context m_context;
                     TextWriter m_writer;
-                    bool m_indent;
+                    readonly bool m_indent = true;
+                    readonly int m_indentSize = 4;
                     static readonly char [] _escapeBKS,
                         _escapeFWD,
                         m_writer = writer;
                     }
+                    public JSONWriter(TextWriter writer, bool indent) {
+                        Safe.ArgumentNotNull(writer, "writer");
+                        m_writer = writer;
+                        m_indent = indent;
+                    }
+                    void WriteIndent() {
+                        if (m_indent) {
+                            var indent = new char[m_contextStack.Count * m_indentSize + 1];
+                            indent[0] = '\n';
+                            for (int i = 1; i < indent.Length; i++)
+                                indent[i] = ' ';
+                            m_writer.Write(new String(indent));
+                        } else {
+                            m_writer.Write(' ');
+                        }
+                    }
                     void WriteMemberName(string name) {
                         Safe.ArgumentNotEmpty(name, "name");
                         if (m_context.element != JSONElementContext.Object)
                             OperationNotApplicable("WriteMember");
                         if (m_context.needComma)
-                            m_writer.Write(", ");
+                            m_writer.Write(",");
-                        // TODO indent
+                        WriteIndent();
                         m_context.needComma = true;
                         Write(name);
                         m_writer.Write(" : ");
                         Write(value);
                     }
                     public void WriteValue(string value) {
                         if (m_context.element != JSONElementContext.Array)
                             OperationNotApplicable("WriteValue");
                         if (m_context.needComma)
-                            m_writer.Write(", ");
+                            m_writer.Write(",");
+                        WriteIndent();
                         m_context.needComma = true;
                         Write(value);
                         if (m_context.element != JSONElementContext.Array)
                             OperationNotApplicable("WriteValue");
                         if (m_context.needComma)
-                            m_writer.Write(", ");
+                            m_writer.Write(",");
                         m_context.needComma = true;
+                        WriteIndent();
                         Write(value);
                     }
                         if (m_context.element != JSONElementContext.Array)
                             OperationNotApplicable("WriteValue");
                         if (m_context.needComma)
-                            m_writer.Write(", ");
+                            m_writer.Write(",");
                         m_context.needComma = true;
+                        WriteIndent();
                         Write(value);
                     }
                         if (m_context.element != JSONElementContext.None && m_context.element != JSONElementContext.Array)
                             OperationNotApplicable("BeginObject");
                         if (m_context.needComma)
-                            m_writer.Write(", ");
+                            m_writer.Write(",");
+                        WriteIndent();
                         m_context.needComma = true;
                         m_contextStack.Push(m_context);
                         m_context = new Context { element = JSONElementContext.Object, needComma = false };
-                        m_writer.Write("{ ");
+                        m_writer.Write("{");
                     }
                     public void BeginObject(string name) {
                         m_contextStack.Push(m_context);
                         m_context = new Context { element = JSONElementContext.Object, needComma = false };
-                        m_writer.Write("{ ");
+                        m_writer.Write("{");
                     }
                     public void EndObject() {
                         if (m_context.element != JSONElementContext.Object)
                             OperationNotApplicable("EndArray");
-                        m_writer.Write(" }");
                         m_context = m_contextStack.Pop();
+                        WriteIndent();
+                        m_writer.Write("}");
                     }
                     public void BeginArray() {
                         if (m_context.element != JSONElementContext.None && m_context.element != JSONElementContext.Array)
                             throw new InvalidOperationException();
-                        if (m_context.needComma)
+                        if (m_context.needComma) {
-                            m_writer.Write(", ");
+                            m_writer.Write(",");
+                        }
                         m_context.needComma = true;
+                        WriteIndent();
                         m_contextStack.Push(m_context);
                         m_context = new Context { element = JSONElementContext.Array, needComma = false };
-                        m_writer.Write("[ ");
+                        m_writer.Write("[");
                     }
                     public void BeginArray(string name) {
                         m_contextStack.Push(m_context);
                         m_context = new Context { element = JSONElementContext.Array, needComma = false };
-                        m_writer.Write("[ ");
+                        m_writer.Write("[");
                     }
                     public void EndArray() {
                         if (m_context.element != JSONElementContext.Array)
                             OperationNotApplicable("EndArray");
-                        m_writer.Write(" ]");
                         m_context = m_contextStack.Pop();
+                        WriteIndent();
+                        m_writer.Write("]");
                     }
                     void Write(bool value) {

Implab/Parallels/ArrayTraits.cs +4 -1

                                             if (left == 0)
                                                 promise.Resolve(res);
                                         },
-                                        e => promise.Reject(e)
+                                        e => {
+                                            promise.Reject(e);
+                                            throw new TransientPromiseException(e);
+                                        }
                                     );
                                 } catch (Exception e) {

Implab/Promise.cs +128 -159

                 public delegate void ErrorHandler(Exception e);
                 public delegate T ErrorHandler<out T>(Exception e);
                 public delegate void ResultHandler<in T>(T result);
-                public delegate TNew ResultMapper<in TSrc, out TNew>(TSrc result);
+                public delegate TNew ResultMapper<in TSrc,out TNew>(TSrc result);
-                public delegate IPromise<TNew> ChainedOperation<in TSrc, TNew>(TSrc result);
+                public delegate IPromise<TNew> ChainedOperation<in TSrc,TNew>(TSrc result);
                 /// <summary>
                 /// Класс для асинхронного получения результатов. Так называемое "обещание".
                     protected struct HandlerDescriptor {
                         public ResultHandler<T> resultHandler;
-                        public ErrorHandler errorHandler;
+                        public ErrorHandler<T> errorHandler;
                         public Action cancellHandler;
+                        public Promise<T> medium;
                         public void Resolve(T result) {
-                            if (resultHandler != null)
+                            if (resultHandler != null) {
                                 try {
                                     resultHandler(result);
                                 } catch (Exception e) {
                                     Reject(e);
+                                    return;
                                 }
+                            }
+                            if (medium != null)
+                                medium.Resolve(result);
                         }
                         public void Reject(Exception err) {
-                            if (errorHandler != null)
+                            if (errorHandler != null) {
                                 try {
-                                    errorHandler(err);
+                                    var res = errorHandler(err);
-                                } catch {
+                                    if (medium != null)
+                                        medium.Resolve(res);
+                                } catch (TransientPromiseException err2) {
+                                    if (medium != null)
+                                        medium.Reject(err2.InnerException);
+                                } catch (Exception err2) {
+                                    if (medium != null)
+                                        medium.Reject(err2);
                                 }
+                            } else if (medium != null)
+                                medium.Reject(err);
                         }
                         public void Cancel() {
-                            if (cancellHandler != null)
+                            if (cancellHandler != null) {
                                 try {
                                     cancellHandler();
-                                } catch {
+                                } catch (Exception err) {
+                                    Reject(err);
+                                    return;
                                 }
+                            }
+                            if (medium != null)
+                                medium.Cancel();
                         }
                     }
                     public Promise(IPromise parent, bool cancellable) {
                         m_cancellable = cancellable;
                         if (parent != null)
-                            AddHandler(
+                            Cancelled(() => {
-                                null,
+                                if (parent.IsExclusive)
-                                null,
+                                    parent.Cancel();
-                                () => {
+                            });
-                                    if (parent.IsExclusive)
-                                        parent.Cancel();
-                            );
                     }
                     bool BeginTransit() {
                     /// </summary>
                     /// <returns><c>true</c> Операция была отменена, обработчики не будут вызваны.<c>false</c> отмена не возможна, поскольку обещание уже выполнено и обработчики отработали.</returns>
                     public bool Cancel() {
-                        if (BeginTransit()) {
+                        if (m_cancellable && BeginTransit()) {
                             CompleteTransit(CANCELLED_STATE);
                             OnStateChanged();
                             return true;
-                        } else {
-                            return false;
                         }
+                        return false;
                     }
                     // сделано для возвращаемого типа void
                     /// </summary>
                     /// <param name="success">The handler of the successfully completed operation.
                     /// This handler will recieve an operation result as a parameter.</param>
-                    /// <param name="error">Handles an exception that may occur during the operation.</param>
-                    /// <returns>The new promise chained to this one.</returns>
-                    public IPromise<T> Then(ResultHandler<T> success, ErrorHandler error) {
-                        if (success == null && error == null)
-                            return this;
-                        var medium = new Promise<T>(this, true);
-                        ResultHandler<T> resultHandler;
-                        if (success != null)
-                            resultHandler = x => {
-                                success(x);
-                                medium.Resolve(x);
-                            };
-                        else
-                            resultHandler = medium.Resolve;
-                        ErrorHandler errorHandler;
-                        if (error != null)
-                            errorHandler = x => {
-                                // несмотря на то, что обработчик ошибки вызывается безопасно,
-                                // т.е. возникшие в нем ошибки будут подавлены, нам нужно
-                                // гарантировать, что ошибка будет передана дальше по цепочке обещаний
-                                try {
-                                    error(x);
-                                } catch { }
-                                medium.Reject(x);
-                            };
-                        else
-                            errorHandler = medium.Reject;
-                        AddHandler(resultHandler, errorHandler, medium.InternalCancel);
-                        return medium;
-                    public IPromise Then(Action success, ErrorHandler error) {
-                        return Then(x => success(), error);
-                    public IPromise Then(Action success) {
-                        return Then(x => success());
-                    /// <summary>
-                    /// Adds new handlers to this promise.
-                    /// </summary>
-                    /// <param name="success">The handler of the successfully completed operation.
-                    /// This handler will recieve an operation result as a parameter.</param>
                     /// <param name="error">Handles an exception that may occur during the operation and returns the value which will be used as the result of the operation.</param>
                     /// <returns>The new promise chained to this one.</returns>
                     public IPromise<T> Then(ResultHandler<T> success, ErrorHandler<T> error) {
                         var medium = new Promise<T>(this, true);
-                        ResultHandler<T> resultHandler;
+                        AddHandler(success, error, null, medium);
-                        ErrorHandler errorHandler;
-                        if (success != null)
-                            resultHandler = x => {
-                                success(x);
-                                medium.Resolve(x);
-                            };
-                        else
-                            resultHandler = medium.Resolve;
-                        if (error != null)
-                            errorHandler = x => {
-                                try {
-                                    medium.Resolve(error(x));
-                                } catch (Exception e) {
-                                    medium.Reject(e);
-                            };
-                        else
-                            errorHandler = medium.Reject;
-                        AddHandler(resultHandler, errorHandler, medium.InternalCancel);
                         return medium;
                     }
+                    public IPromise Then(Action success, ErrorHandler error) {
+                        return Then(
+                            x => success(),
+                            e => {
+                                error(e);
+                                return default(T);
+                            }
+                        );
+                    }
+                    public IPromise Then(Action success) {
+                        return Then(x => success());
+                    }
                     public IPromise<T> Then(ResultHandler<T> success) {
                         if (success == null)
                         var medium = new Promise<T>(this, true);
-                        ResultHandler<T> resultHandler;
+                        AddHandler(success, null, null, medium);
-                        if (success != null)
-                            resultHandler = x => {
-                                success(x);
-                                medium.Resolve(x);
-                            };
-                        else
-                            resultHandler = medium.Resolve;
-                        AddHandler(resultHandler, medium.Reject, medium.InternalCancel);
                         return medium;
                     }
-                    public IPromise<T> Error(ErrorHandler error) {
+                    public IPromise Error(ErrorHandler error) {
-                        return Then((ResultHandler<T>)null, error);
+                        if (error == null)
+                            return this;
+                        var medium = new Promise<T>(this, true);
+                        AddHandler(
+                            null,
+                            e => {
+                                error(e);
+                                return default(T);
+                            },
+                            null,
+                            medium
+                        );
+                        return medium;
                     }
                     /// <summary>
                         var medium = new Promise<T>(this, true);
-                        AddHandler(
+                        AddHandler(null, handler, null, medium);
-                            x => medium.Resolve(x),
-                            e => {
-                                try {
-                                    medium.Resolve(handler(e));
-                                } catch (Exception e2) {
-                                    medium.Reject(e2);
-                            },
-                            medium.InternalCancel
-                        );
                         return medium;
                     }
                         if (handler == null)
                             return this;
-                        var medium = new Promise<T>(this,true);
+                        var medium = new Promise<T>(this, true);
                         AddHandler(
-                            x => {
+                            x => handler(),
-                                // to avoid handler being called multiple times we handle exception by ourselfs
+                            e => {
-                                try {
+                                handler();
-                                    handler();
+                                throw new TransientPromiseException(e);
-                                    medium.Resolve(x);
-                                } catch (Exception e) {
-                                    medium.Reject(e);
                             },
+                            null,
-                            e => {
+                            medium
-                                try {
-                                    handler();
-                                } catch { }
-                                medium.Reject(e);
-                            },
-                            medium.InternalCancel
                         );
                         return medium;
                     /// <param name="error">Обработчик ошибки. Данный обработчик получит
                     /// исключение возникшее при выполнении операции.</param>
                     /// <returns>Новое обещание, которое будет выполнено при выполнении исходного обещания.</returns>
-                    public IPromise<TNew> Map<TNew>(ResultMapper<T, TNew> mapper, ErrorHandler error) {
+                    public IPromise<TNew> Map<TNew>(ResultMapper<T, TNew> mapper, ErrorHandler<T> error) {
                         if (mapper == null)
                             throw new ArgumentNullException("mapper");
                         // создаем прицепленное обещание
-                        var chained = new Promise<TNew>(this,true);
+                        var chained = new Promise<TNew>(this, true);
                         ResultHandler<T> resultHandler = result => chained.Resolve(mapper(result));
-                        ErrorHandler errorHandler = delegate(Exception e) {
+                        ErrorHandler<T> errorHandler;
-                            if (error != null)
+                        if (error != null)
+                            errorHandler = e => {
                                 try {
-                                    error(e);
+                                    return error(e);
-                                } catch { }
+                                } catch (Exception e2) {
-                            // в случае ошибки нужно передать исключение дальше по цепочке
+                                    // в случае ошибки нужно передать исключение дальше по цепочке
-                            chained.Reject(e);
+                                    chained.Reject(e2);
-                        };
+                                return default(T);
+                            };
+                        else
+                            errorHandler = e => {
+                                chained.Reject(e);
+                                return default(T);
+                            };
                         AddHandler(
                             resultHandler,
                             errorHandler,
-                            chained.InternalCancel
+                            chained.InternalCancel,
+                            null
                         );
                         return chained;
                     /// <param name="error">Обработчик ошибки. Данный обработчик получит
                     /// исключение возникшее при выполнении текуещй операции.</param>
                     /// <returns>Новое обещание, которое будет выполнено по окончанию указанной аснхронной операции.</returns>
-                    public IPromise<TNew> Chain<TNew>(ChainedOperation<T, TNew> chained, ErrorHandler error) {
+                    public IPromise<TNew> Chain<TNew>(ChainedOperation<T, TNew> chained, ErrorHandler<T> error) {
                         // проблема в том, что на момент связывания еще не начата асинхронная операция, поэтому нужно
                         // создать посредника, к которому будут подвызяваться следующие обработчики.
                             var promise = chained(result);
                             promise.Then(
-                                x => medium.Resolve(x),
+                                medium.Resolve,
-                                e => medium.Reject(e)
+                                err => {
+                                    medium.Reject(err);
+                                    throw new TransientPromiseException(err);
+                                }
                             );
                             // notify chained operation that it's not needed anymore
                             // порядок вызова Then, Cancelled важен, поскольку от этого
                             // зависит IsExclusive
                             medium.Cancelled(() => {
-                                if(promise.IsExclusive)
+                                if (promise.IsExclusive)
                                     promise.Cancel();
                             });
                             promise.Cancelled(() => medium.Reject(new OperationCanceledException()));
                         };
-                        ErrorHandler errorHandler = delegate(Exception e) {
+                        ErrorHandler<T> errorHandler = delegate(Exception e) {
-                            if (error != null)
+                            if (error != null) {
-                                error(e);
+                                try {
+                                    return error(e);
+                                } catch (Exception e2) {
+                                    medium.Reject(e2);
+                                    return default(T);
+                                }
+                            }
                             // в случае ошибки нужно передать исключение дальше по цепочке
                             medium.Reject(e);
+                            return default(T);
                         };
                         AddHandler(
                             resultHandler,
                             errorHandler,
-                            medium.InternalCancel
+                            medium.InternalCancel,
+                            null
                         );
                         return medium;
                     }
                     public IPromise<T> Cancelled(Action handler) {
-                        AddHandler(null, null, handler);
+                        AddHandler(null, null, handler, null);
                         return this;
                     }
                             throw new ArgumentNullException("handler");
                         AddHandler(
                             x => handler(),
-                            e => handler(),
+                            e => {
-                            handler
+                                handler();
+                                throw new TransientPromiseException(e);
+                            },
+                            handler,
+                            null
                         );
                         return this;
                     }
                         return Join(Timeout.Infinite);
                     }
-                    void AddHandler(ResultHandler<T> success, ErrorHandler error, Action cancel) {
+                    void AddHandler(ResultHandler<T> success, ErrorHandler<T> error, Action cancel, Promise<T> medium) {
                         if (success != null || error != null)
                             Interlocked.Increment(ref m_childrenCount);
-                        HandlerDescriptor handler = new HandlerDescriptor {
+                        var handler = new HandlerDescriptor {
                             resultHandler = success,
                             errorHandler = error,
-                            cancellHandler = cancel
+                            cancellHandler = cancel,
+                            medium = medium
                         };
                         bool queued;
                                         if (Interlocked.Decrement(ref pending) == 0)
                                             promise.Resolve(result);
                                     },
-                                    e => promise.Reject(e)
+                                    e => {
+                                        promise.Reject(e);
+                                        return default(T);
+                                    }
                                 );
                             } else {
                                 if (Interlocked.Decrement(ref pending) == 0)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages