mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-02 09:20:22 +00:00
Code Activity

add z3str2-style free variable check to theory_str

Browse source
This commit is contained in:
Murphy Berzish 2016-11-11 17:52:18 -05:00
parent fbaee080b2
commit 02aacab04e
1 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/smt/theory_str.cpp
View file

@ -7811,26 +7811,54 @@ final_check_status theory_str::final_check_eh() {
return FC_DONE; return FC_DONE;
} }
// Check every variable to see if it's eq. to some string constant.
// If not, mark it as free.
bool needToAssignFreeVars = false; bool needToAssignFreeVars = false;
std::set<expr*> free_variables; std::set<expr*> free_variables;
std::set<expr*> unused_internal_variables; std::set<expr*> unused_internal_variables;
TRACE("t_str_detail", tout << variable_set.size() << " variables in variable_set" << std::endl;); if (true) { // Z3str2 free variables check
for (std::set<expr*>::iterator it = variable_set.begin(); it != variable_set.end(); ++it) { std::map<expr*, int>::iterator itor = varAppearInAssign.begin();
TRACE("t_str_detail", tout << "checking eqc of variable " << mk_ismt2_pp(*it, m) << std::endl;); for (; itor != varAppearInAssign.end(); ++itor) {
bool has_eqc_value = false; /*
get_eqc_value(*it, has_eqc_value); std::string vName = std::string(Z3_ast_to_string(ctx, itor->first));
if (!has_eqc_value) { if (vName.length() >= 3 && vName.substr(0, 3) == "$$_")
// if this is an internal variable, it can be ignored...I think continue;
if (internal_variable_set.find(*it) != internal_variable_set.end() || regex_variable_set.find(*it) != regex_variable_set.end()) { */
TRACE("t_str_detail", tout << "WARNING: free internal variable " << mk_ismt2_pp(*it, m) << std::endl;); if (internal_variable_set.find(itor->first) != internal_variable_set.end()
//unused_internal_variables.insert(*it); || regex_variable_set.find(itor->first) != regex_variable_set.end()) {
} else { // this can be ignored, I think
needToAssignFreeVars = true; TRACE("t_str_detail", tout << "free internal variable " << mk_pp(itor->first, m) << " ignored" << std::endl;);
free_variables.insert(*it); continue;
} }
} bool hasEqcValue = false;
expr * eqcString = get_eqc_value(itor->first, hasEqcValue);
if (!hasEqcValue) {
TRACE("t_str_detail", tout << "found free variable " << mk_pp(itor->first, m) << std::endl;);
needToAssignFreeVars = true;
free_variables.insert(itor->first);
// break;
} else {
// debug
TRACE("t_str_detail", tout << "variable " << mk_pp(itor->first, m) << " = " << mk_pp(eqcString, m) << std::endl;);
}
}
} else { // new, possibly incorrect free variables check
// Check every variable to see if it's eq. to some string constant.
// If not, mark it as free.
TRACE("t_str_detail", tout << variable_set.size() << " variables in variable_set" << std::endl;);
for (std::set<expr*>::iterator it = variable_set.begin(); it != variable_set.end(); ++it) {
TRACE("t_str_detail", tout << "checking eqc of variable " << mk_ismt2_pp(*it, m) << std::endl;);
bool has_eqc_value = false;
get_eqc_value(*it, has_eqc_value);
if (!has_eqc_value) {
// if this is an internal variable, it can be ignored...I think
if (internal_variable_set.find(*it) != internal_variable_set.end() || regex_variable_set.find(*it) != regex_variable_set.end()) {
TRACE("t_str_detail", tout << "WARNING: free internal variable " << mk_ismt2_pp(*it, m) << std::endl;);
//unused_internal_variables.insert(*it);
} else {
needToAssignFreeVars = true;
free_variables.insert(*it);
}
}
}
} }
if (!needToAssignFreeVars) { if (!needToAssignFreeVars) {