diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2021-06-28 15:45:51 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-28 20:45:51 +0000 |
commit | 8ca7aa981af4c6229746aa0c1b3f3f67ddb68b23 (patch) | |
tree | 7c354da7ce9d0023565fcbbae83bde222da53dea /src/api | |
parent | 43fffe772a89537dfecea7e63352a03b922a0fbc (diff) |
Rename internal string kinds to match API (#6797)
This commit replaces (old) internal string kind names to match the API / smt2 standard names.
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/cpp/cvc5.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/api/cpp/cvc5.cpp b/src/api/cpp/cvc5.cpp index 0228f6045..5a34f1453 100644 --- a/src/api/cpp/cvc5.cpp +++ b/src/api/cpp/cvc5.cpp @@ -312,11 +312,11 @@ const static std::unordered_map<Kind, cvc5::Kind> s_kinds{ {STRING_SUBSTR, cvc5::Kind::STRING_SUBSTR}, {STRING_UPDATE, cvc5::Kind::STRING_UPDATE}, {STRING_CHARAT, cvc5::Kind::STRING_CHARAT}, - {STRING_CONTAINS, cvc5::Kind::STRING_STRCTN}, - {STRING_INDEXOF, cvc5::Kind::STRING_STRIDOF}, + {STRING_CONTAINS, cvc5::Kind::STRING_CONTAINS}, + {STRING_INDEXOF, cvc5::Kind::STRING_INDEXOF}, {STRING_INDEXOF_RE, cvc5::Kind::STRING_INDEXOF_RE}, - {STRING_REPLACE, cvc5::Kind::STRING_STRREPL}, - {STRING_REPLACE_ALL, cvc5::Kind::STRING_STRREPLALL}, + {STRING_REPLACE, cvc5::Kind::STRING_REPLACE}, + {STRING_REPLACE_ALL, cvc5::Kind::STRING_REPLACE_ALL}, {STRING_REPLACE_RE, cvc5::Kind::STRING_REPLACE_RE}, {STRING_REPLACE_RE_ALL, cvc5::Kind::STRING_REPLACE_RE_ALL}, {STRING_TOLOWER, cvc5::Kind::STRING_TOLOWER}, @@ -352,10 +352,10 @@ const static std::unordered_map<Kind, cvc5::Kind> s_kinds{ {SEQ_EXTRACT, cvc5::Kind::STRING_SUBSTR}, {SEQ_UPDATE, cvc5::Kind::STRING_UPDATE}, {SEQ_AT, cvc5::Kind::STRING_CHARAT}, - {SEQ_CONTAINS, cvc5::Kind::STRING_STRCTN}, - {SEQ_INDEXOF, cvc5::Kind::STRING_STRIDOF}, - {SEQ_REPLACE, cvc5::Kind::STRING_STRREPL}, - {SEQ_REPLACE_ALL, cvc5::Kind::STRING_STRREPLALL}, + {SEQ_CONTAINS, cvc5::Kind::STRING_CONTAINS}, + {SEQ_INDEXOF, cvc5::Kind::STRING_INDEXOF}, + {SEQ_REPLACE, cvc5::Kind::STRING_REPLACE}, + {SEQ_REPLACE_ALL, cvc5::Kind::STRING_REPLACE_ALL}, {SEQ_REV, cvc5::Kind::STRING_REV}, {SEQ_PREFIX, cvc5::Kind::STRING_PREFIX}, {SEQ_SUFFIX, cvc5::Kind::STRING_SUFFIX}, @@ -620,11 +620,11 @@ const static std::unordered_map<cvc5::Kind, Kind, cvc5::kind::KindHashFunction> {cvc5::Kind::STRING_SUBSTR, STRING_SUBSTR}, {cvc5::Kind::STRING_UPDATE, STRING_UPDATE}, {cvc5::Kind::STRING_CHARAT, STRING_CHARAT}, - {cvc5::Kind::STRING_STRCTN, STRING_CONTAINS}, - {cvc5::Kind::STRING_STRIDOF, STRING_INDEXOF}, + {cvc5::Kind::STRING_CONTAINS, STRING_CONTAINS}, + {cvc5::Kind::STRING_INDEXOF, STRING_INDEXOF}, {cvc5::Kind::STRING_INDEXOF_RE, STRING_INDEXOF_RE}, - {cvc5::Kind::STRING_STRREPL, STRING_REPLACE}, - {cvc5::Kind::STRING_STRREPLALL, STRING_REPLACE_ALL}, + {cvc5::Kind::STRING_REPLACE, STRING_REPLACE}, + {cvc5::Kind::STRING_REPLACE_ALL, STRING_REPLACE_ALL}, {cvc5::Kind::STRING_REPLACE_RE, STRING_REPLACE_RE}, {cvc5::Kind::STRING_REPLACE_RE_ALL, STRING_REPLACE_RE_ALL}, {cvc5::Kind::STRING_TOLOWER, STRING_TOLOWER}, @@ -3208,10 +3208,10 @@ Kind Term::getKindHelper() const case cvc5::Kind::STRING_SUBSTR: return SEQ_EXTRACT; case cvc5::Kind::STRING_UPDATE: return SEQ_UPDATE; case cvc5::Kind::STRING_CHARAT: return SEQ_AT; - case cvc5::Kind::STRING_STRCTN: return SEQ_CONTAINS; - case cvc5::Kind::STRING_STRIDOF: return SEQ_INDEXOF; - case cvc5::Kind::STRING_STRREPL: return SEQ_REPLACE; - case cvc5::Kind::STRING_STRREPLALL: return SEQ_REPLACE_ALL; + case cvc5::Kind::STRING_CONTAINS: return SEQ_CONTAINS; + case cvc5::Kind::STRING_INDEXOF: return SEQ_INDEXOF; + case cvc5::Kind::STRING_REPLACE: return SEQ_REPLACE; + case cvc5::Kind::STRING_REPLACE_ALL: return SEQ_REPLACE_ALL; case cvc5::Kind::STRING_REV: return SEQ_REV; case cvc5::Kind::STRING_PREFIX: return SEQ_PREFIX; case cvc5::Kind::STRING_SUFFIX: return SEQ_SUFFIX; |