summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Noetzli <andres.noetzli@gmail.com>2019-12-03 21:32:39 -0800
committerAndres Noetzli <andres.noetzli@gmail.com>2019-12-03 21:32:39 -0800
commit350c7043982b97494d606eca9e8f5a4c10588125 (patch)
treee11d5ea8bd5b04a3291ad4baee62ae4dcfd8a9f9
parent2003f44c8b27ed197bcf529d9717f1f275c4ca04 (diff)
minor fix
-rw-r--r--src/theory/strings/theory_strings.cpp3
-rw-r--r--src/theory/strings/theory_strings_preprocess.cpp3
-rw-r--r--src/theory/strings/theory_strings_rewriter.cpp3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/theory/strings/theory_strings.cpp b/src/theory/strings/theory_strings.cpp
index df2364790..ade34a1f1 100644
--- a/src/theory/strings/theory_strings.cpp
+++ b/src/theory/strings/theory_strings.cpp
@@ -505,6 +505,7 @@ bool TheoryStrings::collectModelInfo(TheoryModel* m)
// assert the (relevant) portion of the equality engine to the model
if (!m->assertEqualityEngine(&d_equalityEngine, &termSet))
{
+ Trace("strings-model") << "TheoryStrings : assertEqualityEngine ---> :(" << std::endl;
return false;
}
@@ -1646,7 +1647,7 @@ void TheoryStrings::checkExtfEval( int effort ) {
Trace("strings-extf") << " resolve extf : " << sn << " -> " << nrc << std::endl;
d_im.sendInference(
einfo.d_exp, conc, effort == 0 ? "EXTF" : "EXTF-N", true);
- if (!d_state.isInConflict())
+ if (d_state.isInConflict())
{
Trace("strings-extf-debug") << " conflict, return." << std::endl;
return;
diff --git a/src/theory/strings/theory_strings_preprocess.cpp b/src/theory/strings/theory_strings_preprocess.cpp
index dd5f98db1..1b877e0e7 100644
--- a/src/theory/strings/theory_strings_preprocess.cpp
+++ b/src/theory/strings/theory_strings_preprocess.cpp
@@ -363,6 +363,9 @@ Node StringsPreprocess::simplify( Node t, std::vector< Node > &new_nodes ) {
lem = d_zero.eqNode(nm->mkNode(APPLY_UF, u, d_zero));
conc2.push_back(lem);
+ lem = nm->mkNode(GEQ, stoit, d_zero);
+ conc2.push_back(lem);
+
/*
lem = d_empty_str.eqNode(nm->mkNode(APPLY_UF, us, lens));
conc2.push_back(lem);
diff --git a/src/theory/strings/theory_strings_rewriter.cpp b/src/theory/strings/theory_strings_rewriter.cpp
index bd570b446..281df2d33 100644
--- a/src/theory/strings/theory_strings_rewriter.cpp
+++ b/src/theory/strings/theory_strings_rewriter.cpp
@@ -1691,8 +1691,7 @@ RewriteResponse TheoryStringsRewriter::postRewrite(TNode node) {
nm->mkNode(AND, nm->mkNode(LEQ, zero, c), nm->mkNode(LT, c, ten)),
c,
negOne);
- }
- */
+ }*/
}
else if (nk == kind::STRING_IN_REGEXP)
{
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback