diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-03-15 21:10:29 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-03-15 21:10:29 +0000 |
| commit | 12ad4cf2de936acbf8c21117804c69b2deaa7272 (patch) | |
| tree | 39280aebed0a299b080512d1c26d1adad827fcc7 /src/theory/uf/theory_uf.cpp | |
| parent | bb21cdc3a551fa46b5e77345bb5cbcb55cba2fa6 (diff) | |
This checkin resolves bug #57.
* CVC4::theory::Interrupted no longer derives CVC4::Exception.
* Interrupted is only thrown if "safe" parameter is TRUE !
* UF returns one conflict (instead of waiting for Interrupted to be thrown).
* Minor build system work (quieter builds if V=0, better handling of build
profiles in configure)
Diffstat (limited to 'src/theory/uf/theory_uf.cpp')
| -rw-r--r-- | src/theory/uf/theory_uf.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/theory/uf/theory_uf.cpp b/src/theory/uf/theory_uf.cpp index 6d949d6de..ee3cb4734 100644 --- a/src/theory/uf/theory_uf.cpp +++ b/src/theory/uf/theory_uf.cpp @@ -310,7 +310,8 @@ void TheoryUF::check(Effort level){ if(sameCongruenceClass(left, right)){ Node remakeNeq = (*diseqIter).notNode(); Node conflict = constructConflict(remakeNeq); - d_out->conflict(conflict, true); + d_out->conflict(conflict, false); + return; } } } |