removed explicit uses of ValueTuple type

Author: la-yumba

Examples/Chapter10/Transitions/Transition.cs

@@ -5,7 +5,7 @@
 
 namespace Boc.Chapter10
 {
-   public delegate Validation<ValueTuple<T, St>> Transition<St, T>(St state);
+   public delegate Validation<(T, St)> Transition<St, T>(St state);
 
    public static class Transition
    {
@@ -21,10 +21,6 @@ public static Transition<St, R> SelectMany<St, T, R>
          => transition(state0)
             .Bind(t => f(t.Item1)(t.Item2));
 
-         //   var(t, state1) = StatefulComputation(state0);
-         //   return f(t)(state1);
-         //};
-
       public static Transition<St, RR> SelectMany<St, T, R, RR>
          (this Transition<St, T> transition
          , Func<T, Transition<St, R>> bind
@@ -33,10 +29,5 @@ public static Transition<St, RR> SelectMany<St, T, R, RR>
          => transition(state0)
             .Bind(t => bind(t.Item1)(t.Item2)
                .Map(r => (project(t.Item1, r.Item1), r.Item2)));
-         
-      //   var(r, state2) = bind(t)(state1);
-         //   var rr = project(t, r);
-         //   return (rr, state2);
-         //};
    }
 }

Examples/Chapter12/Trade.cs

@@ -42,7 +42,7 @@ struct State
       public Bid Bid { get; set; }
       public IEnumerable<Offer> Offers { get; set; }
 
-      public static implicit operator State(ValueTuple<Bid, IEnumerable<Offer>> t)
+      public static implicit operator State((Bid, IEnumerable<Offer>) t)
          => new State
          {
             Bid = t.Item1,

Examples/Chapter15/Boc/AccountRegistry.cs

@@ -57,7 +57,7 @@ public AccountRegistry(Func<Guid, Task<Option<AccountState>>> loadAccount
          this.loadAccount = loadAccount;
 
          this.agent = Agent.Start(AccountsCache.Empty, (AccountsCache cache, Msg msg) =>
-            new Pattern<ValueTuple<AccountsCache, Option<AccountProcess>>>
+            new Pattern<(AccountsCache, Option<AccountProcess>)>
             {
                (LookupMsg m) => (cache, cache.Lookup(m.Id)),
 

Exercises/Chapter05/Solutions.cs

@@ -49,16 +49,16 @@ static string DailyComment(DateTime day)
          return string.Join(" ", comments.ToArray());
       }
 
-      // note that here I use Tuple instead of KeyValuePair, but that's a minor detail
-      static IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> Switch<T, R>()
-         => Enumerable.Empty<ValueTuple<Predicate<T>, Func<T, R>>>();
+      // note that here I use a tuple instead of KeyValuePair, but that's a minor detail
+      static IEnumerable<(Predicate<T>, Func<T, R>)> Switch<T, R>()
+         => Enumerable.Empty<(Predicate<T>, Func<T, R>)>();
 
-      static IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> Case<T, R>(
-         this IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> rules
+      static IEnumerable<(Predicate<T>, Func<T, R>)> Case<T, R>(
+         this IEnumerable<(Predicate<T>, Func<T, R>)> rules
          , Predicate<T> pred, Func<T, R> func)
             => rules.Append((pred, func));
 
-      static IEnumerable<R> MatchAll<T, R>(this IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> rules, T t)
+      static IEnumerable<R> MatchAll<T, R>(this IEnumerable<(Predicate<T>, Func<T, R>)> rules, T t)
             => rules.Where(rule => rule.Item1(t))
                .Map(rule => rule.Item2(t));
 
@@ -75,12 +75,12 @@ public static string TestDateComment(string date)
       // method that returns the result of invoking the function of the _first_
       // matching case.
 
-      static IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> Case<T, R>(
-         this IEnumerable<ValueTuple<Predicate<T>, Func<T, R>>> rules
+      static IEnumerable<(Predicate<T>, Func<T, R>)> Case<T, R>(
+         this IEnumerable<(Predicate<T>, Func<T, R>)> rules
          , T value, Func<T, R> 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)
+      static R Match<T, R>(this IEnumerable<(Predicate<T>, Func<T, R>)> rules, T t)
          => rules.Where(rule => rule.Item1(t))
             .First().Item2(t);
 

LaYumba.Functional/Agent.cs

@@ -28,12 +28,12 @@ public static Agent<Msg> Start<State, Msg>
 
       public static Agent<Msg, Reply> Start<State, Msg, Reply>
          (State initialState
-         , Func<State, Msg, ValueTuple<State, Reply>> process)
+         , Func<State, Msg, (State, Reply)> process)
          => new TwoWayAgent<State, Msg, Reply>(initialState, process);
 
       public static Agent<Msg, Reply> Start<State, Msg, Reply>
          (State initialState
-         , Func<State, Msg, Task<ValueTuple<State, Reply>>> process)
+         , Func<State, Msg, Task<(State, Reply)>> process)
          => new TwoWayAgent<State, Msg, Reply>(initialState, process);
    }
 
@@ -93,13 +93,13 @@ public StatefulAgent(State initialState
    class TwoWayAgent<State, Msg, Reply> : Agent<Msg, Reply>
    {
       private State state;
-      private readonly ActionBlock<ValueTuple<Msg, TaskCompletionSource<Reply>>> actionBlock;
+      private readonly ActionBlock<(Msg, TaskCompletionSource<Reply>)> actionBlock;
 
-      public TwoWayAgent(State initialState, Func<State, Msg, ValueTuple<State, Reply>> process)
+      public TwoWayAgent(State initialState, Func<State, Msg, (State, Reply)> process)
       {
          state = initialState;
 
-         actionBlock = new ActionBlock<ValueTuple<Msg, TaskCompletionSource<Reply>>>(
+         actionBlock = new ActionBlock<(Msg, TaskCompletionSource<Reply>)>(
             t =>
             {
                var result = process(state, t.Item1);
@@ -109,11 +109,11 @@ public TwoWayAgent(State initialState, Func<State, Msg, ValueTuple<State, Reply>
       }
 
       // creates a 2-way agent with an async processing func
-      public TwoWayAgent(State initialState, Func<State, Msg, Task<ValueTuple<State, Reply>>> process)
+      public TwoWayAgent(State initialState, Func<State, Msg, Task<(State, Reply)>> process)
       {
          state = initialState;
 
-         actionBlock = new ActionBlock<ValueTuple<Msg, TaskCompletionSource<Reply>>>(
+         actionBlock = new ActionBlock<(Msg, TaskCompletionSource<Reply>)>(
             async t => await process(state, t.Item1)
                .ContinueWith(task =>
                {

LaYumba.Functional/Pattern.cs

@@ -14,7 +14,7 @@ public class Pattern : Pattern<dynamic> { }
 
    public class Pattern<R> : IEnumerable
    {
-      IList<ValueTuple<Type, Func<object, R>>> funcs = new List<ValueTuple<Type, Func<object, R>>>();
+      IList<(Type, Func<object, R>)> funcs = new List<(Type, Func<object, R>)>();
 
       IEnumerator IEnumerable.GetEnumerator() => funcs.GetEnumerator();
 
@@ -48,7 +48,7 @@ public R Match(object value)
          return matchingDel(value);
       }
 
-      static Func<ValueTuple<Type, Func<object, R>>, bool> InputArgMatchesTypeOf(object value)
+      static Func<(Type, Func<object, R>), bool> InputArgMatchesTypeOf(object value)
          => tup => tup.Item1.GetTypeInfo().IsAssignableFrom(value.GetType());
    }
 }