removed obsolete helper function

la-yumba · la-yumba · commit a388878e6717 · 2017-05-18T13:21:00.000+02:00
diff --git a/Examples/Chapter08/LINQ/EnumerableExamples.cs b/Examples/Chapter08/LINQ/EnumerableExamples.cs
@@ -39,16 +39,16 @@ public static void SimpleSelectManyExample()
          var a =
             from c in Range('a', 'c')
             from i in Range(2, 3)
-            select Tuple(c, i);
+            select (c, i);
 
          var b =
             Range('a', 'c')
                .SelectMany(c => Range(2, 3)
-                  .Select(i => Tuple(c, i)));
+                  .Select(i => (c, i)));
 
          var d = Range('a', 'c')
             .SelectMany(c => Range(2, 3)
-               , (c, i) => Tuple(c, i));
+               , (c, i) => (c, i));
 
 
 
diff --git a/Examples/Chapter08/LINQ/OptionExamples.cs b/Examples/Chapter08/LINQ/OptionExamples.cs
@@ -140,12 +140,12 @@ public static void SimpleSelectManyExample()
          var a =
             from c in Range('a', 'c')
             from i in Range(1, 2)
-            select Tuple(c, i);
+            select (c, i);
 
          var b =
             Range('a', 'c')
                .SelectMany(c => Range(1, 2)
-                  .Select(i => Tuple(c, i)));
+                  .Select(i => (c, i)));
 
          a.ForEach(t => WriteLine($"({t.Item1}, {t.Item2})"));
          WriteLine();
diff --git a/Examples/Chapter09/Monkeys.cs b/Examples/Chapter09/Monkeys.cs
@@ -48,6 +48,30 @@ string DescribeChoiceOf_Dull(Reward reward)
          throw new InvalidOperationException("Unknown reward");
       }
 
+      string DescribeWithIs(Reward reward)
+      {
+         if (reward is Banana banana)
+            return $"It's a {banana.Ripeness} banana";
+
+         else if (reward is Peanut _)
+            return "It's a peanut";
+
+         return "It's a reward I don't know or care about";
+      }
+
+      string DescribeWithSwitch(Reward reward)
+      {
+         switch (reward)
+         {
+            case Banana banana:
+               return $"It's a {banana.Ripeness} banana";
+            case Peanut _:
+               return "It's a peanut";
+            default:
+               return "It's a reward I don't know or care about";
+         }
+      }
+
       string DescribeChoiceOf(Reward reward)
          => reward.Match(
             Peanut: () => "It's a peanut",
diff --git a/Examples/Chapter10/Domain/Account.cs b/Examples/Chapter10/Domain/Account.cs
@@ -25,7 +25,7 @@ public static class Account
          var evt = cmd.ToEvent();
          var newState = @this.Apply(evt);
 
-         return Tuple(evt as Event, newState);
+         return (evt as Event, newState);
       }
 
       public static Validation<(Event Event, AccountState NewState)> Freeze
@@ -37,7 +37,7 @@ public static class Account
          var evt = cmd.ToEvent();
          var newState = @this.Apply(evt);
 
-         return Tuple(evt as Event, newState);
+         return (evt as Event, newState);
       }
 
       // apply events
diff --git a/Examples/Chapter10/Transitions/Account.cs b/Examples/Chapter10/Transitions/Account.cs
@@ -18,7 +18,7 @@ public static Transition<AccountState, CreatedAccount>
       {
          var evt = cmd.ToEvent();
          var newState = evt.ToAccount();
-         return Tuple(evt, newState);
+         return (evt, newState);
       };
 
 
@@ -32,7 +32,7 @@ public static Transition<AccountState, DepositedCash>
          var evt = cmd.ToEvent();
          var newState = account.Apply(evt);
 
-         return Tuple(evt, newState);
+         return (evt, newState);
       };
 
       public static Transition<AccountState, AlteredOverdraft> 
@@ -42,7 +42,7 @@ public static Transition<AccountState, AlteredOverdraft>
          var evt = cmd.ToEvent(cmd.Amount - account.AllowedOverdraft);
          var newState = account.Apply(evt);
 
