summaryrefslogtreecommitdiff
path: root/src/smt/smt_engine_check_proof.cpp
diff options
context:
space:
mode:
authorAina Niemetz <aina.niemetz@gmail.com>2017-08-25 15:39:16 -0700
committerGitHub <noreply@github.com>2017-08-25 15:39:16 -0700
commitdfa69ff98a14fcc0f2387e59a0c9994ef440e7d0 (patch)
tree23031231926757cb9b8aab425d8354683a3a66d7 /src/smt/smt_engine_check_proof.cpp
parent378a0c45070ec033493c52e4fa92e6d03b89b6c0 (diff)
Move LFSC checker out of the CVC repository. (#222)
LFSC now lives outside of the CVC4 repository and is not part of the CVC4 distribution anymore. As a consequence, we + Add --with-lfsc and --with-lfsc-directory as configure options. In the case where CVC4 has not been built with integrated LFSC, all code that interacts with LFSC is disabled. + Disable proof checking if CVC4_USE_LFSC is not defined. Configuring the build with --check-proofs but without --with-lfsc results in an error. + Do not call LFSC's cleanup function (but we should in the future). LFSC checker segfaults during cleanup on regression testcase regress0/bv/core/bitvec7.smt. Disabled call to lfscc_cleanup until the problem in lfscc is fixed. + Disable building with LFSC for the distcheck travis build since it is not part of the distribution anymore. Further, make distcheck with LFSC would require to call contrib/get-lfsc-checker before calling make check on the temp build (the build of the unpacked distribution tar ball).
Diffstat (limited to 'src/smt/smt_engine_check_proof.cpp')
-rw-r--r--src/smt/smt_engine_check_proof.cpp31
1 files changed, 12 insertions, 19 deletions
diff --git a/src/smt/smt_engine_check_proof.cpp b/src/smt/smt_engine_check_proof.cpp
index f25dd5a51..f48f6753d 100644
--- a/src/smt/smt_engine_check_proof.cpp
+++ b/src/smt/smt_engine_check_proof.cpp
@@ -28,15 +28,16 @@
#include <fstream>
#include <string>
-// #warning "TODO: Why is lfsc's check.h being included like this?"
-#include "check.h"
-
#include "base/configuration_private.h"
#include "base/cvc4_assert.h"
#include "base/output.h"
#include "smt/smt_engine.h"
#include "util/statistics_registry.h"
+#if (IS_LFSC_BUILD && IS_PROOFS_BUILD)
+#include "lfscc.h"
+#endif
+
using namespace CVC4;
using namespace std;
@@ -61,7 +62,7 @@ public:
void SmtEngine::checkProof() {
-#if IS_PROOFS_BUILD
+#if (IS_LFSC_BUILD && IS_PROOFS_BUILD)
Chat() << "generating proof..." << endl;
@@ -113,23 +114,15 @@ void SmtEngine::checkProof() {
pfStream << proof::plf_signatures << endl;
pf->toStream(pfStream);
pfStream.close();
- args a;
- a.show_runs = false;
- a.no_tail_calls = false;
- a.compile_scc = false;
- a.compile_scc_debug = false;
- a.run_scc = false;
- a.use_nested_app = false;
- a.compile_lib = false;
- init();
- check_file(pfFile, a);
+ lfscc_init();
+ lfscc_check_file(pfFile, false, false, false, false, false, false, false);
+ // FIXME: we should actually call lfscc_cleanup here, but lfscc_cleanup
+ // segfaults on regress0/bv/core/bitvec7.smt
+ //lfscc_cleanup();
free(pfFile);
close(fd);
-#else /* IS_PROOFS_BUILD */
-
+#else /* (IS_LFSC_BUILD && IS_PROOFS_BUILD) */
Unreachable("This version of CVC4 was built without proof support; cannot check proofs.");
-
-#endif /* IS_PROOFS_BUILD */
-
+#endif /* (IS_LFSC_BUILD && IS_PROOFS_BUILD) */
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback