Extended member variant of observe to support additional dependencies as well.

schlangster · schlangster · commit 08d8f30daa5b · 2014-05-16T01:36:06.000+02:00
diff --git a/include/react/Event.h b/include/react/Event.h
@@ -91,10 +91,10 @@ class Events : public REACT_IMPL::EventStreamBase<D,E>
         return REACT::Transform(*this, std::forward<F>(f));
     }
 
-    template <typename F>
-    Observer<D> Observe(F&& f) const
+    template <typename F, typename ... TDeps>
+    Observer<D> Observe(F&& f, const TDeps& ... deps) const
     {
-        return REACT::Observe(*this, std::forward<F>(f));
+        return REACT::Observe(*this, std::forward<F>(f), deps ...);
     }
 };
 
@@ -164,10 +164,10 @@ class Events<D,E&> : public REACT_IMPL::EventStreamBase<D,std::reference_wrapper
         return REACT::Transform(*this, std::forward<F>(f));
     }
 
-    template <typename F>
-    Observer<D> Observe(F&& f) const
+    template <typename F, typename ... TDeps>
+    Observer<D> Observe(F&& f, const TDeps& ... deps) const
     {
-        return REACT::Observe(*this, std::forward<F>(f));
+        return REACT::Observe(*this, std::forward<F>(f), deps ...);
     }
 };
 
diff --git a/src/test/ObserverTest.h b/src/test/ObserverTest.h
@@ -157,6 +157,19 @@ TYPED_TEST_P(ObserverTest, SyncedObserveTest)
         ASSERT_EQ(diff, 11);
     }, sum,prod,diff);
 
+    src1.Observe([] (int sum, int prod, int diff) {
+        ASSERT_EQ(sum, 33);
+        ASSERT_EQ(prod, 242);
+        ASSERT_EQ(diff, 11);
+    }, sum,prod,diff);
+
+    src2.Observe([] (int e, int sum, int prod, int diff) {
+        ASSERT_EQ(e, 42);
+        ASSERT_EQ(sum, 33);
+        ASSERT_EQ(prod, 242);
+        ASSERT_EQ(diff, 11);
+    }, sum,prod,diff);
+
     in1 <<= 22;
     in2 <<= 11;
 

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,10 @@ class Events : public REACT_IMPL::EventStreamBase<D,E>`
`91`	`91`	`return REACT::Transform(*this, std::forward<F>(f));`
`92`	`92`	`}`
`93`	`93`
`94`		`- template <typename F>`
`95`		`- Observer<D> Observe(F&& f) const`
	`94`	`+ template <typename F, typename ... TDeps>`
	`95`	`+ Observer<D> Observe(F&& f, const TDeps& ... deps) const`
`96`	`96`	`{`
`97`		`- return REACT::Observe(*this, std::forward<F>(f));`
	`97`	`+ return REACT::Observe(*this, std::forward<F>(f), deps ...);`
`98`	`98`	`}`
`99`	`99`	`};`
`100`	`100`
`@@ -164,10 +164,10 @@ class Events<D,E&> : public REACT_IMPL::EventStreamBase<D,std::reference_wrapper`
`164`	`164`	`return REACT::Transform(*this, std::forward<F>(f));`
`165`	`165`	`}`
`166`	`166`
`167`		`- template <typename F>`
`168`		`- Observer<D> Observe(F&& f) const`
	`167`	`+ template <typename F, typename ... TDeps>`
	`168`	`+ Observer<D> Observe(F&& f, const TDeps& ... deps) const`
`169`	`169`	`{`
`170`		`- return REACT::Observe(*this, std::forward<F>(f));`
	`170`	`+ return REACT::Observe(*this, std::forward<F>(f), deps ...);`
`171`	`171`	`}`
`172`	`172`	`};`
`173`	`173`