Removing StatisticsRegistry's static functions current() and registerStat().

- The functionality the get the StatisticsRegistry attached to the SmtEngine was previously through StatisticsRegistry::current(). This is the dominant StatisticsRegistry in the code. (There is another StatisticsRegistry attached to the NodeManager.) Having this be a static function on StatisticsRegistry requires the use of an SmtEngine in the wrong compilation unit.
- Usages of StatisticsRegistry::current() that were visible in prop/{bvminisat,minisat} has been removed. A pointer to the relevant StatisticsRegistry should be passed instead into the constructor.
- The function StatisticsRegistry::current() has been replaced by SmtScope::currentStatisticsRegistry(). SmtScope is in the libcvc4 package, where SmtEngine is available in the compilation unit.
- The function smtStatisticsRegistry() is a synonym for SmtScope::currentStatisticsRegistry() in smt/smt_statistics_registry.h. This header has fewer include dependencies than the one for SmtScope.
- Correspondingly, the static functions StatisticsRegistry::{registerStat, unregisterStat} have been removed. One should instead use smtStatisticsRegistry()->{registerStat,unregisterStat} instead.
- The KEEP_STATISTIC macro has been moved into smt/smt_statistics_registry.h.
- Documents the reason StatisticsRegistry is CVC4_PUBLIC. This lets me remove the warning I added.
- Removing most operators for timespec from statistics_registry.h file. These a bit error prone in clang.
- Most of the really confusing ifdef's in util/statistics_registry.h are gone.

1 files changed, 23 insertions, 22 deletions

diff --git a/src/theory/ite_utilities.cpp b/src/theory/ite_utilities.cpp
index 20464b14e..2791a9555 100644
--- a/src/theory/ite_utilities.cpp
+++ b/src/theory/ite_utilities.cpp
@@ -16,10 +16,11 @@
  ** Kim, Somenzi, Jin.  Efficient Term-ITE Conversion for SMT.  FMCAD 2009.
  ** Burch, Jerry.  Techniques for Verifying Superscalar Microprocessors.  DAC '96
  **/
-
-
 #include "theory/ite_utilities.h"
+
 #include <utility>
+
+#include "smt/smt_statistics_registry.h"
 #include "theory/rewriter.h"
 #include "theory/theory.h"
 
@@ -276,13 +277,13 @@ ITECompressor::Statistics::Statistics():
   d_compressCalls("ite-simp::compressCalls", 0),
   d_skolemsAdded("ite-simp::skolems", 0)
 {
-  StatisticsRegistry::registerStat(&d_compressCalls);
-  StatisticsRegistry::registerStat(&d_skolemsAdded);
+  smtStatisticsRegistry()->registerStat(&d_compressCalls);
+  smtStatisticsRegistry()->registerStat(&d_skolemsAdded);
 
 }
 ITECompressor::Statistics::~Statistics(){
-  StatisticsRegistry::unregisterStat(&d_compressCalls);
-  StatisticsRegistry::unregisterStat(&d_skolemsAdded);
+  smtStatisticsRegistry()->unregisterStat(&d_compressCalls);
+  smtStatisticsRegistry()->unregisterStat(&d_skolemsAdded);
 }
 
 Node ITECompressor::push_back_boolean(Node original, Node compressed){
@@ -611,25 +612,25 @@ ITESimplifier::Statistics::Statistics():
   d_simpITEVisits("ite-simp::simpITE.visits", 0),
   d_inSmaller("ite-simp::inSmaller")
 {
-  StatisticsRegistry::registerStat(&d_maxNonConstantsFolded);
-  StatisticsRegistry::registerStat(&d_unexpected);
-  StatisticsRegistry::registerStat(&d_unsimplified);
-  StatisticsRegistry::registerStat(&d_exactMatchFold);
-  StatisticsRegistry::registerStat(&d_binaryPredFold);
-  StatisticsRegistry::registerStat(&d_specialEqualityFolds);
-  StatisticsRegistry::registerStat(&d_simpITEVisits);
-  StatisticsRegistry::registerStat(&d_inSmaller);
+  smtStatisticsRegistry()->registerStat(&d_maxNonConstantsFolded);
+  smtStatisticsRegistry()->registerStat(&d_unexpected);
+  smtStatisticsRegistry()->registerStat(&d_unsimplified);
+  smtStatisticsRegistry()->registerStat(&d_exactMatchFold);
+  smtStatisticsRegistry()->registerStat(&d_binaryPredFold);
+  smtStatisticsRegistry()->registerStat(&d_specialEqualityFolds);
+  smtStatisticsRegistry()->registerStat(&d_simpITEVisits);
+  smtStatisticsRegistry()->registerStat(&d_inSmaller);
 }
 
 ITESimplifier::Statistics::~Statistics(){
-  StatisticsRegistry::unregisterStat(&d_maxNonConstantsFolded);
-  StatisticsRegistry::unregisterStat(&d_unexpected);
-  StatisticsRegistry::unregisterStat(&d_unsimplified);
-  StatisticsRegistry::unregisterStat(&d_exactMatchFold);
-  StatisticsRegistry::unregisterStat(&d_binaryPredFold);
-  StatisticsRegistry::unregisterStat(&d_specialEqualityFolds);
-  StatisticsRegistry::unregisterStat(&d_simpITEVisits);
-  StatisticsRegistry::unregisterStat(&d_inSmaller);
+  smtStatisticsRegistry()->unregisterStat(&d_maxNonConstantsFolded);
+  smtStatisticsRegistry()->unregisterStat(&d_unexpected);
+  smtStatisticsRegistry()->unregisterStat(&d_unsimplified);
+  smtStatisticsRegistry()->unregisterStat(&d_exactMatchFold);
+  smtStatisticsRegistry()->unregisterStat(&d_binaryPredFold);
+  smtStatisticsRegistry()->unregisterStat(&d_specialEqualityFolds);
+  smtStatisticsRegistry()->unregisterStat(&d_simpITEVisits);
+  smtStatisticsRegistry()->unregisterStat(&d_inSmaller);
 }
 
 bool ITESimplifier::isConstantIte(TNode e){