Taking a fiber factory

IS4Code · IS4Code · commit fe537e6e1032 · 2017-11-25T14:53:17.000+01:00
diff --git a/Collections/Reactive/IterEnumerable.cs b/Collections/Reactive/IterEnumerable.cs
@@ -6,25 +6,27 @@
 namespace IllidanS4.SharpUtils.Collections.Reactive
 {
 	/// <summary>
-	/// Provides a way to represent a push iterator as a pull iterator.
+	/// Provides a way to represent a push iterator as a pull iterator, using fibers.
 	/// </summary>
 	public class IterEnumerable<T> : IEnumerable<T>
 	{
 		readonly Action<Func<T, bool>> iterProc;
+		readonly IFiberFactory fiberFactory;
 		
-		public IterEnumerable(Action<Func<T, bool>> iterProc)
+		public IterEnumerable(Action<Func<T, bool>> iterProc, IFiberFactory fiberFactory)
 		{
 			this.iterProc = iterProc;
+			this.fiberFactory = fiberFactory;
 		}
 		
-		public IterEnumerable(IIterable<T> iterable) : this(f => iterable.Iterate(Iterator.Create(f)))
+		public IterEnumerable(IIterable<T> iterable, IFiberFactory fiberFactory) : this(f => iterable.Iterate(Iterator.Create(f)), fiberFactory)
 		{
 			
 		}
 		
 		public IEnumerator<T> GetEnumerator()
 		{
-			return new Enumerator(iterProc);
+			return new Enumerator(iterProc, fiberFactory);
 		}
 		
 		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
@@ -34,7 +36,8 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
 		
 		sealed class Enumerator : IEnumerator<T>
 		{
-			readonly Fiber enumFiber;
+			readonly FiberBase enumFiber;
+			readonly IFiberFactory fiberFactory;
 			
 			
 			int state;
@@ -43,11 +46,12 @@ public T Current{
 				get; private set;
 			}
 			
-			Fiber mainFiber;
+			FiberBase mainFiber;
 			
-			public Enumerator(Action<Func<T, bool>> enumProc)
+			public Enumerator(Action<Func<T, bool>> enumProc, IFiberFactory fiberFactory)
 			{
-				enumFiber = new Fiber(
+				this.fiberFactory = fiberFactory;
+				enumFiber = fiberFactory.CreateNew(
 					()=>{
 						enumProc(FiberNext);
 						state = -1;
@@ -74,7 +78,7 @@ public bool MoveNext()
 			{
 				if(state == 0 || state == 1)
 				{
-					mainFiber = Fiber.CurrentFiber;
+					mainFiber = fiberFactory.CurrentFiber;
 					try{
 						enumFiber.Switch();
 					}finally{
@@ -100,7 +104,7 @@ public void Dispose()
 				}else if(state != -1)
 				{
 					state = -1;
-					mainFiber = Fiber.CurrentFiber;
+					mainFiber = fiberFactory.CurrentFiber;
 					try{
 						enumFiber.Switch();
 					}finally{
@@ -119,14 +123,14 @@ public void Reset()
 	
 	public static class IterEnumerable
 	{
-		public static IterEnumerable<T> Create<T>(Action<Func<T, bool>> iterProc)
+		public static IterEnumerable<T> Create<T>(Action<Func<T, bool>> iterProc, IFiberFactory fiberFactory)
 		{
-			return new IterEnumerable<T>(iterProc);
+			return new IterEnumerable<T>(iterProc, fiberFactory);
 		}
 		
-		public static IterEnumerable<T> Create<T>(IIterable<T> iterable)
+		public static IterEnumerable<T> Create<T>(IIterable<T> iterable, IFiberFactory fiberFactory)
 		{
-			return new IterEnumerable<T>(iterable);
+			return new IterEnumerable<T>(iterable, fiberFactory);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -6,25 +6,27 @@`
`6`	`6`	`namespace IllidanS4.SharpUtils.Collections.Reactive`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`		`- /// Provides a way to represent a push iterator as a pull iterator.`
	`9`	`+ /// Provides a way to represent a push iterator as a pull iterator, using fibers.`
`10`	`10`	`/// </summary>`
`11`	`11`	`public class IterEnumerable<T> : IEnumerable<T>`
`12`	`12`	`{`
`13`	`13`	`readonly Action<Func<T, bool>> iterProc;`
	`14`	`+ readonly IFiberFactory fiberFactory;`
`14`	`15`
`15`		`- public IterEnumerable(Action<Func<T, bool>> iterProc)`
	`16`	`+ public IterEnumerable(Action<Func<T, bool>> iterProc, IFiberFactory fiberFactory)`
`16`	`17`	`{`
`17`	`18`	`this.iterProc = iterProc;`
	`19`	`+ this.fiberFactory = fiberFactory;`
`18`	`20`	`}`
`19`	`21`
`20`		`- public IterEnumerable(IIterable<T> iterable) : this(f => iterable.Iterate(Iterator.Create(f)))`
	`22`	`+ public IterEnumerable(IIterable<T> iterable, IFiberFactory fiberFactory) : this(f => iterable.Iterate(Iterator.Create(f)), fiberFactory)`
`21`	`23`	`{`
`22`	`24`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`public IEnumerator<T> GetEnumerator()`
`26`	`28`	`{`
`27`		`- return new Enumerator(iterProc);`
	`29`	`+ return new Enumerator(iterProc, fiberFactory);`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()`
`@@ -34,7 +36,8 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()`
`34`	`36`
`35`	`37`	`sealed class Enumerator : IEnumerator<T>`
`36`	`38`	`{`
`37`		`- readonly Fiber enumFiber;`
	`39`	`+ readonly FiberBase enumFiber;`
	`40`	`+ readonly IFiberFactory fiberFactory;`
`38`	`41`
`39`	`42`
`40`	`43`	`int state;`
`@@ -43,11 +46,12 @@ public T Current{`
`43`	`46`	`get; private set;`
`44`	`47`	`}`
`45`	`48`
`46`		`- Fiber mainFiber;`
	`49`	`+ FiberBase mainFiber;`
`47`	`50`
`48`		`- public Enumerator(Action<Func<T, bool>> enumProc)`
	`51`	`+ public Enumerator(Action<Func<T, bool>> enumProc, IFiberFactory fiberFactory)`
`49`	`52`	`{`
`50`		`- enumFiber = new Fiber(`
	`53`	`+ this.fiberFactory = fiberFactory;`
	`54`	`+ enumFiber = fiberFactory.CreateNew(`
`51`	`55`	`()=>{`
`52`	`56`	`enumProc(FiberNext);`
`53`	`57`	`state = -1;`
`@@ -74,7 +78,7 @@ public bool MoveNext()`
`74`	`78`	`{`
`75`	`79`	`if(state == 0 \|\| state == 1)`
`76`	`80`	`{`
`77`		`- mainFiber = Fiber.CurrentFiber;`
	`81`	`+ mainFiber = fiberFactory.CurrentFiber;`
`78`	`82`	`try{`
`79`	`83`	`enumFiber.Switch();`
`80`	`84`	`}finally{`
`@@ -100,7 +104,7 @@ public void Dispose()`
`100`	`104`	`}else if(state != -1)`
`101`	`105`	`{`
`102`	`106`	`state = -1;`
`103`		`- mainFiber = Fiber.CurrentFiber;`
	`107`	`+ mainFiber = fiberFactory.CurrentFiber;`
`104`	`108`	`try{`
`105`	`109`	`enumFiber.Switch();`
`106`	`110`	`}finally{`
`@@ -119,14 +123,14 @@ public void Reset()`
`119`	`123`
`120`	`124`	`public static class IterEnumerable`
`121`	`125`	`{`
`122`		`- public static IterEnumerable<T> Create<T>(Action<Func<T, bool>> iterProc)`
	`126`	`+ public static IterEnumerable<T> Create<T>(Action<Func<T, bool>> iterProc, IFiberFactory fiberFactory)`
`123`	`127`	`{`
`124`		`- return new IterEnumerable<T>(iterProc);`
	`128`	`+ return new IterEnumerable<T>(iterProc, fiberFactory);`
`125`	`129`	`}`
`126`	`130`
`127`		`- public static IterEnumerable<T> Create<T>(IIterable<T> iterable)`
	`131`	`+ public static IterEnumerable<T> Create<T>(IIterable<T> iterable, IFiberFactory fiberFactory)`
`128`	`132`	`{`
`129`		`- return new IterEnumerable<T>(iterable);`
	`133`	`+ return new IterEnumerable<T>(iterable, fiberFactory);`
`130`	`134`	`}`
`131`	`135`	`}`
`132`	`136`	`}`