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/options/mkoptions | |
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/options/mkoptions')
-rwxr-xr-x | src/options/mkoptions | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/options/mkoptions b/src/options/mkoptions index ffaff9927..48050ef7e 100755 --- a/src/options/mkoptions +++ b/src/options/mkoptions @@ -21,23 +21,24 @@ function usage { } progress_char=/ +if [ -t 1 ]; then r="\r"; else r=""; fi function progress { file="$(expr "$1" : '.*\(.................................................................\)')" if [ -z "$file" ]; then file="$1"; else file="[...]$file"; fi - printf "\r%c %-70s (%3d%%)" "$progress_char" "$file" "$(($2*100/$3))" + [ -t 1 ] && printf "$r%c %-70s (%3d%%)" "$progress_char" "$file" "$(($2*100/$3))" progress_char="`echo "$progress_char" | tr -- '-\\\\|/' '\\\\|/-'`" } function NOTE { - printf "\r%-80s\n" "$kf:$lineno: note: $@" + printf "$r%-80s\n" "$kf:$lineno: note: $@" } function WARN { - printf "\r%-80s\n" "$kf:$lineno: warning: $@" + printf "$r%-80s\n" "$kf:$lineno: warning: $@" } function ERR { - printf "\r%-80s\n" "$kf:$lineno: error: $@" + printf "$r%-80s\n" "$kf:$lineno: error: $@" exit 1 } @@ -1322,7 +1323,7 @@ EOF rm -f "$output.tmp" else mv -f "$output.tmp" "$output" - printf "\rregenerated %-68s\n" "$output" + printf "${r}regenerated %-68s\n" "$output" fi } @@ -1505,7 +1506,7 @@ if diff -q "$output" "$output.tmp" &>/dev/null; then regenerated=false else mv -f "$output.tmp" "$output" - printf "\rregenerated %-68s\n" "$output" + printf "${r}regenerated %-68s\n" "$output" regenerated=true fi rm -f "$output.tmp" @@ -1513,5 +1514,5 @@ rm -f "$output.tmp" done if ! $regenerated; then - printf "\r%-80s\r" "" + [ -t 1 ] && printf "$r%-80s$r" "" fi |