diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-09-27 22:04:38 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-09-27 22:04:38 +0000 |
| commit | ad0a71e2782bc291ba9f808d24df2e1d8ca1b41e (patch) | |
| tree | 744a9ae0f10f6dd8837d7e0dcd8bd2b25d34e481 /src/util | |
| parent | 51daaee8eb1ee55ee3323c5395a95fd121fe87a8 (diff) | |
* Rename SMT parts (printer, parser) to SMT1
* Change --lang smt to mean SMT-LIBv2
* --lang smt1 now means SMT-LIBv1
* SMT-LIBv2 parser now gives helpful error if input looks like v1
* SMT-LIBv1 parser now gives helpful error if input looks like v2
* CVC presentation language parser now gives helpful error if input
looks like either SMT-LIB v1 or v2
* Other associated changes
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/language.cpp | 4 | ||||
| -rw-r--r-- | src/util/language.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/util/language.cpp b/src/util/language.cpp index 1792797cf..22e9840d7 100644 --- a/src/util/language.cpp +++ b/src/util/language.cpp @@ -23,7 +23,7 @@ namespace language { InputLanguage toInputLanguage(OutputLanguage language) { switch(language) { - case output::LANG_SMTLIB: + case output::LANG_SMTLIB_V1: case output::LANG_SMTLIB_V2: case output::LANG_TPTP: case output::LANG_CVC4: @@ -41,7 +41,7 @@ InputLanguage toInputLanguage(OutputLanguage language) { OutputLanguage toOutputLanguage(InputLanguage language) { switch(language) { - case input::LANG_SMTLIB: + case input::LANG_SMTLIB_V1: case input::LANG_SMTLIB_V2: case input::LANG_CVC4: case input::LANG_TPTP: diff --git a/src/util/language.h b/src/util/language.h index b84d45d89..867c61be3 100644 --- a/src/util/language.h +++ b/src/util/language.h @@ -44,8 +44,8 @@ enum CVC4_PUBLIC Language { // OUTPUT LANGUAGE, IF IT IS "IN PRINCIPLE" A COMMON LANGUAGE, // INCLUDE IT HERE - /** The SMTLIB input language */ - LANG_SMTLIB = 0, + /** The SMTLIB v1 input language */ + LANG_SMTLIB_V1 = 0, /** The SMTLIB v2 input language */ LANG_SMTLIB_V2, /** The TPTP input language */ @@ -66,8 +66,8 @@ inline std::ostream& operator<<(std::ostream& out, Language lang) { case LANG_AUTO: out << "LANG_AUTO"; break; - case LANG_SMTLIB: - out << "LANG_SMTLIB"; + case LANG_SMTLIB_V1: + out << "LANG_SMTLIB_V1"; break; case LANG_SMTLIB_V2: out << "LANG_SMTLIB_V2"; @@ -101,8 +101,8 @@ enum CVC4_PUBLIC Language { // OUTPUT LANGUAGE, IF IT IS "IN PRINCIPLE" A COMMON LANGUAGE, // INCLUDE IT HERE - /** The SMTLIB output language */ - LANG_SMTLIB = input::LANG_SMTLIB, + /** The SMTLIB v1 output language */ + LANG_SMTLIB_V1 = input::LANG_SMTLIB_V1, /** The SMTLIB v2 output language */ LANG_SMTLIB_V2 = input::LANG_SMTLIB_V2, /** The TPTP output language */ @@ -123,8 +123,8 @@ enum CVC4_PUBLIC Language { inline std::ostream& operator<<(std::ostream& out, Language lang) CVC4_PUBLIC; inline std::ostream& operator<<(std::ostream& out, Language lang) { switch(lang) { - case LANG_SMTLIB: - out << "LANG_SMTLIB"; + case LANG_SMTLIB_V1: + out << "LANG_SMTLIB_V1"; break; case LANG_SMTLIB_V2: out << "LANG_SMTLIB_V2"; |