diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
commit | 129dadba47447148096acd216d61f93e14539cb4 (patch) | |
tree | fd0053624ee96ee84eb35d1542d1977e40830750 /src/theory/arrays | |
parent | 4c87c0794b7e954afd090cfbf441caa0b09c3ef5 (diff) |
Bug-related:
* ITE removal fixed to be context-dependent (on UserContext).
Resolves incrementality bugs 376 and 396 (which had given wrong answers).
* some bugfixes for incrementality that Dejan found (fixes bug 394)
* fix for bug in SmtEngine::getValue() where definitions weren't respected
(partially resolves bug 411, but get-model is still broken).
* change status of microwave21.ec.minimized.smt2 (it's actually unsat, but
was labeled sat); re-enable it for "make regress"
Also:
* --check-model doesn't fail if quantified assertions don't simplify away.
* fix some examples, and the Java system test, for the disappearance of the
BoolExpr class
* add copy constructor to array type enumerator (the type enumerator
framework requires copy ctors, and the automatically-generated copy ctor
was copying pointers that were then deleted, leaving dangling pointers in
the copy and causing segfaults)
* --dump=assertions now implies --dump=skolems
* --dump=assertions:pre-<PASS> and --dump=assertions:post-<PASS> now allow
you to dump before/after a particular preprocessing pass. E.g.,
--dump=assertions:pre-ite-removal or --dump=assertions:post-static-learning.
"--dump=assertions" by itself is after all preprocessing, just before CNF
conversion.
* minor fixes to dumping output
* include Model in language bindings
Minor refactoring/misc:
* fix compiler warning in src/theory/model.cpp
* remove unnecessary SmtEngine::printModel().
* mkoptions script doesn't give progress output if stdout isn't a terminal
(e.g., if it's written to a log, or piped through less(1), or whatever).
* add some type enumerator unit tests
* de-emphasize --parse-only and --preprocess-only (they aren't really "common"
options)
* fix some exception throw() specifications in SmtEngine
* minor documentation clarifications
Diffstat (limited to 'src/theory/arrays')
-rw-r--r-- | src/theory/arrays/type_enumerator.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/theory/arrays/type_enumerator.h b/src/theory/arrays/type_enumerator.h index c6b73b9f6..161c90f5c 100644 --- a/src/theory/arrays/type_enumerator.h +++ b/src/theory/arrays/type_enumerator.h @@ -46,13 +46,37 @@ public: d_index(type.getArrayIndexType()), d_constituentType(type.getArrayConstituentType()), d_nm(NodeManager::currentNM()), - d_finished(false) + d_indexVec(), + d_constituentVec(), + d_finished(false), + d_arrayConst() { d_indexVec.push_back(*d_index); d_constituentVec.push_back(new TypeEnumerator(d_constituentType)); d_arrayConst = d_nm->mkConst(ArrayStoreAll(type.toType(), (*(*d_constituentVec.back())).toExpr())); } + // An array enumerator could be large, and generally you don't want to + // go around copying these things; but a copy ctor is presently required + // by the TypeEnumerator framework. + ArrayEnumerator(const ArrayEnumerator& ae) throw() : + TypeEnumeratorBase<ArrayEnumerator>(ae.d_nm->mkArrayType(ae.d_index.getType(), ae.d_constituentType)), + d_index(ae.d_index), + d_constituentType(ae.d_constituentType), + d_nm(ae.d_nm), + d_indexVec(ae.d_indexVec), + d_constituentVec(),// copied below + d_finished(ae.d_finished), + d_arrayConst(ae.d_arrayConst) + { + for(std::vector<TypeEnumerator*>::const_iterator i = + ae.d_constituentVec.begin(), i_end = ae.d_constituentVec.end(); + i != i_end; + ++i) { + d_constituentVec.push_back(new TypeEnumerator(**i)); + } + } + ~ArrayEnumerator() { while (!d_constituentVec.empty()) { delete d_constituentVec.back(); |