Shuffling around public vs. private headers

- Adding a script contrib/test_install_headers.h that tests whether one can include all cvc4_public headers. CVC4 can pass this test after this commit.
- Making lib/{clock_gettime.h,ffs.h,strtok_r.h} cvc4_private.
- Making prop/sat_solver_factory.h cvc4_private.
- Moving the expr iostream manipulators into their own files: expr_iomanip.{h,cpp}.
- Setting the generated *_options.h files back to being cvc4_private.
-- Removing the usage of options/expr_options.h from expr.h.
-- Removing the include of base_options.h from options.h.
- Cleaning up CPP macros in cvc4_public headers.
-- Changing the ROLL macro in floatingpoint.h into an inline function.
-- Removing the now unused flag -D__BUILDING_STATISTICS_FOR_EXPORT.

8 files changed, 12 insertions, 9 deletions

diff --git a/src/options/base_options_template.h b/src/options/base_options_template.h
index e43d2848e..c8c02ecaa 100644
--- a/src/options/base_options_template.h
+++ b/src/options/base_options_template.h
@@ -14,7 +14,7 @@
  ** Contains code for handling command-line options
  **/
 
-#include "cvc4_public.h"
+#include "cvc4_private.h"
 
 #ifndef __CVC4__OPTIONS__${module_id}_H
 #define __CVC4__OPTIONS__${module_id}_H
diff --git a/src/options/boolean_term_conversion_mode.h b/src/options/boolean_term_conversion_mode.h
index 65cc7a8a5..81a0c661a 100644
--- a/src/options/boolean_term_conversion_mode.h
+++ b/src/options/boolean_term_conversion_mode.h
@@ -26,7 +26,7 @@ namespace CVC4 {
 namespace theory {
 namespace booleans {
 
-typedef enum {
+enum BooleanTermConversionMode {
   /**
    * Convert Boolean terms to bitvectors of size 1.
    */
@@ -41,7 +41,7 @@ typedef enum {
    */
   BOOLEAN_TERM_CONVERT_NATIVE
 
-} BooleanTermConversionMode;
+};
 
 }/* CVC4::theory::booleans namespace */
 }/* CVC4::theory namespace */
diff --git a/src/options/bv_bitblast_mode.h b/src/options/bv_bitblast_mode.h
index 08a6e4077..f36021478 100644
--- a/src/options/bv_bitblast_mode.h
+++ b/src/options/bv_bitblast_mode.h
@@ -64,8 +64,8 @@ enum BvSlicerMode {
 }/* CVC4::theory::bv namespace */
 }/* CVC4::theory namespace */
 
-std::ostream& operator<<(std::ostream& out, theory::bv::BitblastMode mode) CVC4_PUBLIC;
-std::ostream& operator<<(std::ostream& out, theory::bv::BvSlicerMode mode) CVC4_PUBLIC;
+std::ostream& operator<<(std::ostream& out, theory::bv::BitblastMode mode);
+std::ostream& operator<<(std::ostream& out, theory::bv::BvSlicerMode mode);
 
 }/* CVC4 namespace */
 
diff --git a/src/options/decision_mode.cpp b/src/options/decision_mode.cpp
index 168637e64..0aeae1baa 100644
--- a/src/options/decision_mode.cpp
+++ b/src/options/decision_mode.cpp
@@ -17,6 +17,8 @@
 
 #include "options/decision_mode.h"
 
+#include <iostream>
+
 namespace CVC4 {
 
 std::ostream& operator<<(std::ostream& out, decision::DecisionMode mode) {
diff --git a/src/options/decision_mode.h b/src/options/decision_mode.h
index fb01c587b..420d00b4c 100644
--- a/src/options/decision_mode.h
+++ b/src/options/decision_mode.h
@@ -20,7 +20,7 @@
 #ifndef __CVC4__SMT__DECISION_MODE_H
 #define __CVC4__SMT__DECISION_MODE_H
 
-#include <iostream>
+#include <iosfwd>
 
 namespace CVC4 {
 namespace decision {
@@ -57,7 +57,7 @@ enum DecisionWeightInternal {
 
 }/* CVC4::decision namespace */
 
-std::ostream& operator<<(std::ostream& out, decision::DecisionMode mode) CVC4_PUBLIC;
+std::ostream& operator<<(std::ostream& out, decision::DecisionMode mode);
 
 }/* CVC4 namespace */
 
diff --git a/src/options/decision_weight.h b/src/options/decision_weight.h
index 42f1d5b6d..89ebe8a21 100644
--- a/src/options/decision_weight.h
+++ b/src/options/decision_weight.h
@@ -21,7 +21,9 @@
 
 namespace CVC4 {
 namespace decision {
+
 typedef uint64_t DecisionWeight;
+
 }/* CVC4::decision namespace */
 }/* CVC4 namespace */
 
diff --git a/src/options/options.h b/src/options/options.h
index fc3bf40ac..a83de9acb 100644
--- a/src/options/options.h
+++ b/src/options/options.h
@@ -164,6 +164,4 @@ public:
 
 }/* CVC4 namespace */
 
-#include "options/base_options.h"
-
 #endif /* __CVC4__OPTIONS__OPTIONS_H */
diff --git a/src/options/set_language.cpp b/src/options/set_language.cpp
index db0275e04..f68adbb45 100644
--- a/src/options/set_language.cpp
+++ b/src/options/set_language.cpp
@@ -18,6 +18,7 @@
 #include <iosfwd>
 #include <iomanip>
 
+#include "options/base_options.h"
 #include "options/language.h"
 #include "options/options.h"