From 967332f464f3e26d43f05bb9c68a0be788337ef6 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Tue, 28 Apr 2020 11:15:00 -0500 Subject: 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. --- contrib/competitions/smt-comp/run-script-smtcomp-current | 4 ++-- contrib/competitions/smt-comp/run-script-smtcomp-current-unsat-cores | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/competitions/smt-comp/run-script-smtcomp-current b/contrib/competitions/smt-comp/run-script-smtcomp-current index 8a1d674ed..c7f9d0a71 100755 --- a/contrib/competitions/smt-comp/run-script-smtcomp-current +++ b/contrib/competitions/smt-comp/run-script-smtcomp-current @@ -141,8 +141,8 @@ QF_ALIA) finishwith --decision=justification-stoponly --no-arrays-eager-index --arrays-eager-lemmas ;; QF_S|QF_SLIA) - trywith 300 --strings-exp --rewrite-divk --lang=smt2.6.1 --strings-fmf - finishwith --strings-exp --rewrite-divk --lang=smt2.6.1 + trywith 300 --strings-exp --rewrite-divk --strings-fmf + finishwith --strings-exp --rewrite-divk ;; QF_ABVFP) finishwith --fp-exp diff --git a/contrib/competitions/smt-comp/run-script-smtcomp-current-unsat-cores b/contrib/competitions/smt-comp/run-script-smtcomp-current-unsat-cores index 5e827128e..6cebad7fd 100755 --- a/contrib/competitions/smt-comp/run-script-smtcomp-current-unsat-cores +++ b/contrib/competitions/smt-comp/run-script-smtcomp-current-unsat-cores @@ -66,7 +66,7 @@ QF_ALIA) finishwith --decision=justification-stoponly --no-arrays-eager-index --arrays-eager-lemmas ;; QF_S|QF_SLIA) - finishwith --strings-exp --rewrite-divk --lang=smt2.6.1 + finishwith --strings-exp --rewrite-divk ;; QF_ABVFP) finishwith --fp-exp -- cgit v1.2.3