Moving Options fiddling to options.h

diff --git a/src/main/main.cpp b/src/main/main.cpp
index c740604c3ef2b21c1e68d98c694458a81b3a13ae..fcd322e993362ed4f903564b0f329f805408dfc0 100644 (file)
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -155,10 +155,6 @@ int runCvc4(int argc, char* argv[]) {
   // If in competition mode, set output stream option to flush immediately
 #ifdef CVC4_COMPETITION_MODE
   *options.out << unitbuf;
-  // competition mode implies --no-checking
-  options.semanticChecks = false;
-  options.typeChecking = false;
-  options.earlyTypeChecking = false;
 #endif
 
   // We only accept one input file

diff --git a/src/util/options.h b/src/util/options.h
index a7e9c8a2a8a75bd79ca2eb15d3d2ed21ed60fab6..350c031c71bd4098e59e0266474b32a2b450c86a 100644 (file)
--- a/src/util/options.h
+++ b/src/util/options.h
@@ -27,7 +27,7 @@
 #  define USE_EARLY_TYPE_CHECKING_BY_DEFAULT false
 #endif /* CVC4_DEBUG */
 
-#ifdef CVC4_MUZZLED
+#if defined(CVC4_MUZZLED) || defined(CVC4_COMPETITION_MODE)
 #  define DO_SEMANTIC_CHECKS_BY_DEFAULT false
 #else
 #  define DO_SEMANTIC_CHECKS_BY_DEFAULT true