diff options
author | Clark Barrett <barrett@cs.nyu.edu> | 2013-09-23 14:33:53 -0700 |
---|---|---|
committer | Clark Barrett <barrett@cs.nyu.edu> | 2013-09-23 14:33:53 -0700 |
commit | 9775bced75843c6f01e9524c2d0e7021535e3ec0 (patch) | |
tree | 3b150624ca81fcfd4940b73c7727e05d17c2ffc4 /src/theory/theory.h | |
parent | e50d0f0d93636f296b8d33dc4bd2cd9f91e159e5 (diff) |
Cleaner version of bug-fix for 528, also moved substitutions.h out of theory.h
for faster compilation
Diffstat (limited to 'src/theory/theory.h')
-rw-r--r-- | src/theory/theory.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/theory/theory.h b/src/theory/theory.h index d1734674d..94afdb1d0 100644 --- a/src/theory/theory.h +++ b/src/theory/theory.h @@ -23,7 +23,6 @@ #include "expr/attribute.h" #include "expr/command.h" #include "theory/valuation.h" -#include "theory/substitutions.h" #include "theory/output_channel.h" #include "theory/logic_info.h" #include "theory/options.h" @@ -49,6 +48,7 @@ class TheoryEngine; namespace theory { class QuantifiersEngine; +class SubstitutionMap; class TheoryModel; namespace rrinst { @@ -576,25 +576,7 @@ public: * Given a literal, add the solved substitutions to the map, if any. * The method should return true if the literal can be safely removed. */ - virtual PPAssertStatus ppAssert(TNode in, SubstitutionMap& outSubstitutions) { - if (in.getKind() == kind::EQUAL) { - if (in[0].isVar() && !in[1].hasSubterm(in[0])) { - outSubstitutions.addSubstitution(in[0], in[1]); - return PP_ASSERT_STATUS_SOLVED; - } - if (in[1].isVar() && !in[0].hasSubterm(in[1])) { - outSubstitutions.addSubstitution(in[1], in[0]); - return PP_ASSERT_STATUS_SOLVED; - } - if (in[0].isConst() && in[1].isConst()) { - if (in[0] != in[1]) { - return PP_ASSERT_STATUS_CONFLICT; - } - } - } - - return PP_ASSERT_STATUS_UNSOLVED; - } + virtual PPAssertStatus ppAssert(TNode in, SubstitutionMap& outSubstitutions); /** * Given an atom of the theory coming from the input formula, this |