Use provided ostream for dag logging, allow to log dag from any CcsContext.

Author: hellige

api/ccs/context.h

@@ -1,6 +1,7 @@
 #ifndef CCS_CONTEXT_H_
 #define CCS_CONTEXT_H_
 
+#include <iosfwd>
 #include <memory>
 #include <sstream>
 #include <stdexcept>
@@ -35,6 +36,8 @@ class CcsContext {
 
   class Builder;
 
+  void logRuleDag(std::ostream &os) const;
+
   Builder builder() const;
 
   CcsContext constrain(const std::string &name) const

api/ccs/domain.h

@@ -2,7 +2,7 @@
 #define CCS_DOMAIN_H_
 
 #include <memory>
-#include <istream>
+#include <iosfwd>
 #include <string>
 
 #include "ccs/context.h"
@@ -44,7 +44,8 @@ class CcsDomain {
   CcsDomain &loadCcsStream(std::istream &stream, const std::string &fileName,
       ImportResolver &importResolver);
   RuleBuilder ruleBuilder();
-  void logRuleDag() const;
+
+  void logRuleDag(std::ostream &os) const;
 
   CcsContext build();
 };

src/context.cpp

@@ -40,6 +40,10 @@ CcsContext::CcsContext(const CcsContext &parent, const std::string &name,
     const std::vector<std::string> &values)
   : searchState(SearchState::newChild(parent.searchState, Key(name, values))) {}
 
+void CcsContext::logRuleDag(std::ostream &os) const {
+  searchState->logRuleDag(os);
+}
+
 CcsContext::Builder CcsContext::builder() const { return Builder(*this); }
 
 const CcsProperty &CcsContext::getProperty(const std::string &propertyName)

src/domain.cpp

@@ -59,10 +59,8 @@ CcsContext CcsDomain::build() {
   return CcsContext(dag->root(), log, logAccesses);
 }
 
-void CcsDomain::logRuleDag() const {
-  std::ostringstream os;
-  os << "CCS rule DAG: " << Dumper(*dag->root());
-  log.info(os.str());
+void CcsDomain::logRuleDag(std::ostream &os) const {
+  os << Dumper(*dag->root());
 }
 
 }

src/graphviz.cpp

@@ -91,7 +91,6 @@ void visit(const Dumper &dumper, std::ostream &os,
       visit(dumper, os, visited, tally.node());
     }
   }
-
 }
 
 }

src/search_state.h

@@ -11,6 +11,7 @@
 #include "dag/key.h"
 #include "dag/property.h"
 #include "dag/specificity.h"
+#include "graphviz.h"
 
 namespace ccs {
 
@@ -68,6 +69,13 @@ class SearchState {
   static std::shared_ptr<SearchState> newChild(
       const std::shared_ptr<const SearchState> &parent, const Key &key);
 
+  void logRuleDag(std::ostream &os) const {
+    if (parent)
+      parent->logRuleDag(os);
+    else
+      os << Dumper(*root);
+  }
+
   bool extendWith(const SearchState &priorState);
 
   const CcsProperty *findProperty(const std::string &propertyName) const;

test/acceptance_tests.cpp

@@ -108,7 +108,8 @@ TEST_P(AcceptanceTests, Load) {
   ccs.loadCcsStream(input, "<literal>", ImportResolver::None);
   CcsContext root = ccs.build();
 
-  //ccs.logRuleDag();
+  //ccs.logRuleDag(std::cout);
+  //std::cout << std::endl;
 
   for (auto it = test.assertions.cbegin(); it != test.assertions.cend(); ++it) {
     CcsContext ctx = root;