Removed garbage.

Author: graninas

cpp_stm/context.cpp

@@ -38,26 +38,6 @@ TVarId Context::newGUID()
     return guid;
 }
 
-//tryCommit :: Context -> UStamp -> TVars -> IO Bool
-//tryCommit (Context mtvars) ustamp stagedTVars = do
-//  tvars <- takeMVar mtvars
-
-//  let conflict = Map.foldMapWithKey (f tvars "") stagedTVars
-//  let newTVars = Map.unionWith (merge ustamp) stagedTVars tvars
-
-//  putMVar mtvars $ if null conflict then newTVars else tvars
-
-//  pure $ null conflict
-
-//  where
-//    f :: TVars -> String -> TVarId -> TVarHandle -> String
-//    f origTvars acc tvarId (TVarHandle stagedUS _) = case Map.lookup tvarId origTvars of
-//      Nothing                                         -> acc
-//      Just (TVarHandle origUS _) | origUS == stagedUS -> acc
-//                                 | otherwise          -> acc ++ " " ++ show tvarId
-//    merge :: UStamp -> TVarHandle -> TVarHandle -> TVarHandle
-//    merge us' (TVarHandle _ d) _ = TVarHandle us' d
-
 bool Context::tryCommit(const UStamp& ustamp, const TVars& stagedTvars)
 {
     takeLock();

cpp_stm/stm.h

@@ -161,30 +161,6 @@ STML<Ret> bothTVars(
                       f);
 }
 
-//template <typename A>
-//STML<std::tuple<A>> readMany(const TVar<A>& tvar)
-//{
-//    STML<A> ma = readTVar(tvar);
-//    return stm::bind<A, std::tuple<A>>(ma, [](const A& a)
-//    {
-//        return pure(std::make_tuple(a));
-//    });
-//}
-
-//template <typename A, typename... Tail>
-//STML<std::tuple<Tail>> readMany(const TVar<A>& tvar, Tail... tailTVars)
-//{
-//    STML<std::tuple<Tail...> mTail = readMany<Tail...>(tailTVars);
-//    return stm::bind(mTail, [=](const std::tuple<Tail...>& tail)
-//    {
-//        STML<A> ma = readTVar(tvar);
-//        return stm::bind<A, std::tuple<Tail...>>(ma, [=](const A& a)
-//        {
-//            return stm::pure(std::make_tuple(a, std::tie(tail)));
-//        });
-//    });
-//}
-
 template <typename A, typename B>
 STML<B> sequence(const STML<A> ma, const STML<B>& mb)
 {
@@ -237,11 +213,6 @@ STML<fp::Unit> unless(const STML<bool>& ma, const STML<B>& mb)
     });
 }
 
-//const auto writeTVarRet = [](const auto& tvar, const auto& val)
-//{
-//    return sequence(writeTVar(tvar, val), readTVar(tvar));
-//};
-
 } // namespace stm
 
 #endif // STM_H