summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Noetzli <andres.noetzli@gmail.com>2019-01-29 10:07:08 -0800
committerAndres Noetzli <andres.noetzli@gmail.com>2019-01-29 10:09:58 -0800
commit030cdf1e7f61034dda5b9ed8fd4925d87c6a1c3d (patch)
treef74ee561e2e0bcb4aa7edf3286a49f64b13e1f4d
parent467ef8692009f440bda74083d476131ff1e88b51 (diff)
Fix corner case in stripConstantEndpoints
`stripConstantEndpoints()` was returning `true` when the first argument was a list only containing an empty string, which could lead to rewrite loops. This commit checks for that case and adds a unit test for it.
-rw-r--r--src/theory/strings/theory_strings_rewriter.cpp6
-rw-r--r--test/unit/theory/theory_strings_rewriter_white.h17
2 files changed, 23 insertions, 0 deletions
diff --git a/src/theory/strings/theory_strings_rewriter.cpp b/src/theory/strings/theory_strings_rewriter.cpp
index 8e5e22d38..2123f8cdc 100644
--- a/src/theory/strings/theory_strings_rewriter.cpp
+++ b/src/theory/strings/theory_strings_rewriter.cpp
@@ -3596,6 +3596,12 @@ bool TheoryStringsRewriter::stripConstantEndpoints(std::vector<Node>& n1,
unsigned index1 = r == 0 ? 0 : n2.size() - 1;
bool removeComponent = false;
Node n1cmp = n1[index0];
+
+ if (n1cmp.isConst() && n1cmp.getConst<String>().size() == 0)
+ {
+ return false;
+ }
+
std::vector<Node> sss;
std::vector<Node> sls;
n1cmp = decomposeSubstrChain(n1cmp, sss, sls);
diff --git a/test/unit/theory/theory_strings_rewriter_white.h b/test/unit/theory/theory_strings_rewriter_white.h
index 59d36d9e8..4ad0b4ad2 100644
--- a/test/unit/theory/theory_strings_rewriter_white.h
+++ b/test/unit/theory/theory_strings_rewriter_white.h
@@ -1166,6 +1166,23 @@ class TheoryStringsRewriterWhite : public CxxTest::TestSuite
}
}
+ void testStripConstantEndpoints()
+ {
+ Node empty = d_nm->mkConst(::CVC4::String(""));
+ Node a = d_nm->mkConst(::CVC4::String("A"));
+
+ {
+ // stripConstantEndpoints({ "" }, { "a" }, {}, {}, 0) ---> false
+ std::vector<Node> n1 = {empty};
+ std::vector<Node> n2 = {a};
+ std::vector<Node> nb;
+ std::vector<Node> ne;
+ bool res =
+ TheoryStringsRewriter::stripConstantEndpoints(n1, n2, nb, ne, 0);
+ TS_ASSERT(!res);
+ }
+ }
+
private:
ExprManager* d_em;
SmtEngine* d_smt;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback