diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-04-28 11:15:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 11:15:00 -0500 |
| commit | 967332f464f3e26d43f05bb9c68a0be788337ef6 (patch) | |
| tree | 561391457c65750a8e7fac9b6656a7e7e4176a69 /src/options/language.h | |
| parent | 8ea1603f55d940e56ab3cbee8177f06200228aaa (diff) | |
Support the SMT-LIB Unicode string standard by default (#4378)
This PR merges --lang=smt2.6.1 and --lang=smt2.6 (default). It makes it so that 2.6 always expects the syntax of the string standard http://smtlib.cs.uiowa.edu/theories-UnicodeStrings.shtml.
I've updated the regressions so that the 2.6 benchmarks are now compliant with the standard. Some of the <=2.5 benchmarks I've updated to 2.6. Others I have left for now, in particular the ones that rely on special characters or ad-hoc escape sequences. The old formats will be supported in the release but removed shortly afterwards.
This PR is a prerequisite for the release, but not necessarily SMT-COMP (which will use --lang=smt2.6.1 if needed). Notice that we still do not have parsing support for str.replace_re or str.replace_re_all. This is required to be fully compliant.
Diffstat (limited to 'src/options/language.h')
| -rw-r--r-- | src/options/language.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/options/language.h b/src/options/language.h index 3a9ebf9d5..7866becd3 100644 --- a/src/options/language.h +++ b/src/options/language.h @@ -48,12 +48,10 @@ enum CVC4_PUBLIC Language LANG_SMTLIB_V2_0 = 0, /** The SMTLIB v2.5 input language */ LANG_SMTLIB_V2_5, - /** The SMTLIB v2.6 input language */ + /** The SMTLIB v2.6 input language, with support for the strings standard */ LANG_SMTLIB_V2_6, /** Backward-compatibility for enumeration naming */ LANG_SMTLIB_V2 = LANG_SMTLIB_V2_6, - /** The SMTLIB v2.6 input language, with support for the strings standard */ - LANG_SMTLIB_V2_6_1, /** The TPTP input language */ LANG_TPTP, /** The CVC4 input language */ @@ -87,7 +85,6 @@ inline std::ostream& operator<<(std::ostream& out, Language lang) { case LANG_SMTLIB_V2_6: out << "LANG_SMTLIB_V2_6"; break; - case LANG_SMTLIB_V2_6_1: out << "LANG_SMTLIB_V2_6_1"; break; case LANG_TPTP: out << "LANG_TPTP"; break; @@ -129,12 +126,10 @@ enum CVC4_PUBLIC Language LANG_SMTLIB_V2_0 = input::LANG_SMTLIB_V2_0, /** The SMTLIB v2.5 output language */ LANG_SMTLIB_V2_5 = input::LANG_SMTLIB_V2_5, - /** The SMTLIB v2.6 output language */ + /** The SMTLIB v2.6 output language, with support for the strings standard */ LANG_SMTLIB_V2_6 = input::LANG_SMTLIB_V2_6, /** Backward-compatibility for enumeration naming */ LANG_SMTLIB_V2 = input::LANG_SMTLIB_V2, - /** The SMTLIB v2.6 output language */ - LANG_SMTLIB_V2_6_1 = input::LANG_SMTLIB_V2_6_1, /** The TPTP output language */ LANG_TPTP = input::LANG_TPTP, /** The CVC4 output language */ @@ -168,7 +163,6 @@ inline std::ostream& operator<<(std::ostream& out, Language lang) { out << "LANG_SMTLIB_V2_5"; break; case LANG_SMTLIB_V2_6: out << "LANG_SMTLIB_V2_6"; break; - case LANG_SMTLIB_V2_6_1: out << "LANG_SMTLIB_V2_6_1"; break; case LANG_TPTP: out << "LANG_TPTP"; break; |