add Configuration::isCompetitionBuild() and some main driver fixes

diff --git a/src/main/getopt.cpp b/src/main/getopt.cpp
index 2b36a06d2703aec9508aa8bf3f0e2a9b56f5122a..ed196ac457458d31fcb93c2cebfb561288370a54 100644 (file)
--- a/src/main/getopt.cpp
+++ b/src/main/getopt.cpp
@@ -258,12 +258,13 @@ throw(OptionException) {
              Configuration::getVersionMinor(),
              Configuration::getVersionRelease());
       printf("\n");
-      printf("debug code: %s\n", Configuration::isDebugBuild() ? "yes" : "no");
-      printf("tracing   : %s\n", Configuration::isTracingBuild() ? "yes" : "no");
-      printf("muzzled   : %s\n", Configuration::isMuzzledBuild() ? "yes" : "no");
-      printf("assertions: %s\n", Configuration::isAssertionBuild() ? "yes" : "no");
-      printf("coverage  : %s\n", Configuration::isCoverageBuild() ? "yes" : "no");
-      printf("profiling : %s\n", Configuration::isProfilingBuild() ? "yes" : "no");
+      printf("debug code : %s\n", Configuration::isDebugBuild() ? "yes" : "no");
+      printf("tracing    : %s\n", Configuration::isTracingBuild() ? "yes" : "no");
+      printf("muzzled    : %s\n", Configuration::isMuzzledBuild() ? "yes" : "no");
+      printf("assertions : %s\n", Configuration::isAssertionBuild() ? "yes" : "no");
+      printf("coverage   : %s\n", Configuration::isCoverageBuild() ? "yes" : "no");
+      printf("profiling  : %s\n", Configuration::isProfilingBuild() ? "yes" : "no");
+      printf("competition: %s\n", Configuration::isCompetitionBuild() ? "yes" : "no");
       exit(0);
 
     case '?':

diff --git a/src/main/main.cpp b/src/main/main.cpp
index 855bcbddeeb0d4de7966bbbf50faa83f246ec96d..0cf712e3b3077d8c6f76aa756d953938cc520d9f 100644 (file)
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -182,6 +182,12 @@ int runCvc4(int argc, char* argv[]) {
     delete cmd;
   }
 
+#ifdef CVC4_COMPETITION_MODE
+  // exit, don't return
+  // (don't want destructors to run)
+  exit(0);
+#endif
+
   // Get ready for tear-down
   exprMgr.prepareToBeDestroyed();
 

diff --git a/src/util/configuration.cpp b/src/util/configuration.cpp
index 12908c672603a7c7f8ed1f6ef61c98a0b4cda103..0b751429ba3938ee96bcf55130a05f0a5d3b7c1c 100644 (file)
--- a/src/util/configuration.cpp
+++ b/src/util/configuration.cpp
@@ -73,6 +73,14 @@ bool Configuration::isProfilingBuild() {
 #endif /* CVC4_PROFILING */
 }
 
+bool Configuration::isCompetitionBuild() {
+#ifdef CVC4_COMPETITION_MODE
+  return true;
+#else /* CVC4_COMPETITION_MODE */
+  return false;
+#endif /* CVC4_COMPETITION_MODE */
+}
+
 string Configuration::getPackageName() {
   return PACKAGE_NAME;
 }

diff --git a/src/util/configuration.h b/src/util/configuration.h
index 6d5ac12a1689d3600324ddf35632247429d33d60..cca9202bfacd78c23c9146dec85fea5536d65748 100644 (file)
--- a/src/util/configuration.h
+++ b/src/util/configuration.h
@@ -49,6 +49,8 @@ public:
 
   static bool isProfilingBuild();
 
+  static bool isCompetitionBuild();
+
   static std::string getPackageName();
 
   static std::string getVersionString();