-         return Tuple(evt, newState);
+         return (evt, newState);
       };
 
       public static Validation<FrozeAccount> Freeze
diff --git a/Examples/Chapter10/Transitions/Transition.cs b/Examples/Chapter10/Transitions/Transition.cs
@@ -13,7 +13,7 @@ public static Transition<St, R> Select<St, T, R>
          (this Transition<St, T> transition, Func<T, R> project)
          => state0 
          => transition(state0)
-            .Map(result => Tuple(project(result.Item1), result.Item2));
+            .Map(result => (project(result.Item1), result.Item2));
 
       public static Transition<St, R> SelectMany<St, T, R>
          (this Transition<St, T> transition, Func<T, Transition<St, R>> f)
@@ -32,7 +32,7 @@ public static Transition<St, RR> SelectMany<St, T, R, RR>
          => state0
          => transition(state0)
             .Bind(t => bind(t.Item1)(t.Item2)
-               .Map(r => Tuple(project(t.Item1, r.Item1), r.Item2)));
+               .Map(r => (project(t.Item1, r.Item1), r.Item2)));
          
       //   var(r, state2) = bind(t)(state1);
          //   var rr = project(t, r);
diff --git a/Examples/Chapter14/CurrencyLookup.cs b/Examples/Chapter14/CurrencyLookup.cs
@@ -128,14 +128,14 @@ public static void _main()
          //      if (tpl.Item1.ContainsKey(pair))
          //      {
          //         WriteLine("reusing cached value");
-         //         return Tuple(tpl.Item1, tpl.Item1[pair].ToString());
+         //         return (tpl.Item1, tpl.Item1[pair].ToString());
          //      }
          //      else
          //      {
          //         WriteLine("fetching remotely...");
          //         return Yahoo.GetRate(pair)
-         //            .Map(rate => Tuple(tpl.Item1.Add(pair, rate), rate.ToString()))
-         //            .Recover(ex => Tuple(tpl.Item1, ex.Message))
+         //            .Map(rate => (tpl.Item1.Add(pair, rate), rate.ToString()))
+         //            .Recover(ex => (tpl.Item1, ex.Message))
          //            .Result;
          //      }
          //   });
diff --git a/Examples/Chapter15/Agents/Counter.cs b/Examples/Chapter15/Agents/Counter.cs
@@ -16,7 +16,7 @@ public static void PrintThreadOf(string op)
          {
             var newState = state + msg;
             PrintThreadOf("Counter");
-            return Tuple(newState, newState);
+            return (newState, newState);
          });
 
       // public interface of the Counter
diff --git a/Examples/Chapter15/Boc/AccountProcess.cs b/Examples/Chapter15/Boc/AccountProcess.cs
@@ -30,7 +30,7 @@ public AccountProcess(AccountState initialState, Func<Event, Task<Unit>> saveAnd
                await result.Traverse(tpl => saveAndPublish(tpl.Event)); // persist within block, so that the agent doesn't process new messages in a non-persisted state
 
                var newState = result.Map(tpl => tpl.NewState).GetOrElse(state);
-               return Tuple(newState, result);
+               return (newState, result);
             });
       }
 
diff --git a/Examples/Chapter15/Boc/AccountRegistry.cs b/Examples/Chapter15/Boc/AccountRegistry.cs
@@ -23,16 +23,16 @@ public AccountRegistry_Naive(Func<Guid, Task<Option<AccountState>>> loadAccount
             {
                AccountProcess account;
                if (cache.TryGetValue(id, out account))
-                  return Tuple(cache, Some(account));
+                  return (cache, Some(account));
 
                var optAccount = await loadAccount(id);
 
                return optAccount.Map(accState =>
                {
                   var process = new AccountProcess(accState, saveAndPublish);
-                  return Tuple(cache.Add(id, process), Some(process));
+                  return (cache.Add(id, process), Some(process));
                })
-               .GetOrElse(() => Tuple(cache, (Option<AccountProcess>)None));
+               .GetOrElse(() => (cache, (Option<AccountProcess>)None));
             });
       }
 
