Separate public-facing and internal-facing interfaces to Statistics.

The external interface (e.g., what's answered by ExprManager::getStatistics() and SmtEngine::getStatistics()) is a snapshot of the current statistics (rather than a reference to the actual StatisticsRegistry).

The StatisticsRegistry is now internal-only.  However, it's built as a convenience library so that the parser and driver can use it too (by re-linking against it).

This is part of the ongoing effort to clean up the public interface.

(this commit was certified error- and warning-free by the test-and-commit script.)

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/main.cpp b/src/main/main.cpp
index 70f2783a5..73936526f 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -26,6 +26,7 @@
 
 #include "main/main.h"
 #include "main/interactive_shell.h"
+#include "main/command_executor.h"
 #include "parser/parser.h"
 #include "parser/parser_builder.h"
 #include "parser/parser_exception.h"
@@ -38,7 +39,7 @@
 #include "theory/uf/options.h"
 #include "util/output.h"
 #include "util/result.h"
-#include "util/stats.h"
+#include "util/statistics.h"
 
 using namespace std;
 using namespace CVC4;
@@ -66,8 +67,8 @@ int main(int argc, char* argv[]) {
     *opts[options::out] << "unknown" << endl;
 #endif
     *opts[options::err] << "CVC4 Error:" << endl << e << endl;
-    if(opts[options::statistics] && pStatistics != NULL) {
-      pStatistics->flushInformation(*opts[options::err]);
+    if(opts[options::statistics] && pExecutor != NULL) {
+      pExecutor->flushStatistics(*opts[options::err]);
     }
   }
   exit(1);