Remove support for CVC3 language. (#6369)

3 files changed, 12 insertions, 18 deletions

diff --git a/src/options/language.cpp b/src/options/language.cpp
index 13384164a..bf17e91f9 100644
--- a/src/options/language.cpp
+++ b/src/options/language.cpp
@@ -111,23 +111,22 @@ OutputLanguage toOutputLanguage(InputLanguage language) {
   }/* switch(language) */
 }/* toOutputLanguage() */
 
-OutputLanguage toOutputLanguage(std::string language) {
-  if (language == "cvc4" || language == "pl" || language == "presentation"
+OutputLanguage toOutputLanguage(std::string language)
+{
+  if (language == "cvc" || language == "pl" || language == "presentation"
       || language == "native" || language == "LANG_CVC")
   {
     return output::LANG_CVC;
   }
-  else if (language == "cvc3" || language == "LANG_CVC3")
-  {
-    return output::LANG_CVC3;
-  }
   else if (language == "smtlib" || language == "smt" || language == "smtlib2"
            || language == "smt2" || language == "smtlib2.6"
            || language == "smt2.6" || language == "LANG_SMTLIB_V2_6"
            || language == "LANG_SMTLIB_V2")
   {
     return output::LANG_SMTLIB_V2_6;
-  } else if(language == "tptp" || language == "LANG_TPTP") {
+  }
+  else if (language == "tptp" || language == "LANG_TPTP")
+  {
     return output::LANG_TPTP;
   }
   else if (language == "sygus" || language == "LANG_SYGUS"
@@ -144,11 +143,12 @@ OutputLanguage toOutputLanguage(std::string language) {
     return output::LANG_AUTO;
   }
 
-  throw OptionException(std::string("unknown output language `" + language + "'"));
-}/* toOutputLanguage() */
+  throw OptionException(
+      std::string("unknown output language `" + language + "'"));
+}
 
 InputLanguage toInputLanguage(std::string language) {
-  if (language == "cvc4" || language == "pl" || language == "presentation"
+  if (language == "cvc" || language == "pl" || language == "presentation"
       || language == "native" || language == "LANG_CVC")
   {
     return input::LANG_CVC;
diff --git a/src/options/language.h b/src/options/language.h
index 413ef59ed..54e0e9dfa 100644
--- a/src/options/language.h
+++ b/src/options/language.h
@@ -114,8 +114,6 @@ enum CVC4_EXPORT Language
 
   /** The AST output language */
   LANG_AST = 10,
-  /** The CVC3-compatibility output language */
-  LANG_CVC3,
 
   /** LANG_MAX is > any valid OutputLanguage id */
   LANG_MAX
@@ -133,9 +131,6 @@ inline std::ostream& operator<<(std::ostream& out, Language lang) {
   case LANG_AST:
     out << "LANG_AST";
     break;
-  case LANG_CVC3:
-    out << "LANG_CVC3";
-    break;
   default:
     out << "undefined_output_language";
   }
diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp
index c06a7aab3..91d06dec2 100644
--- a/src/options/options_template.cpp
+++ b/src/options/options_template.cpp
@@ -290,7 +290,7 @@ static const std::string languageDescription =
     "\
 Languages currently supported as arguments to the -L / --lang option:\n\
   auto                           attempt to automatically determine language\n\
-  cvc4 | presentation | pl       cvc5 presentation language\n\
+  cvc | presentation | pl        CVC presentation language\n\
   smt | smtlib | smt2 |\n\
   smt2.6 | smtlib2.6             SMT-LIB format 2.6 with support for the strings standard\n\
   tptp                           TPTP format (cnf, fof and tff)\n\
@@ -298,8 +298,7 @@ Languages currently supported as arguments to the -L / --lang option:\n\
 \n\
 Languages currently supported as arguments to the --output-lang option:\n\
   auto                           match output language to input language\n\
-  cvc4 | presentation | pl       cvc5 presentation language\n\
-  cvc3                           CVC3 presentation language\n\
+  cvc | presentation | pl        CVC presentation language\n\
   smt | smtlib | smt2 |\n\
   smt2.6 | smtlib2.6             SMT-LIB format 2.6 with support for the strings standard\n\
   tptp                           TPTP format\n\