fix integration in nl c15 project

Author: Henry Hoegelow

CMakeLists.txt

@@ -43,4 +43,4 @@ target_include_directories(reactive PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 if (ENABLE_TESTING)
     enable_testing()
     add_subdirectory(tests)
-endif ()
+endif ()

src/Computation.cpp

@@ -3,6 +3,7 @@
 #include <reactive/Computation.h>
 
 #include "ComputationsImpl.h"
+#include "reactive/Deferrer.h"
 
 #include <cassert>
 
@@ -29,7 +30,13 @@ namespace Reactive
   {
     auto pThis = this;
     std::swap(tl_currentComputation, pThis);
-    m_cb();
+    try
+    {
+      m_cb();
+    }
+    catch(...)
+    {
+    }
     std::swap(tl_currentComputation, pThis);
   }
 
@@ -61,6 +68,7 @@ namespace Reactive
 
   void Computation::resolveDirtynessDownstream()
   {
+    Deferrer deferrer;
     for(const auto v : m_registeredVars)
       v->resolveDirtynessDownstream();
   }

src/Deferrer.cpp

@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <chrono>
+#include <iostream>
 
 namespace Reactive
 {
@@ -25,7 +26,6 @@ namespace Reactive
 
       auto cp = std::move(m_pending);
 
-
       while(true)
       {
         std::pair<Deferrable *, Computation *> lowestDepth = { nullptr, nullptr };
@@ -37,12 +37,14 @@ namespace Reactive
             auto newLowestDepth = s->getLowest(lowestDepth.second);
 
             if(newLowestDepth != lowestDepth.second)
-              lowestDepth = {s.get(), newLowestDepth};
+              lowestDepth = { s.get(), newLowestDepth };
           }
         }
 
         if(lowestDepth.first && lowestDepth.second)
+        {
           lowestDepth.first->doDeferred(lowestDepth.second);
+        }
         else
           break;
       }

src/Var.cpp

@@ -35,8 +35,7 @@ namespace Reactive::Detail
 
   void VarBase::onWriteAccess() const
   {
-    Deferrer deferer;
-
+    Deferrer deferrer;
     auto current = Computation::getCurrentComputation();
 
     m_computationsLocked = true;