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

2 files changed, 40 insertions, 40 deletions

diff --git a/test/regress/regress0/push-pop/Makefile.am b/test/regress/regress0/push-pop/Makefile.am
index 0af49ee1a..ca86f920d 100644
--- a/test/regress/regress0/push-pop/Makefile.am
+++ b/test/regress/regress0/push-pop/Makefile.am
@@ -30,14 +30,14 @@ SMT2_TESTS = \
 BUG_TESTS = \
 	bug216.smt2 \
 	bug233.cvc \
-	bug326.smt2
+	bug326.smt2 \
+	bug394.smt2 \
+	bug396.smt2
 
 TESTS =	$(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(BUG_TESTS)
 
 EXTRA_DIST = $(TESTS) \
-	bug216.smt2.expect \
-	bug394.smt2 \
-	bug396.smt2
+	bug216.smt2.expect
 
 # synonyms for "check" in this directory
 .PHONY: regress regress0 test
diff --git a/test/regress/regress0/push-pop/bug394.smt2 b/test/regress/regress0/push-pop/bug394.smt2
index 5b045812d..38e59be4f 100644
--- a/test/regress/regress0/push-pop/bug394.smt2
+++ b/test/regress/regress0/push-pop/bug394.smt2
@@ -1,7 +1,7 @@
 ;(set-option :produce-unsat-cores true)

 (set-option :print-success false)

 (set-info :smt-lib-version 2.0)

-(set-option :produce-models true)

+;(set-option :produce-models true)

 (set-logic ALL_SUPPORTED)

 ; done setting options

 

@@ -1500,9 +1500,9 @@ _b44
 _b45) $getIdx)

 ))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 9318)))

-(get-value ((ControlFlow 0 823)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 9318)))

+;(get-value ((ControlFlow 0 823)))

 (assert (not (= (ControlFlow 0 823) (- 10729))))

 (check-sat)

 (pop 1)

@@ -1613,34 +1613,34 @@ _b44
 _b45) $DCT)

 ))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (assert (not (= (ControlFlow 0 4199) (- 13495))))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (assert (not (= (ControlFlow 0 4199) (- 13487))))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (assert (not (= (ControlFlow 0 4199) (- 13509))))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (assert (not (= (ControlFlow 0 4199) (- 13553))))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (pop 1)

 (push 1)

 (set-info :boogie-vc-id $DCT)

@@ -1695,21 +1695,21 @@ _b44
 _b45) $DCT)

 ))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (assert (not (= (ControlFlow 0 4199) (- 13575))))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (assert (not (= (ControlFlow 0 4199) (- 13712))))

 (check-sat)

-(get-value ((ControlFlow 0 0)))

-(get-value ((ControlFlow 0 11167)))

-(get-value ((ControlFlow 0 4117)))

-(get-value ((ControlFlow 0 4199)))

+;(get-value ((ControlFlow 0 0)))

+;(get-value ((ControlFlow 0 11167)))

+;(get-value ((ControlFlow 0 4117)))

+;(get-value ((ControlFlow 0 4199)))

 (assert (not (= (ControlFlow 0 4199) (- 13700))))

 (check-sat)