summaryrefslogtreecommitdiff
path: root/src/proof/theory_proof.cpp
diff options
context:
space:
mode:
authorAlex Ozdemir <aozdemir@hmc.edu>2019-12-30 20:13:48 -0800
committerGitHub <noreply@github.com>2019-12-30 20:13:48 -0800
commitf10f495cbb3784cfed51779836f49f7a06b4f289 (patch)
tree7be96f4fa2a07b6bd0dbcc6dad735d313da29f21 /src/proof/theory_proof.cpp
parentb3471b719f1cd031d35e9a431027088b0dec156b (diff)
[proof] ITE translation fix (#3484)
* Bugfix: convert ifte arms to formulas for printing We have two kinds of ITEs in our LFSC proofs: * ite: for sort-typed expressions * ifte: for formulas Say that we have a Bool-sorted ITE. We had machinery for emitting an `ifte` for it, but this machinery didn't actually convert the arms of the ITE into formulas... Facepalm. Fixed now. * Test the lifting of ITEs from arithmetic. This test verifies that booleans ITEs are correctly lifted to formula ITEs in LRA proofs. It used to fail, but now passes. * clang-format * Typos. * Add test to CMake * Set --check-proofs in test * Address Yoni * Expand printsAsBool documentation * Assert ITE typing soundness * Assert a subtype relation for ITEs, not equality * Update src/proof/arith_proof.h Thanks Yoni! Co-Authored-By: yoni206 <yoni206@users.noreply.github.com> Co-authored-by: yoni206 <yoni206@users.noreply.github.com>
Diffstat (limited to 'src/proof/theory_proof.cpp')
-rw-r--r--src/proof/theory_proof.cpp46
1 files changed, 38 insertions, 8 deletions
diff --git a/src/proof/theory_proof.cpp b/src/proof/theory_proof.cpp
index d95572820..eee75e612 100644
--- a/src/proof/theory_proof.cpp
+++ b/src/proof/theory_proof.cpp
@@ -872,6 +872,23 @@ void LFSCTheoryProofEngine::printBoundTerm(Expr term, std::ostream& os, const Pr
printTheoryTerm(term, os, map);
}
+void LFSCTheoryProofEngine::printBoundFormula(Expr term,
+ std::ostream& os,
+ const ProofLetMap& map)
+{
+ Assert(term.getType().isBoolean() or term.getType().isPredicate());
+ bool wrapWithBoolToPred = term.getType().isBoolean() and printsAsBool(term);
+ if (wrapWithBoolToPred)
+ {
+ os << "(p_app ";
+ }
+ printBoundTerm(term, os, map);
+ if (wrapWithBoolToPred)
+ {
+ os << ")";
+ }
+}
+
void LFSCTheoryProofEngine::printCoreTerm(Expr term, std::ostream& os, const ProofLetMap& map) {
if (term.isVariable()) {
os << ProofManager::sanitize(term);
@@ -882,17 +899,30 @@ void LFSCTheoryProofEngine::printCoreTerm(Expr term, std::ostream& os, const Pro
switch(k) {
case kind::ITE: {
- os << (term.getType().isBoolean() ? "(ifte ": "(ite _ ");
-
- bool booleanCase = term[0].getType().isBoolean();
- if (booleanCase && printsAsBool(term[0])) os << "(p_app ";
- printBoundTerm(term[0], os, map);
- if (booleanCase && printsAsBool(term[0])) os << ")";
+ bool useFormulaType = term.getType().isBoolean();
+ Assert(term[1].getType().isSubtypeOf(term.getType()));
+ Assert(term[2].getType().isSubtypeOf(term.getType()));
+ os << (useFormulaType ? "(ifte " : "(ite _ ");
+ printBoundFormula(term[0], os, map);
os << " ";
- printBoundTerm(term[1], os, map);
+ if (useFormulaType)
+ {
+ printBoundFormula(term[1], os, map);
+ }
+ else
+ {
+ printBoundTerm(term[1], os, map);
+ }
os << " ";
- printBoundTerm(term[2], os, map);
+ if (useFormulaType)
+ {
+ printBoundFormula(term[2], os, map);
+ }
+ else
+ {
+ printBoundTerm(term[2], os, map);
+ }
os << ")";
return;
}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback