jchjava
diff --git a/‎include/react/Reactor.h‎
Lines changed: 6 additions & 0 deletions b/‎include/react/Reactor.h‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎include/react/detail/graph/ReactorNodes.h‎
Lines changed: 48 additions & 22 deletions b/‎include/react/detail/graph/ReactorNodes.h‎
Lines changed: 48 additions & 22 deletions
@@ -50,6 +50,12 @@ class Reactor
             node_.RepeatUntil(evn.NodePtr(), std::forward<F>(func));
         }
 
+        template <typename S>
+        const S& Get(const Signal<D,S>& sig)
+        {
+            return node_.Get(sig.NodePtr());
+        }
+
     private:
         NodeT&    node_;
     };
 
@@ -78,10 +78,7 @@ class ReactorNode :
 
         // First blocking event is not initiated by Tick() but after loop creation.
         NodeBase<D>* p = mainLoop_.get();
-
-        assert(p != nullptr);
-
-        Engine::OnNodeAttach(*this, *p);
+        doAttach(p);
 
         ++depCount_;
     }
@@ -101,8 +98,7 @@ class ReactorNode :
 
         if (p != nullptr)
         {
-            Engine::OnDynamicNodeAttach(*this, *p, *turnPtr_);
-            ++depCount_;
+            doDynAttach(p);
         }
         else
         {
@@ -126,10 +122,7 @@ class ReactorNode :
         while (! checkEvent(events))
             (*curOutPtr_)(nullptr);
 
-        assert(turnPtr_ != nullptr);
-
-        Engine::OnDynamicNodeDetach(*this, *events, *turnPtr_);
-        --depCount_;
+        doDynDetach(events.get());
 
         auto index = offsets_[reinterpret_cast<uintptr_t>(events.get())]++;
         return events->Events()[index];
@@ -147,8 +140,7 @@ class ReactorNode :
         {
             // Non-dynamic attach in case first loop until is encountered before the loop was
             // suspended for the first time.
-            Engine::OnNodeAttach(*this, *eventsPtr);
-            ++depCount_;
+            doAttach(eventsPtr.get());
         }
 
         // Don't enter loop if event already present
@@ -190,18 +182,20 @@ class ReactorNode :
         --depCount_;
     }
 
-    //template <typename S>
-    //S& Get(const std::shared_ptr<SignalNode<D,S>>& sig)
-    //{
-    //    // Attach to target signal node
-    //    (*curOutPtr_)(sig.get());
+    template <typename S>
+    const S& Get(const std::shared_ptr<SignalNode<D,S>>& sigPtr)
+    {
+        // Do dynamic attach followed by attach if Get() happens during a turn.
+        if (turnPtr_ != nullptr)
+        {
+            // Request attach
+            (*curOutPtr_)(sigPtr.get());
 
-    //    Engine::OnDynamicNodeDetach(*this, *events, *turnPtr_);
-    //    --depCount_;
+            doDynDetach(sigPtr.get());
+        }
 
-    //    auto index = offsets_[reinterpret_cast<uintptr_t>(events.get())]++;
-    //    return events->Events()[index];
-    //}
+        return sigPtr->ValueRef();
+    }
 
 private:
     template <typename E>
@@ -216,6 +210,38 @@ class ReactorNode :
         return offsets_[index] < events->Events().size();
     }
 
+    void doAttach(NodeBase<D>* nodePtr)
+    {
+        assert(nodePtr != nullptr);
+        assert(turnPtr_ == nullptr);
+        Engine::OnNodeAttach(*this, *nodePtr);
+        ++depCount_;
+    }
+
+    void doDetach(NodeBase<D>* nodePtr)
+    {
+        assert(nodePtr != nullptr);
+        assert(turnPtr_ == nullptr);
+        Engine::OnNodeDetach(*this, *nodePtr);
+        --depCount_;
+    }
+
+    void doDynAttach(NodeBase<D>* nodePtr)
+    {
+        assert(nodePtr != nullptr);
+        assert(turnPtr_ != nullptr);
+        Engine::OnDynamicNodeAttach(*this, *nodePtr, *turnPtr_);
+        ++depCount_;
+    }
+
+    void doDynDetach(NodeBase<D>* nodePtr)
+    {
+        assert(nodePtr != nullptr);
+        assert(turnPtr_ != nullptr);
+        Engine::OnDynamicNodeDetach(*this, *nodePtr, *turnPtr_);
+        --depCount_;
+    }
+
     std::function<void(TContext)>    func_;
 
     PullT   mainLoop_;