@@ -59,14 +59,14 @@ public AccountRegistry(Func<Guid, Task<Option<AccountState>>> loadAccount
          this.agent = Agent.Start(AccountsCache.Empty, (AccountsCache cache, Msg msg) =>
             new Pattern<ValueTuple<AccountsCache, Option<AccountProcess>>>
             {
-               (LookupMsg m) => Tuple(cache, cache.Lookup(m.Id)),
+               (LookupMsg m) => (cache, cache.Lookup(m.Id)),
 
                (RegisterMsg m) => cache.Lookup(m.Id).Match(
-                  Some: acc => Tuple(cache, Some(acc)),
+                  Some: acc => (cache, Some(acc)),
                   None: () =>
                   {
                      var account = new AccountProcess(m.AccountState, saveAndPublish);
-                     return Tuple(cache.Add(m.Id, account), Some(account));
+                     return (cache.Add(m.Id, account), Some(account));
                   })
             }
             .Match(msg));
diff --git a/Exercises/Chapter05/Solutions.cs b/Exercises/Chapter05/Solutions.cs
@@ -56,7 +56,7 @@ static IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> Switch<T, R>()
       static IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> Case<T, R>(
          this IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> rules
          , Predicate<T> pred, Func<T, R> func)
-            => rules.Append(Tuple(pred, func));
+            => rules.Append((pred, func));
 
       static IEnumerable<R> MatchAll<T, R>(this IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> rules, T t)
             => rules.Where(rule => rule.Item1(t))
@@ -78,7 +78,7 @@ public static string TestDateComment(string date)
       static IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> Case<T, R>(
          this IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> rules
          , T value, Func<T, R> func)
-            => rules.Append(Tuple(new Predicate<T>(v => v.Equals(value)), func));
+            => rules.Append((new Predicate<T>(v => v.Equals(value)), func));
 
       static R Match<T, R>(this IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> rules, T t)
          => rules.Where(rule => rule.Item1(t))
diff --git a/LaYumba.Functional/Agent.cs b/LaYumba.Functional/Agent.cs
@@ -130,7 +130,7 @@ public TwoWayAgent(State initialState, Func<State, Msg, Task<ValueTuple<State, R
       public Task<Reply> Tell(Msg message)
       {
          var tcs = new TaskCompletionSource<Reply>();
-         actionBlock.Post(Tuple(message, tcs));
+         actionBlock.Post((message, tcs));
          return tcs.Task;
       }
    }
diff --git a/LaYumba.Functional/F.cs b/LaYumba.Functional/F.cs
@@ -34,12 +34,6 @@ public static Func<T, T> Tap<T>(Action<T> act)
 
       // DATA STRUCTURES
 
-      public static ValueTuple<T1, T2> Tuple<T1, T2>(T1 t1, T2 t2) => new ValueTuple<T1, T2>(t1, t2);
-
-      public static ValueTuple<T1, T2, T3> Tuple<T1, T2, T3>(T1 t1, T2 t2, T3 t3) => new ValueTuple<T1, T2, T3>(t1, t2, t3);
-
-      public static ValueTuple<T1, T2, T3, T4> Tuple<T1, T2, T3, T4>(T1 t1, T2 t2, T3 t3, T4 t4) => new ValueTuple<T1, T2, T3, T4>(t1, t2, t3, t4);
-
       public static KeyValuePair<K, T> Pair<K, T>(K key, T value)
          => new KeyValuePair<K, T>(key, value);
 
diff --git a/LaYumba.Functional/Pattern.cs b/LaYumba.Functional/Pattern.cs
@@ -19,7 +19,7 @@ public class Pattern<R> : IEnumerable
       IEnumerator IEnumerable.GetEnumerator() => funcs.GetEnumerator();
 
       public void Add<T>(Func<T, R> func) 
-         => funcs.Add(Tuple<Type, Func<object, R>>(typeof(T), o => func((T)o)));
+         => funcs.Add((typeof(T), o => func((T)o)));
 
       public Pattern<R> Default(Func<R> func)
       {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static class Account`
`25`	`25`	`var evt = cmd.ToEvent();`
`26`	`26`	`var newState = @this.Apply(evt);`
`27`	`27`
`28`		`- return Tuple(evt as Event, newState);`
	`28`	`+ return (evt as Event, newState);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public static Validation<(Event Event, AccountState NewState)> Freeze`
`@@ -37,7 +37,7 @@ public static class Account`
`37`	`37`	`var evt = cmd.ToEvent();`
`38`	`38`	`var newState = @this.Apply(evt);`
`39`	`39`
`40`		`- return Tuple(evt as Event, newState);`
	`40`	`+ return (evt as Event, newState);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`// apply events`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static void PrintThreadOf(string op)`
`16`	`16`	`{`
`17`	`17`	`var newState = state + msg;`
`18`	`18`	`PrintThreadOf("Counter");`
`19`		`- return Tuple(newState, newState);`
	`19`	`+ return (newState, newState);`
`20`	`20`	`});`
`21`	`21`
`22`	`22`	`// public interface of the Counter`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public AccountProcess(AccountState initialState, Func<Event, Task<Unit>> saveAnd`
`30`	`30`	`await result.Traverse(tpl => saveAndPublish(tpl.Event)); // persist within block, so that the agent doesn't process new messages in a non-persisted state`
`31`	`31`
`32`	`32`	`var newState = result.Map(tpl => tpl.NewState).GetOrElse(state);`
`33`		`- return Tuple(newState, result);`
	`33`	`+ return (newState, result);`
`34`	`34`	`});`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,16 @@ public AccountRegistry_Naive(Func<Guid, Task<Option<AccountState>>> loadAccount`
`23`	`23`	`{`
`24`	`24`	`AccountProcess account;`
`25`	`25`	`if (cache.TryGetValue(id, out account))`
`26`		`- return Tuple(cache, Some(account));`
	`26`	`+ return (cache, Some(account));`
`27`	`27`
`28`	`28`	`var optAccount = await loadAccount(id);`
`29`	`29`
`30`	`30`	`return optAccount.Map(accState =>`
`31`	`31`	`{`
`32`	`32`	`var process = new AccountProcess(accState, saveAndPublish);`
`33`		`- return Tuple(cache.Add(id, process), Some(process));`
	`33`	`+ return (cache.Add(id, process), Some(process));`
`34`	`34`	`})`
`35`		`- .GetOrElse(() => Tuple(cache, (Option<AccountProcess>)None));`
	`35`	`+ .GetOrElse(() => (cache, (Option<AccountProcess>)None));`
`36`	`36`	`});`
`37`	`37`	`}`
`38`	`38`
`@@ -59,14 +59,14 @@ public AccountRegistry(Func<Guid, Task<Option<AccountState>>> loadAccount`
`59`	`59`	`this.agent = Agent.Start(AccountsCache.Empty, (AccountsCache cache, Msg msg) =>`
`60`	`60`	`new Pattern<ValueTuple<AccountsCache, Option<AccountProcess>>>`
`61`	`61`	`{`
`62`		`- (LookupMsg m) => Tuple(cache, cache.Lookup(m.Id)),`
	`62`	`+ (LookupMsg m) => (cache, cache.Lookup(m.Id)),`
`63`	`63`
`64`	`64`	`(RegisterMsg m) => cache.Lookup(m.Id).Match(`
`65`		`- Some: acc => Tuple(cache, Some(acc)),`
	`65`	`+ Some: acc => (cache, Some(acc)),`
`66`	`66`	`None: () =>`
`67`	`67`	`{`
`68`	`68`	`var account = new AccountProcess(m.AccountState, saveAndPublish);`
`69`		`- return Tuple(cache.Add(m.Id, account), Some(account));`
	`69`	`+ return (cache.Add(m.Id, account), Some(account));`
`70`	`70`	`})`
`71`	`71`	`}`
`72`	`72`	`.Match(msg));`