mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity

Merge branch 'upstream-master' into develop

Browse source 
Conflicts:
	src/ast/rewriter/seq_rewriter.cpp
	src/ast/seq_decl_plugin.h
This commit is contained in:
Murphy Berzish 2017-04-28 13:43:14 -04:00
commit d2ae94935e
10 changed files with 516 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/ast/rewriter/seq_rewriter.cpp
View file

@ -329,13 +329,8 @@ br_status seq_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * con
switch(f->get_decl_kind()) {
case OP_SEQ_UNIT:
// TODO configuration param
if (true) {
SASSERT(num_args == 1);
return mk_seq_unit(args[0], result);
} else {
return BR_FAILED;
}
SASSERT(num_args == 1);
return mk_seq_unit(args[0], result);
case OP_SEQ_EMPTY:
return BR_FAILED;
case OP_RE_PLUS:

2
src/ast/seq_decl_plugin.h
View file

@ -275,7 +275,7 @@ public:
bool is_string_term(expr const * n) const {
sort * s = get_sort(n);
return (u.is_seq(s) && u.is_string(s));
return u.is_string(s);
}
bool is_non_string_sequence(expr const * n) const {