Removed GenerateEvents. No longer required due to extended Transform.

schlangster · schlangster · commit d18fab40852c · 2014-05-19T11:45:05.000+02:00
diff --git a/include/react/Algorithm.h b/include/react/Algorithm.h
@@ -200,69 +200,6 @@ auto Pulse(const Events<D,E>& trigger, const Signal<D,S>& target)
             target.NodePtr(), trigger.NodePtr()));
 }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-/// GenerateEvents
-///////////////////////////////////////////////////////////////////////////////////////////////////
-template
-<
-    typename D,
-    typename E,
-    typename FIn,
-    typename ... TDepValues,
-    typename TOut = std::result_of<FIn(E,TDepValues ...)>::type,
-    class = std::enable_if<
-        ! std::is_same<E,EventToken>::value>::type
->
-auto GenerateEvents(const Events<D,E>& trigger, FIn&& func,
-                    const Signal<D,TDepValues>& ... deps)
-    -> Events<D,TOut>
-{
-    using REACT_IMPL::EventGeneratorNode;
-
-    using F = std::decay<FIn>::type;
-
-    return Events<D,TOut>(
-        std::make_shared<EventGeneratorNode<D,E,TOut,F,TDepValues ...>>(
-            trigger.NodePtr(), std::forward<FIn>(func), deps.NodePtr() ...));
-}
-
-// Token stream version
-template
-<
-    typename D,
-    typename FIn,
-    typename ... TDepValues,
-    typename TOut = std::result_of<FIn(TDepValues ...)>::type
->
-auto GenerateEvents(const Events<D,EventToken>& trigger, FIn&& func,
-                    const Signal<D,TDepValues>& ... deps)
-    -> Events<D,TOut>
-{
-    using REACT_IMPL::EventGeneratorNode;
-
-    using F = std::decay<FIn>::type;
-
-    struct Wrapper_
-    {
-        Wrapper_(FIn&& func) : MyFunc{ std::forward<FIn>(func) } {}
-        Wrapper_(const Wrapper_& other) = default;
-        Wrapper_(Wrapper_&& other) : MyFunc{ std::move(other.MyFunc) } {}
-
-        void operator()(EventToken, const TDepValues& ... args)
-        {
-            MyFunc(args ...);
-        }
-
-        F MyFunc;
-    };
-
-    Wrapper_ wrapper{ std::forward<FIn>(func) };
-
-    return Events<D,TOut>(
-        std::make_shared<EventGeneratorNode<D,EventToken,TOut,Wrapper_,TDepValues ...>>(
-            trigger.NodePtr(), std::move(wrapper), deps.NodePtr() ...));
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 /// Changed
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/react/detail/graph/AlgorithmNodes.h b/include/react/detail/graph/AlgorithmNodes.h
@@ -520,95 +520,4 @@ class PulseNode : public EventStreamNode<D,S>
     const SharedPtrT<EventStreamNode<D,E>>  trigger_;
 };
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-/// EventGeneratorNode
-///////////////////////////////////////////////////////////////////////////////////////////////////
-template
-<
-    typename D,
-    typename E,
-    typename TOut,
-    typename TFunc,
-    typename ... TDepValues
->
-class EventGeneratorNode : public EventStreamNode<D,TOut>
-{
-public:
-    template <typename F>
-    EventGeneratorNode(const std::shared_ptr<EventStreamNode<D,E>>& trigger, F&& func,
-                       const std::shared_ptr<SignalNode<D,TDepValues>>& ... deps) :
-        EventStreamNode{ },
-        trigger_{ trigger },
-        func_{ std::forward<F>(func) },
-        deps_{ deps ... }
-    {
-        Engine::OnNodeCreate(*this);
-        Engine::OnNodeAttach(*this, *trigger_);
-        REACT_EXPAND_PACK(Engine::OnNodeAttach(*this, *deps));
-    }
-
-    ~EventGeneratorNode()
-    {
-
-        Engine::OnNodeDetach(*this, *trigger_);
-
-        apply(
-            DetachFunctor<D,EventGeneratorNode,
-                SharedPtrT<SignalNode<D,TDepValues>>...>{ *this },
-            deps_);
-
-        Engine::OnNodeDestroy(*this);
-    }
-
-    virtual const char* GetNodeType() const override        { return "EventGeneratorNode"; }
-    virtual int         DependencyCount() const override    { return 1 + sizeof...(TDepValues); }
-
-    virtual void Tick(void* turnPtr) override
-    {
-        struct EvalFunctor_
-        {
-            EvalFunctor_(const E& e, TFunc& f) :
-                MyEvent{ e },
-                MyFunc{ f }
-            {}
-
-            void operator()(const SharedPtrT<SignalNode<D,TDepValues>>& ... args)
-            {
-                MyFunc(MyEvent, args->ValueRef() ...);
-            }
-
-            const E&    MyEvent;
-            TFunc&      MyFunc;
-        };
-
-        typedef typename D::Engine::TurnT TurnT;
-        TurnT& turn = *reinterpret_cast<TurnT*>(turnPtr);
-
-        SetCurrentTurn(turn, true);
-        trigger_->SetCurrentTurn(turn);
-
-        REACT_LOG(D::Log().template Append<NodeEvaluateBeginEvent>(
-            GetObjectId(*this), turn.Id()));
-
-        for (const auto& e : trigger_->Events())
-            apply(EvalFunctor_{ e, func_ }, deps_);
-
-        REACT_LOG(D::Log().template Append<NodeEvaluateEndEvent>(
-            GetObjectId(*this), turn.Id()));
-
-        if (events_.size() > 0)
-            Engine::OnNodePulse(*this, turn);
-        else
-            Engine::OnNodeIdlePulse(*this, turn);
-    }
-
-private:
-    using DepHolderT = std::tuple<SharedPtrT<SignalNode<D,TDepValues>>...>;    
-
-    const SharedPtrT<EventStreamNode<D,E>>  trigger_;
-
-    TFunc       func_;
-    DepHolderT  deps_;
-};
-
 /****************************************/ REACT_IMPL_END /***************************************/
