mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 14:13:23 +00:00
Code Activity

add caching to theory_str::mk_concat, WIP

Browse source
This commit is contained in:
Murphy Berzish 2016-09-12 17:17:17 -04:00
parent 015016c92b
commit ca71a20ab7
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/smt/theory_str.cpp
View file

@ -735,16 +735,14 @@ expr * theory_str::mk_concat(expr * n1, expr * n2) {
// * expr * ast2 = mk_2_arg_app(ctx, td->Concat, n1, n2); // * expr * ast2 = mk_2_arg_app(ctx, td->Concat, n1, n2);
// Z3 treats (ast1) and (ast2) as two different nodes. // Z3 treats (ast1) and (ast2) as two different nodes.
//------------------------------------------------------- //-------------------------------------------------------
std::pair<expr*, expr*> concatArgs(n1, n2);
expr * concatAst = NULL; expr * concatAst = NULL;
// TODO NEXT add cache lookups. I think we need to be more careful than just using std:: data structures here
/* if (!concat_astNode_map.find(n1, n2, concatAst)) {
if (concat_astNode_map.find(concatArgs) == concat_astNode_map.end()) {
*/
if (true) {
expr * args[2] = {n1, n2}; expr * args[2] = {n1, n2};
concatAst = m.mk_app(get_id(), OP_STRCAT, 0, 0, 2, args); concatAst = m.mk_app(get_id(), OP_STRCAT, 0, 0, 2, args);
// concat_astNode_map[concatArgs] = concatAst; m_trail.push_back(concatAst);
concat_astNode_map.insert(n1, n2, concatAst);
expr_ref concat_length(mk_strlen(concatAst), m); expr_ref concat_length(mk_strlen(concatAst), m);
@ -756,9 +754,6 @@ expr * theory_str::mk_concat(expr * n1, expr * n2) {
} }
expr_ref lenAssert(ctx.mk_eq_atom(concat_length, m_autil.mk_add(items.size(), items.c_ptr())), m); expr_ref lenAssert(ctx.mk_eq_atom(concat_length, m_autil.mk_add(items.size(), items.c_ptr())), m);
assert_axiom(lenAssert); assert_axiom(lenAssert);
} else {
// concatAst = concat_astNode_map[concatArgs];
NOT_IMPLEMENTED_YET();
} }
return concatAst; return concatAst;
} }

2
src/smt/theory_str.h
View file

@ -250,6 +250,8 @@ namespace smt {
std::map<char, int> charSetLookupTable; std::map<char, int> charSetLookupTable;
int charSetSize; int charSetSize;
obj_pair_map<expr, expr, expr*> concat_astNode_map;
protected: protected:
void assert_axiom(expr * e); void assert_axiom(expr * e);
void assert_implication(expr * premise, expr * conclusion); void assert_implication(expr * premise, expr * conclusion);