diff options
Diffstat (limited to 'src/theory')
777 files changed, 2368 insertions, 2368 deletions
diff --git a/src/theory/arith/approx_simplex.cpp b/src/theory/arith/approx_simplex.cpp index c911d03e9..8e75f6850 100644 --- a/src/theory/arith/approx_simplex.cpp +++ b/src/theory/arith/approx_simplex.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -369,7 +369,7 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 /* Begin the declaration of GLPK specific code. */ #ifdef CVC4_USE_GLPK @@ -377,7 +377,7 @@ extern "C" { #include <glpk.h> }/* extern "C" */ -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -537,12 +537,12 @@ int ApproxGLPK::s_verbosity = 0; } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /*#ifdef CVC4_USE_GLPK */ /* End the declaration of GLPK specific code. */ /* Begin GPLK/NOGLPK Glue code. */ -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { ApproximateSimplex* ApproximateSimplex::mkApproximateSimplexSolver(const ArithVariables& vars, TreeLog& l, ApproximateStatistics& s){ @@ -561,12 +561,12 @@ bool ApproximateSimplex::enabled() { } } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 /* End GPLK/NOGLPK Glue code. */ /* Begin GPLK implementation. */ #ifdef CVC4_USE_GLPK -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -3176,6 +3176,6 @@ void ApproxGLPK::tryCut(int nid, CutInfo& cut) } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /*#ifdef CVC4_USE_GLPK */ /* End GPLK implementation. */ diff --git a/src/theory/arith/approx_simplex.h b/src/theory/arith/approx_simplex.h index 5835c57c1..787effc94 100644 --- a/src/theory/arith/approx_simplex.h +++ b/src/theory/arith/approx_simplex.h @@ -28,7 +28,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -165,4 +165,4 @@ class ApproximateSimplex{ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_ite_utils.cpp b/src/theory/arith/arith_ite_utils.cpp index 42189f86a..4c991dba3 100644 --- a/src/theory/arith/arith_ite_utils.cpp +++ b/src/theory/arith/arith_ite_utils.cpp @@ -30,7 +30,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -47,7 +47,7 @@ Node ArithIteUtils::applyReduceVariablesInItes(Node n){ } Node ArithIteUtils::reduceVariablesInItes(Node n){ - using namespace CVC5::kind; + using namespace cvc5::kind; if(d_reduceVar.find(n) != d_reduceVar.end()){ Node res = d_reduceVar[n]; return res.isNull() ? n : res; @@ -457,4 +457,4 @@ bool ArithIteUtils::solveBinOr(TNode binor){ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_ite_utils.h b/src/theory/arith/arith_ite_utils.h index 263ddda8e..3e548f42d 100644 --- a/src/theory/arith/arith_ite_utils.h +++ b/src/theory/arith/arith_ite_utils.h @@ -28,7 +28,7 @@ #include "context/cdo.h" #include "context/cdinsert_hashmap.h" -namespace CVC5 { +namespace cvc5 { namespace preprocessing { namespace util { class ContainsTermITEVisitor; @@ -111,6 +111,6 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__ARITH_ITE_UTILS_H */ diff --git a/src/theory/arith/arith_msum.cpp b/src/theory/arith/arith_msum.cpp index 9190dac7d..a2ae138fd 100644 --- a/src/theory/arith/arith_msum.cpp +++ b/src/theory/arith/arith_msum.cpp @@ -16,9 +16,9 @@ #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { bool ArithMSum::getMonomial(Node n, Node& c, Node& v) @@ -322,4 +322,4 @@ void ArithMSum::debugPrintMonomialSum(std::map<Node, Node>& msum, const char* c) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_msum.h b/src/theory/arith/arith_msum.h index f4a2bf824..7854e0d3b 100644 --- a/src/theory/arith/arith_msum.h +++ b/src/theory/arith/arith_msum.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** Arithmetic utilities regarding monomial sums. @@ -183,6 +183,6 @@ class ArithMSum }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__MSUM_H */ diff --git a/src/theory/arith/arith_preprocess.cpp b/src/theory/arith/arith_preprocess.cpp index 2b120c9c7..e57b6c57f 100644 --- a/src/theory/arith/arith_preprocess.cpp +++ b/src/theory/arith/arith_preprocess.cpp @@ -18,7 +18,7 @@ #include "theory/arith/inference_manager.h" #include "theory/skolem_lemma.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -80,4 +80,4 @@ bool ArithPreprocess::isReduced(TNode atom) const } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_preprocess.h b/src/theory/arith/arith_preprocess.h index 45ce0c597..663c09abe 100644 --- a/src/theory/arith/arith_preprocess.h +++ b/src/theory/arith/arith_preprocess.h @@ -21,7 +21,7 @@ #include "theory/arith/operator_elim.h" #include "theory/logic_info.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class SkolemLemma; @@ -86,6 +86,6 @@ class ArithPreprocess } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/arith_rewriter.cpp b/src/theory/arith/arith_rewriter.cpp index 01e88b1a8..87aba7b45 100644 --- a/src/theory/arith/arith_rewriter.cpp +++ b/src/theory/arith/arith_rewriter.cpp @@ -28,7 +28,7 @@ #include "theory/theory.h" #include "util/iand.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -228,7 +228,7 @@ RewriteResponse ArithRewriter::postRewriteTerm(TNode t){ if(exp.sgn() == 0){ return RewriteResponse(REWRITE_DONE, mkRationalNode(Rational(1))); }else if(exp.sgn() > 0 && exp.isIntegral()){ - CVC5::Rational r(expr::NodeValue::MAX_CHILDREN); + cvc5::Rational r(expr::NodeValue::MAX_CHILDREN); if (exp <= r) { unsigned num = exp.getNumerator().toUnsignedInt(); @@ -901,4 +901,4 @@ RewriteResponse ArithRewriter::returnRewrite(TNode t, Node ret, Rewrite r) } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h index 556a7bda7..803f8c8a8 100644 --- a/src/theory/arith/arith_rewriter.h +++ b/src/theory/arith/arith_rewriter.h @@ -23,7 +23,7 @@ #include "theory/arith/rewrites.h" #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -73,6 +73,6 @@ class ArithRewriter : public TheoryRewriter } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__ARITH_REWRITER_H */ diff --git a/src/theory/arith/arith_state.cpp b/src/theory/arith/arith_state.cpp index bab1d6eb9..f4be43b06 100644 --- a/src/theory/arith/arith_state.cpp +++ b/src/theory/arith/arith_state.cpp @@ -16,7 +16,7 @@ #include "theory/arith/theory_arith_private.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -35,4 +35,4 @@ bool ArithState::isInConflict() const } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_state.h b/src/theory/arith/arith_state.h index dfe2bc877..05b09a5a2 100644 --- a/src/theory/arith/arith_state.h +++ b/src/theory/arith/arith_state.h @@ -19,7 +19,7 @@ #include "theory/theory_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -52,6 +52,6 @@ class ArithState : public TheoryState } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/arith_static_learner.cpp b/src/theory/arith/arith_static_learner.cpp index b0129970e..9c764ac7a 100644 --- a/src/theory/arith/arith_static_learner.cpp +++ b/src/theory/arith/arith_static_learner.cpp @@ -27,9 +27,9 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -273,4 +273,4 @@ void ArithStaticLearner::addBound(TNode n) { } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h index 668527c0f..73810dedd 100644 --- a/src/theory/arith/arith_static_learner.h +++ b/src/theory/arith/arith_static_learner.h @@ -25,7 +25,7 @@ #include "theory/arith/delta_rational.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace context { class Context; } @@ -71,6 +71,6 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__ARITH_STATIC_LEARNER_H */ diff --git a/src/theory/arith/arith_utilities.cpp b/src/theory/arith/arith_utilities.cpp index 16c412546..abffcc3d3 100644 --- a/src/theory/arith/arith_utilities.cpp +++ b/src/theory/arith/arith_utilities.cpp @@ -16,9 +16,9 @@ #include <cmath> -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -325,4 +325,4 @@ Node negateProofLiteral(TNode n) } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h index 9c0edb893..852550917 100644 --- a/src/theory/arith/arith_utilities.h +++ b/src/theory/arith/arith_utilities.h @@ -28,7 +28,7 @@ #include "util/integer.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -344,6 +344,6 @@ Node negateProofLiteral(TNode n); } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__ARITH_UTILITIES_H */ diff --git a/src/theory/arith/arithvar.cpp b/src/theory/arith/arithvar.cpp index a0c29cb84..b2db30f82 100644 --- a/src/theory/arith/arithvar.cpp +++ b/src/theory/arith/arithvar.cpp @@ -19,7 +19,7 @@ #include <limits> #include <set> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -32,4 +32,4 @@ bool debugIsASet(const std::vector<ArithVar>& variables){ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arithvar.h b/src/theory/arith/arithvar.h index a49797845..959db4b0d 100644 --- a/src/theory/arith/arithvar.h +++ b/src/theory/arith/arithvar.h @@ -26,7 +26,7 @@ #include "util/index.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -41,4 +41,4 @@ extern bool debugIsASet(const ArithVarVec& variables); } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/arithvar_node_map.h b/src/theory/arith/arithvar_node_map.h index dceeeb407..6764e8e0b 100644 --- a/src/theory/arith/arithvar_node_map.h +++ b/src/theory/arith/arithvar_node_map.h @@ -27,7 +27,7 @@ #include "context/cdhashmap.h" #include "context/cdo.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -90,6 +90,6 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__ARITHVAR_NODE_MAP_H */ diff --git a/src/theory/arith/attempt_solution_simplex.cpp b/src/theory/arith/attempt_solution_simplex.cpp index 292fccb34..d0f69b7a3 100644 --- a/src/theory/arith/attempt_solution_simplex.cpp +++ b/src/theory/arith/attempt_solution_simplex.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -153,4 +153,4 @@ Result::Sat AttemptSolutionSDP::attempt(const ApproximateSimplex::Solution& sol) } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/attempt_solution_simplex.h b/src/theory/arith/attempt_solution_simplex.h index faca0cb25..411bf776e 100644 --- a/src/theory/arith/attempt_solution_simplex.h +++ b/src/theory/arith/attempt_solution_simplex.h @@ -58,7 +58,7 @@ #include "theory/arith/approx_simplex.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -92,4 +92,4 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/bound_counts.h b/src/theory/arith/bound_counts.h index 949828aeb..9caa965ac 100644 --- a/src/theory/arith/bound_counts.h +++ b/src/theory/arith/bound_counts.h @@ -22,7 +22,7 @@ #include "theory/arith/arithvar.h" #include "util/dense_map.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -231,4 +231,4 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/bound_inference.cpp b/src/theory/arith/bound_inference.cpp index 126954144..a3357c1d9 100644 --- a/src/theory/arith/bound_inference.cpp +++ b/src/theory/arith/bound_inference.cpp @@ -17,7 +17,7 @@ #include "theory/arith/normal_form.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -247,4 +247,4 @@ std::map<Node, std::pair<Node,Node>> getBounds(const std::vector<Node>& assertio } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/bound_inference.h b/src/theory/arith/bound_inference.h index 7041777d8..fc5e68cff 100644 --- a/src/theory/arith/bound_inference.h +++ b/src/theory/arith/bound_inference.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -113,6 +113,6 @@ std::map<Node, std::pair<Node,Node>> getBounds(const std::vector<Node>& assertio } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif
\ No newline at end of file diff --git a/src/theory/arith/callbacks.cpp b/src/theory/arith/callbacks.cpp index 7fe8e4934..b2c48163f 100644 --- a/src/theory/arith/callbacks.cpp +++ b/src/theory/arith/callbacks.cpp @@ -21,7 +21,7 @@ #include "theory/arith/proof_macros.h" #include "theory/arith/theory_arith_private.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -196,4 +196,4 @@ BoundCounts BoundCountingLookup::hasBounds(ArithVar basic) const { } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/callbacks.h b/src/theory/arith/callbacks.h index 66004871b..539b7f70d 100644 --- a/src/theory/arith/callbacks.h +++ b/src/theory/arith/callbacks.h @@ -24,7 +24,7 @@ #include "theory/inference_id.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { class ProofNode; @@ -199,4 +199,4 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/congruence_manager.cpp b/src/theory/arith/congruence_manager.cpp index f2e51be02..ea597468d 100644 --- a/src/theory/arith/congruence_manager.cpp +++ b/src/theory/arith/congruence_manager.cpp @@ -30,7 +30,7 @@ #include "theory/uf/proof_equality_engine.h" #include "options/arith_options.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -691,4 +691,4 @@ std::vector<Node> andComponents(TNode an) } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/congruence_manager.h b/src/theory/arith/congruence_manager.h index 540e985f7..055d5ddbb 100644 --- a/src/theory/arith/congruence_manager.h +++ b/src/theory/arith/congruence_manager.h @@ -32,7 +32,7 @@ #include "util/dense_map.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { class ProofNodeManager; @@ -299,4 +299,4 @@ std::vector<Node> andComponents(TNode an); } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/constraint.cpp b/src/theory/arith/constraint.cpp index cc1129f50..baa9b1ebb 100644 --- a/src/theory/arith/constraint.cpp +++ b/src/theory/arith/constraint.cpp @@ -32,9 +32,9 @@ using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -2428,4 +2428,4 @@ std::pair<int, int> Constraint::unateFarkasSigns(ConstraintCP ca, ConstraintCP c } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/constraint.h b/src/theory/arith/constraint.h index 3caa5a030..d00f16c90 100644 --- a/src/theory/arith/constraint.h +++ b/src/theory/arith/constraint.h @@ -93,7 +93,7 @@ #include "theory/trust_node.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { class ProofNodeManager; @@ -1277,6 +1277,6 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__CONSTRAINT_H */ diff --git a/src/theory/arith/constraint_forward.h b/src/theory/arith/constraint_forward.h index 8d36df304..146ffd607 100644 --- a/src/theory/arith/constraint_forward.h +++ b/src/theory/arith/constraint_forward.h @@ -24,7 +24,7 @@ #include "cvc4_private.h" #include <vector> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -46,6 +46,6 @@ static const RationalVectorP RationalVectorPSentinel = NULL; } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__CONSTRAINT_FORWARD_H */ diff --git a/src/theory/arith/cut_log.cpp b/src/theory/arith/cut_log.cpp index 36c8d06f1..faf2fddbe 100644 --- a/src/theory/arith/cut_log.cpp +++ b/src/theory/arith/cut_log.cpp @@ -31,7 +31,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -704,4 +704,4 @@ void DenseVector::print(ostream& out, const DenseMap<Rational>& v){ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/cut_log.h b/src/theory/arith/cut_log.h index 961092f6e..3ab0bb6bf 100644 --- a/src/theory/arith/cut_log.h +++ b/src/theory/arith/cut_log.h @@ -28,7 +28,7 @@ #include "theory/arith/constraint_forward.h" #include "util/dense_map.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -290,4 +290,4 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/delta_rational.cpp b/src/theory/arith/delta_rational.cpp index 7d20a1859..e93b0315e 100644 --- a/src/theory/arith/delta_rational.cpp +++ b/src/theory/arith/delta_rational.cpp @@ -21,7 +21,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { std::ostream& operator<<(std::ostream& os, const DeltaRational& dq){ return os << "(" << dq.getNoninfinitesimalPart() @@ -106,4 +106,4 @@ Integer DeltaRational::euclidianDivideRemainder(const DeltaRational& y) const } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/delta_rational.h b/src/theory/arith/delta_rational.h index e2b769b18..cd01f9c1a 100644 --- a/src/theory/arith/delta_rational.h +++ b/src/theory/arith/delta_rational.h @@ -26,7 +26,7 @@ #include "util/integer.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { class DeltaRational; @@ -46,20 +46,20 @@ class DeltaRationalException : public Exception { */ class DeltaRational { private: - CVC5::Rational c; - CVC5::Rational k; + cvc5::Rational c; + cvc5::Rational k; public: DeltaRational() : c(0,1), k(0,1) {} - DeltaRational(const CVC5::Rational& base) : c(base), k(0, 1) {} - DeltaRational(const CVC5::Rational& base, const CVC5::Rational& coeff) + DeltaRational(const cvc5::Rational& base) : c(base), k(0, 1) {} + DeltaRational(const cvc5::Rational& base, const cvc5::Rational& coeff) : c(base), k(coeff) { } - const CVC5::Rational& getInfinitesimalPart() const { return k; } + const cvc5::Rational& getInfinitesimalPart() const { return k; } - const CVC5::Rational& getNoninfinitesimalPart() const { return c; } + const cvc5::Rational& getNoninfinitesimalPart() const { return c; } int sgn() const { int s = getNoninfinitesimalPart().sgn(); @@ -97,14 +97,14 @@ public: } DeltaRational operator+(const DeltaRational& other) const{ - CVC5::Rational tmpC = c + other.c; - CVC5::Rational tmpK = k + other.k; + cvc5::Rational tmpC = c + other.c; + cvc5::Rational tmpK = k + other.k; return DeltaRational(tmpC, tmpK); } DeltaRational operator*(const Rational& a) const{ - CVC5::Rational tmpC = a * c; - CVC5::Rational tmpK = a * k; + cvc5::Rational tmpC = a * c; + cvc5::Rational tmpK = a * k; return DeltaRational(tmpC, tmpK); } @@ -127,7 +127,7 @@ public: DeltaRational operator-(const DeltaRational& a) const{ - CVC5::Rational negOne(CVC5::Integer(-1)); + cvc5::Rational negOne(cvc5::Integer(-1)); return *(this) + (a * negOne); } @@ -136,14 +136,14 @@ public: } DeltaRational operator/(const Rational& a) const{ - CVC5::Rational tmpC = c / a; - CVC5::Rational tmpK = k / a; + cvc5::Rational tmpC = c / a; + cvc5::Rational tmpK = k / a; return DeltaRational(tmpC, tmpK); } DeltaRational operator/(const Integer& a) const{ - CVC5::Rational tmpC = c / a; - CVC5::Rational tmpK = k / a; + cvc5::Rational tmpC = c / a; + cvc5::Rational tmpK = k / a; return DeltaRational(tmpC, tmpK); } @@ -204,7 +204,7 @@ public: return *(this); } - DeltaRational& operator*=(const CVC5::Rational& a) + DeltaRational& operator*=(const cvc5::Rational& a) { c *= a; k *= a; @@ -299,4 +299,4 @@ public: std::ostream& operator<<(std::ostream& os, const DeltaRational& n); -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/dio_solver.cpp b/src/theory/arith/dio_solver.cpp index 51dd69650..6e069cdf6 100644 --- a/src/theory/arith/dio_solver.cpp +++ b/src/theory/arith/dio_solver.cpp @@ -24,7 +24,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -835,4 +835,4 @@ Node DioSolver::trailIndexToEquality(TrailIndex i) const { } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h index 7892bec52..9b3106036 100644 --- a/src/theory/arith/dio_solver.h +++ b/src/theory/arith/dio_solver.h @@ -33,7 +33,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace context { class Context; } @@ -423,6 +423,6 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__DIO_SOLVER_H */ diff --git a/src/theory/arith/dual_simplex.cpp b/src/theory/arith/dual_simplex.cpp index d4e26600d..52dd20779 100644 --- a/src/theory/arith/dual_simplex.cpp +++ b/src/theory/arith/dual_simplex.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -275,4 +275,4 @@ bool DualSimplexDecisionProcedure::searchForFeasibleSolution(uint32_t remainingI } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/dual_simplex.h b/src/theory/arith/dual_simplex.h index 3e1bc0ee7..a0a727a0a 100644 --- a/src/theory/arith/dual_simplex.h +++ b/src/theory/arith/dual_simplex.h @@ -57,7 +57,7 @@ #include "theory/arith/simplex.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -113,4 +113,4 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/error_set.cpp b/src/theory/arith/error_set.cpp index 142a060ec..b8c20104b 100644 --- a/src/theory/arith/error_set.cpp +++ b/src/theory/arith/error_set.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -479,4 +479,4 @@ void ErrorSet::pushFocusInto(ArithVarVec& vec) const{ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/error_set.h b/src/theory/arith/error_set.h index cdf155c6d..4788d2697 100644 --- a/src/theory/arith/error_set.h +++ b/src/theory/arith/error_set.h @@ -31,7 +31,7 @@ #include "util/bin_heap.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -414,4 +414,4 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/fc_simplex.cpp b/src/theory/arith/fc_simplex.cpp index 61280d651..9d7711361 100644 --- a/src/theory/arith/fc_simplex.cpp +++ b/src/theory/arith/fc_simplex.cpp @@ -25,7 +25,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -861,4 +861,4 @@ const Rational& FCSimplexDecisionProcedure::focusCoefficient(ArithVar nb) const } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/fc_simplex.h b/src/theory/arith/fc_simplex.h index 73e5ae54f..2b303ffa2 100644 --- a/src/theory/arith/fc_simplex.h +++ b/src/theory/arith/fc_simplex.h @@ -61,7 +61,7 @@ #include "util/dense_map.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -256,4 +256,4 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/infer_bounds.cpp b/src/theory/arith/infer_bounds.cpp index 25494bdee..a8b6374cc 100644 --- a/src/theory/arith/infer_bounds.cpp +++ b/src/theory/arith/infer_bounds.cpp @@ -18,7 +18,7 @@ #include "theory/arith/infer_bounds.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -264,4 +264,4 @@ std::ostream& operator<<(std::ostream& os, const Algorithms a){ } /* namespace arith */ } /* namespace theory */ -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/infer_bounds.h b/src/theory/arith/infer_bounds.h index 251c7cbb8..27bc611b3 100644 --- a/src/theory/arith/infer_bounds.h +++ b/src/theory/arith/infer_bounds.h @@ -27,7 +27,7 @@ #include "util/maybe.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -160,4 +160,4 @@ private: } /* namespace arith */ } /* namespace theory */ -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/inference_manager.cpp b/src/theory/arith/inference_manager.cpp index 66b628302..732111f97 100644 --- a/src/theory/arith/inference_manager.cpp +++ b/src/theory/arith/inference_manager.cpp @@ -19,7 +19,7 @@ #include "theory/arith/theory_arith.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -147,4 +147,4 @@ bool InferenceManager::isEntailedFalse(const SimpleTheoryLemma& lem) } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/inference_manager.h b/src/theory/arith/inference_manager.h index bf5ed7b10..a5b200f8b 100644 --- a/src/theory/arith/inference_manager.h +++ b/src/theory/arith/inference_manager.h @@ -22,7 +22,7 @@ #include "theory/inference_id.h" #include "theory/inference_manager_buffered.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -117,6 +117,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/kinds b/src/theory/arith/kinds index b839ccc22..f9f88cddf 100644 --- a/src/theory/arith/kinds +++ b/src/theory/arith/kinds @@ -4,13 +4,13 @@ # src/theory/builtin/kinds. # -theory THEORY_ARITH ::CVC5::theory::arith::TheoryArith "theory/arith/theory_arith.h" +theory THEORY_ARITH ::cvc5::theory::arith::TheoryArith "theory/arith/theory_arith.h" typechecker "theory/arith/theory_arith_type_rules.h" properties stable-infinite properties check propagate ppStaticLearn presolve notifyRestart -rewriter ::CVC5::theory::arith::ArithRewriter "theory/arith/arith_rewriter.h" +rewriter ::cvc5::theory::arith::ArithRewriter "theory/arith/arith_rewriter.h" operator PLUS 2: "arithmetic addition (N-ary)" operator MULT 2: "arithmetic multiplication (N-ary)" @@ -44,10 +44,10 @@ operator ARCCOTANGENT 1 "arc cotangent" operator SQRT 1 "square root" constant DIVISIBLE_OP \ - ::CVC5::Divisible \ - ::CVC5::DivisibleHashFunction \ + ::cvc5::Divisible \ + ::cvc5::DivisibleHashFunction \ "util/divisible.h" \ - "operator for the divisibility-by-k predicate; payload is an instance of the CVC5::Divisible class" + "operator for the divisibility-by-k predicate; payload is an instance of the cvc5::Divisible class" sort REAL_TYPE \ Cardinality::REALS \ @@ -63,16 +63,16 @@ sort INTEGER_TYPE \ "integer type" constant CONST_RATIONAL \ - ::CVC5::Rational \ - ::CVC5::RationalHashFunction \ + ::cvc5::Rational \ + ::cvc5::RationalHashFunction \ "util/rational.h" \ - "a multiple-precision rational constant; payload is an instance of the CVC5::Rational class" + "a multiple-precision rational constant; payload is an instance of the cvc5::Rational class" enumerator REAL_TYPE \ - "::CVC5::theory::arith::RationalEnumerator" \ + "::cvc5::theory::arith::RationalEnumerator" \ "theory/arith/type_enumerator.h" enumerator INTEGER_TYPE \ - "::CVC5::theory::arith::IntegerEnumerator" \ + "::cvc5::theory::arith::IntegerEnumerator" \ "theory/arith/type_enumerator.h" operator LT 2 "less than, x < y" @@ -82,10 +82,10 @@ operator GEQ 2 "greater than or equal, x >= y" # represents an indexed root predicate. See util/indexed_root_predicate.h for more documentation. constant INDEXED_ROOT_PREDICATE_OP \ - ::CVC5::IndexedRootPredicate \ - ::CVC5::IndexedRootPredicateHashFunction \ + ::cvc5::IndexedRootPredicate \ + ::cvc5::IndexedRootPredicateHashFunction \ "util/indexed_root_predicate.h" \ - "operator for the indexed root predicate; payload is an instance of the CVC5::IndexedRootPredicate class" + "operator for the indexed root predicate; payload is an instance of the cvc5::IndexedRootPredicate class" parameterized INDEXED_ROOT_PREDICATE INDEXED_ROOT_PREDICATE_OP 2 "indexed root predicate; first parameter is a INDEXED_ROOT_PREDICATE_OP, second is a real variable compared to zero, third is a polynomial" operator IS_INTEGER 1 "term-is-integer predicate (parameter is a real-sorted term)" @@ -99,15 +99,15 @@ operator TO_REAL 1 "cast term to real (parameter is an integer-sorted term; this # This way, we avoid having 2 nested TO_REAL nodess as a result of Solver::mkTerm(TO_REAL, Solver::mkReal(int val)) operator CAST_TO_REAL 1 "cast term to real same as TO_REAL, but it is used internally, whereas TO_REAL is accessible in the API" -typerule PLUS ::CVC5::theory::arith::ArithOperatorTypeRule -typerule MULT ::CVC5::theory::arith::ArithOperatorTypeRule -typerule NONLINEAR_MULT ::CVC5::theory::arith::ArithOperatorTypeRule -typerule MINUS ::CVC5::theory::arith::ArithOperatorTypeRule -typerule UMINUS ::CVC5::theory::arith::ArithOperatorTypeRule -typerule DIVISION ::CVC5::theory::arith::ArithOperatorTypeRule -typerule POW ::CVC5::theory::arith::ArithOperatorTypeRule +typerule PLUS ::cvc5::theory::arith::ArithOperatorTypeRule +typerule MULT ::cvc5::theory::arith::ArithOperatorTypeRule +typerule NONLINEAR_MULT ::cvc5::theory::arith::ArithOperatorTypeRule +typerule MINUS ::cvc5::theory::arith::ArithOperatorTypeRule +typerule UMINUS ::cvc5::theory::arith::ArithOperatorTypeRule +typerule DIVISION ::cvc5::theory::arith::ArithOperatorTypeRule +typerule POW ::cvc5::theory::arith::ArithOperatorTypeRule -typerule CONST_RATIONAL ::CVC5::theory::arith::ArithConstantTypeRule +typerule CONST_RATIONAL ::cvc5::theory::arith::ArithConstantTypeRule typerule LT "SimpleTypeRule<RBool, AReal, AReal>" typerule LEQ "SimpleTypeRule<RBool, AReal, AReal>" @@ -115,11 +115,11 @@ typerule GT "SimpleTypeRule<RBool, AReal, AReal>" typerule GEQ "SimpleTypeRule<RBool, AReal, AReal>" typerule INDEXED_ROOT_PREDICATE_OP "SimpleTypeRule<RBuiltinOperator>" -typerule INDEXED_ROOT_PREDICATE ::CVC5::theory::arith::IndexedRootPredicateTypeRule +typerule INDEXED_ROOT_PREDICATE ::cvc5::theory::arith::IndexedRootPredicateTypeRule -typerule TO_REAL ::CVC5::theory::arith::ArithOperatorTypeRule -typerule CAST_TO_REAL ::CVC5::theory::arith::ArithOperatorTypeRule -typerule TO_INTEGER ::CVC5::theory::arith::ArithOperatorTypeRule +typerule TO_REAL ::cvc5::theory::arith::ArithOperatorTypeRule +typerule CAST_TO_REAL ::cvc5::theory::arith::ArithOperatorTypeRule +typerule TO_INTEGER ::cvc5::theory::arith::ArithOperatorTypeRule typerule IS_INTEGER "SimpleTypeRule<RBool, AReal>" typerule ABS "SimpleTypeRule<RInteger, AInteger>" @@ -128,7 +128,7 @@ typerule INTS_MODULUS "SimpleTypeRule<RInteger, AInteger, AInteger>" typerule DIVISIBLE "SimpleTypeRule<RBool, AInteger>" typerule DIVISIBLE_OP "SimpleTypeRule<RBuiltinOperator>" -typerule DIVISION_TOTAL ::CVC5::theory::arith::ArithOperatorTypeRule +typerule DIVISION_TOTAL ::cvc5::theory::arith::ArithOperatorTypeRule typerule INTS_DIVISION_TOTAL "SimpleTypeRule<RInteger, AInteger, AInteger>" typerule INTS_MODULUS_TOTAL "SimpleTypeRule<RInteger, AInteger, AInteger>" @@ -150,20 +150,20 @@ typerule SQRT "SimpleTypeRule<RReal, AReal>" nullaryoperator PI "pi" -typerule PI ::CVC5::theory::arith::RealNullaryOperatorTypeRule +typerule PI ::cvc5::theory::arith::RealNullaryOperatorTypeRule # Integer AND, which is parameterized by a (positive) bitwidth k. # ((_ iand k) i1 i2) is equivalent to: # (bv2int (bvand ((_ int2bv k) i1) ((_ int2bv k) i2))) # for all integers i1, i2. constant IAND_OP \ - ::CVC5::IntAnd \ - "::CVC5::UnsignedHashFunction< ::CVC5::IntAnd >" \ + ::cvc5::IntAnd \ + "::cvc5::UnsignedHashFunction< ::cvc5::IntAnd >" \ "util/iand.h" \ - "operator for integer AND; payload is an instance of the CVC5::IntAnd class" + "operator for integer AND; payload is an instance of the cvc5::IntAnd class" parameterized IAND IAND_OP 2 "integer version of AND operator; first parameter is an IAND_OP, second and third are integer terms" -typerule IAND_OP ::CVC5::theory::arith::IAndOpTypeRule -typerule IAND ::CVC5::theory::arith::IAndTypeRule +typerule IAND_OP ::cvc5::theory::arith::IAndOpTypeRule +typerule IAND ::cvc5::theory::arith::IAndTypeRule endtheory diff --git a/src/theory/arith/linear_equality.cpp b/src/theory/arith/linear_equality.cpp index 28f386e2a..95c833707 100644 --- a/src/theory/arith/linear_equality.cpp +++ b/src/theory/arith/linear_equality.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -1413,4 +1413,4 @@ void LinearEqualityModule::directlyAddToCoefficient(ArithVar row, ArithVar col, } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/linear_equality.h b/src/theory/arith/linear_equality.h index 4a923b677..4f50853c9 100644 --- a/src/theory/arith/linear_equality.h +++ b/src/theory/arith/linear_equality.h @@ -40,7 +40,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -758,4 +758,4 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/matrix.cpp b/src/theory/arith/matrix.cpp index dd7f28228..f2ecc8e4c 100644 --- a/src/theory/arith/matrix.cpp +++ b/src/theory/arith/matrix.cpp @@ -18,7 +18,7 @@ #include "theory/arith/matrix.h" using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -28,4 +28,4 @@ bool NoEffectCCCB::canUseRow(RowIndex ridx) const { return false; } } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/matrix.h b/src/theory/arith/matrix.h index 553cef7d4..855f56d1f 100644 --- a/src/theory/arith/matrix.h +++ b/src/theory/arith/matrix.h @@ -28,7 +28,7 @@ #include "util/dense_map.h" #include "util/index.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -368,8 +368,8 @@ public: typedef MatrixEntry<T> Entry; protected: - typedef CVC5::theory::arith::RowVector<T> RowVectorT; - typedef CVC5::theory::arith::ColumnVector<T> ColumnVectorT; + typedef cvc5::theory::arith::RowVector<T> RowVectorT; + typedef cvc5::theory::arith::ColumnVector<T> ColumnVectorT; public: typedef typename RowVectorT::const_iterator RowIterator; @@ -999,4 +999,4 @@ protected: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/cad/cdcac.cpp b/src/theory/arith/nl/cad/cdcac.cpp index 7fd22fb76..c9f3ce3da 100644 --- a/src/theory/arith/nl/cad/cdcac.cpp +++ b/src/theory/arith/nl/cad/cdcac.cpp @@ -29,12 +29,12 @@ namespace std { template <typename T> std::ostream& operator<<(std::ostream& os, const std::vector<T>& v) { - CVC5::container_to_stream(os, v); + cvc5::container_to_stream(os, v); return os; } } // namespace std -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -545,6 +545,6 @@ void CDCAC::pruneRedundantIntervals(std::vector<CACInterval>& intervals) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/cdcac.h b/src/theory/arith/nl/cad/cdcac.h index 2b607ae78..338f54da2 100644 --- a/src/theory/arith/nl/cad/cdcac.h +++ b/src/theory/arith/nl/cad/cdcac.h @@ -31,7 +31,7 @@ #include "theory/arith/nl/cad/proof_generator.h" #include "theory/arith/nl/cad/variable_ordering.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -210,7 +210,7 @@ class CDCAC } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/cdcac_utils.cpp b/src/theory/arith/nl/cad/cdcac_utils.cpp index f40d528ff..999e491f6 100644 --- a/src/theory/arith/nl/cad/cdcac_utils.cpp +++ b/src/theory/arith/nl/cad/cdcac_utils.cpp @@ -20,7 +20,7 @@ #include "theory/arith/nl/cad/projections.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -370,6 +370,6 @@ void makeFinestSquareFreeBasis(CACInterval& lhs, CACInterval& rhs) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/cdcac_utils.h b/src/theory/arith/nl/cad/cdcac_utils.h index 3b3a3638b..607a2226f 100644 --- a/src/theory/arith/nl/cad/cdcac_utils.h +++ b/src/theory/arith/nl/cad/cdcac_utils.h @@ -28,7 +28,7 @@ #include "expr/node.h" #include "theory/arith/nl/cad/projections.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -105,7 +105,7 @@ void makeFinestSquareFreeBasis(CACInterval& lhs, CACInterval& rhs); } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/constraints.cpp b/src/theory/arith/nl/cad/constraints.cpp index 1ea172d11..75d1cb723 100644 --- a/src/theory/arith/nl/cad/constraints.cpp +++ b/src/theory/arith/nl/cad/constraints.cpp @@ -23,7 +23,7 @@ #include "theory/arith/nl/poly_conversion.h" #include "util/poly_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -79,6 +79,6 @@ void Constraints::sortConstraints() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/constraints.h b/src/theory/arith/nl/cad/constraints.h index 70c52e85c..e9e59c40b 100644 --- a/src/theory/arith/nl/cad/constraints.h +++ b/src/theory/arith/nl/cad/constraints.h @@ -28,7 +28,7 @@ #include "theory/arith/nl/poly_conversion.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -87,7 +87,7 @@ class Constraints } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/projections.cpp b/src/theory/arith/nl/cad/projections.cpp index b9e17f844..1bac0c160 100644 --- a/src/theory/arith/nl/cad/projections.cpp +++ b/src/theory/arith/nl/cad/projections.cpp @@ -20,7 +20,7 @@ #include "base/check.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -106,6 +106,6 @@ PolyVector projection_mccallum(const std::vector<Polynomial>& polys) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/projections.h b/src/theory/arith/nl/cad/projections.h index 3b8eb412f..94bdfc3ef 100644 --- a/src/theory/arith/nl/cad/projections.h +++ b/src/theory/arith/nl/cad/projections.h @@ -25,7 +25,7 @@ #include <vector> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -76,7 +76,7 @@ PolyVector projectionMcCallum(const std::vector<poly::Polynomial>& polys); } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/proof_checker.cpp b/src/theory/arith/nl/cad/proof_checker.cpp index f1ab2d6a9..3cd8fe98e 100644 --- a/src/theory/arith/nl/cad/proof_checker.cpp +++ b/src/theory/arith/nl/cad/proof_checker.cpp @@ -17,9 +17,9 @@ #include "expr/sequence.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -58,4 +58,4 @@ Node CADProofRuleChecker::checkInternal(PfRule id, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/cad/proof_checker.h b/src/theory/arith/nl/cad/proof_checker.h index 26bbcc3a9..9100762b7 100644 --- a/src/theory/arith/nl/cad/proof_checker.h +++ b/src/theory/arith/nl/cad/proof_checker.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "expr/proof_checker.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -53,6 +53,6 @@ class CADProofRuleChecker : public ProofRuleChecker } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */ diff --git a/src/theory/arith/nl/cad/proof_generator.cpp b/src/theory/arith/nl/cad/proof_generator.cpp index fe3734dce..73e19aa28 100644 --- a/src/theory/arith/nl/cad/proof_generator.cpp +++ b/src/theory/arith/nl/cad/proof_generator.cpp @@ -19,7 +19,7 @@ #include "theory/lazy_tree_proof_generator.h" #include "theory/arith/nl/poly_conversion.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -230,6 +230,6 @@ std::ostream& operator<<(std::ostream& os, const CADProofGenerator& proof) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/proof_generator.h b/src/theory/arith/nl/cad/proof_generator.h index c1bb4be1e..76a72f9c5 100644 --- a/src/theory/arith/nl/cad/proof_generator.h +++ b/src/theory/arith/nl/cad/proof_generator.h @@ -28,7 +28,7 @@ #include "theory/arith/nl/cad/cdcac_utils.h" #include "theory/lazy_tree_proof_generator.h" -namespace CVC5 { +namespace cvc5 { class ProofGenerator; @@ -144,7 +144,7 @@ std::ostream& operator<<(std::ostream& os, const CADProofGenerator& proof); } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif #endif diff --git a/src/theory/arith/nl/cad/variable_ordering.cpp b/src/theory/arith/nl/cad/variable_ordering.cpp index 63db35553..7ebbc90dd 100644 --- a/src/theory/arith/nl/cad/variable_ordering.cpp +++ b/src/theory/arith/nl/cad/variable_ordering.cpp @@ -20,7 +20,7 @@ #include "util/poly_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -132,6 +132,6 @@ std::vector<poly::Variable> VariableOrdering::operator()( } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad/variable_ordering.h b/src/theory/arith/nl/cad/variable_ordering.h index 7fda3faa4..0ab585197 100644 --- a/src/theory/arith/nl/cad/variable_ordering.h +++ b/src/theory/arith/nl/cad/variable_ordering.h @@ -26,7 +26,7 @@ #include "theory/arith/nl/cad/constraints.h" #include "util/poly_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -65,7 +65,7 @@ std::vector<poly_utils::VariableInformation> collectInformation( } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/cad_solver.cpp b/src/theory/arith/nl/cad_solver.cpp index dc18fbdf5..1cf9cbc54 100644 --- a/src/theory/arith/nl/cad_solver.cpp +++ b/src/theory/arith/nl/cad_solver.cpp @@ -20,7 +20,7 @@ #include "theory/arith/nl/nl_model.h" #include "theory/arith/nl/poly_conversion.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -212,4 +212,4 @@ bool CadSolver::constructModelIfAvailable(std::vector<Node>& assertions) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/cad_solver.h b/src/theory/arith/nl/cad_solver.h index de97c48cc..620679735 100644 --- a/src/theory/arith/nl/cad_solver.h +++ b/src/theory/arith/nl/cad_solver.h @@ -22,7 +22,7 @@ #include "theory/arith/nl/cad/cdcac.h" #include "theory/arith/nl/cad/proof_checker.h" -namespace CVC5 { +namespace cvc5 { class ProofNodeManager; @@ -110,6 +110,6 @@ class CadSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__CAD_SOLVER_H */ diff --git a/src/theory/arith/nl/ext/constraint.cpp b/src/theory/arith/nl/ext/constraint.cpp index 41331d041..688bab86d 100644 --- a/src/theory/arith/nl/ext/constraint.cpp +++ b/src/theory/arith/nl/ext/constraint.cpp @@ -18,9 +18,9 @@ #include "theory/arith/arith_utilities.h" #include "theory/arith/nl/ext/monomial.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -123,4 +123,4 @@ bool ConstraintDb::isMaximal(Node atom, Node x) const } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/constraint.h b/src/theory/arith/nl/ext/constraint.h index 9e6451c99..a96949a1e 100644 --- a/src/theory/arith/nl/ext/constraint.h +++ b/src/theory/arith/nl/ext/constraint.h @@ -21,7 +21,7 @@ #include "expr/kind.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -84,6 +84,6 @@ class ConstraintDb } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NL_SOLVER_H */ diff --git a/src/theory/arith/nl/ext/ext_state.cpp b/src/theory/arith/nl/ext/ext_state.cpp index fc806199e..e20224207 100644 --- a/src/theory/arith/nl/ext/ext_state.cpp +++ b/src/theory/arith/nl/ext/ext_state.cpp @@ -23,7 +23,7 @@ #include "theory/arith/nl/nl_model.h" #include "theory/arith/nl/nl_lemma_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -109,4 +109,4 @@ CDProof* ExtState::getProof() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/ext_state.h b/src/theory/arith/nl/ext/ext_state.h index 1d8e7ea0a..2d20e1557 100644 --- a/src/theory/arith/nl/ext/ext_state.h +++ b/src/theory/arith/nl/ext/ext_state.h @@ -21,7 +21,7 @@ #include "expr/proof_set.h" #include "theory/arith/nl/ext/monomial.h" -namespace CVC5 { +namespace cvc5 { class CDProof; @@ -91,6 +91,6 @@ struct ExtState } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/ext/factoring_check.cpp b/src/theory/arith/nl/ext/factoring_check.cpp index 675368843..09e1d4f10 100644 --- a/src/theory/arith/nl/ext/factoring_check.cpp +++ b/src/theory/arith/nl/ext/factoring_check.cpp @@ -23,7 +23,7 @@ #include "theory/arith/nl/ext/ext_state.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -207,4 +207,4 @@ Node FactoringCheck::getFactorSkolem(Node n, CDProof* proof) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/factoring_check.h b/src/theory/arith/nl/ext/factoring_check.h index 89c5fce30..08154cb98 100644 --- a/src/theory/arith/nl/ext/factoring_check.h +++ b/src/theory/arith/nl/ext/factoring_check.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { class CDProof; @@ -69,6 +69,6 @@ class FactoringCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/ext/monomial.cpp b/src/theory/arith/nl/ext/monomial.cpp index 86abed70c..784c07691 100644 --- a/src/theory/arith/nl/ext/monomial.cpp +++ b/src/theory/arith/nl/ext/monomial.cpp @@ -18,9 +18,9 @@ #include "theory/arith/nl/nl_lemma_utils.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -333,4 +333,4 @@ Node MonomialDb::mkMonomialRemFactor(Node n, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/monomial.h b/src/theory/arith/nl/ext/monomial.h index 98083b996..6646e4a73 100644 --- a/src/theory/arith/nl/ext/monomial.h +++ b/src/theory/arith/nl/ext/monomial.h @@ -20,7 +20,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -144,6 +144,6 @@ class MonomialDb } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NL_MONOMIAL_H */ diff --git a/src/theory/arith/nl/ext/monomial_bounds_check.cpp b/src/theory/arith/nl/ext/monomial_bounds_check.cpp index c8194bbd0..344218148 100644 --- a/src/theory/arith/nl/ext/monomial_bounds_check.cpp +++ b/src/theory/arith/nl/ext/monomial_bounds_check.cpp @@ -24,7 +24,7 @@ #include "theory/arith/nl/nl_model.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -520,4 +520,4 @@ void MonomialBoundsCheck::checkResBounds() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/monomial_bounds_check.h b/src/theory/arith/nl/ext/monomial_bounds_check.h index e63dd454a..a19c61e64 100644 --- a/src/theory/arith/nl/ext/monomial_bounds_check.h +++ b/src/theory/arith/nl/ext/monomial_bounds_check.h @@ -18,7 +18,7 @@ #include "expr/node.h" #include "theory/arith/nl/ext/constraint.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -86,6 +86,6 @@ class MonomialBoundsCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/ext/monomial_check.cpp b/src/theory/arith/nl/ext/monomial_check.cpp index 9fc2ba10a..a30d4aff9 100644 --- a/src/theory/arith/nl/ext/monomial_check.cpp +++ b/src/theory/arith/nl/ext/monomial_check.cpp @@ -22,7 +22,7 @@ #include "theory/arith/nl/nl_lemma_utils.h" #include "theory/arith/nl/ext/ext_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -757,4 +757,4 @@ void MonomialCheck::setMonomialFactor(Node a, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/monomial_check.h b/src/theory/arith/nl/ext/monomial_check.h index 948368542..f242182b4 100644 --- a/src/theory/arith/nl/ext/monomial_check.h +++ b/src/theory/arith/nl/ext/monomial_check.h @@ -19,7 +19,7 @@ #include "theory/arith/nl/ext/monomial.h" #include "theory/theory_inference.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -194,6 +194,6 @@ class MonomialCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/ext/proof_checker.cpp b/src/theory/arith/nl/ext/proof_checker.cpp index 26db3c9e0..b6c4572f5 100644 --- a/src/theory/arith/nl/ext/proof_checker.cpp +++ b/src/theory/arith/nl/ext/proof_checker.cpp @@ -18,9 +18,9 @@ #include "theory/arith/arith_utilities.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -158,4 +158,4 @@ Node ExtProofRuleChecker::checkInternal(PfRule id, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/proof_checker.h b/src/theory/arith/nl/ext/proof_checker.h index 7bd4b7e38..90518fc08 100644 --- a/src/theory/arith/nl/ext/proof_checker.h +++ b/src/theory/arith/nl/ext/proof_checker.h @@ -21,7 +21,7 @@ #include "expr/proof_checker.h" #include "expr/proof_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -51,6 +51,6 @@ class ExtProofRuleChecker : public ProofRuleChecker } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */ diff --git a/src/theory/arith/nl/ext/split_zero_check.cpp b/src/theory/arith/nl/ext/split_zero_check.cpp index 543b6a0bd..7392d45f4 100644 --- a/src/theory/arith/nl/ext/split_zero_check.cpp +++ b/src/theory/arith/nl/ext/split_zero_check.cpp @@ -22,7 +22,7 @@ #include "theory/arith/nl/ext/ext_state.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -57,4 +57,4 @@ void SplitZeroCheck::check() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/split_zero_check.h b/src/theory/arith/nl/ext/split_zero_check.h index 316e304ff..04148bd19 100644 --- a/src/theory/arith/nl/ext/split_zero_check.h +++ b/src/theory/arith/nl/ext/split_zero_check.h @@ -18,7 +18,7 @@ #include "expr/node.h" #include "context/cdhashset.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -50,6 +50,6 @@ class SplitZeroCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/ext/tangent_plane_check.cpp b/src/theory/arith/nl/ext/tangent_plane_check.cpp index bdeca7a29..711bc9816 100644 --- a/src/theory/arith/nl/ext/tangent_plane_check.cpp +++ b/src/theory/arith/nl/ext/tangent_plane_check.cpp @@ -22,7 +22,7 @@ #include "theory/arith/nl/ext/ext_state.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -164,4 +164,4 @@ void TangentPlaneCheck::check(bool asWaitingLemmas) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext/tangent_plane_check.h b/src/theory/arith/nl/ext/tangent_plane_check.h index 7d48d249b..b5159e721 100644 --- a/src/theory/arith/nl/ext/tangent_plane_check.h +++ b/src/theory/arith/nl/ext/tangent_plane_check.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -67,6 +67,6 @@ class TangentPlaneCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/ext_theory_callback.cpp b/src/theory/arith/nl/ext_theory_callback.cpp index 125fbb05a..72848ac89 100644 --- a/src/theory/arith/nl/ext_theory_callback.cpp +++ b/src/theory/arith/nl/ext_theory_callback.cpp @@ -17,9 +17,9 @@ #include "theory/arith/arith_utilities.h" #include "theory/uf/equality_engine.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -129,4 +129,4 @@ bool NlExtTheoryCallback::isExtfReduced(int effort, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/ext_theory_callback.h b/src/theory/arith/nl/ext_theory_callback.h index c747eef69..0e0e1411b 100644 --- a/src/theory/arith/nl/ext_theory_callback.h +++ b/src/theory/arith/nl/ext_theory_callback.h @@ -18,7 +18,7 @@ #include "expr/node.h" #include "theory/ext_theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { class EqualityEngine; @@ -84,6 +84,6 @@ class NlExtTheoryCallback : public ExtTheoryCallback } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NL__EXT_THEORY_CALLBACK_H */ diff --git a/src/theory/arith/nl/iand_solver.cpp b/src/theory/arith/nl/iand_solver.cpp index 01f4c6e15..0e339857b 100644 --- a/src/theory/arith/nl/iand_solver.cpp +++ b/src/theory/arith/nl/iand_solver.cpp @@ -25,9 +25,9 @@ #include "theory/rewriter.h" #include "util/iand.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -298,4 +298,4 @@ Node IAndSolver::bitwiseLemma(Node i) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/iand_solver.h b/src/theory/arith/nl/iand_solver.h index 95d9632aa..2b7f90e9b 100644 --- a/src/theory/arith/nl/iand_solver.h +++ b/src/theory/arith/nl/iand_solver.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/arith/nl/iand_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -132,6 +132,6 @@ class IAndSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__IAND_SOLVER_H */ diff --git a/src/theory/arith/nl/iand_utils.cpp b/src/theory/arith/nl/iand_utils.cpp index cd96021b0..e08068b7e 100644 --- a/src/theory/arith/nl/iand_utils.cpp +++ b/src/theory/arith/nl/iand_utils.cpp @@ -21,7 +21,7 @@ #include "theory/arith/nl/nl_model.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -276,4 +276,4 @@ Node IAndUtils::twoToKMinusOne(unsigned k) const } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/iand_utils.h b/src/theory/arith/nl/iand_utils.h index da5f8f04f..60c3cbe13 100644 --- a/src/theory/arith/nl/iand_utils.h +++ b/src/theory/arith/nl/iand_utils.h @@ -20,7 +20,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -169,6 +169,6 @@ class IAndUtils } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__IAND_TABLE_H */ diff --git a/src/theory/arith/nl/icp/candidate.cpp b/src/theory/arith/nl/icp/candidate.cpp index 87d823018..31b7b085b 100644 --- a/src/theory/arith/nl/icp/candidate.cpp +++ b/src/theory/arith/nl/icp/candidate.cpp @@ -23,7 +23,7 @@ #include "theory/arith/nl/icp/intersection.h" #include "theory/arith/nl/poly_conversion.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -115,6 +115,6 @@ std::ostream& operator<<(std::ostream& os, const Candidate& c) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/icp/candidate.h b/src/theory/arith/nl/icp/candidate.h index d4ad11fcf..4bcbf3e85 100644 --- a/src/theory/arith/nl/icp/candidate.h +++ b/src/theory/arith/nl/icp/candidate.h @@ -23,7 +23,7 @@ #include "expr/node.h" #include "theory/arith/nl/icp/intersection.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -78,7 +78,7 @@ std::ostream& operator<<(std::ostream& os, const Candidate& c); } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/icp/contraction_origins.cpp b/src/theory/arith/nl/icp/contraction_origins.cpp index c0b0cb768..acf499a21 100644 --- a/src/theory/arith/nl/icp/contraction_origins.cpp +++ b/src/theory/arith/nl/icp/contraction_origins.cpp @@ -14,7 +14,7 @@ #include "theory/arith/nl/icp/contraction_origins.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -117,4 +117,4 @@ inline std::ostream& operator<<(std::ostream& os, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/icp/contraction_origins.h b/src/theory/arith/nl/icp/contraction_origins.h index 0f22b5463..dfddbce78 100644 --- a/src/theory/arith/nl/icp/contraction_origins.h +++ b/src/theory/arith/nl/icp/contraction_origins.h @@ -20,7 +20,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -99,6 +99,6 @@ std::ostream& operator<<(std::ostream& os, const ContractionOriginManager& com); } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/icp/icp_solver.cpp b/src/theory/arith/nl/icp/icp_solver.cpp index e09264a25..2f6cdf220 100644 --- a/src/theory/arith/nl/icp/icp_solver.cpp +++ b/src/theory/arith/nl/icp/icp_solver.cpp @@ -26,7 +26,7 @@ #include "theory/rewriter.h" #include "util/poly_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -384,4 +384,4 @@ void ICPSolver::check() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/icp/icp_solver.h b/src/theory/arith/nl/icp/icp_solver.h index 56ec03706..11fd9ac1b 100644 --- a/src/theory/arith/nl/icp/icp_solver.h +++ b/src/theory/arith/nl/icp/icp_solver.h @@ -28,7 +28,7 @@ #include "theory/arith/nl/icp/intersection.h" #include "theory/arith/nl/poly_conversion.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -153,6 +153,6 @@ class ICPSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/icp/intersection.cpp b/src/theory/arith/nl/icp/intersection.cpp index 6cdba297c..e0e93e1dd 100644 --- a/src/theory/arith/nl/icp/intersection.cpp +++ b/src/theory/arith/nl/icp/intersection.cpp @@ -24,7 +24,7 @@ #include "base/output.h" #include "theory/arith/nl/poly_conversion.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -221,6 +221,6 @@ PropagationResult intersect_interval_with(poly::Interval& cur, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/icp/intersection.h b/src/theory/arith/nl/icp/intersection.h index c453f8314..dd4afadfc 100644 --- a/src/theory/arith/nl/icp/intersection.h +++ b/src/theory/arith/nl/icp/intersection.h @@ -25,7 +25,7 @@ namespace poly { class Interval; } -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -77,7 +77,7 @@ PropagationResult intersect_interval_with(poly::Interval& cur, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/icp/interval.h b/src/theory/arith/nl/icp/interval.h index 8acbfec05..981355e4a 100644 --- a/src/theory/arith/nl/icp/interval.h +++ b/src/theory/arith/nl/icp/interval.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -58,7 +58,7 @@ inline std::ostream& operator<<(std::ostream& os, const Interval& i) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/nl_lemma_utils.cpp b/src/theory/arith/nl/nl_lemma_utils.cpp index f3c2d70c8..9740e1b46 100644 --- a/src/theory/arith/nl/nl_lemma_utils.cpp +++ b/src/theory/arith/nl/nl_lemma_utils.cpp @@ -17,7 +17,7 @@ #include "theory/arith/nl/nl_model.h" #include "theory/arith/nl/nonlinear_extension.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -78,4 +78,4 @@ Node ArgTrie::add(Node d, const std::vector<Node>& args) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/nl_lemma_utils.h b/src/theory/arith/nl/nl_lemma_utils.h index 71d86b08a..32fe763b4 100644 --- a/src/theory/arith/nl/nl_lemma_utils.h +++ b/src/theory/arith/nl/nl_lemma_utils.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "theory/theory_inference.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -144,6 +144,6 @@ class ArgTrie } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NL_LEMMA_UTILS_H */ diff --git a/src/theory/arith/nl/nl_model.cpp b/src/theory/arith/nl/nl_model.cpp index f7edefff7..882cd12a4 100644 --- a/src/theory/arith/nl/nl_model.cpp +++ b/src/theory/arith/nl/nl_model.cpp @@ -24,9 +24,9 @@ #include "theory/theory_model.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -1342,4 +1342,4 @@ void NlModel::getModelValueRepair( } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/nl_model.h b/src/theory/arith/nl/nl_model.h index b2c435098..9da8738b6 100644 --- a/src/theory/arith/nl/nl_model.h +++ b/src/theory/arith/nl/nl_model.h @@ -22,7 +22,7 @@ #include "expr/kind.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace context { class Context; @@ -329,6 +329,6 @@ class NlModel } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */ diff --git a/src/theory/arith/nl/nonlinear_extension.cpp b/src/theory/arith/nl/nonlinear_extension.cpp index 3c46e1652..03563006b 100644 --- a/src/theory/arith/nl/nonlinear_extension.cpp +++ b/src/theory/arith/nl/nonlinear_extension.cpp @@ -27,9 +27,9 @@ #include "theory/rewriter.h" #include "theory/theory_model.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -622,4 +622,4 @@ void NonlinearExtension::runStrategy(Theory::Effort effort, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/nonlinear_extension.h b/src/theory/arith/nl/nonlinear_extension.h index b6fb53651..722741d7d 100644 --- a/src/theory/arith/nl/nonlinear_extension.h +++ b/src/theory/arith/nl/nonlinear_extension.h @@ -41,7 +41,7 @@ #include "theory/theory.h" #include "util/result.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { class EqualityEngine; @@ -296,6 +296,6 @@ class NonlinearExtension } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NONLINEAR_EXTENSION_H */ diff --git a/src/theory/arith/nl/poly_conversion.cpp b/src/theory/arith/nl/poly_conversion.cpp index 5738dccfc..c7b549655 100644 --- a/src/theory/arith/nl/poly_conversion.cpp +++ b/src/theory/arith/nl/poly_conversion.cpp @@ -23,12 +23,12 @@ #include "theory/arith/bound_inference.h" #include "util/poly_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { -poly::Variable VariableMapper::operator()(const CVC5::Node& n) +poly::Variable VariableMapper::operator()(const cvc5::Node& n) { auto it = mVarCVCpoly.find(n); if (it == mVarCVCpoly.end()) @@ -54,7 +54,7 @@ poly::Variable VariableMapper::operator()(const CVC5::Node& n) return it->second; } -CVC5::Node VariableMapper::operator()(const poly::Variable& n) +cvc5::Node VariableMapper::operator()(const poly::Variable& n) { auto it = mVarpolyCVC.find(n); Assert(it != mVarpolyCVC.end()) @@ -62,7 +62,7 @@ CVC5::Node VariableMapper::operator()(const poly::Variable& n) return it->second; } -CVC5::Node as_cvc_upolynomial(const poly::UPolynomial& p, const CVC5::Node& var) +cvc5::Node as_cvc_upolynomial(const poly::UPolynomial& p, const cvc5::Node& var) { Trace("poly::conversion") << "Converting " << p << " over " << var << std::endl; @@ -87,9 +87,9 @@ CVC5::Node as_cvc_upolynomial(const poly::UPolynomial& p, const CVC5::Node& var) return res; } -poly::UPolynomial as_poly_upolynomial_impl(const CVC5::Node& n, +poly::UPolynomial as_poly_upolynomial_impl(const cvc5::Node& n, poly::Integer& denominator, - const CVC5::Node& var) + const cvc5::Node& var) { denominator = poly::Integer(1); if (n.isVar()) @@ -140,14 +140,14 @@ poly::UPolynomial as_poly_upolynomial_impl(const CVC5::Node& n, return poly::UPolynomial(); } -poly::UPolynomial as_poly_upolynomial(const CVC5::Node& n, - const CVC5::Node& var) +poly::UPolynomial as_poly_upolynomial(const cvc5::Node& n, + const cvc5::Node& var) { poly::Integer denom; return as_poly_upolynomial_impl(n, denom, var); } -poly::Polynomial as_poly_polynomial_impl(const CVC5::Node& n, +poly::Polynomial as_poly_polynomial_impl(const cvc5::Node& n, poly::Integer& denominator, VariableMapper& vm) { @@ -195,12 +195,12 @@ poly::Polynomial as_poly_polynomial_impl(const CVC5::Node& n, } return poly::Polynomial(); } -poly::Polynomial as_poly_polynomial(const CVC5::Node& n, VariableMapper& vm) +poly::Polynomial as_poly_polynomial(const cvc5::Node& n, VariableMapper& vm) { poly::Integer denom; return as_poly_polynomial_impl(n, denom, vm); } -poly::Polynomial as_poly_polynomial(const CVC5::Node& n, +poly::Polynomial as_poly_polynomial(const cvc5::Node& n, VariableMapper& vm, poly::Rational& denominator) { @@ -257,7 +257,7 @@ void collect_monomials(const lp_polynomial_context_t* ctx, } } // namespace -CVC5::Node as_cvc_polynomial(const poly::Polynomial& p, VariableMapper& vm) +cvc5::Node as_cvc_polynomial(const poly::Polynomial& p, VariableMapper& vm) { CollectMonomialData cmd(vm); // Do the actual conversion @@ -274,7 +274,7 @@ CVC5::Node as_cvc_polynomial(const poly::Polynomial& p, VariableMapper& vm) return cmd.d_nm->mkNode(Kind::PLUS, cmd.d_terms); } -poly::SignCondition normalize_kind(CVC5::Kind kind, +poly::SignCondition normalize_kind(cvc5::Kind kind, bool negated, poly::Polynomial& lhs) { @@ -803,6 +803,6 @@ poly::IntervalAssignment getBounds(VariableMapper& vm, const BoundInference& bi) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/poly_conversion.h b/src/theory/arith/nl/poly_conversion.h index 9adc9a996..9aef0db18 100644 --- a/src/theory/arith/nl/poly_conversion.h +++ b/src/theory/arith/nl/poly_conversion.h @@ -30,7 +30,7 @@ #include "expr/node.h" #include "util/real_algebraic_number.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -42,23 +42,23 @@ namespace nl { struct VariableMapper { /** A mapping from CVC4 variables to poly variables. */ - std::map<CVC5::Node, poly::Variable> mVarCVCpoly; + std::map<cvc5::Node, poly::Variable> mVarCVCpoly; /** A mapping from poly variables to CVC4 variables. */ - std::map<poly::Variable, CVC5::Node> mVarpolyCVC; + std::map<poly::Variable, cvc5::Node> mVarpolyCVC; /** Retrieves the according poly variable. */ - poly::Variable operator()(const CVC5::Node& n); + poly::Variable operator()(const cvc5::Node& n); /** Retrieves the according CVC4 variable. */ - CVC5::Node operator()(const poly::Variable& n); + cvc5::Node operator()(const poly::Variable& n); }; -/** Convert a poly univariate polynomial to a CVC5::Node. */ -CVC5::Node as_cvc_upolynomial(const poly::UPolynomial& p, - const CVC5::Node& var); +/** Convert a poly univariate polynomial to a cvc5::Node. */ +cvc5::Node as_cvc_upolynomial(const poly::UPolynomial& p, + const cvc5::Node& var); -/** Convert a CVC5::Node to a poly univariate polynomial. */ -poly::UPolynomial as_poly_upolynomial(const CVC5::Node& n, - const CVC5::Node& var); +/** Convert a cvc5::Node to a poly univariate polynomial. */ +poly::UPolynomial as_poly_upolynomial(const cvc5::Node& n, + const cvc5::Node& var); /** * Constructs a polynomial from the given node. @@ -73,8 +73,8 @@ poly::UPolynomial as_poly_upolynomial(const CVC5::Node& n, * in the context of ICP) the second overload provides the denominator in the * third argument. */ -poly::Polynomial as_poly_polynomial(const CVC5::Node& n, VariableMapper& vm); -poly::Polynomial as_poly_polynomial(const CVC5::Node& n, +poly::Polynomial as_poly_polynomial(const cvc5::Node& n, VariableMapper& vm); +poly::Polynomial as_poly_polynomial(const cvc5::Node& n, VariableMapper& vm, poly::Rational& denominator); @@ -87,7 +87,7 @@ poly::Polynomial as_poly_polynomial(const CVC5::Node& n, * multiplications with one or use NONLINEAR_MULT where regular MULT may be * sufficient), so it may be sensible to rewrite it afterwards. */ -CVC5::Node as_cvc_polynomial(const poly::Polynomial& p, VariableMapper& vm); +cvc5::Node as_cvc_polynomial(const poly::Polynomial& p, VariableMapper& vm); /** * Constructs a constraints (a polynomial and a sign condition) from the given @@ -164,7 +164,7 @@ poly::IntervalAssignment getBounds(VariableMapper& vm, const BoundInference& bi) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arith/nl/stats.cpp b/src/theory/arith/nl/stats.cpp index 92cebc8fc..33a73ddd7 100644 --- a/src/theory/arith/nl/stats.cpp +++ b/src/theory/arith/nl/stats.cpp @@ -16,7 +16,7 @@ #include "smt/smt_statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -38,4 +38,4 @@ NlStats::~NlStats() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/stats.h b/src/theory/arith/nl/stats.h index 66157d0a3..66f41375b 100644 --- a/src/theory/arith/nl/stats.h +++ b/src/theory/arith/nl/stats.h @@ -19,7 +19,7 @@ #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -44,6 +44,6 @@ class NlStats } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NL__STATS_H */ diff --git a/src/theory/arith/nl/strategy.cpp b/src/theory/arith/nl/strategy.cpp index af23f67f9..4df53b103 100644 --- a/src/theory/arith/nl/strategy.cpp +++ b/src/theory/arith/nl/strategy.cpp @@ -19,7 +19,7 @@ #include "base/check.h" #include "options/arith_options.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -173,4 +173,4 @@ StepGenerator Strategy::getStrategy() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/strategy.h b/src/theory/arith/nl/strategy.h index 9caf6322b..139db7459 100644 --- a/src/theory/arith/nl/strategy.h +++ b/src/theory/arith/nl/strategy.h @@ -18,7 +18,7 @@ #include <iosfwd> #include <vector> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -173,6 +173,6 @@ class Strategy } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NL__STRATEGY_H */ diff --git a/src/theory/arith/nl/transcendental/exponential_solver.cpp b/src/theory/arith/nl/transcendental/exponential_solver.cpp index 05849a579..5e2358b68 100644 --- a/src/theory/arith/nl/transcendental/exponential_solver.cpp +++ b/src/theory/arith/nl/transcendental/exponential_solver.cpp @@ -28,7 +28,7 @@ #include "theory/arith/nl/transcendental/transcendental_state.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -276,4 +276,4 @@ std::pair<Node, Node> ExponentialSolver::getSecantBounds(TNode e, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/transcendental/exponential_solver.h b/src/theory/arith/nl/transcendental/exponential_solver.h index 8bd00c456..c5eb45728 100644 --- a/src/theory/arith/nl/transcendental/exponential_solver.h +++ b/src/theory/arith/nl/transcendental/exponential_solver.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -108,6 +108,6 @@ class ExponentialSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */ diff --git a/src/theory/arith/nl/transcendental/proof_checker.cpp b/src/theory/arith/nl/transcendental/proof_checker.cpp index fe071c36a..4fc85666a 100644 --- a/src/theory/arith/nl/transcendental/proof_checker.cpp +++ b/src/theory/arith/nl/transcendental/proof_checker.cpp @@ -19,9 +19,9 @@ #include "theory/arith/nl/transcendental/taylor_generator.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -402,4 +402,4 @@ Node TranscendentalProofRuleChecker::checkInternal( } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/transcendental/proof_checker.h b/src/theory/arith/nl/transcendental/proof_checker.h index 2a6837590..a4c8b55cb 100644 --- a/src/theory/arith/nl/transcendental/proof_checker.h +++ b/src/theory/arith/nl/transcendental/proof_checker.h @@ -21,7 +21,7 @@ #include "expr/proof_checker.h" #include "expr/proof_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -53,6 +53,6 @@ class TranscendentalProofRuleChecker : public ProofRuleChecker } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */ diff --git a/src/theory/arith/nl/transcendental/sine_solver.cpp b/src/theory/arith/nl/transcendental/sine_solver.cpp index 052b6c056..c8c375096 100644 --- a/src/theory/arith/nl/transcendental/sine_solver.cpp +++ b/src/theory/arith/nl/transcendental/sine_solver.cpp @@ -28,7 +28,7 @@ #include "theory/arith/nl/transcendental/transcendental_state.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -484,4 +484,4 @@ std::pair<Node, Node> SineSolver::getSecantBounds(TNode e, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/transcendental/sine_solver.h b/src/theory/arith/nl/transcendental/sine_solver.h index c20c50f6d..b85d0dc48 100644 --- a/src/theory/arith/nl/transcendental/sine_solver.h +++ b/src/theory/arith/nl/transcendental/sine_solver.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/arith/nl/transcendental/transcendental_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -175,6 +175,6 @@ class SineSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */ diff --git a/src/theory/arith/nl/transcendental/taylor_generator.cpp b/src/theory/arith/nl/transcendental/taylor_generator.cpp index f2817344a..5a9e87b7f 100644 --- a/src/theory/arith/nl/transcendental/taylor_generator.cpp +++ b/src/theory/arith/nl/transcendental/taylor_generator.cpp @@ -18,7 +18,7 @@ #include "theory/arith/nl/nl_model.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -243,4 +243,4 @@ std::pair<Node, Node> TaylorGenerator::getTfModelBounds(Node tf, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/transcendental/taylor_generator.h b/src/theory/arith/nl/transcendental/taylor_generator.h index b13be57f0..8b7f5340d 100644 --- a/src/theory/arith/nl/transcendental/taylor_generator.h +++ b/src/theory/arith/nl/transcendental/taylor_generator.h @@ -17,7 +17,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -118,6 +118,6 @@ class TaylorGenerator } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */ diff --git a/src/theory/arith/nl/transcendental/transcendental_solver.cpp b/src/theory/arith/nl/transcendental/transcendental_solver.cpp index bedfe4d3b..ed5ab4255 100644 --- a/src/theory/arith/nl/transcendental/transcendental_solver.cpp +++ b/src/theory/arith/nl/transcendental/transcendental_solver.cpp @@ -27,9 +27,9 @@ #include "theory/arith/nl/transcendental/taylor_generator.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -438,4 +438,4 @@ int TranscendentalSolver::regionToConcavity(Kind k, int region) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/transcendental/transcendental_solver.h b/src/theory/arith/nl/transcendental/transcendental_solver.h index e22bf3e64..c3d098e03 100644 --- a/src/theory/arith/nl/transcendental/transcendental_solver.h +++ b/src/theory/arith/nl/transcendental/transcendental_solver.h @@ -22,7 +22,7 @@ #include "theory/arith/nl/transcendental/sine_solver.h" #include "theory/arith/nl/transcendental/transcendental_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -200,6 +200,6 @@ class TranscendentalSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__TRANSCENDENTAL_SOLVER_H */ diff --git a/src/theory/arith/nl/transcendental/transcendental_state.cpp b/src/theory/arith/nl/transcendental/transcendental_state.cpp index 6ab136d39..e662c017e 100644 --- a/src/theory/arith/nl/transcendental/transcendental_state.cpp +++ b/src/theory/arith/nl/transcendental/transcendental_state.cpp @@ -21,7 +21,7 @@ #include "theory/arith/nl/transcendental/taylor_generator.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -437,4 +437,4 @@ void TranscendentalState::doSecantLemmas(const std::pair<Node, Node>& bounds, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/nl/transcendental/transcendental_state.h b/src/theory/arith/nl/transcendental/transcendental_state.h index 21a60e038..a55071ef1 100644 --- a/src/theory/arith/nl/transcendental/transcendental_state.h +++ b/src/theory/arith/nl/transcendental/transcendental_state.h @@ -21,7 +21,7 @@ #include "theory/arith/nl/transcendental/proof_checker.h" #include "theory/arith/nl/transcendental/taylor_generator.h" -namespace CVC5 { +namespace cvc5 { class CDProof; namespace theory { namespace arith { @@ -278,6 +278,6 @@ struct TranscendentalState } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NL__TRANSCENDENTAL__TRANSCENDENTAL_STATE_H */ diff --git a/src/theory/arith/normal_form.cpp b/src/theory/arith/normal_form.cpp index d1ef6486e..b872b4309 100644 --- a/src/theory/arith/normal_form.cpp +++ b/src/theory/arith/normal_form.cpp @@ -24,7 +24,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -1412,4 +1412,4 @@ bool Polynomial::isNonlinear() const { } //namespace arith } //namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/normal_form.h b/src/theory/arith/normal_form.h index c4d0e2268..7b9002d82 100644 --- a/src/theory/arith/normal_form.h +++ b/src/theory/arith/normal_form.h @@ -28,7 +28,7 @@ #include "theory/arith/delta_rational.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -1404,6 +1404,6 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__NORMAL_FORM_H */ diff --git a/src/theory/arith/operator_elim.cpp b/src/theory/arith/operator_elim.cpp index 15e09eaa5..600724f33 100644 --- a/src/theory/arith/operator_elim.cpp +++ b/src/theory/arith/operator_elim.cpp @@ -26,9 +26,9 @@ #include "theory/rewriter.h" #include "theory/theory.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -499,4 +499,4 @@ Node OperatorElim::mkWitnessTerm(Node v, } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/operator_elim.h b/src/theory/arith/operator_elim.h index fa09ad26b..1b2f7190e 100644 --- a/src/theory/arith/operator_elim.h +++ b/src/theory/arith/operator_elim.h @@ -21,7 +21,7 @@ #include "theory/logic_info.h" #include "theory/skolem_lemma.h" -namespace CVC5 { +namespace cvc5 { class TConvProofGenerator; @@ -142,4 +142,4 @@ class OperatorElim : public EagerProofGenerator } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/partial_model.cpp b/src/theory/arith/partial_model.cpp index 6e4fa6bed..fe3408a43 100644 --- a/src/theory/arith/partial_model.cpp +++ b/src/theory/arith/partial_model.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -686,4 +686,4 @@ void ArithVariables::UpperBoundCleanUp::operator()(AVCPair* p){ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/partial_model.h b/src/theory/arith/partial_model.h index b7a1a0efe..30a684e47 100644 --- a/src/theory/arith/partial_model.h +++ b/src/theory/arith/partial_model.h @@ -32,7 +32,7 @@ #include "theory/arith/constraint_forward.h" #include "theory/arith/delta_rational.h" -namespace CVC5 { +namespace cvc5 { namespace context { class Context; } @@ -414,6 +414,6 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__PARTIAL_MODEL_H */ diff --git a/src/theory/arith/proof_checker.cpp b/src/theory/arith/proof_checker.cpp index 09ef5bf34..23f141535 100644 --- a/src/theory/arith/proof_checker.cpp +++ b/src/theory/arith/proof_checker.cpp @@ -23,7 +23,7 @@ #include "theory/arith/normal_form.h" #include "theory/arith/operator_elim.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -360,4 +360,4 @@ Node ArithProofRuleChecker::checkInternal(PfRule id, } } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/proof_checker.h b/src/theory/arith/proof_checker.h index 5b9a50387..ca4fdfb6d 100644 --- a/src/theory/arith/proof_checker.h +++ b/src/theory/arith/proof_checker.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "expr/proof_checker.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -43,6 +43,6 @@ class ArithProofRuleChecker : public ProofRuleChecker } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__PROOF_CHECKER_H */ diff --git a/src/theory/arith/proof_macros.h b/src/theory/arith/proof_macros.h index 169e4e2db..a02738fd3 100644 --- a/src/theory/arith/proof_macros.h +++ b/src/theory/arith/proof_macros.h @@ -21,11 +21,11 @@ #include "options/smt_options.h" #define ARITH_PROOF(x) \ - if (CVC5::options::produceProofs()) \ + if (cvc5::options::produceProofs()) \ { \ x; \ } -#define ARITH_NULLPROOF(x) (CVC5::options::produceProofs()) ? x : NULL -#define ARITH_PROOF_ON() CVC5::options::produceProofs() +#define ARITH_NULLPROOF(x) (cvc5::options::produceProofs()) ? x : NULL +#define ARITH_PROOF_ON() cvc5::options::produceProofs() #endif // CVC4__THEORY__ARITH__PROOF_MACROS_H diff --git a/src/theory/arith/rewrites.cpp b/src/theory/arith/rewrites.cpp index 9522ef4f4..d095b4a20 100644 --- a/src/theory/arith/rewrites.cpp +++ b/src/theory/arith/rewrites.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -47,4 +47,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r) } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/rewrites.h b/src/theory/arith/rewrites.h index 250eacb09..e7a44f27e 100644 --- a/src/theory/arith/rewrites.h +++ b/src/theory/arith/rewrites.h @@ -19,7 +19,7 @@ #include <iosfwd> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -77,6 +77,6 @@ std::ostream& operator<<(std::ostream& out, Rewrite r); } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__REWRITES_H */ diff --git a/src/theory/arith/simplex.cpp b/src/theory/arith/simplex.cpp index fe6fad4d7..f599cdf40 100644 --- a/src/theory/arith/simplex.cpp +++ b/src/theory/arith/simplex.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -280,4 +280,4 @@ SimplexDecisionProcedure::sgn_table::const_iterator SimplexDecisionProcedure::fi } } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/simplex.h b/src/theory/arith/simplex.h index a1ee18adf..d826f0ba3 100644 --- a/src/theory/arith/simplex.h +++ b/src/theory/arith/simplex.h @@ -64,7 +64,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -221,4 +221,4 @@ protected: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/simplex_update.cpp b/src/theory/arith/simplex_update.cpp index ea868a886..81723f7c2 100644 --- a/src/theory/arith/simplex_update.cpp +++ b/src/theory/arith/simplex_update.cpp @@ -19,7 +19,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -188,4 +188,4 @@ std::ostream& operator<<(std::ostream& out, WitnessImprovement w){ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/simplex_update.h b/src/theory/arith/simplex_update.h index 833e92dd4..8310d3783 100644 --- a/src/theory/arith/simplex_update.h +++ b/src/theory/arith/simplex_update.h @@ -33,7 +33,7 @@ #include "theory/arith/constraint_forward.h" #include "util/maybe.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -354,4 +354,4 @@ std::ostream& operator<<(std::ostream& out, const UpdateInfo& up); } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/soi_simplex.cpp b/src/theory/arith/soi_simplex.cpp index 0efc33d02..d7cfd28c1 100644 --- a/src/theory/arith/soi_simplex.cpp +++ b/src/theory/arith/soi_simplex.cpp @@ -28,7 +28,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -1024,4 +1024,4 @@ Result::Sat SumOfInfeasibilitiesSPD::sumOfInfeasibilities(){ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/soi_simplex.h b/src/theory/arith/soi_simplex.h index 16af7292d..605d23767 100644 --- a/src/theory/arith/soi_simplex.h +++ b/src/theory/arith/soi_simplex.h @@ -60,7 +60,7 @@ #include "util/dense_map.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -242,4 +242,4 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/tableau.cpp b/src/theory/arith/tableau.cpp index c39b3aae7..2d389b0f5 100644 --- a/src/theory/arith/tableau.cpp +++ b/src/theory/arith/tableau.cpp @@ -19,7 +19,7 @@ #include "theory/arith/tableau.h" using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -192,4 +192,4 @@ void Tableau::printBasicRow(ArithVar basic, std::ostream& out){ } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/tableau.h b/src/theory/arith/tableau.h index 0834c7f35..6c597aa66 100644 --- a/src/theory/arith/tableau.h +++ b/src/theory/arith/tableau.h @@ -26,7 +26,7 @@ #include "util/dense_map.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -159,4 +159,4 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/tableau_sizes.cpp b/src/theory/arith/tableau_sizes.cpp index a167cf1a8..b0f2ab9a8 100644 --- a/src/theory/arith/tableau_sizes.cpp +++ b/src/theory/arith/tableau_sizes.cpp @@ -19,7 +19,7 @@ #include "theory/arith/tableau_sizes.h" #include "theory/arith/tableau.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -33,4 +33,4 @@ uint32_t TableauSizes::getColumnLength(ArithVar x) const { } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/tableau_sizes.h b/src/theory/arith/tableau_sizes.h index 3bbb5c818..969620db1 100644 --- a/src/theory/arith/tableau_sizes.h +++ b/src/theory/arith/tableau_sizes.h @@ -21,7 +21,7 @@ #include "theory/arith/arithvar.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -39,4 +39,4 @@ public: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/theory_arith.cpp b/src/theory/arith/theory_arith.cpp index 12603ea7d..577aa0e6c 100644 --- a/src/theory/arith/theory_arith.cpp +++ b/src/theory/arith/theory_arith.cpp @@ -29,9 +29,9 @@ #include "theory/theory_model.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -313,4 +313,4 @@ eq::ProofEqEngine* TheoryArith::getProofEqEngine() } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/theory_arith.h b/src/theory/arith/theory_arith.h index e430f6da6..40abe21e0 100644 --- a/src/theory/arith/theory_arith.h +++ b/src/theory/arith/theory_arith.h @@ -24,7 +24,7 @@ #include "theory/arith/inference_manager.h" #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { namespace nl { @@ -165,4 +165,4 @@ class TheoryArith : public Theory { } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/theory_arith_private.cpp b/src/theory/arith/theory_arith_private.cpp index 1e9e8ca3f..b11bff768 100644 --- a/src/theory/arith/theory_arith_private.cpp +++ b/src/theory/arith/theory_arith_private.cpp @@ -74,9 +74,9 @@ #include "util/statistics_registry.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -5714,4 +5714,4 @@ std::pair<Node, DeltaRational> TheoryArithPrivate::entailmentCheckSimplex(int sg } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/theory_arith_private.h b/src/theory/arith/theory_arith_private.h index e0b7cea56..929f40b56 100644 --- a/src/theory/arith/theory_arith_private.h +++ b/src/theory/arith/theory_arith_private.h @@ -54,7 +54,7 @@ #include "util/result.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class EagerProofGenerator; @@ -886,4 +886,4 @@ private: } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arith/theory_arith_type_rules.h b/src/theory/arith/theory_arith_type_rules.h index dc8885e55..e192270ff 100644 --- a/src/theory/arith/theory_arith_type_rules.h +++ b/src/theory/arith/theory_arith_type_rules.h @@ -19,7 +19,7 @@ #ifndef CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H #define CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -159,6 +159,6 @@ class IndexedRootPredicateTypeRule } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__THEORY_ARITH_TYPE_RULES_H */ diff --git a/src/theory/arith/type_enumerator.h b/src/theory/arith/type_enumerator.h index a32073ad9..9b3f4535b 100644 --- a/src/theory/arith/type_enumerator.h +++ b/src/theory/arith/type_enumerator.h @@ -25,7 +25,7 @@ #include "util/integer.h" #include "util/rational.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arith { @@ -102,6 +102,6 @@ class IntegerEnumerator : public TypeEnumeratorBase<IntegerEnumerator> { } // namespace arith } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARITH__TYPE_ENUMERATOR_H */ diff --git a/src/theory/arrays/array_info.cpp b/src/theory/arrays/array_info.cpp index 64e1d81c8..d88345f10 100644 --- a/src/theory/arrays/array_info.cpp +++ b/src/theory/arrays/array_info.cpp @@ -19,7 +19,7 @@ #include "smt/smt_statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -519,4 +519,4 @@ void ArrayInfo::mergeInfo(const TNode a, const TNode b){ } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arrays/array_info.h b/src/theory/arrays/array_info.h index 405a40ead..1a1cf441b 100644 --- a/src/theory/arrays/array_info.h +++ b/src/theory/arrays/array_info.h @@ -27,7 +27,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -207,6 +207,6 @@ public: } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARRAYS__ARRAY_INFO_H */ diff --git a/src/theory/arrays/inference_manager.cpp b/src/theory/arrays/inference_manager.cpp index f53fe8cc3..c414a901f 100644 --- a/src/theory/arrays/inference_manager.cpp +++ b/src/theory/arrays/inference_manager.cpp @@ -19,9 +19,9 @@ #include "theory/theory_state.h" #include "theory/uf/equality_engine.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -129,4 +129,4 @@ void InferenceManager::convert(PfRule& id, } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arrays/inference_manager.h b/src/theory/arrays/inference_manager.h index 60336dd63..58b2b37bc 100644 --- a/src/theory/arrays/inference_manager.h +++ b/src/theory/arrays/inference_manager.h @@ -22,7 +22,7 @@ #include "theory/eager_proof_generator.h" #include "theory/theory_inference_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -71,6 +71,6 @@ class InferenceManager : public TheoryInferenceManager } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arrays/kinds b/src/theory/arrays/kinds index d8d4b2bae..e39f30c6e 100644 --- a/src/theory/arrays/kinds +++ b/src/theory/arrays/kinds @@ -4,25 +4,25 @@ # src/theory/builtin/kinds. # -theory THEORY_ARRAYS ::CVC5::theory::arrays::TheoryArrays "theory/arrays/theory_arrays.h" +theory THEORY_ARRAYS ::cvc5::theory::arrays::TheoryArrays "theory/arrays/theory_arrays.h" typechecker "theory/arrays/theory_arrays_type_rules.h" properties polite stable-infinite parametric properties check presolve -rewriter ::CVC5::theory::arrays::TheoryArraysRewriter "theory/arrays/theory_arrays_rewriter.h" +rewriter ::cvc5::theory::arrays::TheoryArraysRewriter "theory/arrays/theory_arrays_rewriter.h" operator ARRAY_TYPE 2 "array type" cardinality ARRAY_TYPE \ - "::CVC5::theory::arrays::ArraysProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::arrays::ArraysProperties::computeCardinality(%TYPE%)" \ "theory/arrays/theory_arrays_type_rules.h" well-founded ARRAY_TYPE \ - "::CVC5::theory::arrays::ArraysProperties::isWellFounded(%TYPE%)" \ - "::CVC5::theory::arrays::ArraysProperties::mkGroundTerm(%TYPE%)" \ + "::cvc5::theory::arrays::ArraysProperties::isWellFounded(%TYPE%)" \ + "::cvc5::theory::arrays::ArraysProperties::mkGroundTerm(%TYPE%)" \ "theory/arrays/theory_arrays_type_rules.h" enumerator ARRAY_TYPE \ - "::CVC5::theory::arrays::ArrayEnumerator" \ + "::cvc5::theory::arrays::ArrayEnumerator" \ "theory/arrays/type_enumerator.h" # select a i is a[i] @@ -36,10 +36,10 @@ operator EQ_RANGE 4 "equality of two arrays over an index range lower/upper" # storeall t e is \all i in indexType(t) <= e constant STORE_ALL \ - ::CVC5::ArrayStoreAll \ - ::CVC5::ArrayStoreAllHashFunction \ + ::cvc5::ArrayStoreAll \ + ::cvc5::ArrayStoreAllHashFunction \ "expr/array_store_all.h" \ - "array store-all; payload is an instance of the CVC5::ArrayStoreAll class (this is not supported by arrays decision procedure yet, but it is used for returned array models)" + "array store-all; payload is an instance of the cvc5::ArrayStoreAll class (this is not supported by arrays decision procedure yet, but it is used for returned array models)" # used internally by array theory operator ARR_TABLE_FUN 4 "array table function (internal-only symbol)" @@ -51,19 +51,19 @@ operator ARR_TABLE_FUN 4 "array table function (internal-only symbol)" # as a shifted over one. operator ARRAY_LAMBDA 1 "array lambda (internal-only symbol)" -typerule SELECT ::CVC5::theory::arrays::ArraySelectTypeRule -typerule STORE ::CVC5::theory::arrays::ArrayStoreTypeRule -typerule STORE_ALL ::CVC5::theory::arrays::ArrayStoreTypeRule -typerule ARR_TABLE_FUN ::CVC5::theory::arrays::ArrayTableFunTypeRule -typerule ARRAY_LAMBDA ::CVC5::theory::arrays::ArrayLambdaTypeRule -typerule EQ_RANGE ::CVC5::theory::arrays::ArrayEqRangeTypeRule +typerule SELECT ::cvc5::theory::arrays::ArraySelectTypeRule +typerule STORE ::cvc5::theory::arrays::ArrayStoreTypeRule +typerule STORE_ALL ::cvc5::theory::arrays::ArrayStoreTypeRule +typerule ARR_TABLE_FUN ::cvc5::theory::arrays::ArrayTableFunTypeRule +typerule ARRAY_LAMBDA ::cvc5::theory::arrays::ArrayLambdaTypeRule +typerule EQ_RANGE ::cvc5::theory::arrays::ArrayEqRangeTypeRule operator PARTIAL_SELECT_0 0:2 "partial array select, for internal use only" operator PARTIAL_SELECT_1 0:2 "partial array select, for internal use only" -typerule PARTIAL_SELECT_0 ::CVC5::theory::arrays::ArrayPartialSelectTypeRule -typerule PARTIAL_SELECT_1 ::CVC5::theory::arrays::ArrayPartialSelectTypeRule +typerule PARTIAL_SELECT_0 ::cvc5::theory::arrays::ArrayPartialSelectTypeRule +typerule PARTIAL_SELECT_1 ::cvc5::theory::arrays::ArrayPartialSelectTypeRule # store operations that are ordered (by index) over a store-all are constant -construle STORE ::CVC5::theory::arrays::ArrayStoreTypeRule +construle STORE ::cvc5::theory::arrays::ArrayStoreTypeRule endtheory diff --git a/src/theory/arrays/proof_checker.cpp b/src/theory/arrays/proof_checker.cpp index 72e444d63..643de0d71 100644 --- a/src/theory/arrays/proof_checker.cpp +++ b/src/theory/arrays/proof_checker.cpp @@ -17,7 +17,7 @@ #include "theory/arrays/skolem_cache.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -115,4 +115,4 @@ Node ArraysProofRuleChecker::checkInternal(PfRule id, } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arrays/proof_checker.h b/src/theory/arrays/proof_checker.h index 64d5d785f..b62f929a3 100644 --- a/src/theory/arrays/proof_checker.h +++ b/src/theory/arrays/proof_checker.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "expr/proof_checker.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -43,6 +43,6 @@ class ArraysProofRuleChecker : public ProofRuleChecker } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARRAYS__PROOF_CHECKER_H */ diff --git a/src/theory/arrays/skolem_cache.cpp b/src/theory/arrays/skolem_cache.cpp index a1f2fddc4..a76f616a9 100644 --- a/src/theory/arrays/skolem_cache.cpp +++ b/src/theory/arrays/skolem_cache.cpp @@ -19,9 +19,9 @@ #include "expr/skolem_manager.h" #include "expr/type_node.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -78,4 +78,4 @@ Node SkolemCache::getExtIndexVar(Node deq) } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arrays/skolem_cache.h b/src/theory/arrays/skolem_cache.h index a95dc9a4f..fbd547079 100644 --- a/src/theory/arrays/skolem_cache.h +++ b/src/theory/arrays/skolem_cache.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -52,6 +52,6 @@ class SkolemCache } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/arrays/theory_arrays.cpp b/src/theory/arrays/theory_arrays.cpp index 665ad8da0..543d9833c 100644 --- a/src/theory/arrays/theory_arrays.cpp +++ b/src/theory/arrays/theory_arrays.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -2271,4 +2271,4 @@ void TheoryArrays::computeRelevantTerms(std::set<Node>& termSet) } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h index a7db2db7a..e61c76089 100644 --- a/src/theory/arrays/theory_arrays.h +++ b/src/theory/arrays/theory_arrays.h @@ -35,7 +35,7 @@ #include "theory/uf/equality_engine.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -490,6 +490,6 @@ class TheoryArrays : public Theory { } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_H */ diff --git a/src/theory/arrays/theory_arrays_rewriter.cpp b/src/theory/arrays/theory_arrays_rewriter.cpp index e91844a9c..497ccac21 100644 --- a/src/theory/arrays/theory_arrays_rewriter.cpp +++ b/src/theory/arrays/theory_arrays_rewriter.cpp @@ -18,7 +18,7 @@ #include "expr/attribute.h" #include "theory/arrays/theory_arrays_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -46,4 +46,4 @@ void setMostFrequentValueCount(TNode store, uint64_t count) { } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arrays/theory_arrays_rewriter.h b/src/theory/arrays/theory_arrays_rewriter.h index 114913ee7..2d8da6929 100644 --- a/src/theory/arrays/theory_arrays_rewriter.h +++ b/src/theory/arrays/theory_arrays_rewriter.h @@ -27,7 +27,7 @@ #include "theory/theory_rewriter.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -503,6 +503,6 @@ class TheoryArraysRewriter : public TheoryRewriter } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_REWRITER_H */ diff --git a/src/theory/arrays/theory_arrays_type_rules.h b/src/theory/arrays/theory_arrays_type_rules.h index fc3340251..5637639de 100644 --- a/src/theory/arrays/theory_arrays_type_rules.h +++ b/src/theory/arrays/theory_arrays_type_rules.h @@ -22,7 +22,7 @@ #include "theory/arrays/theory_arrays_rewriter.h" // for array-constant attributes #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -276,6 +276,6 @@ struct ArrayEqRangeTypeRule } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARRAYS__THEORY_ARRAYS_TYPE_RULES_H */ diff --git a/src/theory/arrays/type_enumerator.h b/src/theory/arrays/type_enumerator.h index 4f5b981b2..715a3f7a5 100644 --- a/src/theory/arrays/type_enumerator.h +++ b/src/theory/arrays/type_enumerator.h @@ -24,7 +24,7 @@ #include "expr/kind.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -157,6 +157,6 @@ class ArrayEnumerator : public TypeEnumeratorBase<ArrayEnumerator> { } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ARRAYS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/arrays/union_find.cpp b/src/theory/arrays/union_find.cpp index e178e9dbb..ac8f92b80 100644 --- a/src/theory/arrays/union_find.cpp +++ b/src/theory/arrays/union_find.cpp @@ -23,7 +23,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace arrays { @@ -53,4 +53,4 @@ template void UnionFind<TNode, TNodeHashFunction>::notify(); } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/arrays/union_find.h b/src/theory/arrays/union_find.h index ebe31baad..6285e0e9b 100644 --- a/src/theory/arrays/union_find.h +++ b/src/theory/arrays/union_find.h @@ -28,7 +28,7 @@ #include "expr/node.h" #include "context/cdo.h" -namespace CVC5 { +namespace cvc5 { namespace context { class Context; @@ -137,6 +137,6 @@ inline void UnionFind<NodeType, NodeHash>::setCanon(TNode n, TNode newParent) { } // namespace arrays } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /*CVC4__THEORY__ARRAYS__UNION_FIND_H */ diff --git a/src/theory/assertion.cpp b/src/theory/assertion.cpp index b21025314..17806738c 100644 --- a/src/theory/assertion.cpp +++ b/src/theory/assertion.cpp @@ -16,7 +16,7 @@ #include "theory/assertion.h" -namespace CVC5 { +namespace cvc5 { namespace theory { std::ostream& operator<<(std::ostream& out, const Assertion& a) { @@ -24,4 +24,4 @@ std::ostream& operator<<(std::ostream& out, const Assertion& a) { } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/assertion.h b/src/theory/assertion.h index 10f300d69..4971dee00 100644 --- a/src/theory/assertion.h +++ b/src/theory/assertion.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** Information about an assertion for the theories. */ @@ -48,6 +48,6 @@ struct Assertion { std::ostream& operator<<(std::ostream& out, const Assertion& a); } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ASSERTION_H */ diff --git a/src/theory/atom_requests.cpp b/src/theory/atom_requests.cpp index c3305417f..96b83bbe5 100644 --- a/src/theory/atom_requests.cpp +++ b/src/theory/atom_requests.cpp @@ -17,7 +17,7 @@ #include "theory/atom_requests.h" -using namespace CVC5; +using namespace cvc5; AtomRequests::AtomRequests(context::Context* context) : d_allRequests(context) diff --git a/src/theory/atom_requests.h b/src/theory/atom_requests.h index 906fec303..a6b50dd72 100644 --- a/src/theory/atom_requests.h +++ b/src/theory/atom_requests.h @@ -25,7 +25,7 @@ #include "context/cdhashset.h" #include "context/cdhashmap.h" -namespace CVC5 { +namespace cvc5 { class AtomRequests { @@ -114,4 +114,4 @@ private: }; -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/bag_solver.cpp b/src/theory/bags/bag_solver.cpp index fd80a03f7..478ce58cd 100644 --- a/src/theory/bags/bag_solver.cpp +++ b/src/theory/bags/bag_solver.cpp @@ -24,10 +24,10 @@ #include "theory/uf/equality_engine_iterator.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -212,4 +212,4 @@ void BagSolver::checkDisequalBagTerms() } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/bag_solver.h b/src/theory/bags/bag_solver.h index 9d0e597dd..5cd7ed338 100644 --- a/src/theory/bags/bag_solver.h +++ b/src/theory/bags/bag_solver.h @@ -19,7 +19,7 @@ #include "theory/bags/inference_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -90,6 +90,6 @@ class BagSolver } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAG__SOLVER_H */ diff --git a/src/theory/bags/bags_rewriter.cpp b/src/theory/bags/bags_rewriter.cpp index ccee08aab..f4670f8be 100644 --- a/src/theory/bags/bags_rewriter.cpp +++ b/src/theory/bags/bags_rewriter.cpp @@ -16,9 +16,9 @@ #include "theory/bags/normal_form.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -503,4 +503,4 @@ BagsRewriteResponse BagsRewriter::postRewriteEqual(const TNode& n) const } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/bags_rewriter.h b/src/theory/bags/bags_rewriter.h index 4552ed9da..bc66d7efa 100644 --- a/src/theory/bags/bags_rewriter.h +++ b/src/theory/bags/bags_rewriter.h @@ -22,7 +22,7 @@ #include "util/statistics_registry.h" #include "util/stats_histogram.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -223,6 +223,6 @@ class BagsRewriter : public TheoryRewriter } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__THEORY_BAGS_REWRITER_H */ diff --git a/src/theory/bags/bags_statistics.cpp b/src/theory/bags/bags_statistics.cpp index 369831c70..6c88ffb43 100644 --- a/src/theory/bags/bags_statistics.cpp +++ b/src/theory/bags/bags_statistics.cpp @@ -16,7 +16,7 @@ #include "smt/smt_statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -32,4 +32,4 @@ BagsStatistics::~BagsStatistics() } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/bags_statistics.h b/src/theory/bags/bags_statistics.h index e0a1c4133..ac60fbc3e 100644 --- a/src/theory/bags/bags_statistics.h +++ b/src/theory/bags/bags_statistics.h @@ -21,7 +21,7 @@ #include "util/statistics_registry.h" #include "util/stats_histogram.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -40,6 +40,6 @@ class BagsStatistics } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS_STATISTICS_H */ diff --git a/src/theory/bags/infer_info.cpp b/src/theory/bags/infer_info.cpp index 444597eb5..c0fac0753 100644 --- a/src/theory/bags/infer_info.cpp +++ b/src/theory/bags/infer_info.cpp @@ -16,7 +16,7 @@ #include "theory/bags/inference_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -79,4 +79,4 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii) } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/infer_info.h b/src/theory/bags/infer_info.h index 18765bbe7..508c49fe5 100644 --- a/src/theory/bags/infer_info.h +++ b/src/theory/bags/infer_info.h @@ -24,7 +24,7 @@ #include "theory/inference_id.h" #include "theory/theory_inference.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class TheoryInferenceManager; @@ -85,6 +85,6 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii); } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__INFER_INFO_H */ diff --git a/src/theory/bags/inference_generator.cpp b/src/theory/bags/inference_generator.cpp index 2f6a36b9c..57a306820 100644 --- a/src/theory/bags/inference_generator.cpp +++ b/src/theory/bags/inference_generator.cpp @@ -21,7 +21,7 @@ #include "theory/bags/solver_state.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -270,4 +270,4 @@ Node InferenceGenerator::getMultiplicityTerm(Node element, Node bag) } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/inference_generator.h b/src/theory/bags/inference_generator.h index 4f0b498c2..baa391f38 100644 --- a/src/theory/bags/inference_generator.h +++ b/src/theory/bags/inference_generator.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "infer_info.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -188,6 +188,6 @@ class InferenceGenerator } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__INFERENCE_GENERATOR_H */ diff --git a/src/theory/bags/inference_manager.cpp b/src/theory/bags/inference_manager.cpp index 3fa425f7a..422fb53d0 100644 --- a/src/theory/bags/inference_manager.cpp +++ b/src/theory/bags/inference_manager.cpp @@ -17,9 +17,9 @@ #include "theory/bags/solver_state.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -48,4 +48,4 @@ void InferenceManager::doPending() } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/inference_manager.h b/src/theory/bags/inference_manager.h index 34f6621aa..68d923889 100644 --- a/src/theory/bags/inference_manager.h +++ b/src/theory/bags/inference_manager.h @@ -19,7 +19,7 @@ #include "theory/inference_manager_buffered.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -63,6 +63,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__INFERENCE_MANAGER_H */ diff --git a/src/theory/bags/kinds b/src/theory/bags/kinds index dd8eacfb5..038e7dd7f 100644 --- a/src/theory/bags/kinds +++ b/src/theory/bags/kinds @@ -5,10 +5,10 @@ # theory THEORY_BAGS \ - ::CVC5::theory::bags::TheoryBags \ + ::cvc5::theory::bags::TheoryBags \ "theory/bags/theory_bags.h" typechecker "theory/bags/theory_bags_type_rules.h" -rewriter ::CVC5::theory::bags::BagsRewriter \ +rewriter ::cvc5::theory::bags::BagsRewriter \ "theory/bags/bags_rewriter.h" properties parametric @@ -16,22 +16,22 @@ properties check presolve # constants constant EMPTYBAG \ - ::CVC5::EmptyBag \ - ::CVC5::EmptyBagHashFunction \ + ::cvc5::EmptyBag \ + ::cvc5::EmptyBagHashFunction \ "expr/emptybag.h" \ - "the empty bag constant; payload is an instance of the CVC5::EmptyBag class" + "the empty bag constant; payload is an instance of the cvc5::EmptyBag class" # the type operator BAG_TYPE 1 "bag type, takes as parameter the type of the elements" cardinality BAG_TYPE \ - "::CVC5::theory::bags::BagsProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::bags::BagsProperties::computeCardinality(%TYPE%)" \ "theory/bags/theory_bags_type_rules.h" well-founded BAG_TYPE \ - "::CVC5::theory::bags::BagsProperties::isWellFounded(%TYPE%)" \ - "::CVC5::theory::bags::BagsProperties::mkGroundTerm(%TYPE%)" \ + "::cvc5::theory::bags::BagsProperties::isWellFounded(%TYPE%)" \ + "::cvc5::theory::bags::BagsProperties::mkGroundTerm(%TYPE%)" \ "theory/bags/theory_bags_type_rules.h" enumerator BAG_TYPE \ - "::CVC5::theory::bags::BagEnumerator" \ + "::cvc5::theory::bags::BagEnumerator" \ "theory/bags/theory_bags_type_enumerator.h" # operators @@ -50,10 +50,10 @@ operator BAG_COUNT 2 "multiplicity of an element in a bag" operator DUPLICATE_REMOVAL 1 "eliminate duplicates in a bag (also known as the delta operator,or the squash operator)" constant MK_BAG_OP \ - ::CVC5::MakeBagOp \ - ::CVC5::MakeBagOpHashFunction \ + ::cvc5::MakeBagOp \ + ::cvc5::MakeBagOpHashFunction \ "theory/bags/make_bag_op.h" \ - "operator for MK_BAG; payload is an instance of the CVC5::MakeBagOp class" + "operator for MK_BAG; payload is an instance of the cvc5::MakeBagOp class" parameterized MK_BAG MK_BAG_OP 2 \ "constructs a bag from one element along with its multiplicity" @@ -70,24 +70,24 @@ operator BAG_TO_SET 1 "converts a bag to a set" # If the bag has cardinality > 1, then (choose A) will deterministically return an element in A. operator BAG_CHOOSE 1 "return an element in the bag given as a parameter" -typerule UNION_MAX ::CVC5::theory::bags::BinaryOperatorTypeRule -typerule UNION_DISJOINT ::CVC5::theory::bags::BinaryOperatorTypeRule -typerule INTERSECTION_MIN ::CVC5::theory::bags::BinaryOperatorTypeRule -typerule DIFFERENCE_SUBTRACT ::CVC5::theory::bags::BinaryOperatorTypeRule -typerule DIFFERENCE_REMOVE ::CVC5::theory::bags::BinaryOperatorTypeRule -typerule SUBBAG ::CVC5::theory::bags::SubBagTypeRule -typerule BAG_COUNT ::CVC5::theory::bags::CountTypeRule -typerule DUPLICATE_REMOVAL ::CVC5::theory::bags::DuplicateRemovalTypeRule +typerule UNION_MAX ::cvc5::theory::bags::BinaryOperatorTypeRule +typerule UNION_DISJOINT ::cvc5::theory::bags::BinaryOperatorTypeRule +typerule INTERSECTION_MIN ::cvc5::theory::bags::BinaryOperatorTypeRule +typerule DIFFERENCE_SUBTRACT ::cvc5::theory::bags::BinaryOperatorTypeRule +typerule DIFFERENCE_REMOVE ::cvc5::theory::bags::BinaryOperatorTypeRule +typerule SUBBAG ::cvc5::theory::bags::SubBagTypeRule +typerule BAG_COUNT ::cvc5::theory::bags::CountTypeRule +typerule DUPLICATE_REMOVAL ::cvc5::theory::bags::DuplicateRemovalTypeRule typerule MK_BAG_OP "SimpleTypeRule<RBuiltinOperator>" -typerule MK_BAG ::CVC5::theory::bags::MkBagTypeRule -typerule EMPTYBAG ::CVC5::theory::bags::EmptyBagTypeRule -typerule BAG_CARD ::CVC5::theory::bags::CardTypeRule -typerule BAG_CHOOSE ::CVC5::theory::bags::ChooseTypeRule -typerule BAG_IS_SINGLETON ::CVC5::theory::bags::IsSingletonTypeRule -typerule BAG_FROM_SET ::CVC5::theory::bags::FromSetTypeRule -typerule BAG_TO_SET ::CVC5::theory::bags::ToSetTypeRule +typerule MK_BAG ::cvc5::theory::bags::MkBagTypeRule +typerule EMPTYBAG ::cvc5::theory::bags::EmptyBagTypeRule +typerule BAG_CARD ::cvc5::theory::bags::CardTypeRule +typerule BAG_CHOOSE ::cvc5::theory::bags::ChooseTypeRule +typerule BAG_IS_SINGLETON ::cvc5::theory::bags::IsSingletonTypeRule +typerule BAG_FROM_SET ::cvc5::theory::bags::FromSetTypeRule +typerule BAG_TO_SET ::cvc5::theory::bags::ToSetTypeRule -construle UNION_DISJOINT ::CVC5::theory::bags::BinaryOperatorTypeRule -construle MK_BAG ::CVC5::theory::bags::MkBagTypeRule +construle UNION_DISJOINT ::cvc5::theory::bags::BinaryOperatorTypeRule +construle MK_BAG ::cvc5::theory::bags::MkBagTypeRule endtheory diff --git a/src/theory/bags/make_bag_op.cpp b/src/theory/bags/make_bag_op.cpp index 15e3a30c7..168379390 100644 --- a/src/theory/bags/make_bag_op.cpp +++ b/src/theory/bags/make_bag_op.cpp @@ -18,7 +18,7 @@ #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { std::ostream& operator<<(std::ostream& out, const MakeBagOp& op) { @@ -46,4 +46,4 @@ bool MakeBagOp::operator==(const MakeBagOp& op) const return getType() == op.getType(); } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/make_bag_op.h b/src/theory/bags/make_bag_op.h index 4c2a3e933..44b105225 100644 --- a/src/theory/bags/make_bag_op.h +++ b/src/theory/bags/make_bag_op.h @@ -19,7 +19,7 @@ #include <memory> -namespace CVC5 { +namespace cvc5 { class TypeNode; @@ -57,6 +57,6 @@ struct MakeBagOpHashFunction size_t operator()(const MakeBagOp& op) const; }; /* struct MakeBagOpHashFunction */ -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__MAKE_BAG_OP_H */ diff --git a/src/theory/bags/normal_form.cpp b/src/theory/bags/normal_form.cpp index 5952b66d8..1773346f0 100644 --- a/src/theory/bags/normal_form.cpp +++ b/src/theory/bags/normal_form.cpp @@ -16,9 +16,9 @@ #include "theory/sets/normal_form.h" #include "theory/type_enumerator.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -674,4 +674,4 @@ Node NormalForm::evaluateToSet(TNode n) } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/normal_form.h b/src/theory/bags/normal_form.h index 1c7f05d8e..5b5591133 100644 --- a/src/theory/bags/normal_form.h +++ b/src/theory/bags/normal_form.h @@ -19,7 +19,7 @@ #ifndef CVC4__THEORY__BAGS__NORMAL_FORM_H #define CVC4__THEORY__BAGS__NORMAL_FORM_H -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -192,6 +192,6 @@ class NormalForm }; } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__NORMAL_FORM_H */ diff --git a/src/theory/bags/rewrites.cpp b/src/theory/bags/rewrites.cpp index d0299d52a..4d6929346 100644 --- a/src/theory/bags/rewrites.cpp +++ b/src/theory/bags/rewrites.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -79,4 +79,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r) } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/rewrites.h b/src/theory/bags/rewrites.h index 9e7bb54fa..aa49c71fb 100644 --- a/src/theory/bags/rewrites.h +++ b/src/theory/bags/rewrites.h @@ -19,7 +19,7 @@ #include <iosfwd> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -92,6 +92,6 @@ std::ostream& operator<<(std::ostream& out, Rewrite r); } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__REWRITES_H */ diff --git a/src/theory/bags/solver_state.cpp b/src/theory/bags/solver_state.cpp index 4011a3fc4..aa714a61b 100644 --- a/src/theory/bags/solver_state.cpp +++ b/src/theory/bags/solver_state.cpp @@ -20,9 +20,9 @@ #include "theory/uf/equality_engine.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -136,4 +136,4 @@ void SolverState::collectDisequalBagTerms() } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/solver_state.h b/src/theory/bags/solver_state.h index e6b2a2504..e7c09db8f 100644 --- a/src/theory/bags/solver_state.h +++ b/src/theory/bags/solver_state.h @@ -21,7 +21,7 @@ #include "theory/theory_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -90,6 +90,6 @@ class SolverState : public TheoryState } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__THEORY_SOLVER_STATE_H */ diff --git a/src/theory/bags/term_registry.cpp b/src/theory/bags/term_registry.cpp index 072655834..dd3820c82 100644 --- a/src/theory/bags/term_registry.cpp +++ b/src/theory/bags/term_registry.cpp @@ -18,9 +18,9 @@ #include "theory/bags/solver_state.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -45,4 +45,4 @@ Node TermRegistry::getEmptyBag(TypeNode tn) } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/term_registry.h b/src/theory/bags/term_registry.h index adf97fd5f..ab519b100 100644 --- a/src/theory/bags/term_registry.h +++ b/src/theory/bags/term_registry.h @@ -22,7 +22,7 @@ #include "context/cdhashmap.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -59,6 +59,6 @@ class TermRegistry } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__TERM_REGISTRY_H */ diff --git a/src/theory/bags/theory_bags.cpp b/src/theory/bags/theory_bags.cpp index f91fd40f0..bea83ce40 100644 --- a/src/theory/bags/theory_bags.cpp +++ b/src/theory/bags/theory_bags.cpp @@ -19,9 +19,9 @@ #include "theory/rewriter.h" #include "theory/theory_model.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -262,4 +262,4 @@ void TheoryBags::NotifyClass::eqNotifyDisequal(TNode n1, TNode n2, TNode reason) } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/theory_bags.h b/src/theory/bags/theory_bags.h index 6bd9ddc65..7bb6111bd 100644 --- a/src/theory/bags/theory_bags.h +++ b/src/theory/bags/theory_bags.h @@ -27,7 +27,7 @@ #include "theory/theory.h" #include "theory/theory_eq_notify.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -114,6 +114,6 @@ class TheoryBags : public Theory } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__THEORY_BAGS_H */ diff --git a/src/theory/bags/theory_bags_type_enumerator.cpp b/src/theory/bags/theory_bags_type_enumerator.cpp index 02494727c..f34d304fb 100644 --- a/src/theory/bags/theory_bags_type_enumerator.cpp +++ b/src/theory/bags/theory_bags_type_enumerator.cpp @@ -18,7 +18,7 @@ #include "theory/rewriter.h" #include "theory_bags_type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -83,4 +83,4 @@ bool BagEnumerator::isFinished() } // namespace bags } // namespace theory -} // namespace CVC5
\ No newline at end of file +} // namespace cvc5
\ No newline at end of file diff --git a/src/theory/bags/theory_bags_type_enumerator.h b/src/theory/bags/theory_bags_type_enumerator.h index c13946388..bdf57213d 100644 --- a/src/theory/bags/theory_bags_type_enumerator.h +++ b/src/theory/bags/theory_bags_type_enumerator.h @@ -20,7 +20,7 @@ #include "expr/type_node.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -86,6 +86,6 @@ class BagEnumerator : public TypeEnumeratorBase<BagEnumerator> } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__TYPE_ENUMERATOR_H */
\ No newline at end of file diff --git a/src/theory/bags/theory_bags_type_rules.cpp b/src/theory/bags/theory_bags_type_rules.cpp index 2acbb1e27..f198d68e9 100644 --- a/src/theory/bags/theory_bags_type_rules.cpp +++ b/src/theory/bags/theory_bags_type_rules.cpp @@ -19,7 +19,7 @@ #include "base/check.h" #include "theory/bags/normal_form.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bags { @@ -279,4 +279,4 @@ TypeNode ToSetTypeRule::computeType(NodeManager* nodeManager, } } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bags/theory_bags_type_rules.h b/src/theory/bags/theory_bags_type_rules.h index dd93186ad..f48001c5e 100644 --- a/src/theory/bags/theory_bags_type_rules.h +++ b/src/theory/bags/theory_bags_type_rules.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { class NodeManager; @@ -102,6 +102,6 @@ struct BagsProperties } // namespace bags } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BAGS__THEORY_BAGS_TYPE_RULES_H */ diff --git a/src/theory/booleans/circuit_propagator.cpp b/src/theory/booleans/circuit_propagator.cpp index 897c86e93..aa400a750 100644 --- a/src/theory/booleans/circuit_propagator.cpp +++ b/src/theory/booleans/circuit_propagator.cpp @@ -31,7 +31,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -814,4 +814,4 @@ void CircuitPropagator::addProof(TNode f, std::shared_ptr<ProofNode> pf) } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/booleans/circuit_propagator.h b/src/theory/booleans/circuit_propagator.h index 6caccef08..72c5da1b3 100644 --- a/src/theory/booleans/circuit_propagator.h +++ b/src/theory/booleans/circuit_propagator.h @@ -31,7 +31,7 @@ #include "expr/node.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { class ProofGenerator; class ProofNode; @@ -274,6 +274,6 @@ class CircuitPropagator } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */ diff --git a/src/theory/booleans/kinds b/src/theory/booleans/kinds index d8009ad12..6560cdd1a 100644 --- a/src/theory/booleans/kinds +++ b/src/theory/booleans/kinds @@ -4,12 +4,12 @@ # src/theory/builtin/kinds. # -theory THEORY_BOOL ::CVC5::theory::booleans::TheoryBool "theory/booleans/theory_bool.h" +theory THEORY_BOOL ::cvc5::theory::booleans::TheoryBool "theory/booleans/theory_bool.h" typechecker "theory/booleans/theory_bool_type_rules.h" properties finite -rewriter ::CVC5::theory::booleans::TheoryBoolRewriter "theory/booleans/theory_bool_rewriter.h" +rewriter ::cvc5::theory::booleans::TheoryBoolRewriter "theory/booleans/theory_bool_rewriter.h" sort BOOLEAN_TYPE \ 2 \ @@ -20,12 +20,12 @@ sort BOOLEAN_TYPE \ constant CONST_BOOLEAN \ bool \ - ::CVC5::BoolHashFunction \ + ::cvc5::BoolHashFunction \ "util/bool.h" \ "truth and falsity; payload is a (C++) bool" enumerator BOOLEAN_TYPE \ - "::CVC5::theory::booleans::BooleanEnumerator" \ + "::cvc5::theory::booleans::BooleanEnumerator" \ "theory/booleans/type_enumerator.h" operator NOT 1 "logical not" @@ -35,13 +35,13 @@ operator OR 2: "logical or (N-ary)" operator XOR 2 "exclusive or (exactly two parameters)" operator ITE 3 "if-then-else, used for both Boolean and term ITE constructs; first parameter is (Boolean-sorted) condition, second is 'then', third is 'else' and these two parameters must have same base sort" -typerule CONST_BOOLEAN ::CVC5::theory::boolean::BooleanTypeRule +typerule CONST_BOOLEAN ::cvc5::theory::boolean::BooleanTypeRule -typerule NOT ::CVC5::theory::boolean::BooleanTypeRule -typerule AND ::CVC5::theory::boolean::BooleanTypeRule -typerule IMPLIES ::CVC5::theory::boolean::BooleanTypeRule -typerule OR ::CVC5::theory::boolean::BooleanTypeRule -typerule XOR ::CVC5::theory::boolean::BooleanTypeRule -typerule ITE ::CVC5::theory::boolean::IteTypeRule +typerule NOT ::cvc5::theory::boolean::BooleanTypeRule +typerule AND ::cvc5::theory::boolean::BooleanTypeRule +typerule IMPLIES ::cvc5::theory::boolean::BooleanTypeRule +typerule OR ::cvc5::theory::boolean::BooleanTypeRule +typerule XOR ::cvc5::theory::boolean::BooleanTypeRule +typerule ITE ::cvc5::theory::boolean::IteTypeRule endtheory diff --git a/src/theory/booleans/proof_checker.cpp b/src/theory/booleans/proof_checker.cpp index a51f238a2..d6600f14d 100644 --- a/src/theory/booleans/proof_checker.cpp +++ b/src/theory/booleans/proof_checker.cpp @@ -16,7 +16,7 @@ #include "expr/skolem_manager.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -948,4 +948,4 @@ Node BoolProofRuleChecker::checkInternal(PfRule id, } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/booleans/proof_checker.h b/src/theory/booleans/proof_checker.h index 93c3baf1e..da7ad0039 100644 --- a/src/theory/booleans/proof_checker.h +++ b/src/theory/booleans/proof_checker.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "expr/proof_checker.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -43,6 +43,6 @@ class BoolProofRuleChecker : public ProofRuleChecker } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BOOLEANS__PROOF_CHECKER_H */ diff --git a/src/theory/booleans/proof_circuit_propagator.cpp b/src/theory/booleans/proof_circuit_propagator.cpp index b84cf5488..9b3c6de10 100644 --- a/src/theory/booleans/proof_circuit_propagator.cpp +++ b/src/theory/booleans/proof_circuit_propagator.cpp @@ -21,7 +21,7 @@ #include "expr/proof_node.h" #include "expr/proof_node_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -587,4 +587,4 @@ std::shared_ptr<ProofNode> ProofCircuitPropagatorForward::xorEval(bool x, } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/booleans/proof_circuit_propagator.h b/src/theory/booleans/proof_circuit_propagator.h index 671c6e964..5a643f7aa 100644 --- a/src/theory/booleans/proof_circuit_propagator.h +++ b/src/theory/booleans/proof_circuit_propagator.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "expr/proof_rule.h" -namespace CVC5 { +namespace cvc5 { class ProofNode; class ProofNodeManager; @@ -212,6 +212,6 @@ class ProofCircuitPropagatorForward : public ProofCircuitPropagator } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/booleans/theory_bool.cpp b/src/theory/booleans/theory_bool.cpp index 2df179e27..74279f43c 100644 --- a/src/theory/booleans/theory_bool.cpp +++ b/src/theory/booleans/theory_bool.cpp @@ -31,7 +31,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -82,4 +82,4 @@ Theory::PPAssertStatus TheoryBool::ppAssert( } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/booleans/theory_bool.h b/src/theory/booleans/theory_bool.h index cbd9ec381..05b169c24 100644 --- a/src/theory/booleans/theory_bool.h +++ b/src/theory/booleans/theory_bool.h @@ -24,7 +24,7 @@ #include "theory/booleans/theory_bool_rewriter.h" #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -53,6 +53,6 @@ class TheoryBool : public Theory { } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_H */ diff --git a/src/theory/booleans/theory_bool_rewriter.cpp b/src/theory/booleans/theory_bool_rewriter.cpp index 3cc19a520..f1e002735 100644 --- a/src/theory/booleans/theory_bool_rewriter.cpp +++ b/src/theory/booleans/theory_bool_rewriter.cpp @@ -21,7 +21,7 @@ #include "expr/node_value.h" #include "theory/booleans/theory_bool_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -431,4 +431,4 @@ RewriteResponse TheoryBoolRewriter::preRewrite(TNode n) { } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/booleans/theory_bool_rewriter.h b/src/theory/booleans/theory_bool_rewriter.h index 4caf5c681..5c1625f6d 100644 --- a/src/theory/booleans/theory_bool_rewriter.h +++ b/src/theory/booleans/theory_bool_rewriter.h @@ -22,7 +22,7 @@ #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -36,6 +36,6 @@ class TheoryBoolRewriter : public TheoryRewriter } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BOOLEANS__THEORY_BOOL_REWRITER_H */ diff --git a/src/theory/booleans/theory_bool_type_rules.h b/src/theory/booleans/theory_bool_type_rules.h index 2f59a032e..af6618fa2 100644 --- a/src/theory/booleans/theory_bool_type_rules.h +++ b/src/theory/booleans/theory_bool_type_rules.h @@ -19,7 +19,7 @@ #ifndef CVC4__THEORY_BOOL_TYPE_RULES_H #define CVC4__THEORY_BOOL_TYPE_RULES_H -namespace CVC5 { +namespace cvc5 { namespace theory { namespace boolean { @@ -72,6 +72,6 @@ public: } // namespace boolean } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY_BOOL_TYPE_RULES_H */ diff --git a/src/theory/booleans/type_enumerator.h b/src/theory/booleans/type_enumerator.h index 9b6619961..c07290d31 100644 --- a/src/theory/booleans/type_enumerator.h +++ b/src/theory/booleans/type_enumerator.h @@ -23,7 +23,7 @@ #include "expr/type_node.h" #include "expr/kind.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace booleans { @@ -65,6 +65,6 @@ class BooleanEnumerator : public TypeEnumeratorBase<BooleanEnumerator> { } // namespace booleans } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/builtin/kinds b/src/theory/builtin/kinds index 48ceaf103..e2f69f19d 100644 --- a/src/theory/builtin/kinds +++ b/src/theory/builtin/kinds @@ -196,7 +196,7 @@ # is with your type checker: # # cardinality MY_TYPE \ -# ::CVC5::theory::foo::TheoryFoo::CardinalityComputer(%TYPE%) \ +# ::cvc5::theory::foo::TheoryFoo::CardinalityComputer(%TYPE%) \ # "theory/foo/theory_foo_type_rules.h" # # well-founded K wellfoundedness-computer ground-term-computer [header] @@ -240,13 +240,13 @@ # commands. # -theory THEORY_BUILTIN ::CVC5::theory::builtin::TheoryBuiltin "theory/builtin/theory_builtin.h" +theory THEORY_BUILTIN ::cvc5::theory::builtin::TheoryBuiltin "theory/builtin/theory_builtin.h" typechecker "theory/builtin/theory_builtin_type_rules.h" properties stable-infinite # Rewriter responsible for all the terms of the theory -rewriter ::CVC5::theory::builtin::TheoryBuiltinRewriter "theory/builtin/theory_builtin_rewriter.h" +rewriter ::cvc5::theory::builtin::TheoryBuiltinRewriter "theory/builtin/theory_builtin_rewriter.h" sort BUILTIN_OPERATOR_TYPE \ Cardinality::INTEGERS \ @@ -259,33 +259,33 @@ parameterized SORT_TYPE SORT_TAG 0: "specifies types of user-declared 'uninterpr # enough (for now) ? cardinality SORT_TYPE "Cardinality(Cardinality::INTEGERS)" well-founded SORT_TYPE \ - "::CVC5::theory::builtin::SortProperties::isWellFounded(%TYPE%)" \ - "::CVC5::theory::builtin::SortProperties::mkGroundTerm(%TYPE%)" + "::cvc5::theory::builtin::SortProperties::isWellFounded(%TYPE%)" \ + "::cvc5::theory::builtin::SortProperties::mkGroundTerm(%TYPE%)" constant UNINTERPRETED_CONSTANT \ - ::CVC5::UninterpretedConstant \ - ::CVC5::UninterpretedConstantHashFunction \ + ::cvc5::UninterpretedConstant \ + ::cvc5::UninterpretedConstantHashFunction \ "expr/uninterpreted_constant.h" \ - "the kind of expressions representing uninterpreted constants; payload is an instance of the CVC5::UninterpretedConstant class (used in models)" -typerule UNINTERPRETED_CONSTANT ::CVC5::theory::builtin::UninterpretedConstantTypeRule + "the kind of expressions representing uninterpreted constants; payload is an instance of the cvc5::UninterpretedConstant class (used in models)" +typerule UNINTERPRETED_CONSTANT ::cvc5::theory::builtin::UninterpretedConstantTypeRule enumerator SORT_TYPE \ - ::CVC5::theory::builtin::UninterpretedSortEnumerator \ + ::cvc5::theory::builtin::UninterpretedSortEnumerator \ "theory/builtin/type_enumerator.h" constant ABSTRACT_VALUE \ - ::CVC5::AbstractValue \ - ::CVC5::AbstractValueHashFunction \ + ::cvc5::AbstractValue \ + ::cvc5::AbstractValueHashFunction \ "util/abstract_value.h" \ - "the kind of expressions representing abstract values (other than uninterpreted sort constants); payload is an instance of the CVC5::AbstractValue class (used in models)" -typerule ABSTRACT_VALUE ::CVC5::theory::builtin::AbstractValueTypeRule + "the kind of expressions representing abstract values (other than uninterpreted sort constants); payload is an instance of the cvc5::AbstractValue class (used in models)" +typerule ABSTRACT_VALUE ::cvc5::theory::builtin::AbstractValueTypeRule # A kind representing "inlined" operators defined with OPERATOR # Conceptually, (EQUAL a b) is actually an (APPLY EQUAL a b), but it's # not stored that way. If you ask for the operator of (EQUAL a b), # you'll get a special, singleton (BUILTIN EQUAL) Node. constant BUILTIN \ - ::CVC5::Kind \ - ::CVC5::kind::KindHashFunction \ + ::cvc5::Kind \ + ::cvc5::kind::KindHashFunction \ "expr/kind.h" \ "the kind of expressions representing built-in operators" @@ -301,33 +301,33 @@ operator LAMBDA 2 "a lambda expression; first parameter is a BOUND_VAR_LIST, sec operator WITNESS 2 "a witness expression; first parameter is a BOUND_VAR_LIST, second is the witness body" constant TYPE_CONSTANT \ - ::CVC5::TypeConstant \ - ::CVC5::TypeConstantHashFunction \ + ::cvc5::TypeConstant \ + ::cvc5::TypeConstantHashFunction \ "expr/kind.h" \ "a representation for basic types" operator FUNCTION_TYPE 2: "a function type" cardinality FUNCTION_TYPE \ - "::CVC5::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ "theory/builtin/theory_builtin_type_rules.h" well-founded FUNCTION_TYPE \ - "::CVC5::theory::builtin::FunctionProperties::isWellFounded(%TYPE%)" \ - "::CVC5::theory::builtin::FunctionProperties::mkGroundTerm(%TYPE%)" \ + "::cvc5::theory::builtin::FunctionProperties::isWellFounded(%TYPE%)" \ + "::cvc5::theory::builtin::FunctionProperties::mkGroundTerm(%TYPE%)" \ "theory/builtin/theory_builtin_type_rules.h" enumerator FUNCTION_TYPE \ - ::CVC5::theory::builtin::FunctionEnumerator \ + ::cvc5::theory::builtin::FunctionEnumerator \ "theory/builtin/type_enumerator.h" sort SEXPR_TYPE \ Cardinality::INTEGERS \ not-well-founded \ "the type of a symbolic expression" -typerule EQUAL ::CVC5::theory::builtin::EqualityTypeRule -typerule DISTINCT ::CVC5::theory::builtin::DistinctTypeRule -typerule SEXPR ::CVC5::theory::builtin::SExprTypeRule -typerule LAMBDA ::CVC5::theory::builtin::LambdaTypeRule -typerule WITNESS ::CVC5::theory::builtin::WitnessTypeRule +typerule EQUAL ::cvc5::theory::builtin::EqualityTypeRule +typerule DISTINCT ::cvc5::theory::builtin::DistinctTypeRule +typerule SEXPR ::cvc5::theory::builtin::SExprTypeRule +typerule LAMBDA ::cvc5::theory::builtin::LambdaTypeRule +typerule WITNESS ::cvc5::theory::builtin::WitnessTypeRule # lambda expressions that are isomorphic to array constants can be considered constants -construle LAMBDA ::CVC5::theory::builtin::LambdaTypeRule +construle LAMBDA ::cvc5::theory::builtin::LambdaTypeRule endtheory diff --git a/src/theory/builtin/proof_checker.cpp b/src/theory/builtin/proof_checker.cpp index 62f0f1b9a..36a29f88a 100644 --- a/src/theory/builtin/proof_checker.cpp +++ b/src/theory/builtin/proof_checker.cpp @@ -20,9 +20,9 @@ #include "theory/rewriter.h" #include "theory/theory.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { const char* toString(MethodId id) @@ -497,4 +497,4 @@ Node BuiltinProofRuleChecker::mkTheoryIdNode(TheoryId tid) } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/builtin/proof_checker.h b/src/theory/builtin/proof_checker.h index ed68f1215..f80434068 100644 --- a/src/theory/builtin/proof_checker.h +++ b/src/theory/builtin/proof_checker.h @@ -22,7 +22,7 @@ #include "expr/proof_node.h" #include "theory/quantifiers/extended_rewrite.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -179,6 +179,6 @@ class BuiltinProofRuleChecker : public ProofRuleChecker } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BUILTIN__PROOF_CHECKER_H */ diff --git a/src/theory/builtin/theory_builtin.cpp b/src/theory/builtin/theory_builtin.cpp index 83e9d3fed..bd0374675 100644 --- a/src/theory/builtin/theory_builtin.cpp +++ b/src/theory/builtin/theory_builtin.cpp @@ -24,7 +24,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -62,4 +62,4 @@ void TheoryBuiltin::finishInit() } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/builtin/theory_builtin.h b/src/theory/builtin/theory_builtin.h index 449282ae6..b4de83c02 100644 --- a/src/theory/builtin/theory_builtin.h +++ b/src/theory/builtin/theory_builtin.h @@ -23,7 +23,7 @@ #include "theory/builtin/theory_builtin_rewriter.h" #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -53,6 +53,6 @@ class TheoryBuiltin : public Theory } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_H */ diff --git a/src/theory/builtin/theory_builtin_rewriter.cpp b/src/theory/builtin/theory_builtin_rewriter.cpp index 16fc59a5a..d76bd51dd 100644 --- a/src/theory/builtin/theory_builtin_rewriter.cpp +++ b/src/theory/builtin/theory_builtin_rewriter.cpp @@ -23,7 +23,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -504,4 +504,4 @@ Node TheoryBuiltinRewriter::getArrayRepresentationForLambda(TNode n) } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/builtin/theory_builtin_rewriter.h b/src/theory/builtin/theory_builtin_rewriter.h index c419abdb3..7625aa846 100644 --- a/src/theory/builtin/theory_builtin_rewriter.h +++ b/src/theory/builtin/theory_builtin_rewriter.h @@ -22,7 +22,7 @@ #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -119,6 +119,6 @@ class TheoryBuiltinRewriter : public TheoryRewriter } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_REWRITER_H */ diff --git a/src/theory/builtin/theory_builtin_type_rules.cpp b/src/theory/builtin/theory_builtin_type_rules.cpp index d5a5c9ab7..c5ea17847 100644 --- a/src/theory/builtin/theory_builtin_type_rules.cpp +++ b/src/theory/builtin/theory_builtin_type_rules.cpp @@ -18,7 +18,7 @@ #include "expr/attribute.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -47,4 +47,4 @@ Node SortProperties::mkGroundTerm(TypeNode type) } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/builtin/theory_builtin_type_rules.h b/src/theory/builtin/theory_builtin_type_rules.h index 815483507..2c474aaee 100644 --- a/src/theory/builtin/theory_builtin_type_rules.h +++ b/src/theory/builtin/theory_builtin_type_rules.h @@ -25,7 +25,7 @@ #include <sstream> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -248,6 +248,6 @@ class FunctionProperties { } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BUILTIN__THEORY_BUILTIN_TYPE_RULES_H */ diff --git a/src/theory/builtin/type_enumerator.cpp b/src/theory/builtin/type_enumerator.cpp index 4dda11070..2434bc521 100644 --- a/src/theory/builtin/type_enumerator.cpp +++ b/src/theory/builtin/type_enumerator.cpp @@ -18,7 +18,7 @@ #include "theory/builtin/theory_builtin_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -49,4 +49,4 @@ FunctionEnumerator& FunctionEnumerator::operator++() } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/builtin/type_enumerator.h b/src/theory/builtin/type_enumerator.h index 50cd50dda..7c14bb14c 100644 --- a/src/theory/builtin/type_enumerator.h +++ b/src/theory/builtin/type_enumerator.h @@ -25,7 +25,7 @@ #include "theory/type_enumerator.h" #include "util/integer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace builtin { @@ -106,6 +106,6 @@ class FunctionEnumerator : public TypeEnumeratorBase<FunctionEnumerator> } // namespace builtin } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BUILTIN_TYPE_ENUMERATOR_H */ diff --git a/src/theory/bv/abstraction.cpp b/src/theory/bv/abstraction.cpp index ee4b467b8..62c458723 100644 --- a/src/theory/bv/abstraction.cpp +++ b/src/theory/bv/abstraction.cpp @@ -23,13 +23,13 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/rewriter.h" -using namespace CVC5; -using namespace CVC5::theory; -using namespace CVC5::theory::bv; -using namespace CVC5::context; +using namespace cvc5; +using namespace cvc5::theory; +using namespace cvc5::theory::bv; +using namespace cvc5::context; using namespace std; -using namespace CVC5::theory::bv::utils; +using namespace cvc5::theory::bv::utils; bool AbstractionModule::applyAbstraction(const std::vector<Node>& assertions, std::vector<Node>& new_assertions) diff --git a/src/theory/bv/abstraction.h b/src/theory/bv/abstraction.h index 6c36de34c..182b29c19 100644 --- a/src/theory/bv/abstraction.h +++ b/src/theory/bv/abstraction.h @@ -27,7 +27,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -246,6 +246,6 @@ public: } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/bv/bitblast/aig_bitblaster.cpp b/src/theory/bv/bitblast/aig_bitblaster.cpp index 002a4f631..fb5adb54c 100644 --- a/src/theory/bv/bitblast/aig_bitblaster.cpp +++ b/src/theory/bv/bitblast/aig_bitblaster.cpp @@ -40,7 +40,7 @@ static inline int Cnf_Lit2Var(int Lit) return (Lit & 1) ? -(Lit >> 1) - 1 : (Lit >> 1) + 1; } -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -123,7 +123,7 @@ Abc_Ntk_t* AigBitblaster::currentAigNtk() { if (!AigBitblaster::s_abcAigNetwork) { Abc_Start(); s_abcAigNetwork = Abc_NtkAlloc( ABC_NTK_STRASH, ABC_FUNC_AIG, 1); - char pName[] = "CVC5::theory::bv::AigNetwork"; + char pName[] = "cvc5::theory::bv::AigNetwork"; s_abcAigNetwork->pName = Extra_UtilStrsav(pName); } @@ -496,5 +496,5 @@ AigBitblaster::Statistics::~Statistics() { } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4_USE_ABC diff --git a/src/theory/bv/bitblast/aig_bitblaster.h b/src/theory/bv/bitblast/aig_bitblaster.h index 3eccbd3ec..002ca71ec 100644 --- a/src/theory/bv/bitblast/aig_bitblaster.h +++ b/src/theory/bv/bitblast/aig_bitblaster.h @@ -33,7 +33,7 @@ typedef Abc_Aig_t_ Abc_Aig_t; class Cnf_Dat_t_; typedef Cnf_Dat_t_ Cnf_Dat_t; -namespace CVC5 { +namespace cvc5 { namespace prop { class SatSolver; } @@ -121,6 +121,6 @@ class AigBitblaster : public TBitblaster<Abc_Obj_t*> } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__BV__BITBLAST__AIG_BITBLASTER_H diff --git a/src/theory/bv/bitblast/bitblast_strategies_template.h b/src/theory/bv/bitblast/bitblast_strategies_template.h index 7ae55015f..72b079321 100644 --- a/src/theory/bv/bitblast/bitblast_strategies_template.h +++ b/src/theory/bv/bitblast/bitblast_strategies_template.h @@ -27,7 +27,7 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -899,6 +899,6 @@ void DefaultRotateLeftBB (TNode node, std::vector<T>& bits, TBitblaster<T>* bb) } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/bv/bitblast/bitblast_utils.h b/src/theory/bv/bitblast/bitblast_utils.h index e342d4410..461d7fcaf 100644 --- a/src/theory/bv/bitblast/bitblast_utils.h +++ b/src/theory/bv/bitblast/bitblast_utils.h @@ -23,7 +23,7 @@ #include <ostream> #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -267,6 +267,6 @@ T inline sLessThanBB(const std::vector<T>&a, const std::vector<T>& b, bool orEqu } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__BV__BITBLAST__BITBLAST_UTILS_H diff --git a/src/theory/bv/bitblast/bitblaster.h b/src/theory/bv/bitblast/bitblaster.h index 90ea5ac2b..311d44c94 100644 --- a/src/theory/bv/bitblast/bitblaster.h +++ b/src/theory/bv/bitblast/bitblaster.h @@ -35,7 +35,7 @@ #include "theory/valuation.h" #include "util/resource_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -268,6 +268,6 @@ Node TBitblaster<T>::getTermModel(TNode node, bool fullModel) } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__BITBLAST__BITBLASTER_H */ diff --git a/src/theory/bv/bitblast/eager_bitblaster.cpp b/src/theory/bv/bitblast/eager_bitblaster.cpp index 5e22262e2..41fadd8b0 100644 --- a/src/theory/bv/bitblast/eager_bitblaster.cpp +++ b/src/theory/bv/bitblast/eager_bitblaster.cpp @@ -27,7 +27,7 @@ #include "theory/bv/theory_bv.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -288,4 +288,4 @@ bool EagerBitblaster::isSharedTerm(TNode node) { } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bitblast/eager_bitblaster.h b/src/theory/bv/bitblast/eager_bitblaster.h index dead462b5..87699df40 100644 --- a/src/theory/bv/bitblast/eager_bitblaster.h +++ b/src/theory/bv/bitblast/eager_bitblaster.h @@ -26,7 +26,7 @@ #include "prop/sat_solver.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -85,5 +85,5 @@ class BitblastingRegistrar : public prop::Registrar } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__BV__BITBLAST__EAGER_BITBLASTER_H diff --git a/src/theory/bv/bitblast/lazy_bitblaster.cpp b/src/theory/bv/bitblast/lazy_bitblaster.cpp index e20a6f6b5..a5d3e9bb6 100644 --- a/src/theory/bv/bitblast/lazy_bitblaster.cpp +++ b/src/theory/bv/bitblast/lazy_bitblaster.cpp @@ -30,7 +30,7 @@ #include "theory/rewriter.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -590,4 +590,4 @@ void TLazyBitblaster::clearSolver() { } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bitblast/lazy_bitblaster.h b/src/theory/bv/bitblast/lazy_bitblaster.h index 1a963e67d..91995b56b 100644 --- a/src/theory/bv/bitblast/lazy_bitblaster.h +++ b/src/theory/bv/bitblast/lazy_bitblaster.h @@ -26,7 +26,7 @@ #include "prop/bv_sat_solver_notify.h" #include "theory/bv/abstraction.h" -namespace CVC5 { +namespace cvc5 { namespace prop { class CnfStream; class NullRegistrat; @@ -176,5 +176,5 @@ class TLazyBitblaster : public TBitblaster<Node> } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__BV__BITBLAST__LAZY_BITBLASTER_H diff --git a/src/theory/bv/bitblast/proof_bitblaster.cpp b/src/theory/bv/bitblast/proof_bitblaster.cpp index b0cf68609..a441e769e 100644 --- a/src/theory/bv/bitblast/proof_bitblaster.cpp +++ b/src/theory/bv/bitblast/proof_bitblaster.cpp @@ -17,7 +17,7 @@ #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -84,4 +84,4 @@ bool BBProof::collectModelValues(TheoryModel* m, } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bitblast/proof_bitblaster.h b/src/theory/bv/bitblast/proof_bitblaster.h index 894a9a916..4983b485e 100644 --- a/src/theory/bv/bitblast/proof_bitblaster.h +++ b/src/theory/bv/bitblast/proof_bitblaster.h @@ -18,7 +18,7 @@ #include "theory/bv/bitblast/simple_bitblaster.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -47,5 +47,5 @@ class BBProof } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/bv/bitblast/simple_bitblaster.cpp b/src/theory/bv/bitblast/simple_bitblaster.cpp index 76677e2db..05227ed09 100644 --- a/src/theory/bv/bitblast/simple_bitblaster.cpp +++ b/src/theory/bv/bitblast/simple_bitblaster.cpp @@ -17,7 +17,7 @@ #include "theory/theory_model.h" #include "theory/theory_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -155,4 +155,4 @@ bool BBSimple::isVariable(TNode node) } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bitblast/simple_bitblaster.h b/src/theory/bv/bitblast/simple_bitblaster.h index 1b48f9a68..300b93b53 100644 --- a/src/theory/bv/bitblast/simple_bitblaster.h +++ b/src/theory/bv/bitblast/simple_bitblaster.h @@ -19,7 +19,7 @@ #include "theory/bv/bitblast/bitblaster.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -75,6 +75,6 @@ class BBSimple : public TBitblaster<Node> } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/bv/bv_eager_solver.cpp b/src/theory/bv/bv_eager_solver.cpp index 9c478791c..97df17c58 100644 --- a/src/theory/bv/bv_eager_solver.cpp +++ b/src/theory/bv/bv_eager_solver.cpp @@ -23,7 +23,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -125,4 +125,4 @@ bool EagerBitblastSolver::collectModelInfo(TheoryModel* m, bool fullModel) } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_eager_solver.h b/src/theory/bv/bv_eager_solver.h index 0fe1ed32b..17e6c50e7 100644 --- a/src/theory/bv/bv_eager_solver.h +++ b/src/theory/bv/bv_eager_solver.h @@ -23,7 +23,7 @@ #include "theory/bv/bv_solver_lazy.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -60,6 +60,6 @@ class EagerBitblastSolver { } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__BV__BV_EAGER_SOLVER_H diff --git a/src/theory/bv/bv_inequality_graph.cpp b/src/theory/bv/bv_inequality_graph.cpp index 67554525a..27063ea7a 100644 --- a/src/theory/bv/bv_inequality_graph.cpp +++ b/src/theory/bv/bv_inequality_graph.cpp @@ -18,15 +18,15 @@ #include "theory/bv/theory_bv_utils.h" using namespace std; -using namespace CVC5; -using namespace CVC5::context; -using namespace CVC5::theory; -using namespace CVC5::theory::bv; -using namespace CVC5::theory::bv::utils; - -const TermId CVC5::theory::bv::UndefinedTermId = -1; -const ReasonId CVC5::theory::bv::UndefinedReasonId = -1; -const ReasonId CVC5::theory::bv::AxiomReasonId = -2; +using namespace cvc5; +using namespace cvc5::context; +using namespace cvc5::theory; +using namespace cvc5::theory::bv; +using namespace cvc5::theory::bv::utils; + +const TermId cvc5::theory::bv::UndefinedTermId = -1; +const ReasonId cvc5::theory::bv::UndefinedReasonId = -1; +const ReasonId cvc5::theory::bv::AxiomReasonId = -2; bool InequalityGraph::addInequality(TNode a, TNode b, bool strict, TNode reason) { Debug("bv-inequality") << "InequalityGraph::addInequality " << a << " " << b << " strict: " << strict << "\n"; diff --git a/src/theory/bv/bv_inequality_graph.h b/src/theory/bv/bv_inequality_graph.h index caa7220cf..3e856b789 100644 --- a/src/theory/bv/bv_inequality_graph.h +++ b/src/theory/bv/bv_inequality_graph.h @@ -29,7 +29,7 @@ #include "context/cdqueue.h" #include "context/context.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -291,6 +291,6 @@ public: } } -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__BV_INEQUALITY__GRAPH_H */ diff --git a/src/theory/bv/bv_quick_check.cpp b/src/theory/bv/bv_quick_check.cpp index bbb2f1ca9..983a61eb5 100644 --- a/src/theory/bv/bv_quick_check.cpp +++ b/src/theory/bv/bv_quick_check.cpp @@ -21,9 +21,9 @@ #include "theory/bv/bv_solver_lazy.h" #include "theory/bv/theory_bv_utils.h" -using namespace CVC5::prop; +using namespace cvc5::prop; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -381,4 +381,4 @@ QuickXPlain::Statistics::~Statistics() { } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_quick_check.h b/src/theory/bv/bv_quick_check.h index 3d30d912d..7dbd01dcd 100644 --- a/src/theory/bv/bv_quick_check.h +++ b/src/theory/bv/bv_quick_check.h @@ -29,7 +29,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class TheoryModel; @@ -181,6 +181,6 @@ class QuickXPlain } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__BV_QUICK_CHECK_H */ diff --git a/src/theory/bv/bv_solver.h b/src/theory/bv/bv_solver.h index f08f7527a..faa285b97 100644 --- a/src/theory/bv/bv_solver.h +++ b/src/theory/bv/bv_solver.h @@ -21,7 +21,7 @@ #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -117,6 +117,6 @@ class BVSolver } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__BV_SOLVER_H */ diff --git a/src/theory/bv/bv_solver_bitblast.cpp b/src/theory/bv/bv_solver_bitblast.cpp index 16a99c2e4..125cb243f 100644 --- a/src/theory/bv/bv_solver_bitblast.cpp +++ b/src/theory/bv/bv_solver_bitblast.cpp @@ -23,7 +23,7 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -281,4 +281,4 @@ Node BVSolverBitblast::getValue(TNode node) } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_solver_bitblast.h b/src/theory/bv/bv_solver_bitblast.h index 794b9fa9b..86a75e0aa 100644 --- a/src/theory/bv/bv_solver_bitblast.h +++ b/src/theory/bv/bv_solver_bitblast.h @@ -29,7 +29,7 @@ #include "theory/bv/proof_checker.h" #include "theory/eager_proof_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -143,6 +143,6 @@ class BVSolverBitblast : public BVSolver } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/bv/bv_solver_lazy.cpp b/src/theory/bv/bv_solver_lazy.cpp index ed71fccbe..00190233c 100644 --- a/src/theory/bv/bv_solver_lazy.cpp +++ b/src/theory/bv/bv_solver_lazy.cpp @@ -32,9 +32,9 @@ #include "theory/theory_model.h" #include "theory/trust_substitutions.h" -using namespace CVC5::theory::bv::utils; +using namespace cvc5::theory::bv::utils; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -828,4 +828,4 @@ void BVSolverLazy::setConflict(Node conflict) } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_solver_lazy.h b/src/theory/bv/bv_solver_lazy.h index 6511900eb..ea647346e 100644 --- a/src/theory/bv/bv_solver_lazy.h +++ b/src/theory/bv/bv_solver_lazy.h @@ -28,7 +28,7 @@ #include "theory/bv/theory_bv.h" #include "util/hash.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -229,6 +229,6 @@ class BVSolverLazy : public BVSolver } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__BV_SOLVER_LAZY_H */ diff --git a/src/theory/bv/bv_solver_simple.cpp b/src/theory/bv/bv_solver_simple.cpp index 65d46e861..c96e8d0bc 100644 --- a/src/theory/bv/bv_solver_simple.cpp +++ b/src/theory/bv/bv_solver_simple.cpp @@ -20,7 +20,7 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -151,4 +151,4 @@ bool BVSolverSimple::collectModelValues(TheoryModel* m, } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_solver_simple.h b/src/theory/bv/bv_solver_simple.h index 1b6976abb..8983bddb2 100644 --- a/src/theory/bv/bv_solver_simple.h +++ b/src/theory/bv/bv_solver_simple.h @@ -24,7 +24,7 @@ #include "theory/bv/proof_checker.h" #include "theory/eager_proof_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -81,6 +81,6 @@ class BVSolverSimple : public BVSolver } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/bv/bv_subtheory.h b/src/theory/bv/bv_subtheory.h index e558ea7c7..dec4614d3 100644 --- a/src/theory/bv/bv_subtheory.h +++ b/src/theory/bv/bv_subtheory.h @@ -23,7 +23,7 @@ #include "theory/uf/equality_engine.h" #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { @@ -107,6 +107,6 @@ class SubtheorySolver { } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__BV_SUBTHEORY_H */ diff --git a/src/theory/bv/bv_subtheory_algebraic.cpp b/src/theory/bv/bv_subtheory_algebraic.cpp index 2343d72d1..c025dab5d 100644 --- a/src/theory/bv/bv_subtheory_algebraic.cpp +++ b/src/theory/bv/bv_subtheory_algebraic.cpp @@ -31,12 +31,12 @@ #include "theory/rewriter.h" #include "theory/theory_model.h" -using namespace CVC5::context; -using namespace CVC5::prop; -using namespace CVC5::theory::bv::utils; +using namespace cvc5::context; +using namespace cvc5::prop; +using namespace cvc5::theory::bv::utils; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -992,4 +992,4 @@ Node mergeExplanations(TNode expl1, TNode expl2) { } // namespace bv } /* namespace CVc4::theory */ -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_subtheory_algebraic.h b/src/theory/bv/bv_subtheory_algebraic.h index e7156a33e..01209331f 100644 --- a/src/theory/bv/bv_subtheory_algebraic.h +++ b/src/theory/bv/bv_subtheory_algebraic.h @@ -25,7 +25,7 @@ #include "theory/bv/slicer.h" #include "theory/substitutions.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -245,4 +245,4 @@ class AlgebraicSolver : public SubtheorySolver } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_subtheory_bitblast.cpp b/src/theory/bv/bv_subtheory_bitblast.cpp index 2d21a8f0c..f67f11e42 100644 --- a/src/theory/bv/bv_subtheory_bitblast.cpp +++ b/src/theory/bv/bv_subtheory_bitblast.cpp @@ -27,9 +27,9 @@ #include "theory/bv/theory_bv_utils.h" using namespace std; -using namespace CVC5::context; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -278,4 +278,4 @@ void BitblastSolver::setConflict(TNode conflict) } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_subtheory_bitblast.h b/src/theory/bv/bv_subtheory_bitblast.h index f964fb995..2a6930184 100644 --- a/src/theory/bv/bv_subtheory_bitblast.h +++ b/src/theory/bv/bv_subtheory_bitblast.h @@ -22,7 +22,7 @@ #include "theory/bv/bv_subtheory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -83,4 +83,4 @@ class BitblastSolver : public SubtheorySolver } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_subtheory_core.cpp b/src/theory/bv/bv_subtheory_core.cpp index 486adfdb7..4f89eff71 100644 --- a/src/theory/bv/bv_subtheory_core.cpp +++ b/src/theory/bv/bv_subtheory_core.cpp @@ -25,11 +25,11 @@ #include "theory/theory_model.h" using namespace std; -using namespace CVC5; -using namespace CVC5::context; -using namespace CVC5::theory; -using namespace CVC5::theory::bv; -using namespace CVC5::theory::bv::utils; +using namespace cvc5; +using namespace cvc5::context; +using namespace cvc5::theory; +using namespace cvc5::theory::bv; +using namespace cvc5::theory::bv::utils; bool CoreSolverExtTheoryCallback::getCurrentSubstitution( int effort, diff --git a/src/theory/bv/bv_subtheory_core.h b/src/theory/bv/bv_subtheory_core.h index 700d8c4f5..042f2e73c 100644 --- a/src/theory/bv/bv_subtheory_core.h +++ b/src/theory/bv/bv_subtheory_core.h @@ -25,7 +25,7 @@ #include "theory/bv/bv_subtheory.h" #include "theory/ext_theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -164,4 +164,4 @@ class CoreSolver : public SubtheorySolver { } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/bv_subtheory_inequality.cpp b/src/theory/bv/bv_subtheory_inequality.cpp index d67a5c550..c95d5e2dd 100644 --- a/src/theory/bv/bv_subtheory_inequality.cpp +++ b/src/theory/bv/bv_subtheory_inequality.cpp @@ -24,11 +24,11 @@ #include "theory/theory_model.h" using namespace std; -using namespace CVC5; -using namespace CVC5::context; -using namespace CVC5::theory; -using namespace CVC5::theory::bv; -using namespace CVC5::theory::bv::utils; +using namespace cvc5; +using namespace cvc5::context; +using namespace cvc5::theory; +using namespace cvc5::theory::bv; +using namespace cvc5::theory::bv::utils; bool InequalitySolver::check(Theory::Effort e) { Debug("bv-subtheory-inequality") << "InequalitySolveR::check("<< e <<")\n"; diff --git a/src/theory/bv/bv_subtheory_inequality.h b/src/theory/bv/bv_subtheory_inequality.h index 232c8676e..dc585b49b 100644 --- a/src/theory/bv/bv_subtheory_inequality.h +++ b/src/theory/bv/bv_subtheory_inequality.h @@ -26,7 +26,7 @@ #include "theory/bv/bv_inequality_graph.h" #include "theory/bv/bv_subtheory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -89,6 +89,6 @@ class InequalitySolver : public SubtheorySolver } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__BV_SUBTHEORY__INEQUALITY_H */ diff --git a/src/theory/bv/int_blaster.h b/src/theory/bv/int_blaster.h index 65a8b5480..b76fc1cb7 100644 --- a/src/theory/bv/int_blaster.h +++ b/src/theory/bv/int_blaster.h @@ -24,7 +24,7 @@ #include "options/smt_options.h" #include "theory/arith/nl/iand_utils.h" -namespace CVC5 { +namespace cvc5 { /* ** Converts bit-vector formulas to integer formulas. @@ -349,6 +349,6 @@ class IntBlaster bool d_introduceFreshIntVars; }; -} // namespace CVC5 +} // namespace cvc5 #endif /* __CVC4__THEORY__BV__INT_BLASTER_H */ diff --git a/src/theory/bv/kinds b/src/theory/bv/kinds index 884ee49e6..3a1032bc3 100644 --- a/src/theory/bv/kinds +++ b/src/theory/bv/kinds @@ -4,36 +4,36 @@ # src/theory/builtin/kinds. # -theory THEORY_BV ::CVC5::theory::bv::TheoryBV "theory/bv/theory_bv.h" +theory THEORY_BV ::cvc5::theory::bv::TheoryBV "theory/bv/theory_bv.h" typechecker "theory/bv/theory_bv_type_rules.h" properties finite properties check propagate presolve ppStaticLearn -rewriter ::CVC5::theory::bv::TheoryBVRewriter "theory/bv/theory_bv_rewriter.h" +rewriter ::cvc5::theory::bv::TheoryBVRewriter "theory/bv/theory_bv_rewriter.h" constant BITVECTOR_TYPE \ - ::CVC5::BitVectorSize \ - "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorSize >" \ + ::cvc5::BitVectorSize \ + "::cvc5::UnsignedHashFunction< ::cvc5::BitVectorSize >" \ "util/bitvector.h" \ "bit-vector type" cardinality BITVECTOR_TYPE \ - "::CVC5::theory::bv::CardinalityComputer::computeCardinality(%TYPE%)" \ + "::cvc5::theory::bv::CardinalityComputer::computeCardinality(%TYPE%)" \ "theory/bv/theory_bv_type_rules.h" constant CONST_BITVECTOR \ - ::CVC5::BitVector \ - ::CVC5::BitVectorHashFunction \ + ::cvc5::BitVector \ + ::cvc5::BitVectorHashFunction \ "util/bitvector.h" \ - "a fixed-width bit-vector constant; payload is an instance of the CVC5::BitVector class" + "a fixed-width bit-vector constant; payload is an instance of the cvc5::BitVector class" enumerator BITVECTOR_TYPE \ - "::CVC5::theory::bv::BitVectorEnumerator" \ + "::cvc5::theory::bv::BitVectorEnumerator" \ "theory/bv/type_enumerator.h" well-founded BITVECTOR_TYPE \ true \ - "(*CVC5::theory::TypeEnumerator(%TYPE%))" \ + "(*cvc5::theory::TypeEnumerator(%TYPE%))" \ "theory/type_enumerator.h" ### non-parameterized operator kinds ------------------------------------------ @@ -99,139 +99,139 @@ operator BITVECTOR_EAGER_ATOM 1 "formula to be treated as a bv atom via eager bi ### parameterized operator kinds ---------------------------------------------- constant BITVECTOR_BITOF_OP \ - ::CVC5::BitVectorBitOf \ - ::CVC5::BitVectorBitOfHashFunction \ + ::cvc5::BitVectorBitOf \ + ::cvc5::BitVectorBitOfHashFunction \ "util/bitvector.h" \ - "operator for the bit-vector boolean bit extract; payload is an instance of the CVC5::BitVectorBitOf class" + "operator for the bit-vector boolean bit extract; payload is an instance of the cvc5::BitVectorBitOf class" parameterized BITVECTOR_BITOF BITVECTOR_BITOF_OP 1 "bit-vector boolean bit extract; first parameter is a BITVECTOR_BITOF_OP, second is a bit-vector term" constant BITVECTOR_EXTRACT_OP \ - ::CVC5::BitVectorExtract \ - ::CVC5::BitVectorExtractHashFunction \ + ::cvc5::BitVectorExtract \ + ::cvc5::BitVectorExtractHashFunction \ "util/bitvector.h" \ - "operator for the bit-vector extract; payload is an instance of the CVC5::BitVectorExtract class" + "operator for the bit-vector extract; payload is an instance of the cvc5::BitVectorExtract class" parameterized BITVECTOR_EXTRACT BITVECTOR_EXTRACT_OP 1 "bit-vector extract; first parameter is a BITVECTOR_EXTRACT_OP, second is a bit-vector term" constant BITVECTOR_REPEAT_OP \ - ::CVC5::BitVectorRepeat \ - "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorRepeat >" \ + ::cvc5::BitVectorRepeat \ + "::cvc5::UnsignedHashFunction< ::cvc5::BitVectorRepeat >" \ "util/bitvector.h" \ - "operator for the bit-vector repeat; payload is an instance of the CVC5::BitVectorRepeat class" + "operator for the bit-vector repeat; payload is an instance of the cvc5::BitVectorRepeat class" parameterized BITVECTOR_REPEAT BITVECTOR_REPEAT_OP 1 "bit-vector repeat; first parameter is a BITVECTOR_REPEAT_OP, second is a bit-vector term" constant BITVECTOR_ROTATE_LEFT_OP \ - ::CVC5::BitVectorRotateLeft \ - "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorRotateLeft >" \ + ::cvc5::BitVectorRotateLeft \ + "::cvc5::UnsignedHashFunction< ::cvc5::BitVectorRotateLeft >" \ "util/bitvector.h" \ - "operator for the bit-vector rotate left; payload is an instance of the CVC5::BitVectorRotateLeft class" + "operator for the bit-vector rotate left; payload is an instance of the cvc5::BitVectorRotateLeft class" parameterized BITVECTOR_ROTATE_LEFT BITVECTOR_ROTATE_LEFT_OP 1 "bit-vector rotate left; first parameter is a BITVECTOR_ROTATE_LEFT_OP, second is a bit-vector term" constant BITVECTOR_ROTATE_RIGHT_OP \ - ::CVC5::BitVectorRotateRight \ - "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorRotateRight >" \ + ::cvc5::BitVectorRotateRight \ + "::cvc5::UnsignedHashFunction< ::cvc5::BitVectorRotateRight >" \ "util/bitvector.h" \ - "operator for the bit-vector rotate right; payload is an instance of the CVC5::BitVectorRotateRight class" + "operator for the bit-vector rotate right; payload is an instance of the cvc5::BitVectorRotateRight class" parameterized BITVECTOR_ROTATE_RIGHT BITVECTOR_ROTATE_RIGHT_OP 1 "bit-vector rotate right; first parameter is a BITVECTOR_ROTATE_RIGHT_OP, second is a bit-vector term" constant BITVECTOR_SIGN_EXTEND_OP \ - ::CVC5::BitVectorSignExtend \ - "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorSignExtend >" \ + ::cvc5::BitVectorSignExtend \ + "::cvc5::UnsignedHashFunction< ::cvc5::BitVectorSignExtend >" \ "util/bitvector.h" \ - "operator for the bit-vector sign-extend; payload is an instance of the CVC5::BitVectorSignExtend class" + "operator for the bit-vector sign-extend; payload is an instance of the cvc5::BitVectorSignExtend class" parameterized BITVECTOR_SIGN_EXTEND BITVECTOR_SIGN_EXTEND_OP 1 "bit-vector sign-extend; first parameter is a BITVECTOR_SIGN_EXTEND_OP, second is a bit-vector term" constant BITVECTOR_ZERO_EXTEND_OP \ - ::CVC5::BitVectorZeroExtend \ - "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorZeroExtend >" \ + ::cvc5::BitVectorZeroExtend \ + "::cvc5::UnsignedHashFunction< ::cvc5::BitVectorZeroExtend >" \ "util/bitvector.h" \ - "operator for the bit-vector zero-extend; payload is an instance of the CVC5::BitVectorZeroExtend class" + "operator for the bit-vector zero-extend; payload is an instance of the cvc5::BitVectorZeroExtend class" parameterized BITVECTOR_ZERO_EXTEND BITVECTOR_ZERO_EXTEND_OP 1 "bit-vector zero-extend; first parameter is a BITVECTOR_ZERO_EXTEND_OP, second is a bit-vector term" constant INT_TO_BITVECTOR_OP \ - ::CVC5::IntToBitVector \ - "::CVC5::UnsignedHashFunction< ::CVC5::IntToBitVector >" \ + ::cvc5::IntToBitVector \ + "::cvc5::UnsignedHashFunction< ::cvc5::IntToBitVector >" \ "util/bitvector.h" \ - "operator for the integer conversion to bit-vector; payload is an instance of the CVC5::IntToBitVector class" + "operator for the integer conversion to bit-vector; payload is an instance of the cvc5::IntToBitVector class" parameterized INT_TO_BITVECTOR INT_TO_BITVECTOR_OP 1 "integer conversion to bit-vector; first parameter is an INT_TO_BITVECTOR_OP, second is an integer term" ### type rules for non-parameterized operator kinds --------------------------- -typerule CONST_BITVECTOR ::CVC5::theory::bv::BitVectorConstantTypeRule +typerule CONST_BITVECTOR ::cvc5::theory::bv::BitVectorConstantTypeRule ## concatentation kind -typerule BITVECTOR_CONCAT ::CVC5::theory::bv::BitVectorConcatTypeRule +typerule BITVECTOR_CONCAT ::cvc5::theory::bv::BitVectorConcatTypeRule ## bit-wise kinds -typerule BITVECTOR_AND ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_COMP ::CVC5::theory::bv::BitVectorBVPredTypeRule -typerule BITVECTOR_NAND ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_NOR ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_NOT ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_OR ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_XNOR ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_XOR ::CVC5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_AND ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_COMP ::cvc5::theory::bv::BitVectorBVPredTypeRule +typerule BITVECTOR_NAND ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_NOR ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_NOT ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_OR ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_XNOR ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_XOR ::cvc5::theory::bv::BitVectorFixedWidthTypeRule ## arithmetic kinds -typerule BITVECTOR_MULT ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_NEG ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_PLUS ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SUB ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_UDIV ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_UREM ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SDIV ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SMOD ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SREM ::CVC5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_MULT ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_NEG ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_PLUS ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_SUB ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_UDIV ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_UREM ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_SDIV ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_SMOD ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_SREM ::cvc5::theory::bv::BitVectorFixedWidthTypeRule ## shift kinds -typerule BITVECTOR_ASHR ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_LSHR ::CVC5::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SHL ::CVC5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_ASHR ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_LSHR ::cvc5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_SHL ::cvc5::theory::bv::BitVectorFixedWidthTypeRule ## inequality kinds -typerule BITVECTOR_ULE ::CVC5::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_ULT ::CVC5::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_UGE ::CVC5::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_UGT ::CVC5::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SLE ::CVC5::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SLT ::CVC5::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SGE ::CVC5::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SGT ::CVC5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_ULE ::cvc5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_ULT ::cvc5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_UGE ::cvc5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_UGT ::cvc5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_SLE ::cvc5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_SLT ::cvc5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_SGE ::cvc5::theory::bv::BitVectorPredicateTypeRule +typerule BITVECTOR_SGT ::cvc5::theory::bv::BitVectorPredicateTypeRule # inequalities with return type bit-vector of size 1 -typerule BITVECTOR_ULTBV ::CVC5::theory::bv::BitVectorBVPredTypeRule -typerule BITVECTOR_SLTBV ::CVC5::theory::bv::BitVectorBVPredTypeRule +typerule BITVECTOR_ULTBV ::cvc5::theory::bv::BitVectorBVPredTypeRule +typerule BITVECTOR_SLTBV ::cvc5::theory::bv::BitVectorBVPredTypeRule ## if-then-else kind -typerule BITVECTOR_ITE ::CVC5::theory::bv::BitVectorITETypeRule +typerule BITVECTOR_ITE ::cvc5::theory::bv::BitVectorITETypeRule ## reduction kinds -typerule BITVECTOR_REDAND ::CVC5::theory::bv::BitVectorUnaryPredicateTypeRule -typerule BITVECTOR_REDOR ::CVC5::theory::bv::BitVectorUnaryPredicateTypeRule +typerule BITVECTOR_REDAND ::cvc5::theory::bv::BitVectorUnaryPredicateTypeRule +typerule BITVECTOR_REDOR ::cvc5::theory::bv::BitVectorUnaryPredicateTypeRule ## conversion kinds -typerule BITVECTOR_TO_NAT ::CVC5::theory::bv::BitVectorConversionTypeRule +typerule BITVECTOR_TO_NAT ::cvc5::theory::bv::BitVectorConversionTypeRule ## internal kinds -typerule BITVECTOR_ACKERMANNIZE_UDIV ::CVC5::theory::bv::BitVectorAckermanizationUdivTypeRule -typerule BITVECTOR_ACKERMANNIZE_UREM ::CVC5::theory::bv::BitVectorAckermanizationUremTypeRule -typerule BITVECTOR_EAGER_ATOM ::CVC5::theory::bv::BitVectorEagerAtomTypeRule +typerule BITVECTOR_ACKERMANNIZE_UDIV ::cvc5::theory::bv::BitVectorAckermanizationUdivTypeRule +typerule BITVECTOR_ACKERMANNIZE_UREM ::cvc5::theory::bv::BitVectorAckermanizationUremTypeRule +typerule BITVECTOR_EAGER_ATOM ::cvc5::theory::bv::BitVectorEagerAtomTypeRule ### type rules for parameterized operator kinds ------------------------------- typerule BITVECTOR_BITOF_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_BITOF ::CVC5::theory::bv::BitVectorBitOfTypeRule +typerule BITVECTOR_BITOF ::cvc5::theory::bv::BitVectorBitOfTypeRule typerule BITVECTOR_EXTRACT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_EXTRACT ::CVC5::theory::bv::BitVectorExtractTypeRule +typerule BITVECTOR_EXTRACT ::cvc5::theory::bv::BitVectorExtractTypeRule typerule BITVECTOR_REPEAT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_REPEAT ::CVC5::theory::bv::BitVectorRepeatTypeRule +typerule BITVECTOR_REPEAT ::cvc5::theory::bv::BitVectorRepeatTypeRule typerule BITVECTOR_ROTATE_LEFT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_ROTATE_LEFT ::CVC5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_ROTATE_LEFT ::cvc5::theory::bv::BitVectorFixedWidthTypeRule typerule BITVECTOR_ROTATE_RIGHT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_ROTATE_RIGHT ::CVC5::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_ROTATE_RIGHT ::cvc5::theory::bv::BitVectorFixedWidthTypeRule typerule BITVECTOR_SIGN_EXTEND_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_SIGN_EXTEND ::CVC5::theory::bv::BitVectorExtendTypeRule +typerule BITVECTOR_SIGN_EXTEND ::cvc5::theory::bv::BitVectorExtendTypeRule typerule BITVECTOR_ZERO_EXTEND_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_ZERO_EXTEND ::CVC5::theory::bv::BitVectorExtendTypeRule -typerule INT_TO_BITVECTOR_OP ::CVC5::theory::bv::IntToBitVectorOpTypeRule -typerule INT_TO_BITVECTOR ::CVC5::theory::bv::BitVectorConversionTypeRule +typerule BITVECTOR_ZERO_EXTEND ::cvc5::theory::bv::BitVectorExtendTypeRule +typerule INT_TO_BITVECTOR_OP ::cvc5::theory::bv::IntToBitVectorOpTypeRule +typerule INT_TO_BITVECTOR ::cvc5::theory::bv::BitVectorConversionTypeRule endtheory diff --git a/src/theory/bv/proof_checker.cpp b/src/theory/bv/proof_checker.cpp index 82f37c552..e7ecc0f48 100644 --- a/src/theory/bv/proof_checker.cpp +++ b/src/theory/bv/proof_checker.cpp @@ -14,7 +14,7 @@ #include "theory/bv/proof_checker.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -50,4 +50,4 @@ Node BVProofRuleChecker::checkInternal(PfRule id, } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/proof_checker.h b/src/theory/bv/proof_checker.h index efa319322..b328600df 100644 --- a/src/theory/bv/proof_checker.h +++ b/src/theory/bv/proof_checker.h @@ -22,7 +22,7 @@ #include "expr/proof_node.h" #include "theory/bv/bitblast/simple_bitblaster.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -45,6 +45,6 @@ class BVProofRuleChecker : public ProofRuleChecker } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__PROOF_CHECKER_H */ diff --git a/src/theory/bv/slicer.cpp b/src/theory/bv/slicer.cpp index e8c032a61..75357b76c 100644 --- a/src/theory/bv/slicer.cpp +++ b/src/theory/bv/slicer.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -83,4 +83,4 @@ std::string Base::debugPrint() const { } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/slicer.h b/src/theory/bv/slicer.h index 56ed0ecba..55a64d92b 100644 --- a/src/theory/bv/slicer.h +++ b/src/theory/bv/slicer.h @@ -23,7 +23,7 @@ #include <vector> #include "util/index.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -51,6 +51,6 @@ public: } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__SLICER_BV_H */ diff --git a/src/theory/bv/theory_bv.cpp b/src/theory/bv/theory_bv.cpp index 185f7ad2a..8f9f88ea2 100644 --- a/src/theory/bv/theory_bv.cpp +++ b/src/theory/bv/theory_bv.cpp @@ -23,7 +23,7 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/ee_setup_info.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -236,4 +236,4 @@ bool TheoryBV::applyAbstraction(const std::vector<Node>& assertions, } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h index 1608dc3cf..c9ddaad11 100644 --- a/src/theory/bv/theory_bv.h +++ b/src/theory/bv/theory_bv.h @@ -24,7 +24,7 @@ #include "theory/theory_eq_notify.h" #include "theory/theory_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -124,6 +124,6 @@ class TheoryBV : public Theory } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__THEORY_BV_H */ diff --git a/src/theory/bv/theory_bv_rewrite_rules.h b/src/theory/bv/theory_bv_rewrite_rules.h index f9bd4215d..e92ed5543 100644 --- a/src/theory/bv/theory_bv_rewrite_rules.h +++ b/src/theory/bv/theory_bv_rewrite_rules.h @@ -30,7 +30,7 @@ #include "theory/theory.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -770,4 +770,4 @@ struct FixpointRewriteStrategy { } // End namespace bv } // End namespace theory -} // End namespace CVC5 +} // End namespace cvc5 diff --git a/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h b/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h index 917d77637..5b25eb45d 100644 --- a/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h +++ b/src/theory/bv/theory_bv_rewrite_rules_constant_evaluation.h @@ -22,7 +22,7 @@ #include "theory/bv/theory_bv_rewrite_rules.h" #include "theory/bv/theory_bv_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -492,4 +492,4 @@ Node RewriteRule<EvalComp>::apply(TNode node) { } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/theory_bv_rewrite_rules_core.h b/src/theory/bv/theory_bv_rewrite_rules_core.h index c24c3ac48..7060b68a9 100644 --- a/src/theory/bv/theory_bv_rewrite_rules_core.h +++ b/src/theory/bv/theory_bv_rewrite_rules_core.h @@ -22,7 +22,7 @@ #include "theory/bv/theory_bv_rewrite_rules.h" #include "theory/bv/theory_bv_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -302,4 +302,4 @@ Node RewriteRule<ReflexivityEq>::apply(TNode node) { } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/theory_bv_rewrite_rules_normalization.h b/src/theory/bv/theory_bv_rewrite_rules_normalization.h index cf7bc4a8f..4872f8070 100644 --- a/src/theory/bv/theory_bv_rewrite_rules_normalization.h +++ b/src/theory/bv/theory_bv_rewrite_rules_normalization.h @@ -27,7 +27,7 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -1571,4 +1571,4 @@ inline Node RewriteRule<NormalizeEqPlusNeg>::apply(TNode node) } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h index 3750ef5b0..3244ebb6e 100644 --- a/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h +++ b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h @@ -23,7 +23,7 @@ #include "theory/bv/theory_bv_rewrite_rules.h" #include "theory/bv/theory_bv_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -788,4 +788,4 @@ inline Node RewriteRule<RedandEliminate>::apply(TNode node) } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/theory_bv_rewrite_rules_simplification.h b/src/theory/bv/theory_bv_rewrite_rules_simplification.h index c6dcb9f1e..2e99cc467 100644 --- a/src/theory/bv/theory_bv_rewrite_rules_simplification.h +++ b/src/theory/bv/theory_bv_rewrite_rules_simplification.h @@ -24,7 +24,7 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -2257,4 +2257,4 @@ Node RewriteRule<MultSltMult>::apply(TNode node) } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/theory_bv_rewriter.cpp b/src/theory/bv/theory_bv_rewriter.cpp index 9b2d929ed..142afbb3f 100644 --- a/src/theory/bv/theory_bv_rewriter.cpp +++ b/src/theory/bv/theory_bv_rewriter.cpp @@ -25,9 +25,9 @@ #include "theory/bv/theory_bv_rewriter.h" #include "theory/theory.h" -using namespace CVC5; -using namespace CVC5::theory; -using namespace CVC5::theory::bv; +using namespace cvc5; +using namespace cvc5::theory; +using namespace cvc5::theory::bv; TheoryBVRewriter::TheoryBVRewriter() { initializeRewrites(); } diff --git a/src/theory/bv/theory_bv_rewriter.h b/src/theory/bv/theory_bv_rewriter.h index e6c42f117..0be333ef0 100644 --- a/src/theory/bv/theory_bv_rewriter.h +++ b/src/theory/bv/theory_bv_rewriter.h @@ -22,7 +22,7 @@ #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -105,6 +105,6 @@ class TheoryBVRewriter : public TheoryRewriter } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__THEORY_BV_REWRITER_H */ diff --git a/src/theory/bv/theory_bv_type_rules.h b/src/theory/bv/theory_bv_type_rules.h index 54ed4579b..4de7eed6d 100644 --- a/src/theory/bv/theory_bv_type_rules.h +++ b/src/theory/bv/theory_bv_type_rules.h @@ -21,7 +21,7 @@ #ifndef CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H #define CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -450,6 +450,6 @@ class BitVectorAckermanizationUremTypeRule } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__THEORY_BV_TYPE_RULES_H */ diff --git a/src/theory/bv/theory_bv_utils.cpp b/src/theory/bv/theory_bv_utils.cpp index 4a68e3724..c2a7f05b6 100644 --- a/src/theory/bv/theory_bv_utils.cpp +++ b/src/theory/bv/theory_bv_utils.cpp @@ -21,7 +21,7 @@ #include "options/theory_options.h" #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { namespace utils { @@ -511,4 +511,4 @@ Node eliminateInt2Bv(TNode node) } // namespace utils } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/theory_bv_utils.h b/src/theory/bv/theory_bv_utils.h index 5795b5f14..04258d441 100644 --- a/src/theory/bv/theory_bv_utils.h +++ b/src/theory/bv/theory_bv_utils.h @@ -25,7 +25,7 @@ #include "expr/node_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -226,4 +226,4 @@ Node eliminateInt2Bv(TNode node); } } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/bv/type_enumerator.h b/src/theory/bv/type_enumerator.h index 31fe11715..826b61d6b 100644 --- a/src/theory/bv/type_enumerator.h +++ b/src/theory/bv/type_enumerator.h @@ -26,7 +26,7 @@ #include "util/bitvector.h" #include "util/integer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace bv { @@ -61,6 +61,6 @@ public: } // namespace bv } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__BV__TYPE_ENUMERATOR_H */ diff --git a/src/theory/care_graph.h b/src/theory/care_graph.h index 687378887..c87cafcbd 100644 --- a/src/theory/care_graph.h +++ b/src/theory/care_graph.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "theory/theory_id.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -60,6 +60,6 @@ struct CarePair { typedef std::set<CarePair> CareGraph; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__CARE_GRAPH_H */ diff --git a/src/theory/combination_care_graph.cpp b/src/theory/combination_care_graph.cpp index df757c4a9..4fab0c580 100644 --- a/src/theory/combination_care_graph.cpp +++ b/src/theory/combination_care_graph.cpp @@ -20,7 +20,7 @@ #include "theory/model_manager.h" #include "theory/theory_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { CombinationCareGraph::CombinationCareGraph( @@ -99,4 +99,4 @@ bool CombinationCareGraph::buildModel() } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/combination_care_graph.h b/src/theory/combination_care_graph.h index a59fa154e..9d40ed05f 100644 --- a/src/theory/combination_care_graph.h +++ b/src/theory/combination_care_graph.h @@ -21,7 +21,7 @@ #include "theory/combination_engine.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -47,6 +47,6 @@ class CombinationCareGraph : public CombinationEngine }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__COMBINATION_DISTRIBUTED__H */ diff --git a/src/theory/combination_engine.cpp b/src/theory/combination_engine.cpp index 639a7e201..a5402633d 100644 --- a/src/theory/combination_engine.cpp +++ b/src/theory/combination_engine.cpp @@ -24,7 +24,7 @@ #include "theory/shared_solver_distributed.h" #include "theory/theory_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { CombinationEngine::CombinationEngine(TheoryEngine& te, @@ -118,4 +118,4 @@ void CombinationEngine::resetRound() } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/combination_engine.h b/src/theory/combination_engine.h index 6798404e9..3fd74f630 100644 --- a/src/theory/combination_engine.h +++ b/src/theory/combination_engine.h @@ -23,7 +23,7 @@ #include "theory/ee_manager.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -137,6 +137,6 @@ class CombinationEngine }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__COMBINATION_DISTRIBUTED__H */ diff --git a/src/theory/datatypes/datatypes_rewriter.cpp b/src/theory/datatypes/datatypes_rewriter.cpp index 18332a972..0c190c776 100644 --- a/src/theory/datatypes/datatypes_rewriter.cpp +++ b/src/theory/datatypes/datatypes_rewriter.cpp @@ -24,10 +24,10 @@ #include "theory/datatypes/sygus_datatype_utils.h" #include "theory/datatypes/theory_datatypes_utils.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -796,4 +796,4 @@ Node DatatypesRewriter::replaceDebruijn(Node n, } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/datatypes_rewriter.h b/src/theory/datatypes/datatypes_rewriter.h index 4126a505d..705fabdca 100644 --- a/src/theory/datatypes/datatypes_rewriter.h +++ b/src/theory/datatypes/datatypes_rewriter.h @@ -21,7 +21,7 @@ #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -144,6 +144,6 @@ class DatatypesRewriter : public TheoryRewriter } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DATATYPES__DATATYPES_REWRITER_H */ diff --git a/src/theory/datatypes/infer_proof_cons.cpp b/src/theory/datatypes/infer_proof_cons.cpp index d87ff15a5..e629ee2ff 100644 --- a/src/theory/datatypes/infer_proof_cons.cpp +++ b/src/theory/datatypes/infer_proof_cons.cpp @@ -20,9 +20,9 @@ #include "theory/model_manager.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -275,4 +275,4 @@ std::string InferProofCons::identify() const } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/infer_proof_cons.h b/src/theory/datatypes/infer_proof_cons.h index 70fa8fad5..362996f76 100644 --- a/src/theory/datatypes/infer_proof_cons.h +++ b/src/theory/datatypes/infer_proof_cons.h @@ -22,7 +22,7 @@ #include "expr/proof_generator.h" #include "theory/datatypes/inference.h" -namespace CVC5 { +namespace cvc5 { class ProofNodeManager; @@ -95,6 +95,6 @@ class InferProofCons : public ProofGenerator } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DATATYPES__INFER_PROOF_CONS_H */ diff --git a/src/theory/datatypes/inference.cpp b/src/theory/datatypes/inference.cpp index 9749d7a2d..2f598598a 100644 --- a/src/theory/datatypes/inference.cpp +++ b/src/theory/datatypes/inference.cpp @@ -19,9 +19,9 @@ #include "theory/datatypes/inference_manager.h" #include "theory/theory.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -80,4 +80,4 @@ Node DatatypesInference::processFact(std::vector<Node>& exp, } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/inference.h b/src/theory/datatypes/inference.h index bff56afdc..d60fb26f0 100644 --- a/src/theory/datatypes/inference.h +++ b/src/theory/datatypes/inference.h @@ -22,7 +22,7 @@ #include "theory/theory_inference.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -69,6 +69,6 @@ class DatatypesInference : public SimpleTheoryInternalFact } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/datatypes/inference_manager.cpp b/src/theory/datatypes/inference_manager.cpp index f4a0f45d9..51d9a27ed 100644 --- a/src/theory/datatypes/inference_manager.cpp +++ b/src/theory/datatypes/inference_manager.cpp @@ -23,9 +23,9 @@ #include "theory/theory_state.h" #include "theory/trust_substitutions.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -171,4 +171,4 @@ Node InferenceManager::prepareDtInference(Node conc, } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/inference_manager.h b/src/theory/datatypes/inference_manager.h index c7b20ec83..912b44477 100644 --- a/src/theory/datatypes/inference_manager.h +++ b/src/theory/datatypes/inference_manager.h @@ -21,7 +21,7 @@ #include "theory/datatypes/infer_proof_cons.h" #include "theory/inference_manager_buffered.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class EagerProofGenerator; @@ -109,6 +109,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/datatypes/kinds b/src/theory/datatypes/kinds index 3fd59d9cb..ab4c3bf6b 100644 --- a/src/theory/datatypes/kinds +++ b/src/theory/datatypes/kinds @@ -4,31 +4,31 @@ # src/theory/builtin/kinds. # -theory THEORY_DATATYPES ::CVC5::theory::datatypes::TheoryDatatypes "theory/datatypes/theory_datatypes.h" +theory THEORY_DATATYPES ::cvc5::theory::datatypes::TheoryDatatypes "theory/datatypes/theory_datatypes.h" typechecker "theory/datatypes/theory_datatypes_type_rules.h" properties check parametric -rewriter ::CVC5::theory::datatypes::DatatypesRewriter "theory/datatypes/datatypes_rewriter.h" +rewriter ::cvc5::theory::datatypes::DatatypesRewriter "theory/datatypes/datatypes_rewriter.h" # constructor type has a list of selector types followed by a return type operator CONSTRUCTOR_TYPE 1: "constructor" cardinality CONSTRUCTOR_TYPE \ - "::CVC5::theory::datatypes::ConstructorProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::datatypes::ConstructorProperties::computeCardinality(%TYPE%)" \ "theory/datatypes/theory_datatypes_type_rules.h" # selector type has domain type and a range type operator SELECTOR_TYPE 2 "selector" # can re-use function cardinality cardinality SELECTOR_TYPE \ - "::CVC5::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ "theory/builtin/theory_builtin_type_rules.h" # tester type has a constructor type operator TESTER_TYPE 1 "tester" # can re-use function cardinality cardinality TESTER_TYPE \ - "::CVC5::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ "theory/builtin/theory_builtin_type_rules.h" parameterized APPLY_CONSTRUCTOR APPLY_TYPE_ASCRIPTION 0: "constructor application; first parameter is the constructor, remaining parameters (if any) are parameters to the constructor" @@ -39,8 +39,8 @@ parameterized APPLY_SELECTOR_TOTAL [SELECTOR_TYPE] 1 "selector application; para parameterized APPLY_TESTER TESTER_TYPE 1 "tester application; first parameter is a tester, second is a datatype term" constant DATATYPE_TYPE \ - ::CVC5::DatatypeIndexConstant \ - "::CVC5::DatatypeIndexConstantHashFunction" \ + ::cvc5::DatatypeIndexConstant \ + "::cvc5::DatatypeIndexConstantHashFunction" \ "expr/datatype_index.h" \ "a datatype type index" cardinality DATATYPE_TYPE \ @@ -52,7 +52,7 @@ well-founded DATATYPE_TYPE \ "expr/dtype.h" enumerator DATATYPE_TYPE \ - "::CVC5::theory::datatypes::DatatypesEnumerator" \ + "::cvc5::theory::datatypes::DatatypesEnumerator" \ "theory/datatypes/type_enumerator.h" operator PARAMETRIC_DATATYPE 1: "parametric datatype" @@ -65,59 +65,59 @@ well-founded PARAMETRIC_DATATYPE \ "expr/dtype.h" enumerator PARAMETRIC_DATATYPE \ - "::CVC5::theory::datatypes::DatatypesEnumerator" \ + "::cvc5::theory::datatypes::DatatypesEnumerator" \ "theory/datatypes/type_enumerator.h" parameterized APPLY_TYPE_ASCRIPTION ASCRIPTION_TYPE 1 \ "type ascription, for datatype constructor applications; first parameter is an ASCRIPTION_TYPE, second is the datatype constructor application being ascribed" constant ASCRIPTION_TYPE \ - ::CVC5::AscriptionType \ - ::CVC5::AscriptionTypeHashFunction \ + ::cvc5::AscriptionType \ + ::cvc5::AscriptionTypeHashFunction \ "expr/ascription_type.h" \ - "a type parameter for type ascription; payload is an instance of the CVC5::AscriptionType class" + "a type parameter for type ascription; payload is an instance of the cvc5::AscriptionType class" -typerule APPLY_CONSTRUCTOR ::CVC5::theory::datatypes::DatatypeConstructorTypeRule -typerule APPLY_SELECTOR ::CVC5::theory::datatypes::DatatypeSelectorTypeRule -typerule APPLY_SELECTOR_TOTAL ::CVC5::theory::datatypes::DatatypeSelectorTypeRule -typerule APPLY_TESTER ::CVC5::theory::datatypes::DatatypeTesterTypeRule -typerule APPLY_TYPE_ASCRIPTION ::CVC5::theory::datatypes::DatatypeAscriptionTypeRule +typerule APPLY_CONSTRUCTOR ::cvc5::theory::datatypes::DatatypeConstructorTypeRule +typerule APPLY_SELECTOR ::cvc5::theory::datatypes::DatatypeSelectorTypeRule +typerule APPLY_SELECTOR_TOTAL ::cvc5::theory::datatypes::DatatypeSelectorTypeRule +typerule APPLY_TESTER ::cvc5::theory::datatypes::DatatypeTesterTypeRule +typerule APPLY_TYPE_ASCRIPTION ::cvc5::theory::datatypes::DatatypeAscriptionTypeRule # constructor applications are constant if they are applied only to constants -construle APPLY_CONSTRUCTOR ::CVC5::theory::datatypes::DatatypeConstructorTypeRule +construle APPLY_CONSTRUCTOR ::cvc5::theory::datatypes::DatatypeConstructorTypeRule constant TUPLE_UPDATE_OP \ - ::CVC5::TupleUpdate \ - ::CVC5::TupleUpdateHashFunction \ + ::cvc5::TupleUpdate \ + ::cvc5::TupleUpdateHashFunction \ "util/tuple.h" \ - "operator for a tuple update; payload is an instance of the CVC5::TupleUpdate class" + "operator for a tuple update; payload is an instance of the cvc5::TupleUpdate class" parameterized TUPLE_UPDATE TUPLE_UPDATE_OP 2 "tuple update; first parameter is a TUPLE_UPDATE_OP (which references an index), second is the tuple, third is the element to store in the tuple at the given index" -typerule TUPLE_UPDATE_OP ::CVC5::theory::datatypes::TupleUpdateOpTypeRule -typerule TUPLE_UPDATE ::CVC5::theory::datatypes::TupleUpdateTypeRule +typerule TUPLE_UPDATE_OP ::cvc5::theory::datatypes::TupleUpdateOpTypeRule +typerule TUPLE_UPDATE ::cvc5::theory::datatypes::TupleUpdateTypeRule constant RECORD_UPDATE_OP \ - ::CVC5::RecordUpdate \ - ::CVC5::RecordUpdateHashFunction \ + ::cvc5::RecordUpdate \ + ::cvc5::RecordUpdateHashFunction \ "expr/record.h" \ - "operator for a record update; payload is an instance CVC5::RecordUpdate class" + "operator for a record update; payload is an instance cvc5::RecordUpdate class" parameterized RECORD_UPDATE RECORD_UPDATE_OP 2 "record update; first parameter is a RECORD_UPDATE_OP (which references a field), second is a record term to update, third is the element to store in the record in the given field" -typerule RECORD_UPDATE_OP ::CVC5::theory::datatypes::RecordUpdateOpTypeRule -typerule RECORD_UPDATE ::CVC5::theory::datatypes::RecordUpdateTypeRule +typerule RECORD_UPDATE_OP ::cvc5::theory::datatypes::RecordUpdateOpTypeRule +typerule RECORD_UPDATE ::cvc5::theory::datatypes::RecordUpdateTypeRule operator DT_SIZE 1 "datatypes size" -typerule DT_SIZE ::CVC5::theory::datatypes::DtSizeTypeRule +typerule DT_SIZE ::cvc5::theory::datatypes::DtSizeTypeRule operator DT_HEIGHT_BOUND 2 "datatypes height bound" -typerule DT_HEIGHT_BOUND ::CVC5::theory::datatypes::DtBoundTypeRule +typerule DT_HEIGHT_BOUND ::cvc5::theory::datatypes::DtBoundTypeRule operator DT_SIZE_BOUND 2 "datatypes height bound" -typerule DT_SIZE_BOUND ::CVC5::theory::datatypes::DtBoundTypeRule +typerule DT_SIZE_BOUND ::cvc5::theory::datatypes::DtBoundTypeRule operator DT_SYGUS_BOUND 2 "datatypes sygus bound" -typerule DT_SYGUS_BOUND ::CVC5::theory::datatypes::DtSygusBoundTypeRule +typerule DT_SYGUS_BOUND ::cvc5::theory::datatypes::DtSygusBoundTypeRule operator DT_SYGUS_EVAL 1: "datatypes sygus evaluation function" -typerule DT_SYGUS_EVAL ::CVC5::theory::datatypes::DtSyguEvalTypeRule +typerule DT_SYGUS_EVAL ::cvc5::theory::datatypes::DtSyguEvalTypeRule # Kinds for match terms. For example, the match term @@ -134,21 +134,21 @@ operator MATCH 2: "match construct" operator MATCH_CASE 2 "a match case" operator MATCH_BIND_CASE 3 "a match case with bound variables" -typerule MATCH ::CVC5::theory::datatypes::MatchTypeRule -typerule MATCH_CASE ::CVC5::theory::datatypes::MatchCaseTypeRule -typerule MATCH_BIND_CASE ::CVC5::theory::datatypes::MatchBindCaseTypeRule +typerule MATCH ::cvc5::theory::datatypes::MatchTypeRule +typerule MATCH_CASE ::cvc5::theory::datatypes::MatchCaseTypeRule +typerule MATCH_BIND_CASE ::cvc5::theory::datatypes::MatchBindCaseTypeRule constant TUPLE_PROJECT_OP \ - ::CVC5::TupleProjectOp \ - ::CVC5::TupleProjectOpHashFunction \ + ::cvc5::TupleProjectOp \ + ::cvc5::TupleProjectOpHashFunction \ "theory/datatypes/tuple_project_op.h" \ - "operator for TUPLE_PROJECT; payload is an instance of the CVC5::TupleProjectOp class" + "operator for TUPLE_PROJECT; payload is an instance of the cvc5::TupleProjectOp class" parameterized TUPLE_PROJECT TUPLE_PROJECT_OP 1 \ "projects a tuple from an existing tuple using indices passed in TupleProjectOp" typerule TUPLE_PROJECT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule TUPLE_PROJECT ::CVC5::theory::datatypes::TupleProjectTypeRule +typerule TUPLE_PROJECT ::cvc5::theory::datatypes::TupleProjectTypeRule endtheory diff --git a/src/theory/datatypes/proof_checker.cpp b/src/theory/datatypes/proof_checker.cpp index f55b45541..06a94aa47 100644 --- a/src/theory/datatypes/proof_checker.cpp +++ b/src/theory/datatypes/proof_checker.cpp @@ -18,7 +18,7 @@ #include "theory/datatypes/theory_datatypes_utils.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -133,4 +133,4 @@ Node DatatypesProofRuleChecker::checkInternal(PfRule id, } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/proof_checker.h b/src/theory/datatypes/proof_checker.h index a66cac8d8..a52bbafb0 100644 --- a/src/theory/datatypes/proof_checker.h +++ b/src/theory/datatypes/proof_checker.h @@ -21,7 +21,7 @@ #include "expr/proof_checker.h" #include "expr/proof_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -44,6 +44,6 @@ class DatatypesProofRuleChecker : public ProofRuleChecker } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DATATYPES__PROOF_CHECKER_H */ diff --git a/src/theory/datatypes/sygus_datatype_utils.cpp b/src/theory/datatypes/sygus_datatype_utils.cpp index 4f328619b..114608e05 100644 --- a/src/theory/datatypes/sygus_datatype_utils.cpp +++ b/src/theory/datatypes/sygus_datatype_utils.cpp @@ -27,10 +27,10 @@ #include "theory/evaluator.h" #include "theory/rewriter.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { namespace utils { @@ -777,4 +777,4 @@ TypeNode substituteAndGeneralizeSygusType(TypeNode sdt, } // namespace utils } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/sygus_datatype_utils.h b/src/theory/datatypes/sygus_datatype_utils.h index e1af9250b..7aa308aea 100644 --- a/src/theory/datatypes/sygus_datatype_utils.h +++ b/src/theory/datatypes/sygus_datatype_utils.h @@ -24,7 +24,7 @@ #include "expr/node_manager_attributes.h" #include "theory/datatypes/theory_datatypes_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { // ----------------------- sygus datatype attributes @@ -237,6 +237,6 @@ TypeNode substituteAndGeneralizeSygusType(TypeNode sdt, } // namespace utils } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/datatypes/sygus_extension.cpp b/src/theory/datatypes/sygus_extension.cpp index a53799baf..14c004bda 100644 --- a/src/theory/datatypes/sygus_extension.cpp +++ b/src/theory/datatypes/sygus_extension.cpp @@ -34,11 +34,11 @@ #include "theory/theory_model.h" #include "theory/theory_state.h" -using namespace CVC5; -using namespace CVC5::kind; -using namespace CVC5::context; -using namespace CVC5::theory; -using namespace CVC5::theory::datatypes; +using namespace cvc5; +using namespace cvc5::kind; +using namespace cvc5::context; +using namespace cvc5::theory; +using namespace cvc5::theory::datatypes; SygusExtension::SygusExtension(TheoryState& s, InferenceManager& im, diff --git a/src/theory/datatypes/sygus_extension.h b/src/theory/datatypes/sygus_extension.h index 7b49faa6d..157929ee6 100644 --- a/src/theory/datatypes/sygus_extension.h +++ b/src/theory/datatypes/sygus_extension.h @@ -29,7 +29,7 @@ #include "theory/quantifiers/sygus_sampler.h" #include "theory/quantifiers/term_database.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { class SynthConjecture; @@ -709,7 +709,7 @@ private: } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/datatypes/sygus_simple_sym.cpp b/src/theory/datatypes/sygus_simple_sym.cpp index ed6357244..81a9b7444 100644 --- a/src/theory/datatypes/sygus_simple_sym.cpp +++ b/src/theory/datatypes/sygus_simple_sym.cpp @@ -18,9 +18,9 @@ #include "theory/quantifiers/term_util.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -584,4 +584,4 @@ int SygusSimpleSymBreak::getFirstArgOccurrence(const DTypeConstructor& c, } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/sygus_simple_sym.h b/src/theory/datatypes/sygus_simple_sym.h index 5b5b816b7..be90aa9ff 100644 --- a/src/theory/datatypes/sygus_simple_sym.h +++ b/src/theory/datatypes/sygus_simple_sym.h @@ -20,7 +20,7 @@ #include "expr/dtype.h" #include "theory/quantifiers/sygus/term_database_sygus.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -98,6 +98,6 @@ class SygusSimpleSymBreak } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DATATYPES__SIMPLE_SYM_BREAK_H */ diff --git a/src/theory/datatypes/theory_datatypes.cpp b/src/theory/datatypes/theory_datatypes.cpp index 48a2a8a99..9d231f07d 100644 --- a/src/theory/datatypes/theory_datatypes.cpp +++ b/src/theory/datatypes/theory_datatypes.cpp @@ -40,10 +40,10 @@ #include "theory/valuation.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -2041,4 +2041,4 @@ std::pair<bool, Node> TheoryDatatypes::entailmentCheck(TNode lit) } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/theory_datatypes.h b/src/theory/datatypes/theory_datatypes.h index 03ea69fc4..34e865a50 100644 --- a/src/theory/datatypes/theory_datatypes.h +++ b/src/theory/datatypes/theory_datatypes.h @@ -35,7 +35,7 @@ #include "theory/uf/equality_engine.h" #include "util/hash.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -314,6 +314,6 @@ private: } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_H */ diff --git a/src/theory/datatypes/theory_datatypes_type_rules.h b/src/theory/datatypes/theory_datatypes_type_rules.h index 8084763b2..68269b61c 100644 --- a/src/theory/datatypes/theory_datatypes_type_rules.h +++ b/src/theory/datatypes/theory_datatypes_type_rules.h @@ -24,7 +24,7 @@ #include "expr/type_matcher.h" #include "theory/datatypes/theory_datatypes_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -628,6 +628,6 @@ class TupleProjectTypeRule } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DATATYPES__THEORY_DATATYPES_TYPE_RULES_H */ diff --git a/src/theory/datatypes/theory_datatypes_utils.cpp b/src/theory/datatypes/theory_datatypes_utils.cpp index 72c032e4e..a18b5fdb5 100644 --- a/src/theory/datatypes/theory_datatypes_utils.cpp +++ b/src/theory/datatypes/theory_datatypes_utils.cpp @@ -19,10 +19,10 @@ #include "expr/dtype.h" #include "expr/dtype_cons.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { namespace utils { @@ -207,4 +207,4 @@ bool checkClash(Node n1, Node n2, std::vector<Node>& rew) } // namespace utils } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/theory_datatypes_utils.h b/src/theory/datatypes/theory_datatypes_utils.h index be7f5d4af..c79364dab 100644 --- a/src/theory/datatypes/theory_datatypes_utils.h +++ b/src/theory/datatypes/theory_datatypes_utils.h @@ -25,7 +25,7 @@ #include "expr/node.h" #include "expr/node_manager_attributes.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { namespace utils { @@ -97,6 +97,6 @@ bool checkClash(Node n1, Node n2, std::vector<Node>& rew); } // namespace utils } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/datatypes/tuple_project_op.cpp b/src/theory/datatypes/tuple_project_op.cpp index ebc229eb4..0bab99d21 100644 --- a/src/theory/datatypes/tuple_project_op.cpp +++ b/src/theory/datatypes/tuple_project_op.cpp @@ -18,7 +18,7 @@ #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { std::ostream& operator<<(std::ostream& out, const TupleProjectOp& op) { @@ -53,4 +53,4 @@ bool TupleProjectOp::operator==(const TupleProjectOp& op) const return d_indices == op.d_indices; } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/datatypes/tuple_project_op.h b/src/theory/datatypes/tuple_project_op.h index 8272e7487..9e9e2dad4 100644 --- a/src/theory/datatypes/tuple_project_op.h +++ b/src/theory/datatypes/tuple_project_op.h @@ -20,7 +20,7 @@ #include <ostream> #include <vector> -namespace CVC5 { +namespace cvc5 { class TypeNode; @@ -53,6 +53,6 @@ struct TupleProjectOpHashFunction size_t operator()(const TupleProjectOp& op) const; }; /* struct TupleProjectOpHashFunction */ -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__PROJECT_OP_H */ diff --git a/src/theory/datatypes/type_enumerator.cpp b/src/theory/datatypes/type_enumerator.cpp index 54b042307..769446fd2 100644 --- a/src/theory/datatypes/type_enumerator.cpp +++ b/src/theory/datatypes/type_enumerator.cpp @@ -19,7 +19,7 @@ #include "theory/datatypes/datatypes_rewriter.h" #include "theory/datatypes/theory_datatypes_utils.h" -using namespace CVC5; +using namespace cvc5; using namespace theory; using namespace datatypes; diff --git a/src/theory/datatypes/type_enumerator.h b/src/theory/datatypes/type_enumerator.h index 3d1264a80..5d9a3a9b1 100644 --- a/src/theory/datatypes/type_enumerator.h +++ b/src/theory/datatypes/type_enumerator.h @@ -25,7 +25,7 @@ #include "options/quantifiers_options.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace datatypes { @@ -164,6 +164,6 @@ class DatatypesEnumerator : public TypeEnumeratorBase<DatatypesEnumerator> { } // namespace datatypes } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H */ diff --git a/src/theory/decision_manager.cpp b/src/theory/decision_manager.cpp index 3abbb83e7..c249c9e89 100644 --- a/src/theory/decision_manager.cpp +++ b/src/theory/decision_manager.cpp @@ -17,9 +17,9 @@ #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { DecisionManager::DecisionManager(context::Context* userContext) @@ -107,4 +107,4 @@ Node DecisionManager::getNextDecisionRequest() } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/decision_manager.h b/src/theory/decision_manager.h index c6e7a44a1..910375370 100644 --- a/src/theory/decision_manager.h +++ b/src/theory/decision_manager.h @@ -22,7 +22,7 @@ #include "context/cdlist.h" #include "theory/decision_strategy.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** DecisionManager @@ -141,6 +141,6 @@ class DecisionManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DECISION_MANAGER__H */ diff --git a/src/theory/decision_strategy.cpp b/src/theory/decision_strategy.cpp index b8ef264dd..0ce2372b2 100644 --- a/src/theory/decision_strategy.cpp +++ b/src/theory/decision_strategy.cpp @@ -17,9 +17,9 @@ #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { DecisionStrategyFmf::DecisionStrategyFmf(context::Context* satContext, @@ -147,4 +147,4 @@ Node DecisionStrategySingleton::mkLiteral(unsigned n) Node DecisionStrategySingleton::getSingleLiteral() { return d_literal; } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/decision_strategy.h b/src/theory/decision_strategy.h index e9d8b8bbc..9046dd6ce 100644 --- a/src/theory/decision_strategy.h +++ b/src/theory/decision_strategy.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -140,6 +140,6 @@ class DecisionStrategySingleton : public DecisionStrategyFmf }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__DECISION_STRATEGY__H */ diff --git a/src/theory/eager_proof_generator.cpp b/src/theory/eager_proof_generator.cpp index 1763969e6..112f7ea7b 100644 --- a/src/theory/eager_proof_generator.cpp +++ b/src/theory/eager_proof_generator.cpp @@ -18,7 +18,7 @@ #include "expr/proof_node.h" #include "expr/proof_node_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { EagerProofGenerator::EagerProofGenerator(ProofNodeManager* pnm, @@ -154,4 +154,4 @@ TrustNode EagerProofGenerator::mkTrustNodeSplit(Node f) std::string EagerProofGenerator::identify() const { return d_name; } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/eager_proof_generator.h b/src/theory/eager_proof_generator.h index 2c94d2074..5cc0fde35 100644 --- a/src/theory/eager_proof_generator.h +++ b/src/theory/eager_proof_generator.h @@ -23,7 +23,7 @@ #include "expr/proof_rule.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { class ProofNode; class ProofNodeManager; @@ -193,6 +193,6 @@ class EagerProofGenerator : public ProofGenerator }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__PROOF_GENERATOR_H */ diff --git a/src/theory/ee_manager.cpp b/src/theory/ee_manager.cpp index d2254fc6c..ec08c8669 100644 --- a/src/theory/ee_manager.cpp +++ b/src/theory/ee_manager.cpp @@ -16,7 +16,7 @@ #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { EqEngineManager::EqEngineManager(TheoryEngine& te, SharedSolver& shs) @@ -47,4 +47,4 @@ eq::EqualityEngine* EqEngineManager::allocateEqualityEngine(EeSetupInfo& esi, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/ee_manager.h b/src/theory/ee_manager.h index dd400c188..ad922bf80 100644 --- a/src/theory/ee_manager.h +++ b/src/theory/ee_manager.h @@ -24,7 +24,7 @@ #include "theory/theory.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -95,6 +95,6 @@ class EqEngineManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__EE_MANAGER__H */ diff --git a/src/theory/ee_manager_distributed.cpp b/src/theory/ee_manager_distributed.cpp index 289725e30..0619b58b3 100644 --- a/src/theory/ee_manager_distributed.cpp +++ b/src/theory/ee_manager_distributed.cpp @@ -19,7 +19,7 @@ #include "theory/theory_engine.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { EqEngineManagerDistributed::EqEngineManagerDistributed(TheoryEngine& te, @@ -115,4 +115,4 @@ void EqEngineManagerDistributed::MasterNotifyClass::eqNotifyNewClass(TNode t) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/ee_manager_distributed.h b/src/theory/ee_manager_distributed.h index d7d6688fb..48bbfd073 100644 --- a/src/theory/ee_manager_distributed.h +++ b/src/theory/ee_manager_distributed.h @@ -22,7 +22,7 @@ #include "theory/ee_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -97,6 +97,6 @@ class EqEngineManagerDistributed : public EqEngineManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__EE_MANAGER_DISTRIBUTED__H */ diff --git a/src/theory/ee_setup_info.h b/src/theory/ee_setup_info.h index 7859773f0..b2167115a 100644 --- a/src/theory/ee_setup_info.h +++ b/src/theory/ee_setup_info.h @@ -19,7 +19,7 @@ #include <string> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -55,6 +55,6 @@ struct EeSetupInfo }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__EE_SETUP_INFO__H */ diff --git a/src/theory/engine_output_channel.cpp b/src/theory/engine_output_channel.cpp index 40d1d59d5..0597bb3ea 100644 --- a/src/theory/engine_output_channel.cpp +++ b/src/theory/engine_output_channel.cpp @@ -18,9 +18,9 @@ #include "smt/smt_statistics_registry.h" #include "theory/theory_engine.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { EngineOutputChannel::Statistics::Statistics(theory::TheoryId theory) @@ -188,4 +188,4 @@ void EngineOutputChannel::trustedLemma(TrustNode plem, LemmaProperty p) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/engine_output_channel.h b/src/theory/engine_output_channel.h index 115566bdc..8b497547b 100644 --- a/src/theory/engine_output_channel.h +++ b/src/theory/engine_output_channel.h @@ -22,7 +22,7 @@ #include "theory/theory_id.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -108,6 +108,6 @@ class EngineOutputChannel : public theory::OutputChannel }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__ENGINE_OUTPUT_CHANNEL_H */ diff --git a/src/theory/evaluator.cpp b/src/theory/evaluator.cpp index 758930859..156e23093 100644 --- a/src/theory/evaluator.cpp +++ b/src/theory/evaluator.cpp @@ -22,7 +22,7 @@ #include "theory/theory.h" #include "util/integer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { EvalResult::EvalResult(const EvalResult& other) @@ -952,4 +952,4 @@ Node Evaluator::reconstruct( } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/evaluator.h b/src/theory/evaluator.h index ee76c6210..ad6eedb0f 100644 --- a/src/theory/evaluator.h +++ b/src/theory/evaluator.h @@ -30,7 +30,7 @@ #include "util/rational.h" #include "util/string.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -159,6 +159,6 @@ class Evaluator }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__EVALUATOR_H */ diff --git a/src/theory/ext_theory.cpp b/src/theory/ext_theory.cpp index 2e39b2a35..80fafe92c 100644 --- a/src/theory/ext_theory.cpp +++ b/src/theory/ext_theory.cpp @@ -27,7 +27,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { bool ExtTheoryCallback::getCurrentSubstitution( @@ -558,4 +558,4 @@ std::vector<Node> ExtTheory::getActive(Kind k) const void ExtTheory::clearCache() { d_gst_cache.clear(); } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/ext_theory.h b/src/theory/ext_theory.h index 3d8df356c..b44f2b852 100644 --- a/src/theory/ext_theory.h +++ b/src/theory/ext_theory.h @@ -41,7 +41,7 @@ #include "context/context.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class OutputChannel; @@ -302,6 +302,6 @@ class ExtTheory }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__EXT_THEORY_H */ diff --git a/src/theory/fp/fp_converter.cpp b/src/theory/fp/fp_converter.cpp index 879cd2988..3b5a115c8 100644 --- a/src/theory/fp/fp_converter.cpp +++ b/src/theory/fp/fp_converter.cpp @@ -41,7 +41,7 @@ #ifdef CVC4_USE_SYMFPU namespace symfpu { -using namespace ::CVC5::theory::fp::symfpuSymbolic; +using namespace ::cvc5::theory::fp::symfpuSymbolic; #define CVC4_SYM_ITE_DFN(T) \ template <> \ @@ -51,65 +51,65 @@ using namespace ::CVC5::theory::fp::symfpuSymbolic; const T& _l, \ const T& _r) \ { \ - ::CVC5::NodeManager* nm = ::CVC5::NodeManager::currentNM(); \ + ::cvc5::NodeManager* nm = ::cvc5::NodeManager::currentNM(); \ \ - ::CVC5::Node cond = _cond; \ - ::CVC5::Node l = _l; \ - ::CVC5::Node r = _r; \ + ::cvc5::Node cond = _cond; \ + ::cvc5::Node l = _l; \ + ::cvc5::Node r = _r; \ \ /* Handle some common symfpu idioms */ \ if (cond.isConst()) \ { \ - return (cond == nm->mkConst(::CVC5::BitVector(1U, 1U))) ? l : r; \ + return (cond == nm->mkConst(::cvc5::BitVector(1U, 1U))) ? l : r; \ } \ else \ { \ - if (l.getKind() == ::CVC5::kind::BITVECTOR_ITE) \ + if (l.getKind() == ::cvc5::kind::BITVECTOR_ITE) \ { \ if (l[1] == r) \ { \ return nm->mkNode( \ - ::CVC5::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC5::kind::BITVECTOR_AND, \ + ::cvc5::kind::BITVECTOR_ITE, \ + nm->mkNode(::cvc5::kind::BITVECTOR_AND, \ cond, \ - nm->mkNode(::CVC5::kind::BITVECTOR_NOT, l[0])), \ + nm->mkNode(::cvc5::kind::BITVECTOR_NOT, l[0])), \ l[2], \ r); \ } \ else if (l[2] == r) \ { \ return nm->mkNode( \ - ::CVC5::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC5::kind::BITVECTOR_AND, cond, l[0]), \ + ::cvc5::kind::BITVECTOR_ITE, \ + nm->mkNode(::cvc5::kind::BITVECTOR_AND, cond, l[0]), \ l[1], \ r); \ } \ } \ - else if (r.getKind() == ::CVC5::kind::BITVECTOR_ITE) \ + else if (r.getKind() == ::cvc5::kind::BITVECTOR_ITE) \ { \ if (r[1] == l) \ { \ return nm->mkNode( \ - ::CVC5::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC5::kind::BITVECTOR_AND, \ - nm->mkNode(::CVC5::kind::BITVECTOR_NOT, cond), \ - nm->mkNode(::CVC5::kind::BITVECTOR_NOT, r[0])), \ + ::cvc5::kind::BITVECTOR_ITE, \ + nm->mkNode(::cvc5::kind::BITVECTOR_AND, \ + nm->mkNode(::cvc5::kind::BITVECTOR_NOT, cond), \ + nm->mkNode(::cvc5::kind::BITVECTOR_NOT, r[0])), \ r[2], \ l); \ } \ else if (r[2] == l) \ { \ return nm->mkNode( \ - ::CVC5::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC5::kind::BITVECTOR_AND, \ - nm->mkNode(::CVC5::kind::BITVECTOR_NOT, cond), \ + ::cvc5::kind::BITVECTOR_ITE, \ + nm->mkNode(::cvc5::kind::BITVECTOR_AND, \ + nm->mkNode(::cvc5::kind::BITVECTOR_NOT, cond), \ r[0]), \ r[1], \ l); \ } \ } \ } \ - return T(nm->mkNode(::CVC5::kind::BITVECTOR_ITE, cond, l, r)); \ + return T(nm->mkNode(::cvc5::kind::BITVECTOR_ITE, cond, l, r)); \ } \ } @@ -148,7 +148,7 @@ void probabilityAnnotation<traits, traits::prop>(const traits::prop &p, #define SYMFPU_NUMBER_OF_ROUNDING_MODES 5 #endif -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { namespace symfpuSymbolic { @@ -412,8 +412,8 @@ symbolicBitVector<true> symbolicBitVector<true>::maxValue(const bwt &w) symbolicBitVector<true> leadingZero(symbolicBitVector<true>::zero(1)); symbolicBitVector<true> base(symbolicBitVector<true>::allOnes(w - 1)); - return symbolicBitVector<true>(::CVC5::NodeManager::currentNM()->mkNode( - ::CVC5::kind::BITVECTOR_CONCAT, leadingZero, base)); + return symbolicBitVector<true>(::cvc5::NodeManager::currentNM()->mkNode( + ::cvc5::kind::BITVECTOR_CONCAT, leadingZero, base)); } template <> @@ -428,8 +428,8 @@ symbolicBitVector<true> symbolicBitVector<true>::minValue(const bwt &w) symbolicBitVector<true> leadingOne(symbolicBitVector<true>::one(1)); symbolicBitVector<true> base(symbolicBitVector<true>::zero(w - 1)); - return symbolicBitVector<true>(::CVC5::NodeManager::currentNM()->mkNode( - ::CVC5::kind::BITVECTOR_CONCAT, leadingOne, base)); + return symbolicBitVector<true>(::cvc5::NodeManager::currentNM()->mkNode( + ::cvc5::kind::BITVECTOR_CONCAT, leadingOne, base)); } template <> @@ -817,7 +817,7 @@ Node FpConverter::propToNode(const prop &p) const { NodeManager *nm = NodeManager::currentNM(); Node value = - nm->mkNode(kind::EQUAL, p, nm->mkConst(::CVC5::BitVector(1U, 1U))); + nm->mkNode(kind::EQUAL, p, nm->mkConst(::cvc5::BitVector(1U, 1U))); return value; } Node FpConverter::ubvToNode(const ubv &u) const { return u; } @@ -1739,4 +1739,4 @@ Node FpConverter::getValue(Valuation &val, TNode var) } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/fp/fp_converter.h b/src/theory/fp/fp_converter.h index e952699a7..f25ce0822 100644 --- a/src/theory/fp/fp_converter.h +++ b/src/theory/fp/fp_converter.h @@ -45,7 +45,7 @@ #include "theory/rewriter.h" #endif -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { @@ -97,7 +97,7 @@ class traits typedef traits::bwt bwt; /** - * Wrap the CVC5::Node types so that we can debug issues with this back-end + * Wrap the cvc5::Node types so that we can debug issues with this back-end */ class nodeWrapper : public Node { @@ -352,6 +352,6 @@ class FpConverter } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__FP__THEORY_FP_H */ diff --git a/src/theory/fp/kinds b/src/theory/fp/kinds index 4a4d16b55..d67738a63 100644 --- a/src/theory/fp/kinds +++ b/src/theory/fp/kinds @@ -4,9 +4,9 @@ # src/theory/builtin/kinds. # -theory THEORY_FP ::CVC5::theory::fp::TheoryFp "theory/fp/theory_fp.h" +theory THEORY_FP ::cvc5::theory::fp::TheoryFp "theory/fp/theory_fp.h" typechecker "theory/fp/theory_fp_type_rules.h" -rewriter ::CVC5::theory::fp::TheoryFpRewriter "theory/fp/theory_fp_rewriter.h" +rewriter ::cvc5::theory::fp::TheoryFpRewriter "theory/fp/theory_fp_rewriter.h" properties check @@ -14,19 +14,19 @@ properties check # constants... constant CONST_FLOATINGPOINT \ - ::CVC5::FloatingPoint \ - ::CVC5::FloatingPointHashFunction \ + ::cvc5::FloatingPoint \ + ::cvc5::FloatingPointHashFunction \ "util/floatingpoint.h" \ "a floating-point literal" -typerule CONST_FLOATINGPOINT ::CVC5::theory::fp::FloatingPointConstantTypeRule +typerule CONST_FLOATINGPOINT ::cvc5::theory::fp::FloatingPointConstantTypeRule constant CONST_ROUNDINGMODE \ - ::CVC5::RoundingMode \ - ::CVC5::RoundingModeHashFunction \ + ::cvc5::RoundingMode \ + ::cvc5::RoundingModeHashFunction \ "util/floatingpoint.h" \ "a floating-point rounding mode" -typerule CONST_ROUNDINGMODE ::CVC5::theory::fp::RoundingModeConstantTypeRule +typerule CONST_ROUNDINGMODE ::cvc5::theory::fp::RoundingModeConstantTypeRule @@ -39,272 +39,272 @@ sort ROUNDINGMODE_TYPE \ "floating-point rounding mode" enumerator ROUNDINGMODE_TYPE \ - "::CVC5::theory::fp::RoundingModeEnumerator" \ + "::cvc5::theory::fp::RoundingModeEnumerator" \ "theory/fp/type_enumerator.h" constant FLOATINGPOINT_TYPE \ - ::CVC5::FloatingPointSize \ - ::CVC5::FloatingPointSizeHashFunction \ + ::cvc5::FloatingPointSize \ + ::cvc5::FloatingPointSizeHashFunction \ "util/floatingpoint.h" \ "floating-point type" cardinality FLOATINGPOINT_TYPE \ - "::CVC5::theory::fp::CardinalityComputer::computeCardinality(%TYPE%)" \ + "::cvc5::theory::fp::CardinalityComputer::computeCardinality(%TYPE%)" \ "theory/fp/theory_fp_type_rules.h" enumerator FLOATINGPOINT_TYPE \ - "::CVC5::theory::fp::FloatingPointEnumerator" \ + "::cvc5::theory::fp::FloatingPointEnumerator" \ "theory/fp/type_enumerator.h" well-founded FLOATINGPOINT_TYPE \ true \ - "(*CVC5::theory::TypeEnumerator(%TYPE%))" \ + "(*cvc5::theory::TypeEnumerator(%TYPE%))" \ "theory/type_enumerator.h" # operators... operator FLOATINGPOINT_FP 3 "construct a floating-point literal from bit vectors" -typerule FLOATINGPOINT_FP ::CVC5::theory::fp::FloatingPointFPTypeRule +typerule FLOATINGPOINT_FP ::cvc5::theory::fp::FloatingPointFPTypeRule operator FLOATINGPOINT_EQ 2: "floating-point equality" -typerule FLOATINGPOINT_EQ ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_EQ ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ABS 1 "floating-point absolute value" -typerule FLOATINGPOINT_ABS ::CVC5::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_ABS ::cvc5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_NEG 1 "floating-point negation" -typerule FLOATINGPOINT_NEG ::CVC5::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_NEG ::cvc5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_PLUS 3 "floating-point addition" -typerule FLOATINGPOINT_PLUS ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_PLUS ::cvc5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_SUB 3 "floating-point sutraction" -typerule FLOATINGPOINT_SUB ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_SUB ::cvc5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_MULT 3 "floating-point multiply" -typerule FLOATINGPOINT_MULT ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_MULT ::cvc5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_DIV 3 "floating-point division" -typerule FLOATINGPOINT_DIV ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_DIV ::cvc5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_FMA 4 "floating-point fused multiply and add" -typerule FLOATINGPOINT_FMA ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_FMA ::cvc5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_SQRT 2 "floating-point square root" -typerule FLOATINGPOINT_SQRT ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_SQRT ::cvc5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_REM 2 "floating-point remainder" -typerule FLOATINGPOINT_REM ::CVC5::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_REM ::cvc5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_RTI 2 "floating-point round to integral" -typerule FLOATINGPOINT_RTI ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_RTI ::cvc5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_MIN 2 "floating-point minimum" -typerule FLOATINGPOINT_MIN ::CVC5::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_MIN ::cvc5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_MAX 2 "floating-point maximum" -typerule FLOATINGPOINT_MAX ::CVC5::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_MAX ::cvc5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_MIN_TOTAL 3 "floating-point minimum (defined for all inputs)" -typerule FLOATINGPOINT_MIN_TOTAL ::CVC5::theory::fp::FloatingPointPartialOperationTypeRule +typerule FLOATINGPOINT_MIN_TOTAL ::cvc5::theory::fp::FloatingPointPartialOperationTypeRule operator FLOATINGPOINT_MAX_TOTAL 3 "floating-point maximum (defined for all inputs)" -typerule FLOATINGPOINT_MAX_TOTAL ::CVC5::theory::fp::FloatingPointPartialOperationTypeRule +typerule FLOATINGPOINT_MAX_TOTAL ::cvc5::theory::fp::FloatingPointPartialOperationTypeRule operator FLOATINGPOINT_LEQ 2: "floating-point less than or equal" -typerule FLOATINGPOINT_LEQ ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_LEQ ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_LT 2: "floating-point less than" -typerule FLOATINGPOINT_LT ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_LT ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_GEQ 2: "floating-point greater than or equal" -typerule FLOATINGPOINT_GEQ ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_GEQ ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_GT 2: "floating-point greater than" -typerule FLOATINGPOINT_GT ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_GT ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISN 1 "floating-point is normal" -typerule FLOATINGPOINT_ISN ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISN ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISSN 1 "floating-point is sub-normal" -typerule FLOATINGPOINT_ISSN ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISSN ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISZ 1 "floating-point is zero" -typerule FLOATINGPOINT_ISZ ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISZ ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISINF 1 "floating-point is infinite" -typerule FLOATINGPOINT_ISINF ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISINF ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISNAN 1 "floating-point is NaN" -typerule FLOATINGPOINT_ISNAN ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISNAN ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISNEG 1 "floating-point is negative" -typerule FLOATINGPOINT_ISNEG ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISNEG ::cvc5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISPOS 1 "floating-point is positive" -typerule FLOATINGPOINT_ISPOS ::CVC5::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISPOS ::cvc5::theory::fp::FloatingPointTestTypeRule constant FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP \ - ::CVC5::FloatingPointToFPIEEEBitVector \ - "::CVC5::FloatingPointConvertSortHashFunction<0x1>" \ + ::cvc5::FloatingPointToFPIEEEBitVector \ + "::cvc5::FloatingPointConvertSortHashFunction<0x1>" \ "util/floatingpoint.h" \ "operator for to_fp from bit vector" -typerule FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_FP_IEEE_BITVECTOR FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP 1 "convert an IEEE-754 bit vector to floating-point" -typerule FLOATINGPOINT_TO_FP_IEEE_BITVECTOR ::CVC5::theory::fp::FloatingPointToFPIEEEBitVectorTypeRule +typerule FLOATINGPOINT_TO_FP_IEEE_BITVECTOR ::cvc5::theory::fp::FloatingPointToFPIEEEBitVectorTypeRule constant FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP \ - ::CVC5::FloatingPointToFPFloatingPoint \ - "::CVC5::FloatingPointConvertSortHashFunction<0x2>" \ + ::cvc5::FloatingPointToFPFloatingPoint \ + "::cvc5::FloatingPointConvertSortHashFunction<0x2>" \ "util/floatingpoint.h" \ "operator for to_fp from floating point" -typerule FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_FP_FLOATINGPOINT FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP 2 "convert between floating-point sorts" -typerule FLOATINGPOINT_TO_FP_FLOATINGPOINT ::CVC5::theory::fp::FloatingPointToFPFloatingPointTypeRule +typerule FLOATINGPOINT_TO_FP_FLOATINGPOINT ::cvc5::theory::fp::FloatingPointToFPFloatingPointTypeRule constant FLOATINGPOINT_TO_FP_REAL_OP \ - ::CVC5::FloatingPointToFPReal \ - "::CVC5::FloatingPointConvertSortHashFunction<0x4>" \ + ::cvc5::FloatingPointToFPReal \ + "::cvc5::FloatingPointConvertSortHashFunction<0x4>" \ "util/floatingpoint.h" \ "operator for to_fp from real" -typerule FLOATINGPOINT_TO_FP_REAL_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_FP_REAL_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_FP_REAL FLOATINGPOINT_TO_FP_REAL_OP 2 "convert a real to floating-point" -typerule FLOATINGPOINT_TO_FP_REAL ::CVC5::theory::fp::FloatingPointToFPRealTypeRule +typerule FLOATINGPOINT_TO_FP_REAL ::cvc5::theory::fp::FloatingPointToFPRealTypeRule constant FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR_OP \ - ::CVC5::FloatingPointToFPSignedBitVector \ - "::CVC5::FloatingPointConvertSortHashFunction<0x8>" \ + ::cvc5::FloatingPointToFPSignedBitVector \ + "::cvc5::FloatingPointConvertSortHashFunction<0x8>" \ "util/floatingpoint.h" \ "operator for to_fp from signed bit vector" -typerule FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR_OP 2 "convert a signed bit vector to floating-point" -typerule FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR ::CVC5::theory::fp::FloatingPointToFPSignedBitVectorTypeRule +typerule FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR ::cvc5::theory::fp::FloatingPointToFPSignedBitVectorTypeRule constant FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR_OP \ - ::CVC5::FloatingPointToFPUnsignedBitVector \ - "::CVC5::FloatingPointConvertSortHashFunction<0x10>" \ + ::cvc5::FloatingPointToFPUnsignedBitVector \ + "::cvc5::FloatingPointConvertSortHashFunction<0x10>" \ "util/floatingpoint.h" \ "operator for to_fp from unsigned bit vector" -typerule FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR_OP 2 "convert an unsigned bit vector to floating-point" -typerule FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR ::CVC5::theory::fp::FloatingPointToFPUnsignedBitVectorTypeRule +typerule FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR ::cvc5::theory::fp::FloatingPointToFPUnsignedBitVectorTypeRule constant FLOATINGPOINT_TO_FP_GENERIC_OP \ - ::CVC5::FloatingPointToFPGeneric \ - "::CVC5::FloatingPointConvertSortHashFunction<0x11>" \ + ::cvc5::FloatingPointToFPGeneric \ + "::cvc5::FloatingPointConvertSortHashFunction<0x11>" \ "util/floatingpoint.h" \ "operator for a generic to_fp" -typerule FLOATINGPOINT_TO_FP_GENERIC_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_FP_GENERIC_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_FP_GENERIC FLOATINGPOINT_TO_FP_GENERIC_OP 1:2 "a generic conversion to floating-point, used in parsing only" -typerule FLOATINGPOINT_TO_FP_GENERIC ::CVC5::theory::fp::FloatingPointToFPGenericTypeRule +typerule FLOATINGPOINT_TO_FP_GENERIC ::cvc5::theory::fp::FloatingPointToFPGenericTypeRule constant FLOATINGPOINT_TO_UBV_OP \ - ::CVC5::FloatingPointToUBV \ - "::CVC5::FloatingPointToBVHashFunction<0x1>" \ + ::cvc5::FloatingPointToUBV \ + "::cvc5::FloatingPointToBVHashFunction<0x1>" \ "util/floatingpoint.h" \ "operator for to_ubv" -typerule FLOATINGPOINT_TO_UBV_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_UBV_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_UBV FLOATINGPOINT_TO_UBV_OP 2 "convert a floating-point value to an unsigned bit vector" -typerule FLOATINGPOINT_TO_UBV ::CVC5::theory::fp::FloatingPointToUBVTypeRule +typerule FLOATINGPOINT_TO_UBV ::cvc5::theory::fp::FloatingPointToUBVTypeRule constant FLOATINGPOINT_TO_UBV_TOTAL_OP \ - ::CVC5::FloatingPointToUBVTotal \ - "::CVC5::FloatingPointToBVHashFunction<0x4>" \ + ::cvc5::FloatingPointToUBVTotal \ + "::cvc5::FloatingPointToBVHashFunction<0x4>" \ "util/floatingpoint.h" \ "operator for to_ubv_total" -typerule FLOATINGPOINT_TO_UBV_TOTAL_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_UBV_TOTAL_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_UBV_TOTAL FLOATINGPOINT_TO_UBV_TOTAL_OP 3 "convert a floating-point value to an unsigned bit vector (defined for all inputs)" -typerule FLOATINGPOINT_TO_UBV_TOTAL ::CVC5::theory::fp::FloatingPointToUBVTotalTypeRule +typerule FLOATINGPOINT_TO_UBV_TOTAL ::cvc5::theory::fp::FloatingPointToUBVTotalTypeRule constant FLOATINGPOINT_TO_SBV_OP \ - ::CVC5::FloatingPointToSBV \ - "::CVC5::FloatingPointToBVHashFunction<0x2>" \ + ::cvc5::FloatingPointToSBV \ + "::cvc5::FloatingPointToBVHashFunction<0x2>" \ "util/floatingpoint.h" \ "operator for to_sbv" -typerule FLOATINGPOINT_TO_SBV_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_SBV_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_SBV FLOATINGPOINT_TO_SBV_OP 2 "convert a floating-point value to a signed bit vector" -typerule FLOATINGPOINT_TO_SBV ::CVC5::theory::fp::FloatingPointToSBVTypeRule +typerule FLOATINGPOINT_TO_SBV ::cvc5::theory::fp::FloatingPointToSBVTypeRule constant FLOATINGPOINT_TO_SBV_TOTAL_OP \ - ::CVC5::FloatingPointToSBVTotal \ - "::CVC5::FloatingPointToBVHashFunction<0x8>" \ + ::cvc5::FloatingPointToSBVTotal \ + "::cvc5::FloatingPointToBVHashFunction<0x8>" \ "util/floatingpoint.h" \ "operator for to_sbv_total" -typerule FLOATINGPOINT_TO_SBV_TOTAL_OP ::CVC5::theory::fp::FloatingPointParametricOpTypeRule +typerule FLOATINGPOINT_TO_SBV_TOTAL_OP ::cvc5::theory::fp::FloatingPointParametricOpTypeRule parameterized FLOATINGPOINT_TO_SBV_TOTAL FLOATINGPOINT_TO_SBV_TOTAL_OP 3 "convert a floating-point value to a signed bit vector (defined for all inputs)" -typerule FLOATINGPOINT_TO_SBV_TOTAL ::CVC5::theory::fp::FloatingPointToSBVTotalTypeRule +typerule FLOATINGPOINT_TO_SBV_TOTAL ::cvc5::theory::fp::FloatingPointToSBVTotalTypeRule operator FLOATINGPOINT_TO_REAL 1 "floating-point to real" -typerule FLOATINGPOINT_TO_REAL ::CVC5::theory::fp::FloatingPointToRealTypeRule +typerule FLOATINGPOINT_TO_REAL ::cvc5::theory::fp::FloatingPointToRealTypeRule operator FLOATINGPOINT_TO_REAL_TOTAL 2 "floating-point to real (defined for all inputs)" -typerule FLOATINGPOINT_TO_REAL_TOTAL ::CVC5::theory::fp::FloatingPointToRealTotalTypeRule +typerule FLOATINGPOINT_TO_REAL_TOTAL ::cvc5::theory::fp::FloatingPointToRealTotalTypeRule operator FLOATINGPOINT_COMPONENT_NAN 1 "NaN component of a word-blasted floating-point number" -typerule FLOATINGPOINT_COMPONENT_NAN ::CVC5::theory::fp::FloatingPointComponentBit +typerule FLOATINGPOINT_COMPONENT_NAN ::cvc5::theory::fp::FloatingPointComponentBit operator FLOATINGPOINT_COMPONENT_INF 1 "Inf component of a word-blasted floating-point number" -typerule FLOATINGPOINT_COMPONENT_INF ::CVC5::theory::fp::FloatingPointComponentBit +typerule FLOATINGPOINT_COMPONENT_INF ::cvc5::theory::fp::FloatingPointComponentBit operator FLOATINGPOINT_COMPONENT_ZERO 1 "Zero component of a word-blasted floating-point number" -typerule FLOATINGPOINT_COMPONENT_ZERO ::CVC5::theory::fp::FloatingPointComponentBit +typerule FLOATINGPOINT_COMPONENT_ZERO ::cvc5::theory::fp::FloatingPointComponentBit operator FLOATINGPOINT_COMPONENT_SIGN 1 "Sign component of a word-blasted floating-point number" -typerule FLOATINGPOINT_COMPONENT_SIGN ::CVC5::theory::fp::FloatingPointComponentBit +typerule FLOATINGPOINT_COMPONENT_SIGN ::cvc5::theory::fp::FloatingPointComponentBit operator FLOATINGPOINT_COMPONENT_EXPONENT 1 "Exponent component of a word-blasted floating-point number" -typerule FLOATINGPOINT_COMPONENT_EXPONENT ::CVC5::theory::fp::FloatingPointComponentExponent +typerule FLOATINGPOINT_COMPONENT_EXPONENT ::cvc5::theory::fp::FloatingPointComponentExponent operator FLOATINGPOINT_COMPONENT_SIGNIFICAND 1 "Significand component of a word-blasted floating-point number" -typerule FLOATINGPOINT_COMPONENT_SIGNIFICAND ::CVC5::theory::fp::FloatingPointComponentSignificand +typerule FLOATINGPOINT_COMPONENT_SIGNIFICAND ::cvc5::theory::fp::FloatingPointComponentSignificand operator ROUNDINGMODE_BITBLAST 1 "The bit-vector for a non-deterministic rounding mode" -typerule ROUNDINGMODE_BITBLAST ::CVC5::theory::fp::RoundingModeBitBlast +typerule ROUNDINGMODE_BITBLAST ::cvc5::theory::fp::RoundingModeBitBlast endtheory diff --git a/src/theory/fp/theory_fp.cpp b/src/theory/fp/theory_fp.cpp index ea9ea902c..38444c7af 100644 --- a/src/theory/fp/theory_fp.cpp +++ b/src/theory/fp/theory_fp.cpp @@ -33,7 +33,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { @@ -774,7 +774,7 @@ void TheoryFp::convertAndEquateTerm(TNode node) { NodeManager *nm = NodeManager::currentNM(); handleLemma( - nm->mkNode(kind::EQUAL, addA, nm->mkConst(::CVC5::BitVector(1U, 1U)))); + nm->mkNode(kind::EQUAL, addA, nm->mkConst(::cvc5::BitVector(1U, 1U)))); #endif ++oldAdditionalAssertions; @@ -795,7 +795,7 @@ void TheoryFp::convertAndEquateTerm(TNode node) { kind::EQUAL, node, nm->mkNode( - kind::EQUAL, converted, nm->mkConst(::CVC5::BitVector(1U, 1U))))); + kind::EQUAL, converted, nm->mkConst(::cvc5::BitVector(1U, 1U))))); #endif } else { @@ -1157,4 +1157,4 @@ void TheoryFp::NotifyClass::eqNotifyConstantTermMerge(TNode t1, TNode t2) { } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/fp/theory_fp.h b/src/theory/fp/theory_fp.h index 2607a33c6..87c63a231 100644 --- a/src/theory/fp/theory_fp.h +++ b/src/theory/fp/theory_fp.h @@ -31,7 +31,7 @@ #include "theory/theory_state.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { @@ -189,6 +189,6 @@ class TheoryFp : public Theory } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__FP__THEORY_FP_H */ diff --git a/src/theory/fp/theory_fp_rewriter.cpp b/src/theory/fp/theory_fp_rewriter.cpp index 65e27fc48..d84c553de 100644 --- a/src/theory/fp/theory_fp_rewriter.cpp +++ b/src/theory/fp/theory_fp_rewriter.cpp @@ -37,7 +37,7 @@ #include "theory/fp/fp_converter.h" #include "theory/fp/theory_fp_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { @@ -1421,4 +1421,4 @@ TheoryFpRewriter::TheoryFpRewriter() } // namespace fp } // namespace theory - } // namespace CVC5 + } // namespace cvc5 diff --git a/src/theory/fp/theory_fp_rewriter.h b/src/theory/fp/theory_fp_rewriter.h index bfdf90d44..52d22f3d3 100644 --- a/src/theory/fp/theory_fp_rewriter.h +++ b/src/theory/fp/theory_fp_rewriter.h @@ -22,7 +22,7 @@ #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { @@ -53,6 +53,6 @@ class TheoryFpRewriter : public TheoryRewriter } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__FP__THEORY_FP_REWRITER_H */ diff --git a/src/theory/fp/theory_fp_type_rules.cpp b/src/theory/fp/theory_fp_type_rules.cpp index 6b87f8af3..d7060ad98 100644 --- a/src/theory/fp/theory_fp_type_rules.cpp +++ b/src/theory/fp/theory_fp_type_rules.cpp @@ -18,7 +18,7 @@ #include "theory/theory.h" #include "util/roundingmode.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { @@ -812,4 +812,4 @@ Cardinality CardinalityComputer::computeCardinality(TypeNode type) } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/fp/theory_fp_type_rules.h b/src/theory/fp/theory_fp_type_rules.h index 632ae660d..0002b2abf 100644 --- a/src/theory/fp/theory_fp_type_rules.h +++ b/src/theory/fp/theory_fp_type_rules.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { class NodeManager; @@ -229,6 +229,6 @@ class CardinalityComputer } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/fp/type_enumerator.h b/src/theory/fp/type_enumerator.h index 535ed7c69..73946ce5a 100644 --- a/src/theory/fp/type_enumerator.h +++ b/src/theory/fp/type_enumerator.h @@ -26,7 +26,7 @@ #include "util/bitvector.h" #include "util/floatingpoint.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace fp { @@ -120,6 +120,6 @@ class RoundingModeEnumerator } // namespace fp } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__FP__TYPE_ENUMERATOR_H */ diff --git a/src/theory/inference_id.cpp b/src/theory/inference_id.cpp index f96a9e244..8b35f5645 100644 --- a/src/theory/inference_id.cpp +++ b/src/theory/inference_id.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC5 { +namespace cvc5 { namespace theory { const char* toString(InferenceId i) @@ -357,4 +357,4 @@ std::ostream& operator<<(std::ostream& out, InferenceId i) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/inference_id.h b/src/theory/inference_id.h index aa34d45ae..89957ded6 100644 --- a/src/theory/inference_id.h +++ b/src/theory/inference_id.h @@ -19,7 +19,7 @@ #ifndef CVC4__THEORY__INFERENCE_ID_H #define CVC4__THEORY__INFERENCE_ID_H -namespace CVC5 { +namespace cvc5 { namespace theory { /** Types of inferences used in the procedure @@ -752,6 +752,6 @@ const char* toString(InferenceId i); std::ostream& operator<<(std::ostream& out, InferenceId i); } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__INFERENCE_H */ diff --git a/src/theory/inference_manager_buffered.cpp b/src/theory/inference_manager_buffered.cpp index 26434f802..023098fe1 100644 --- a/src/theory/inference_manager_buffered.cpp +++ b/src/theory/inference_manager_buffered.cpp @@ -18,9 +18,9 @@ #include "theory/theory.h" #include "theory/theory_state.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { InferenceManagerBuffered::InferenceManagerBuffered(Theory& t, @@ -187,4 +187,4 @@ void InferenceManagerBuffered::assertInternalFactTheoryInference( } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/inference_manager_buffered.h b/src/theory/inference_manager_buffered.h index 77ed1329a..b5888efd6 100644 --- a/src/theory/inference_manager_buffered.h +++ b/src/theory/inference_manager_buffered.h @@ -21,7 +21,7 @@ #include "theory/theory_inference.h" #include "theory/theory_inference_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -174,6 +174,6 @@ class InferenceManagerBuffered : public TheoryInferenceManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/interrupted.h b/src/theory/interrupted.h index 75c8f93a5..c928f2faf 100644 --- a/src/theory/interrupted.h +++ b/src/theory/interrupted.h @@ -15,7 +15,7 @@ ** An exception signaling that a Theory should immediately stop ** performing processing and relinquish control to its caller (e.g., ** in a parallel environment). A Theory might be interrupted if it - ** calls into its CVC5::theory::OutputChannel, and it should only + ** calls into its cvc5::theory::OutputChannel, and it should only ** catch this exception to perform emergency repair of any invariants ** it must re-establish. Further, if this exception is caught by a ** Theory, the Theory should rethrow the same exception (via "throw;" @@ -31,14 +31,14 @@ #include "base/exception.h" -namespace CVC5 { +namespace cvc5 { namespace theory { -class Interrupted : public CVC5::Exception +class Interrupted : public cvc5::Exception { }; /* class Interrupted */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__INTERRUPTED_H */ diff --git a/src/theory/lazy_tree_proof_generator.cpp b/src/theory/lazy_tree_proof_generator.cpp index 0a466fec4..aad3dd28a 100644 --- a/src/theory/lazy_tree_proof_generator.cpp +++ b/src/theory/lazy_tree_proof_generator.cpp @@ -21,7 +21,7 @@ #include "expr/proof_node.h" #include "expr/proof_node_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { LazyTreeProofGenerator::LazyTreeProofGenerator(ProofNodeManager* pnm, @@ -142,4 +142,4 @@ std::ostream& operator<<(std::ostream& os, const LazyTreeProofGenerator& ltpg) } } // namespace theory -} // namespace CVC5
\ No newline at end of file +} // namespace cvc5
\ No newline at end of file diff --git a/src/theory/lazy_tree_proof_generator.h b/src/theory/lazy_tree_proof_generator.h index 3c02380c1..ef235ff1a 100644 --- a/src/theory/lazy_tree_proof_generator.h +++ b/src/theory/lazy_tree_proof_generator.h @@ -23,7 +23,7 @@ #include "expr/proof_generator.h" #include "expr/proof_node_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace detail { /** @@ -217,6 +217,6 @@ class LazyTreeProofGenerator : public ProofGenerator std::ostream& operator<<(std::ostream& os, const LazyTreeProofGenerator& ltpg); } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/logic_info.cpp b/src/theory/logic_info.cpp index 841ec097e..6863a2833 100644 --- a/src/theory/logic_info.cpp +++ b/src/theory/logic_info.cpp @@ -27,9 +27,9 @@ #include "expr/kind.h" using namespace std; -using namespace CVC5::theory; +using namespace cvc5::theory; -namespace CVC5 { +namespace cvc5 { LogicInfo::LogicInfo() : d_logicString(""), @@ -725,4 +725,4 @@ std::ostream& operator<<(std::ostream& out, const LogicInfo& logic) { return out << logic.getLogicString(); } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/logic_info.h b/src/theory/logic_info.h index fb23f4f2d..c4221040b 100644 --- a/src/theory/logic_info.h +++ b/src/theory/logic_info.h @@ -27,7 +27,7 @@ #include "cvc4_export.h" #include "theory/theory_id.h" -namespace CVC5 { +namespace cvc5 { /** * A LogicInfo instance describes a collection of theory modules and some @@ -291,6 +291,6 @@ public: std::ostream& operator<<(std::ostream& out, const LogicInfo& logic); -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__LOGIC_INFO_H */ diff --git a/src/theory/mkrewriter b/src/theory/mkrewriter index 9fa3c64c8..c447350dd 100755 --- a/src/theory/mkrewriter +++ b/src/theory/mkrewriter @@ -73,9 +73,9 @@ function theory { echo "$kf:$lineno: error: \"theory\" directive missing class or header argument" >&2 exit 1 elif ! expr "$2" : '\(::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::CVC5::theory::foo)" >&2 - elif ! expr "$2" : '\(::CVC5::theory::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class not under ::CVC5::theory namespace" >&2 + echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::cvc5::theory::foo)" >&2 + elif ! expr "$2" : '\(::cvc5::theory::*\)' >/dev/null; then + echo "$kf:$lineno: warning: theory class not under ::cvc5::theory namespace" >&2 fi theory_id="$1" diff --git a/src/theory/mktheorytraits b/src/theory/mktheorytraits index b2c6e1ef2..b303c3b4b 100755 --- a/src/theory/mktheorytraits +++ b/src/theory/mktheorytraits @@ -92,9 +92,9 @@ function theory { echo "$kf:$lineno: error: \"theory\" directive missing class or header argument" >&2 exit 1 elif ! expr "$2" : '\(::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::CVC5::theory::foo)" >&2 - elif ! expr "$2" : '\(::CVC5::theory::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class not under ::CVC5::theory namespace" >&2 + echo "$kf:$lineno: warning: theory class \`$2' isn't fully-qualified (e.g., ::cvc5::theory::foo)" >&2 + elif ! expr "$2" : '\(::cvc5::theory::*\)' >/dev/null; then + echo "$kf:$lineno: warning: theory class not under ::cvc5::theory namespace" >&2 fi theory_id="$1" diff --git a/src/theory/model_manager.cpp b/src/theory/model_manager.cpp index 8ca7a2c48..3a8d7ab0e 100644 --- a/src/theory/model_manager.cpp +++ b/src/theory/model_manager.cpp @@ -22,7 +22,7 @@ #include "theory/quantifiers/fmf/model_builder.h" #include "theory/theory_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { ModelManager::ModelManager(TheoryEngine& te, EqEngineManager& eem) @@ -239,4 +239,4 @@ void ModelManager::collectTerms(TheoryId tid, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/model_manager.h b/src/theory/model_manager.h index 4f4d06a43..db3ea4ecf 100644 --- a/src/theory/model_manager.h +++ b/src/theory/model_manager.h @@ -22,7 +22,7 @@ #include "theory/ee_manager.h" #include "theory/logic_info.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -152,6 +152,6 @@ class ModelManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__MODEL_MANAGER__H */ diff --git a/src/theory/model_manager_distributed.cpp b/src/theory/model_manager_distributed.cpp index 3b9c1aad4..61279ee11 100644 --- a/src/theory/model_manager_distributed.cpp +++ b/src/theory/model_manager_distributed.cpp @@ -18,7 +18,7 @@ #include "theory/theory_model.h" #include "theory/theory_model_builder.h" -namespace CVC5 { +namespace cvc5 { namespace theory { ModelManagerDistributed::ModelManagerDistributed(TheoryEngine& te, @@ -114,4 +114,4 @@ bool ModelManagerDistributed::finishBuildModel() const } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/model_manager_distributed.h b/src/theory/model_manager_distributed.h index dd7cf2b78..04c146278 100644 --- a/src/theory/model_manager_distributed.h +++ b/src/theory/model_manager_distributed.h @@ -20,7 +20,7 @@ #include "theory/ee_manager.h" #include "theory/model_manager.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -56,6 +56,6 @@ class ModelManagerDistributed : public ModelManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__MODEL_MANAGER_DISTRIBUTED__H */ diff --git a/src/theory/output_channel.cpp b/src/theory/output_channel.cpp index 0fd475563..8f8898ce3 100644 --- a/src/theory/output_channel.cpp +++ b/src/theory/output_channel.cpp @@ -14,7 +14,7 @@ #include "theory/output_channel.h" -namespace CVC5 { +namespace cvc5 { namespace theory { LemmaProperty operator|(LemmaProperty lhs, LemmaProperty rhs) @@ -91,4 +91,4 @@ void OutputChannel::trustedLemma(TrustNode lem, LemmaProperty p) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/output_channel.h b/src/theory/output_channel.h index 16fc5a483..b86a4d647 100644 --- a/src/theory/output_channel.h +++ b/src/theory/output_channel.h @@ -22,7 +22,7 @@ #include "theory/trust_node.h" #include "util/resource_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** Properties of lemmas */ @@ -66,7 +66,7 @@ class Theory; /** * Generic "theory output channel" interface. * - * All methods can throw unrecoverable CVC5::Exception's unless otherwise + * All methods can throw unrecoverable cvc5::Exception's unless otherwise * documented. */ class OutputChannel { @@ -199,6 +199,6 @@ class OutputChannel { }; /* class OutputChannel */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__OUTPUT_CHANNEL_H */ diff --git a/src/theory/quantifiers/alpha_equivalence.cpp b/src/theory/quantifiers/alpha_equivalence.cpp index eb977960b..3832508dd 100644 --- a/src/theory/quantifiers/alpha_equivalence.cpp +++ b/src/theory/quantifiers/alpha_equivalence.cpp @@ -15,9 +15,9 @@ #include "theory/quantifiers/alpha_equivalence.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -110,4 +110,4 @@ Node AlphaEquivalence::reduceQuantifier(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/alpha_equivalence.h b/src/theory/quantifiers/alpha_equivalence.h index 822b674e2..03047c93b 100644 --- a/src/theory/quantifiers/alpha_equivalence.h +++ b/src/theory/quantifiers/alpha_equivalence.h @@ -21,7 +21,7 @@ #include "expr/term_canonize.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -101,6 +101,6 @@ class AlphaEquivalence } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/bv_inverter.cpp b/src/theory/quantifiers/bv_inverter.cpp index c4bd2c083..014e46925 100644 --- a/src/theory/quantifiers/bv_inverter.cpp +++ b/src/theory/quantifiers/bv_inverter.cpp @@ -22,9 +22,9 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -442,4 +442,4 @@ Node BvInverter::solveBvLit(Node sv, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/bv_inverter.h b/src/theory/quantifiers/bv_inverter.h index c033b26d7..a187cd36a 100644 --- a/src/theory/quantifiers/bv_inverter.h +++ b/src/theory/quantifiers/bv_inverter.h @@ -24,7 +24,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -128,6 +128,6 @@ class BvInverter } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__BV_INVERTER_H */ diff --git a/src/theory/quantifiers/bv_inverter_utils.cpp b/src/theory/quantifiers/bv_inverter_utils.cpp index 459c3f93f..e53e64a94 100644 --- a/src/theory/quantifiers/bv_inverter_utils.cpp +++ b/src/theory/quantifiers/bv_inverter_utils.cpp @@ -15,9 +15,9 @@ #include "theory/quantifiers/bv_inverter_utils.h" #include "theory/bv/theory_bv_utils.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace utils { @@ -2589,4 +2589,4 @@ Node getICBvSext(bool pol, Kind litk, unsigned idx, Node x, Node sv_t, Node t) } // namespace utils } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/bv_inverter_utils.h b/src/theory/quantifiers/bv_inverter_utils.h index c6400bd60..823855d1b 100644 --- a/src/theory/quantifiers/bv_inverter_utils.h +++ b/src/theory/quantifiers/bv_inverter_utils.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace utils { @@ -68,5 +68,5 @@ Node getICBvSext(bool pol, Kind litk, unsigned idx, Node x, Node sv_t, Node t); } // namespace utils } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/candidate_rewrite_database.cpp b/src/theory/quantifiers/candidate_rewrite_database.cpp index 1319e5c38..526469ef2 100644 --- a/src/theory/quantifiers/candidate_rewrite_database.cpp +++ b/src/theory/quantifiers/candidate_rewrite_database.cpp @@ -24,10 +24,10 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -296,4 +296,4 @@ void CandidateRewriteDatabase::setExtendedRewriter(ExtendedRewriter* er) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/candidate_rewrite_database.h b/src/theory/quantifiers/candidate_rewrite_database.h index 396ef0d03..45333bc76 100644 --- a/src/theory/quantifiers/candidate_rewrite_database.h +++ b/src/theory/quantifiers/candidate_rewrite_database.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/expr_miner.h" #include "theory/quantifiers/sygus_sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -128,6 +128,6 @@ class CandidateRewriteDatabase : public ExprMiner } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_DATABASE_H */ diff --git a/src/theory/quantifiers/candidate_rewrite_filter.cpp b/src/theory/quantifiers/candidate_rewrite_filter.cpp index 0ab85ccf7..7ada36dc2 100644 --- a/src/theory/quantifiers/candidate_rewrite_filter.cpp +++ b/src/theory/quantifiers/candidate_rewrite_filter.cpp @@ -20,9 +20,9 @@ #include "options/quantifiers_options.h" #include "printer/printer.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -277,4 +277,4 @@ bool CandidateRewriteFilter::notify(Node s, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/candidate_rewrite_filter.h b/src/theory/quantifiers/candidate_rewrite_filter.h index faf675bcb..aa31c7845 100644 --- a/src/theory/quantifiers/candidate_rewrite_filter.h +++ b/src/theory/quantifiers/candidate_rewrite_filter.h @@ -25,7 +25,7 @@ #include "theory/quantifiers/sygus/term_database_sygus.h" #include "theory/quantifiers/sygus_sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -171,6 +171,6 @@ class CandidateRewriteFilter } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_REWRITE_FILTER_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.cpp b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.cpp index 29881a3a4..2a7a95b65 100644 --- a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.cpp +++ b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.cpp @@ -25,10 +25,10 @@ #include "util/random.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1036,4 +1036,4 @@ Node ArithInstantiator::getModelBasedProjectionValue(CegInstantiator* ci, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h index e6cfa31c6..a81f5f180 100644 --- a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h @@ -22,7 +22,7 @@ #include "theory/quantifiers/cegqi/ceg_instantiator.h" #include "theory/quantifiers/cegqi/vts_term_cache.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -209,6 +209,6 @@ class ArithInstantiator : public Instantiator } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CEG_ARITH_INSTANTIATOR_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.cpp b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.cpp index 2c163421e..bdd6d26ab 100644 --- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.cpp +++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.cpp @@ -23,9 +23,9 @@ #include "util/random.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -759,4 +759,4 @@ void BvInstantiatorPreprocess::collectExtracts( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h index 4bfda133e..9914428ef 100644 --- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h @@ -21,7 +21,7 @@ #include "theory/quantifiers/bv_inverter.h" #include "theory/quantifiers/cegqi/ceg_instantiator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -209,6 +209,6 @@ class BvInstantiatorPreprocess : public InstantiatorPreprocess } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CEG_BV_INSTANTIATOR_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.cpp b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.cpp index 85faea4b1..030258113 100644 --- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.cpp +++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.cpp @@ -17,9 +17,9 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace utils { @@ -342,4 +342,4 @@ Node normalizePvEqual( } // namespace utils } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h index 576d68d06..ac68dc4d5 100644 --- a/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h +++ b/src/theory/quantifiers/cegqi/ceg_bv_instantiator_utils.h @@ -20,7 +20,7 @@ #include "expr/attribute.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -104,5 +104,5 @@ Node normalizePvEqual( } // namespace utils } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.cpp b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.cpp index bb81d2790..672ed990a 100644 --- a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.cpp +++ b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.cpp @@ -20,9 +20,9 @@ #include "theory/datatypes/theory_datatypes_utils.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -180,4 +180,4 @@ Node DtInstantiator::solve_dt(Node v, Node a, Node b, Node sa, Node sb) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h index c0386465d..27bf560cb 100644 --- a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/quantifiers/cegqi/ceg_instantiator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -91,6 +91,6 @@ class DtInstantiator : public Instantiator } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CEG_DT_INSTANTIATOR_H */ diff --git a/src/theory/quantifiers/cegqi/ceg_instantiator.cpp b/src/theory/quantifiers/cegqi/ceg_instantiator.cpp index 118c505fc..b9d70768b 100644 --- a/src/theory/quantifiers/cegqi/ceg_instantiator.cpp +++ b/src/theory/quantifiers/cegqi/ceg_instantiator.cpp @@ -32,9 +32,9 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1638,4 +1638,4 @@ bool Instantiator::processEqualTerm(CegInstantiator* ci, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/ceg_instantiator.h b/src/theory/quantifiers/cegqi/ceg_instantiator.h index 03161399c..986874266 100644 --- a/src/theory/quantifiers/cegqi/ceg_instantiator.h +++ b/src/theory/quantifiers/cegqi/ceg_instantiator.h @@ -23,7 +23,7 @@ #include "theory/inference_id.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -822,6 +822,6 @@ class InstantiatorPreprocess } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.cpp b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.cpp index d6a504713..5e3a64325 100644 --- a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.cpp +++ b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.cpp @@ -26,10 +26,10 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -546,4 +546,4 @@ bool InstStrategyCegqi::processNestedQe(Node q, bool isPreregister) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h index a5b79fb00..6d4ee047f 100644 --- a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h +++ b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h @@ -26,7 +26,7 @@ #include "theory/quantifiers/quant_module.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -215,6 +215,6 @@ class InstStrategyCegqi : public QuantifiersModule } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/cegqi/nested_qe.cpp b/src/theory/quantifiers/cegqi/nested_qe.cpp index 9efc0ec31..d5fabbbd9 100644 --- a/src/theory/quantifiers/cegqi/nested_qe.cpp +++ b/src/theory/quantifiers/cegqi/nested_qe.cpp @@ -19,7 +19,7 @@ #include "expr/subs.h" #include "theory/smt_engine_subsolver.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -152,4 +152,4 @@ Node NestedQe::doQe(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/nested_qe.h b/src/theory/quantifiers/cegqi/nested_qe.h index 29df5d16b..e0cccb9c9 100644 --- a/src/theory/quantifiers/cegqi/nested_qe.h +++ b/src/theory/quantifiers/cegqi/nested_qe.h @@ -23,7 +23,7 @@ #include "context/cdhashmap.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -81,6 +81,6 @@ class NestedQe } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/cegqi/vts_term_cache.cpp b/src/theory/quantifiers/cegqi/vts_term_cache.cpp index 1a7431038..1974e7c7c 100644 --- a/src/theory/quantifiers/cegqi/vts_term_cache.cpp +++ b/src/theory/quantifiers/cegqi/vts_term_cache.cpp @@ -19,9 +19,9 @@ #include "theory/quantifiers/quantifiers_inference_manager.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -296,4 +296,4 @@ bool VtsTermCache::containsVtsInfinity(Node n, bool isFree) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/cegqi/vts_term_cache.h b/src/theory/quantifiers/cegqi/vts_term_cache.h index 53c198213..d56684d43 100644 --- a/src/theory/quantifiers/cegqi/vts_term_cache.h +++ b/src/theory/quantifiers/cegqi/vts_term_cache.h @@ -21,7 +21,7 @@ #include "expr/attribute.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** Attribute to mark Skolems as virtual terms */ @@ -140,6 +140,6 @@ class VtsTermCache } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CEGQI__VTS_TERM_CACHE_H */ diff --git a/src/theory/quantifiers/conjecture_generator.cpp b/src/theory/quantifiers/conjecture_generator.cpp index ffe06a7ad..41d881f2c 100644 --- a/src/theory/quantifiers/conjecture_generator.cpp +++ b/src/theory/quantifiers/conjecture_generator.cpp @@ -26,13 +26,13 @@ #include "theory/rewriter.h" #include "util/random.h" -using namespace CVC5; -using namespace CVC5::kind; -using namespace CVC5::theory; -using namespace CVC5::theory::quantifiers; +using namespace cvc5; +using namespace cvc5::kind; +using namespace cvc5::theory; +using namespace cvc5::theory::quantifiers; using namespace std; -namespace CVC5 { +namespace cvc5 { struct sortConjectureScore { std::vector< int > d_scores; @@ -2260,4 +2260,4 @@ unsigned ConjectureGenerator::optFullCheckFrequency() { return 1; } bool ConjectureGenerator::optStatsOnly() { return false; } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/conjecture_generator.h b/src/theory/quantifiers/conjecture_generator.h index cc3314f82..db609a521 100644 --- a/src/theory/quantifiers/conjecture_generator.h +++ b/src/theory/quantifiers/conjecture_generator.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/quant_module.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -466,6 +466,6 @@ private: //information about ground equivalence classes } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/dynamic_rewrite.cpp b/src/theory/quantifiers/dynamic_rewrite.cpp index 6e7601072..fe712e01e 100644 --- a/src/theory/quantifiers/dynamic_rewrite.cpp +++ b/src/theory/quantifiers/dynamic_rewrite.cpp @@ -17,9 +17,9 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -183,4 +183,4 @@ Node DynamicRewriter::OpInternalSymTrie::getSymbol(Node n) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/dynamic_rewrite.h b/src/theory/quantifiers/dynamic_rewrite.h index 79b4824b4..9fce59796 100644 --- a/src/theory/quantifiers/dynamic_rewrite.h +++ b/src/theory/quantifiers/dynamic_rewrite.h @@ -22,7 +22,7 @@ #include "context/cdlist.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -119,6 +119,6 @@ class DynamicRewriter } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__DYNAMIC_REWRITER_H */ diff --git a/src/theory/quantifiers/ematching/candidate_generator.cpp b/src/theory/quantifiers/ematching/candidate_generator.cpp index 4c9da3632..a3708bdfe 100644 --- a/src/theory/quantifiers/ematching/candidate_generator.cpp +++ b/src/theory/quantifiers/ematching/candidate_generator.cpp @@ -24,9 +24,9 @@ #include "theory/quantifiers/term_registry.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -348,4 +348,4 @@ Node CandidateGeneratorSelector::getNextCandidate() } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/candidate_generator.h b/src/theory/quantifiers/ematching/candidate_generator.h index b21a96225..0de57f02f 100644 --- a/src/theory/quantifiers/ematching/candidate_generator.h +++ b/src/theory/quantifiers/ematching/candidate_generator.h @@ -20,7 +20,7 @@ #include "theory/theory.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -243,6 +243,6 @@ class CandidateGeneratorSelector : public CandidateGeneratorQE } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CANDIDATE_GENERATOR_H */ diff --git a/src/theory/quantifiers/ematching/ho_trigger.cpp b/src/theory/quantifiers/ematching/ho_trigger.cpp index 14f514b73..5a00d41ca 100644 --- a/src/theory/quantifiers/ematching/ho_trigger.cpp +++ b/src/theory/quantifiers/ematching/ho_trigger.cpp @@ -25,9 +25,9 @@ #include "theory/uf/theory_uf_rewriter.h" #include "util/hash.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -526,4 +526,4 @@ uint64_t HigherOrderTrigger::addHoTypeMatchPredicateLemmas() } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/ho_trigger.h b/src/theory/quantifiers/ematching/ho_trigger.h index 66b374ea8..12c91be63 100644 --- a/src/theory/quantifiers/ematching/ho_trigger.h +++ b/src/theory/quantifiers/ematching/ho_trigger.h @@ -25,7 +25,7 @@ #include "theory/quantifiers/inst_match.h" #include "theory/quantifiers/ematching/trigger.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -275,6 +275,6 @@ class HigherOrderTrigger : public Trigger } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__HO_TRIGGER_H */ diff --git a/src/theory/quantifiers/ematching/im_generator.cpp b/src/theory/quantifiers/ematching/im_generator.cpp index 2f415779a..9f24faf68 100644 --- a/src/theory/quantifiers/ematching/im_generator.cpp +++ b/src/theory/quantifiers/ematching/im_generator.cpp @@ -16,9 +16,9 @@ #include "theory/quantifiers/ematching/trigger.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -36,4 +36,4 @@ bool IMGenerator::sendInstantiation(InstMatch& m, InferenceId id) } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/im_generator.h b/src/theory/quantifiers/ematching/im_generator.h index b0d937120..222e3c078 100644 --- a/src/theory/quantifiers/ematching/im_generator.h +++ b/src/theory/quantifiers/ematching/im_generator.h @@ -22,7 +22,7 @@ #include "theory/inference_id.h" #include "theory/quantifiers/inst_match.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -117,6 +117,6 @@ protected: } // namespace inst } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/inst_match_generator.cpp b/src/theory/quantifiers/ematching/inst_match_generator.cpp index 79b6927f7..94e356418 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator.cpp +++ b/src/theory/quantifiers/ematching/inst_match_generator.cpp @@ -29,9 +29,9 @@ #include "theory/quantifiers/term_registry.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -673,4 +673,4 @@ InstMatchGenerator* InstMatchGenerator::getInstMatchGenerator(Trigger* tparent, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/inst_match_generator.h b/src/theory/quantifiers/ematching/inst_match_generator.h index 32d6e38f1..7b440035f 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator.h +++ b/src/theory/quantifiers/ematching/inst_match_generator.h @@ -22,7 +22,7 @@ #include "theory/quantifiers/inst_match.h" #include "theory/quantifiers/ematching/im_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -325,6 +325,6 @@ class InstMatchGenerator : public IMGenerator { } // namespace inst } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/inst_match_generator_multi.cpp b/src/theory/quantifiers/ematching/inst_match_generator_multi.cpp index 6ac910e2e..6677a162f 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator_multi.cpp +++ b/src/theory/quantifiers/ematching/inst_match_generator_multi.cpp @@ -18,9 +18,9 @@ #include "theory/quantifiers/term_util.h" #include "theory/uf/equality_engine_iterator.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -315,4 +315,4 @@ void InstMatchGeneratorMulti::processNewInstantiations(InstMatch& m, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/inst_match_generator_multi.h b/src/theory/quantifiers/ematching/inst_match_generator_multi.h index 644a47bee..309aa2640 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator_multi.h +++ b/src/theory/quantifiers/ematching/inst_match_generator_multi.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/ematching/inst_match_generator.h" #include "theory/quantifiers/inst_match_trie.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -103,6 +103,6 @@ class InstMatchGeneratorMulti : public IMGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.cpp b/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.cpp index 94b7921ed..8289ea841 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.cpp +++ b/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.cpp @@ -17,9 +17,9 @@ #include "theory/quantifiers/ematching/trigger_trie.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -175,4 +175,4 @@ int InstMatchGeneratorMultiLinear::getNextMatch(Node q, InstMatch& m) } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h b/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h index 00a372c8f..4d4339bac 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h +++ b/src/theory/quantifiers/ematching/inst_match_generator_multi_linear.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/quantifiers/ematching/inst_match_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -85,6 +85,6 @@ class InstMatchGeneratorMultiLinear : public InstMatchGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/inst_match_generator_simple.cpp b/src/theory/quantifiers/ematching/inst_match_generator_simple.cpp index 7d7b3e1c0..b6af066f8 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator_simple.cpp +++ b/src/theory/quantifiers/ematching/inst_match_generator_simple.cpp @@ -21,9 +21,9 @@ #include "theory/quantifiers/term_registry.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -198,4 +198,4 @@ int InstMatchGeneratorSimple::getActiveScore() } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/inst_match_generator_simple.h b/src/theory/quantifiers/ematching/inst_match_generator_simple.h index 8361628da..ccc650044 100644 --- a/src/theory/quantifiers/ematching/inst_match_generator_simple.h +++ b/src/theory/quantifiers/ematching/inst_match_generator_simple.h @@ -23,7 +23,7 @@ #include "expr/node_trie.h" #include "theory/quantifiers/ematching/inst_match_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -100,6 +100,6 @@ class InstMatchGeneratorSimple : public IMGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/inst_strategy.cpp b/src/theory/quantifiers/ematching/inst_strategy.cpp index a56e7efeb..ad269ac31 100644 --- a/src/theory/quantifiers/ematching/inst_strategy.cpp +++ b/src/theory/quantifiers/ematching/inst_strategy.cpp @@ -16,7 +16,7 @@ #include "theory/quantifiers/quantifiers_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -44,4 +44,4 @@ options::UserPatMode InstStrategy::getInstUserPatMode() const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/inst_strategy.h b/src/theory/quantifiers/ematching/inst_strategy.h index 0537d92ce..1ce62f170 100644 --- a/src/theory/quantifiers/ematching/inst_strategy.h +++ b/src/theory/quantifiers/ematching/inst_strategy.h @@ -22,7 +22,7 @@ #include "options/quantifiers_options.h" #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -85,6 +85,6 @@ class InstStrategy } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */ diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp b/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp index c62a034e4..d298f994d 100644 --- a/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp +++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching.cpp @@ -22,10 +22,10 @@ #include "theory/quantifiers/quantifiers_state.h" #include "util/random.h" -using namespace CVC5::kind; -using namespace CVC5::theory::quantifiers::inst; +using namespace cvc5::kind; +using namespace cvc5::theory::quantifiers::inst; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -688,4 +688,4 @@ void InstStrategyAutoGenTriggers::addUserNoPattern( Node q, Node pat ) { } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h index bc52d605c..2c765e194 100644 --- a/src/theory/quantifiers/ematching/inst_strategy_e_matching.h +++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching.h @@ -21,7 +21,7 @@ #include "theory/quantifiers/ematching/trigger.h" #include "theory/quantifiers/quant_relevance.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -112,6 +112,6 @@ class InstStrategyAutoGenTriggers : public InstStrategy }; /* class InstStrategyAutoGenTriggers */ } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.cpp b/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.cpp index 4b0d619bc..12ad77ef2 100644 --- a/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.cpp +++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.cpp @@ -18,10 +18,10 @@ #include "theory/quantifiers/ematching/trigger_database.h" #include "theory/quantifiers/quantifiers_state.h" -using namespace CVC5::kind; -using namespace CVC5::theory::quantifiers::inst; +using namespace cvc5::kind; +using namespace cvc5::theory::quantifiers::inst; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -175,4 +175,4 @@ void InstStrategyUserPatterns::addUserPattern(Node q, Node pat) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h b/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h index 1bb50af7b..ed247b89a 100644 --- a/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h +++ b/src/theory/quantifiers/ematching/inst_strategy_e_matching_user.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/ematching/inst_strategy.h" #include "theory/quantifiers/ematching/trigger.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -64,6 +64,6 @@ class InstStrategyUserPatterns : public InstStrategy } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/instantiation_engine.cpp b/src/theory/quantifiers/ematching/instantiation_engine.cpp index 94054b8f9..86abb4986 100644 --- a/src/theory/quantifiers/ematching/instantiation_engine.cpp +++ b/src/theory/quantifiers/ematching/instantiation_engine.cpp @@ -23,11 +23,11 @@ #include "theory/quantifiers/term_database.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; -using namespace CVC5::context; -using namespace CVC5::theory::quantifiers::inst; +using namespace cvc5::kind; +using namespace cvc5::context; +using namespace cvc5::theory::quantifiers::inst; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -272,4 +272,4 @@ bool InstantiationEngine::shouldProcess(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/instantiation_engine.h b/src/theory/quantifiers/ematching/instantiation_engine.h index 8dface27e..bd7388afb 100644 --- a/src/theory/quantifiers/ematching/instantiation_engine.h +++ b/src/theory/quantifiers/ematching/instantiation_engine.h @@ -24,7 +24,7 @@ #include "theory/quantifiers/quant_module.h" #include "theory/quantifiers/quant_relevance.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -75,6 +75,6 @@ class InstantiationEngine : public QuantifiersModule { } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_ENGINE_H */ diff --git a/src/theory/quantifiers/ematching/pattern_term_selector.cpp b/src/theory/quantifiers/ematching/pattern_term_selector.cpp index 467ed46be..fb5bd49a3 100644 --- a/src/theory/quantifiers/ematching/pattern_term_selector.cpp +++ b/src/theory/quantifiers/ematching/pattern_term_selector.cpp @@ -20,9 +20,9 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -729,4 +729,4 @@ void PatternTermSelector::getTriggerVariables(Node n, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/pattern_term_selector.h b/src/theory/quantifiers/ematching/pattern_term_selector.h index 6f26f2cec..5ac6c1da3 100644 --- a/src/theory/quantifiers/ematching/pattern_term_selector.h +++ b/src/theory/quantifiers/ematching/pattern_term_selector.h @@ -23,7 +23,7 @@ #include "options/quantifiers_options.h" #include "theory/quantifiers/ematching/trigger_term_info.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -192,6 +192,6 @@ class PatternTermSelector } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/trigger.cpp b/src/theory/quantifiers/ematching/trigger.cpp index 234940b54..dd0af2e18 100644 --- a/src/theory/quantifiers/ematching/trigger.cpp +++ b/src/theory/quantifiers/ematching/trigger.cpp @@ -32,9 +32,9 @@ #include "theory/quantifiers/term_util.h" #include "theory/valuation.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -229,4 +229,4 @@ void Trigger::debugPrint(const char* c) const } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/trigger.h b/src/theory/quantifiers/ematching/trigger.h index c6d3b3cd5..e2ad00561 100644 --- a/src/theory/quantifiers/ematching/trigger.h +++ b/src/theory/quantifiers/ematching/trigger.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/inference_id.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersEngine; @@ -219,6 +219,6 @@ class Trigger { } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_H */ diff --git a/src/theory/quantifiers/ematching/trigger_database.cpp b/src/theory/quantifiers/ematching/trigger_database.cpp index 327d2bba1..fa8d2ff52 100644 --- a/src/theory/quantifiers/ematching/trigger_database.cpp +++ b/src/theory/quantifiers/ematching/trigger_database.cpp @@ -18,7 +18,7 @@ #include "theory/quantifiers/ematching/trigger.h" #include "theory/quantifiers/term_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -185,4 +185,4 @@ bool TriggerDatabase::mkTriggerTerms(Node q, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/trigger_database.h b/src/theory/quantifiers/ematching/trigger_database.h index 2c28c77bc..9cebb6173 100644 --- a/src/theory/quantifiers/ematching/trigger_database.h +++ b/src/theory/quantifiers/ematching/trigger_database.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/quantifiers/ematching/trigger_trie.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -105,6 +105,6 @@ class TriggerDatabase } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_DATABASE_H */ diff --git a/src/theory/quantifiers/ematching/trigger_term_info.cpp b/src/theory/quantifiers/ematching/trigger_term_info.cpp index 1f3ca0577..984e825f0 100644 --- a/src/theory/quantifiers/ematching/trigger_term_info.cpp +++ b/src/theory/quantifiers/ematching/trigger_term_info.cpp @@ -16,9 +16,9 @@ #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -114,4 +114,4 @@ int32_t TriggerTermInfo::getTriggerWeight(Node n) } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/trigger_term_info.h b/src/theory/quantifiers/ematching/trigger_term_info.h index 603a1ab77..c70257e08 100644 --- a/src/theory/quantifiers/ematching/trigger_term_info.h +++ b/src/theory/quantifiers/ematching/trigger_term_info.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -124,6 +124,6 @@ class TriggerTermInfo } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/ematching/trigger_trie.cpp b/src/theory/quantifiers/ematching/trigger_trie.cpp index c8a13d447..7ca925b53 100644 --- a/src/theory/quantifiers/ematching/trigger_trie.cpp +++ b/src/theory/quantifiers/ematching/trigger_trie.cpp @@ -14,7 +14,7 @@ #include "theory/quantifiers/ematching/trigger_trie.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -74,4 +74,4 @@ void TriggerTrie::addTrigger(std::vector<Node>& nodes, inst::Trigger* t) } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/trigger_trie.h b/src/theory/quantifiers/ematching/trigger_trie.h index 355ad6c31..fe16e3c0f 100644 --- a/src/theory/quantifiers/ematching/trigger_trie.h +++ b/src/theory/quantifiers/ematching/trigger_trie.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/quantifiers/ematching/trigger.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -58,6 +58,6 @@ class TriggerTrie } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TRIGGER_TRIE_H */ diff --git a/src/theory/quantifiers/ematching/var_match_generator.cpp b/src/theory/quantifiers/ematching/var_match_generator.cpp index e2dd3f37d..63a9cceae 100644 --- a/src/theory/quantifiers/ematching/var_match_generator.cpp +++ b/src/theory/quantifiers/ematching/var_match_generator.cpp @@ -16,9 +16,9 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -81,4 +81,4 @@ int VarMatchGeneratorTermSubs::getNextMatch(Node q, InstMatch& m) } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/ematching/var_match_generator.h b/src/theory/quantifiers/ematching/var_match_generator.h index 6ee179e91..87c4d1e32 100644 --- a/src/theory/quantifiers/ematching/var_match_generator.h +++ b/src/theory/quantifiers/ematching/var_match_generator.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/quantifiers/ematching/inst_match_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace inst { @@ -53,6 +53,6 @@ class VarMatchGeneratorTermSubs : public InstMatchGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/equality_query.cpp b/src/theory/quantifiers/equality_query.cpp index 7846a60bd..77b402843 100644 --- a/src/theory/quantifiers/equality_query.cpp +++ b/src/theory/quantifiers/equality_query.cpp @@ -21,10 +21,10 @@ #include "theory/quantifiers/term_util.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -187,4 +187,4 @@ int32_t EqualityQuery::getRepScore(Node n, Node q, size_t index, TypeNode v_tn) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/equality_query.h b/src/theory/quantifiers/equality_query.h index d863c830b..988291ed5 100644 --- a/src/theory/quantifiers/equality_query.h +++ b/src/theory/quantifiers/equality_query.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/quantifiers/quant_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -90,6 +90,6 @@ class EqualityQuery : public QuantifiersUtil } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS_EQUALITY_QUERY_H */ diff --git a/src/theory/quantifiers/expr_miner.cpp b/src/theory/quantifiers/expr_miner.cpp index 20f3afe63..b21252358 100644 --- a/src/theory/quantifiers/expr_miner.cpp +++ b/src/theory/quantifiers/expr_miner.cpp @@ -22,9 +22,9 @@ #include "theory/smt_engine_subsolver.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -104,4 +104,4 @@ Result ExprMiner::doCheck(Node query) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/expr_miner.h b/src/theory/quantifiers/expr_miner.h index 7046dad83..37d0de6f8 100644 --- a/src/theory/quantifiers/expr_miner.h +++ b/src/theory/quantifiers/expr_miner.h @@ -25,7 +25,7 @@ #include "smt/smt_engine.h" #include "theory/quantifiers/sygus_sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -90,6 +90,6 @@ class ExprMiner } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__EXPRESSION_MINER_H */ diff --git a/src/theory/quantifiers/expr_miner_manager.cpp b/src/theory/quantifiers/expr_miner_manager.cpp index 867e6748a..b84968adf 100644 --- a/src/theory/quantifiers/expr_miner_manager.cpp +++ b/src/theory/quantifiers/expr_miner_manager.cpp @@ -16,7 +16,7 @@ #include "options/quantifiers_options.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -165,4 +165,4 @@ bool ExpressionMinerManager::addTerm(Node sol, std::ostream& out) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/expr_miner_manager.h b/src/theory/quantifiers/expr_miner_manager.h index 6e775f586..d33c9902c 100644 --- a/src/theory/quantifiers/expr_miner_manager.h +++ b/src/theory/quantifiers/expr_miner_manager.h @@ -24,7 +24,7 @@ #include "theory/quantifiers/solution_filter.h" #include "theory/quantifiers/sygus_sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersEngine; @@ -118,6 +118,6 @@ class ExpressionMinerManager } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__EXPR_MINER_MANAGER_H */ diff --git a/src/theory/quantifiers/extended_rewrite.cpp b/src/theory/quantifiers/extended_rewrite.cpp index 01d573607..092041b15 100644 --- a/src/theory/quantifiers/extended_rewrite.cpp +++ b/src/theory/quantifiers/extended_rewrite.cpp @@ -24,10 +24,10 @@ #include "theory/strings/sequences_rewriter.h" #include "theory/theory.h" -using namespace CVC5::kind; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1726,4 +1726,4 @@ void ExtendedRewriter::debugExtendedRewrite(Node n, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/extended_rewrite.h b/src/theory/quantifiers/extended_rewrite.h index f04f9eaae..0d6ece71e 100644 --- a/src/theory/quantifiers/extended_rewrite.h +++ b/src/theory/quantifiers/extended_rewrite.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -250,6 +250,6 @@ class ExtendedRewriter } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__EXTENDED_REWRITE_H */ diff --git a/src/theory/quantifiers/first_order_model.cpp b/src/theory/quantifiers/first_order_model.cpp index bbd6443fa..eb1e4e96a 100644 --- a/src/theory/quantifiers/first_order_model.cpp +++ b/src/theory/quantifiers/first_order_model.cpp @@ -23,10 +23,10 @@ #include "theory/quantifiers/term_registry.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -363,4 +363,4 @@ unsigned FirstOrderModel::getModelBasisArg(Node n) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/first_order_model.h b/src/theory/quantifiers/first_order_model.h index 7a578a33a..ec3b6dd7a 100644 --- a/src/theory/quantifiers/first_order_model.h +++ b/src/theory/quantifiers/first_order_model.h @@ -22,7 +22,7 @@ #include "theory/theory_model.h" #include "theory/uf/theory_uf_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersEngine; @@ -196,6 +196,6 @@ class FirstOrderModel : public TheoryModel } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__FIRST_ORDER_MODEL_H */ diff --git a/src/theory/quantifiers/fmf/bounded_integers.cpp b/src/theory/quantifiers/fmf/bounded_integers.cpp index 6044de049..efa3dd160 100644 --- a/src/theory/quantifiers/fmf/bounded_integers.cpp +++ b/src/theory/quantifiers/fmf/bounded_integers.cpp @@ -28,11 +28,11 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5; +using namespace cvc5; using namespace std; -using namespace CVC5::theory; -using namespace CVC5::theory::quantifiers; -using namespace CVC5::kind; +using namespace cvc5::theory; +using namespace cvc5::theory::quantifiers; +using namespace cvc5::kind; BoundedIntegers::IntRangeDecisionHeuristic::IntRangeDecisionHeuristic( Node r, diff --git a/src/theory/quantifiers/fmf/bounded_integers.h b/src/theory/quantifiers/fmf/bounded_integers.h index f2abf743a..fc6fac92a 100644 --- a/src/theory/quantifiers/fmf/bounded_integers.h +++ b/src/theory/quantifiers/fmf/bounded_integers.h @@ -26,7 +26,7 @@ #include "theory/decision_strategy.h" #include "theory/quantifiers/quant_bound_inference.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class RepSetIterator; @@ -238,6 +238,6 @@ private: } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/fmf/first_order_model_fmc.cpp b/src/theory/quantifiers/fmf/first_order_model_fmc.cpp index 7c9aacd76..515d9fe58 100644 --- a/src/theory/quantifiers/fmf/first_order_model_fmc.cpp +++ b/src/theory/quantifiers/fmf/first_order_model_fmc.cpp @@ -18,9 +18,9 @@ #include "theory/quantifiers/fmf/full_model_check.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace fmcheck { @@ -156,4 +156,4 @@ Node FirstOrderModelFmc::getFunctionValue(Node op, const char* argPrefix) } // namespace fmcheck } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/fmf/first_order_model_fmc.h b/src/theory/quantifiers/fmf/first_order_model_fmc.h index 86665aef4..d858e24f6 100644 --- a/src/theory/quantifiers/fmf/first_order_model_fmc.h +++ b/src/theory/quantifiers/fmf/first_order_model_fmc.h @@ -19,7 +19,7 @@ #include "theory/quantifiers/first_order_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace fmcheck { @@ -54,6 +54,6 @@ class FirstOrderModelFmc : public FirstOrderModel } // namespace fmcheck } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__FIRST_ORDER_MODEL_H */ diff --git a/src/theory/quantifiers/fmf/full_model_check.cpp b/src/theory/quantifiers/fmf/full_model_check.cpp index 3a7209f00..7dbc10f57 100644 --- a/src/theory/quantifiers/fmf/full_model_check.cpp +++ b/src/theory/quantifiers/fmf/full_model_check.cpp @@ -28,10 +28,10 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace fmcheck { @@ -1375,4 +1375,4 @@ bool FullModelChecker::isHandled(Node q) const } // namespace fmcheck } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/fmf/full_model_check.h b/src/theory/quantifiers/fmf/full_model_check.h index 19ecc8ddc..586bde226 100644 --- a/src/theory/quantifiers/fmf/full_model_check.h +++ b/src/theory/quantifiers/fmf/full_model_check.h @@ -20,7 +20,7 @@ #include "theory/quantifiers/fmf/first_order_model_fmc.h" #include "theory/quantifiers/fmf/model_builder.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { namespace fmcheck { @@ -187,6 +187,6 @@ protected: } // namespace fmcheck } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__FULL_MODEL_CHECK_H */ diff --git a/src/theory/quantifiers/fmf/model_builder.cpp b/src/theory/quantifiers/fmf/model_builder.cpp index 17935f6b4..27eed53f2 100644 --- a/src/theory/quantifiers/fmf/model_builder.cpp +++ b/src/theory/quantifiers/fmf/model_builder.cpp @@ -22,11 +22,11 @@ #include "theory/quantifiers/quantifiers_state.h" using namespace std; -using namespace CVC5; -using namespace CVC5::kind; -using namespace CVC5::context; -using namespace CVC5::theory; -using namespace CVC5::theory::quantifiers; +using namespace cvc5; +using namespace cvc5::kind; +using namespace cvc5::context; +using namespace cvc5::theory; +using namespace cvc5::theory::quantifiers; QModelBuilder::QModelBuilder(QuantifiersState& qs, QuantifiersRegistry& qr, diff --git a/src/theory/quantifiers/fmf/model_builder.h b/src/theory/quantifiers/fmf/model_builder.h index 2b102c0a8..4a95a8a73 100644 --- a/src/theory/quantifiers/fmf/model_builder.h +++ b/src/theory/quantifiers/fmf/model_builder.h @@ -21,7 +21,7 @@ #include "theory/quantifiers/inst_match.h" #include "theory/theory_model_builder.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -73,6 +73,6 @@ class QModelBuilder : public TheoryEngineModelBuilder } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__MODEL_BUILDER_H */ diff --git a/src/theory/quantifiers/fmf/model_engine.cpp b/src/theory/quantifiers/fmf/model_engine.cpp index 9943744f7..1c46e425d 100644 --- a/src/theory/quantifiers/fmf/model_engine.cpp +++ b/src/theory/quantifiers/fmf/model_engine.cpp @@ -22,10 +22,10 @@ #include "theory/quantifiers/quantifiers_attributes.h" #include "theory/quantifiers/term_database.h" -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -343,4 +343,4 @@ void ModelEngine::debugPrint( const char* c ){ } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/fmf/model_engine.h b/src/theory/quantifiers/fmf/model_engine.h index 078894de6..2547f2831 100644 --- a/src/theory/quantifiers/fmf/model_engine.h +++ b/src/theory/quantifiers/fmf/model_engine.h @@ -21,7 +21,7 @@ #include "theory/quantifiers/quant_module.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -71,6 +71,6 @@ private: } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__MODEL_ENGINE_H */ diff --git a/src/theory/quantifiers/fun_def_evaluator.cpp b/src/theory/quantifiers/fun_def_evaluator.cpp index 326de79fa..9a3d465d5 100644 --- a/src/theory/quantifiers/fun_def_evaluator.cpp +++ b/src/theory/quantifiers/fun_def_evaluator.cpp @@ -19,9 +19,9 @@ #include "theory/quantifiers/quantifiers_attributes.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -252,4 +252,4 @@ bool FunDefEvaluator::hasDefinitions() const { return !d_funDefMap.empty(); } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/fun_def_evaluator.h b/src/theory/quantifiers/fun_def_evaluator.h index be4070840..fcc30948d 100644 --- a/src/theory/quantifiers/fun_def_evaluator.h +++ b/src/theory/quantifiers/fun_def_evaluator.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/evaluator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -70,6 +70,6 @@ class FunDefEvaluator } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/index_trie.cpp b/src/theory/quantifiers/index_trie.cpp index 444882729..8c00efb0e 100644 --- a/src/theory/quantifiers/index_trie.cpp +++ b/src/theory/quantifiers/index_trie.cpp @@ -15,7 +15,7 @@ **/ #include "theory/quantifiers/index_trie.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -114,4 +114,4 @@ IndexTrieNode* IndexTrie::addRec(IndexTrieNode* n, } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/index_trie.h b/src/theory/quantifiers/index_trie.h index 4ac754252..2c968e107 100644 --- a/src/theory/quantifiers/index_trie.h +++ b/src/theory/quantifiers/index_trie.h @@ -21,7 +21,7 @@ #include "base/check.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -106,5 +106,5 @@ class IndexTrie } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* THEORY__QUANTIFIERS__INDEX_TRIE_H */ diff --git a/src/theory/quantifiers/inst_match.cpp b/src/theory/quantifiers/inst_match.cpp index 3db8db74e..c2f65ea93 100644 --- a/src/theory/quantifiers/inst_match.cpp +++ b/src/theory/quantifiers/inst_match.cpp @@ -16,7 +16,7 @@ #include "theory/quantifiers/quantifiers_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -102,4 +102,4 @@ bool InstMatch::set(QuantifiersState& qs, size_t i, TNode n) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/inst_match.h b/src/theory/quantifiers/inst_match.h index 9ff507917..e5e8f97cd 100644 --- a/src/theory/quantifiers/inst_match.h +++ b/src/theory/quantifiers/inst_match.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -89,6 +89,6 @@ inline std::ostream& operator<<(std::ostream& out, const InstMatch& m) { } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_H */ diff --git a/src/theory/quantifiers/inst_match_trie.cpp b/src/theory/quantifiers/inst_match_trie.cpp index 879eb8479..347fe45af 100644 --- a/src/theory/quantifiers/inst_match_trie.cpp +++ b/src/theory/quantifiers/inst_match_trie.cpp @@ -20,9 +20,9 @@ #include "theory/quantifiers/term_database.h" #include "theory/uf/equality_engine_iterator.h" -using namespace CVC5::context; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -369,4 +369,4 @@ bool InstMatchTrieOrdered::existsInstMatch(quantifiers::QuantifiersState& qs, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/inst_match_trie.h b/src/theory/quantifiers/inst_match_trie.h index da8858e8a..ca878c888 100644 --- a/src/theory/quantifiers/inst_match_trie.h +++ b/src/theory/quantifiers/inst_match_trie.h @@ -23,7 +23,7 @@ #include "context/cdo.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -224,6 +224,6 @@ class InstMatchTrieOrdered } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__INST_MATCH_TRIE_H */ diff --git a/src/theory/quantifiers/inst_strategy_enumerative.cpp b/src/theory/quantifiers/inst_strategy_enumerative.cpp index c2ee94d1e..3e560acaa 100644 --- a/src/theory/quantifiers/inst_strategy_enumerative.cpp +++ b/src/theory/quantifiers/inst_strategy_enumerative.cpp @@ -21,10 +21,10 @@ #include "theory/quantifiers/term_tuple_enumerator.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -220,4 +220,4 @@ bool InstStrategyEnum::process(Node quantifier, bool fullEffort, bool isRd) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/inst_strategy_enumerative.h b/src/theory/quantifiers/inst_strategy_enumerative.h index 05e5f7352..7b5cb8e0e 100644 --- a/src/theory/quantifiers/inst_strategy_enumerative.h +++ b/src/theory/quantifiers/inst_strategy_enumerative.h @@ -19,7 +19,7 @@ #include "theory/quantifiers/quant_module.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -116,6 +116,6 @@ class InstStrategyEnum : public QuantifiersModule } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/instantiate.cpp b/src/theory/quantifiers/instantiate.cpp index 4f878c79b..62376bff6 100644 --- a/src/theory/quantifiers/instantiate.cpp +++ b/src/theory/quantifiers/instantiate.cpp @@ -33,10 +33,10 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -760,4 +760,4 @@ Instantiate::Statistics::~Statistics() } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/instantiate.h b/src/theory/quantifiers/instantiate.h index 3fb194589..b3c056506 100644 --- a/src/theory/quantifiers/instantiate.h +++ b/src/theory/quantifiers/instantiate.h @@ -27,7 +27,7 @@ #include "theory/quantifiers/quant_util.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { class LazyCDProof; @@ -361,6 +361,6 @@ class Instantiate : public QuantifiersUtil } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATE_H */ diff --git a/src/theory/quantifiers/instantiation_list.cpp b/src/theory/quantifiers/instantiation_list.cpp index 1c3a0bcac..78bfdf9a4 100644 --- a/src/theory/quantifiers/instantiation_list.cpp +++ b/src/theory/quantifiers/instantiation_list.cpp @@ -17,7 +17,7 @@ #include "options/base_options.h" #include "printer/printer.h" -namespace CVC5 { +namespace cvc5 { std::ostream& operator<<(std::ostream& out, const InstantiationList& ilist) { @@ -31,4 +31,4 @@ std::ostream& operator<<(std::ostream& out, const SkolemList& skl) return out; } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/instantiation_list.h b/src/theory/quantifiers/instantiation_list.h index da8d5c3b5..86dfa0081 100644 --- a/src/theory/quantifiers/instantiation_list.h +++ b/src/theory/quantifiers/instantiation_list.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { /** A list of instantiations for a quantified formula */ struct InstantiationList @@ -53,6 +53,6 @@ struct SkolemList /** Print the skolem list to stream out */ std::ostream& operator<<(std::ostream& out, const SkolemList& skl); -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H */ diff --git a/src/theory/quantifiers/kinds b/src/theory/quantifiers/kinds index 6a32969e3..4561226e1 100644 --- a/src/theory/quantifiers/kinds +++ b/src/theory/quantifiers/kinds @@ -4,12 +4,12 @@ # src/theory/builtin/kinds. # -theory THEORY_QUANTIFIERS ::CVC5::theory::quantifiers::TheoryQuantifiers "theory/quantifiers/theory_quantifiers.h" +theory THEORY_QUANTIFIERS ::cvc5::theory::quantifiers::TheoryQuantifiers "theory/quantifiers/theory_quantifiers.h" typechecker "theory/quantifiers/theory_quantifiers_type_rules.h" properties check presolve -rewriter ::CVC5::theory::quantifiers::QuantifiersRewriter "theory/quantifiers/quantifiers_rewriter.h" +rewriter ::cvc5::theory::quantifiers::QuantifiersRewriter "theory/quantifiers/quantifiers_rewriter.h" operator FORALL 2:3 "universally quantified formula; first parameter is an BOUND_VAR_LIST, second is quantifier body, and an optional third parameter is an INST_PATTERN_LIST" @@ -47,16 +47,16 @@ sort INST_PATTERN_LIST_TYPE \ # a list of instantiation patterns operator INST_PATTERN_LIST 1: "a list of instantiation patterns" -typerule FORALL ::CVC5::theory::quantifiers::QuantifierTypeRule -typerule EXISTS ::CVC5::theory::quantifiers::QuantifierTypeRule -typerule BOUND_VAR_LIST ::CVC5::theory::quantifiers::QuantifierBoundVarListTypeRule -typerule INST_PATTERN_LIST ::CVC5::theory::quantifiers::QuantifierInstPatternListTypeRule - -typerule INST_PATTERN ::CVC5::theory::quantifiers::QuantifierInstPatternTypeRule -typerule INST_NO_PATTERN ::CVC5::theory::quantifiers::QuantifierAnnotationTypeRule -typerule INST_ATTRIBUTE ::CVC5::theory::quantifiers::QuantifierAnnotationTypeRule -typerule INST_POOL ::CVC5::theory::quantifiers::QuantifierAnnotationTypeRule -typerule INST_ADD_TO_POOL ::CVC5::theory::quantifiers::QuantifierAnnotationTypeRule -typerule SKOLEM_ADD_TO_POOL ::CVC5::theory::quantifiers::QuantifierAnnotationTypeRule +typerule FORALL ::cvc5::theory::quantifiers::QuantifierTypeRule +typerule EXISTS ::cvc5::theory::quantifiers::QuantifierTypeRule +typerule BOUND_VAR_LIST ::cvc5::theory::quantifiers::QuantifierBoundVarListTypeRule +typerule INST_PATTERN_LIST ::cvc5::theory::quantifiers::QuantifierInstPatternListTypeRule + +typerule INST_PATTERN ::cvc5::theory::quantifiers::QuantifierInstPatternTypeRule +typerule INST_NO_PATTERN ::cvc5::theory::quantifiers::QuantifierAnnotationTypeRule +typerule INST_ATTRIBUTE ::cvc5::theory::quantifiers::QuantifierAnnotationTypeRule +typerule INST_POOL ::cvc5::theory::quantifiers::QuantifierAnnotationTypeRule +typerule INST_ADD_TO_POOL ::cvc5::theory::quantifiers::QuantifierAnnotationTypeRule +typerule SKOLEM_ADD_TO_POOL ::cvc5::theory::quantifiers::QuantifierAnnotationTypeRule endtheory diff --git a/src/theory/quantifiers/lazy_trie.cpp b/src/theory/quantifiers/lazy_trie.cpp index 1b706d904..06d1798d5 100644 --- a/src/theory/quantifiers/lazy_trie.cpp +++ b/src/theory/quantifiers/lazy_trie.cpp @@ -14,7 +14,7 @@ #include "theory/quantifiers/lazy_trie.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -156,4 +156,4 @@ void LazyTrieMulti::clear() } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/lazy_trie.h b/src/theory/quantifiers/lazy_trie.h index 2d92b13fd..d4437ae75 100644 --- a/src/theory/quantifiers/lazy_trie.h +++ b/src/theory/quantifiers/lazy_trie.h @@ -17,7 +17,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -168,6 +168,6 @@ class LazyTrieMulti } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__LAZY_TRIE_H */ diff --git a/src/theory/quantifiers/proof_checker.cpp b/src/theory/quantifiers/proof_checker.cpp index 572c631e1..4be66a703 100644 --- a/src/theory/quantifiers/proof_checker.cpp +++ b/src/theory/quantifiers/proof_checker.cpp @@ -18,9 +18,9 @@ #include "expr/skolem_manager.h" #include "theory/builtin/proof_checker.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -123,4 +123,4 @@ Node QuantifiersProofRuleChecker::checkInternal( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/proof_checker.h b/src/theory/quantifiers/proof_checker.h index da78daf90..39e933149 100644 --- a/src/theory/quantifiers/proof_checker.h +++ b/src/theory/quantifiers/proof_checker.h @@ -21,7 +21,7 @@ #include "expr/proof_checker.h" #include "expr/proof_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -44,6 +44,6 @@ class QuantifiersProofRuleChecker : public ProofRuleChecker } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__PROOF_CHECKER_H */ diff --git a/src/theory/quantifiers/quant_bound_inference.cpp b/src/theory/quantifiers/quant_bound_inference.cpp index 6d7e2e9cd..609bc66a4 100644 --- a/src/theory/quantifiers/quant_bound_inference.cpp +++ b/src/theory/quantifiers/quant_bound_inference.cpp @@ -17,9 +17,9 @@ #include "theory/quantifiers/fmf/bounded_integers.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -127,4 +127,4 @@ bool QuantifiersBoundInference::getBoundElements( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quant_bound_inference.h b/src/theory/quantifiers/quant_bound_inference.h index 62ac0ea58..7c15d5146 100644 --- a/src/theory/quantifiers/quant_bound_inference.h +++ b/src/theory/quantifiers/quant_bound_inference.h @@ -20,7 +20,7 @@ #include <vector> #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class RepSetIterator; @@ -122,6 +122,6 @@ class QuantifiersBoundInference } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__QUANT_BOUND_INFERENCE_H */ diff --git a/src/theory/quantifiers/quant_conflict_find.cpp b/src/theory/quantifiers/quant_conflict_find.cpp index 5fa617670..94b2f001e 100644 --- a/src/theory/quantifiers/quant_conflict_find.cpp +++ b/src/theory/quantifiers/quant_conflict_find.cpp @@ -29,10 +29,10 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -2351,4 +2351,4 @@ bool QuantConflictFind::isPropagatingInstance(Node n) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quant_conflict_find.h b/src/theory/quantifiers/quant_conflict_find.h index ef605a48a..93e6075a8 100644 --- a/src/theory/quantifiers/quant_conflict_find.h +++ b/src/theory/quantifiers/quant_conflict_find.h @@ -25,7 +25,7 @@ #include "expr/node_trie.h" #include "theory/quantifiers/quant_module.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -313,6 +313,6 @@ std::ostream& operator<<(std::ostream& os, const QuantConflictFind::Effort& e); } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/quant_module.cpp b/src/theory/quantifiers/quant_module.cpp index 811dc8642..2c74b3557 100644 --- a/src/theory/quantifiers/quant_module.cpp +++ b/src/theory/quantifiers/quant_module.cpp @@ -14,9 +14,9 @@ #include "theory/quantifiers/quant_module.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { QuantifiersModule::QuantifiersModule( @@ -75,4 +75,4 @@ quantifiers::QuantifiersRegistry& QuantifiersModule::getQuantifiersRegistry() } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quant_module.h b/src/theory/quantifiers/quant_module.h index 53fb55aa0..e6d5eee76 100644 --- a/src/theory/quantifiers/quant_module.h +++ b/src/theory/quantifiers/quant_module.h @@ -28,7 +28,7 @@ #include "theory/theory.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { class TermDb; @@ -174,6 +174,6 @@ class QuantifiersModule }; /* class QuantifiersModule */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANT_UTIL_H */ diff --git a/src/theory/quantifiers/quant_relevance.cpp b/src/theory/quantifiers/quant_relevance.cpp index 2ce79d285..f6a96cda2 100644 --- a/src/theory/quantifiers/quant_relevance.cpp +++ b/src/theory/quantifiers/quant_relevance.cpp @@ -15,10 +15,10 @@ #include "theory/quantifiers/quant_relevance.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -62,4 +62,4 @@ size_t QuantRelevance::getNumQuantifiersForSymbol(Node s) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quant_relevance.h b/src/theory/quantifiers/quant_relevance.h index 73b62489e..e6a178c73 100644 --- a/src/theory/quantifiers/quant_relevance.h +++ b/src/theory/quantifiers/quant_relevance.h @@ -21,7 +21,7 @@ #include "theory/quantifiers/quant_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -63,6 +63,6 @@ class QuantRelevance : public QuantifiersUtil } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANT_RELEVANCE_H */ diff --git a/src/theory/quantifiers/quant_rep_bound_ext.cpp b/src/theory/quantifiers/quant_rep_bound_ext.cpp index 2a70e5d4e..383091e33 100644 --- a/src/theory/quantifiers/quant_rep_bound_ext.cpp +++ b/src/theory/quantifiers/quant_rep_bound_ext.cpp @@ -17,9 +17,9 @@ #include "theory/quantifiers/first_order_model.h" #include "theory/quantifiers/quant_bound_inference.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -86,4 +86,4 @@ bool QRepBoundExt::getVariableOrder(Node owner, std::vector<unsigned>& varOrder) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quant_rep_bound_ext.h b/src/theory/quantifiers/quant_rep_bound_ext.h index 7e8f5d386..6fe0faefa 100644 --- a/src/theory/quantifiers/quant_rep_bound_ext.h +++ b/src/theory/quantifiers/quant_rep_bound_ext.h @@ -23,7 +23,7 @@ #include "theory/rep_set.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -67,6 +67,6 @@ class QRepBoundExt : public RepBoundExt } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__FIRST_ORDER_MODEL_H */ diff --git a/src/theory/quantifiers/quant_split.cpp b/src/theory/quantifiers/quant_split.cpp index 85fb291f0..00a8ff08f 100644 --- a/src/theory/quantifiers/quant_split.cpp +++ b/src/theory/quantifiers/quant_split.cpp @@ -20,9 +20,9 @@ #include "theory/quantifiers/first_order_model.h" #include "options/quantifiers_options.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -207,4 +207,4 @@ void QuantDSplit::check(Theory::Effort e, QEffort quant_e) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quant_split.h b/src/theory/quantifiers/quant_split.h index eb85a2c28..ee961cbbc 100644 --- a/src/theory/quantifiers/quant_split.h +++ b/src/theory/quantifiers/quant_split.h @@ -20,7 +20,7 @@ #include "context/cdo.h" #include "theory/quantifiers/quant_module.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersEngine; @@ -73,6 +73,6 @@ class QuantDSplit : public QuantifiersModule { } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/quant_util.cpp b/src/theory/quantifiers/quant_util.cpp index 841778a89..cbf29065c 100644 --- a/src/theory/quantifiers/quant_util.cpp +++ b/src/theory/quantifiers/quant_util.cpp @@ -16,9 +16,9 @@ #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { QuantPhaseReq::QuantPhaseReq( Node n, bool computeEq ){ @@ -131,4 +131,4 @@ void QuantPhaseReq::getEntailPolarity( Node n, int child, bool hasPol, bool pol, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quant_util.h b/src/theory/quantifiers/quant_util.h index f41f394e8..7cd89c7d8 100644 --- a/src/theory/quantifiers/quant_util.h +++ b/src/theory/quantifiers/quant_util.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** Quantifiers utility @@ -78,6 +78,6 @@ public: }; } -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANT_UTIL_H */ diff --git a/src/theory/quantifiers/quantifiers_attributes.cpp b/src/theory/quantifiers/quantifiers_attributes.cpp index 8c068e06c..d53ed74be 100644 --- a/src/theory/quantifiers/quantifiers_attributes.cpp +++ b/src/theory/quantifiers/quantifiers_attributes.cpp @@ -20,10 +20,10 @@ #include "theory/quantifiers/term_util.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -378,4 +378,4 @@ void QuantAttributes::setInstantiationLevelAttr(Node n, uint64_t level) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quantifiers_attributes.h b/src/theory/quantifiers/quantifiers_attributes.h index 4f7f1e22c..2fb294abe 100644 --- a/src/theory/quantifiers/quantifiers_attributes.h +++ b/src/theory/quantifiers/quantifiers_attributes.h @@ -22,7 +22,7 @@ #include "expr/attribute.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** Attribute true for function definition quantifiers */ @@ -244,6 +244,6 @@ class QuantAttributes } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/quantifiers_inference_manager.cpp b/src/theory/quantifiers/quantifiers_inference_manager.cpp index 687e17e4a..ff3087b63 100644 --- a/src/theory/quantifiers/quantifiers_inference_manager.cpp +++ b/src/theory/quantifiers/quantifiers_inference_manager.cpp @@ -17,7 +17,7 @@ #include "theory/quantifiers/instantiate.h" #include "theory/quantifiers/skolemize.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -53,4 +53,4 @@ void QuantifiersInferenceManager::doPending() } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quantifiers_inference_manager.h b/src/theory/quantifiers/quantifiers_inference_manager.h index afe8dd40a..b468e0478 100644 --- a/src/theory/quantifiers/quantifiers_inference_manager.h +++ b/src/theory/quantifiers/quantifiers_inference_manager.h @@ -20,7 +20,7 @@ #include "theory/inference_manager_buffered.h" #include "theory/quantifiers/quantifiers_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -59,6 +59,6 @@ class QuantifiersInferenceManager : public InferenceManagerBuffered } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_INFERENCE_MANAGER_H */ diff --git a/src/theory/quantifiers/quantifiers_modules.cpp b/src/theory/quantifiers/quantifiers_modules.cpp index e39e38ea7..049e72edf 100644 --- a/src/theory/quantifiers/quantifiers_modules.cpp +++ b/src/theory/quantifiers/quantifiers_modules.cpp @@ -18,7 +18,7 @@ #include "theory/quantifiers/relevant_domain.h" #include "theory/quantifiers/term_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -122,4 +122,4 @@ void QuantifiersModules::initialize(QuantifiersState& qs, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quantifiers_modules.h b/src/theory/quantifiers/quantifiers_modules.h index 71928502d..c52da79a7 100644 --- a/src/theory/quantifiers/quantifiers_modules.h +++ b/src/theory/quantifiers/quantifiers_modules.h @@ -30,7 +30,7 @@ #include "theory/quantifiers/sygus/synth_engine.h" #include "theory/quantifiers/sygus_inst.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersEngine; @@ -45,7 +45,7 @@ namespace quantifiers { */ class QuantifiersModules { - friend class ::CVC5::theory::QuantifiersEngine; + friend class ::cvc5::theory::QuantifiersEngine; public: QuantifiersModules(); @@ -94,6 +94,6 @@ class QuantifiersModules } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_MODULES_H */ diff --git a/src/theory/quantifiers/quantifiers_registry.cpp b/src/theory/quantifiers/quantifiers_registry.cpp index 3cd59c834..58edc72bd 100644 --- a/src/theory/quantifiers/quantifiers_registry.cpp +++ b/src/theory/quantifiers/quantifiers_registry.cpp @@ -18,7 +18,7 @@ #include "theory/quantifiers/quant_module.h" #include "theory/quantifiers/term_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -208,4 +208,4 @@ bool QuantifiersRegistry::getNameForQuant(Node q, Node& name, bool req) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quantifiers_registry.h b/src/theory/quantifiers/quantifiers_registry.h index a3dffb063..383934c15 100644 --- a/src/theory/quantifiers/quantifiers_registry.h +++ b/src/theory/quantifiers/quantifiers_registry.h @@ -22,7 +22,7 @@ #include "theory/quantifiers/quant_util.h" #include "theory/quantifiers/quantifiers_attributes.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersModule; @@ -129,6 +129,6 @@ class QuantifiersRegistry : public QuantifiersUtil } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REGISTRY_H */ diff --git a/src/theory/quantifiers/quantifiers_rewriter.cpp b/src/theory/quantifiers/quantifiers_rewriter.cpp index d31b22f88..2c91df7a7 100644 --- a/src/theory/quantifiers/quantifiers_rewriter.cpp +++ b/src/theory/quantifiers/quantifiers_rewriter.cpp @@ -32,10 +32,10 @@ #include "theory/strings/theory_strings_utils.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -2030,4 +2030,4 @@ TrustNode QuantifiersRewriter::preprocess(Node n, bool isInst) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h index 7bbe32da7..5ea8352d0 100644 --- a/src/theory/quantifiers/quantifiers_rewriter.h +++ b/src/theory/quantifiers/quantifiers_rewriter.h @@ -22,7 +22,7 @@ #include "theory/theory_rewriter.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -303,6 +303,6 @@ public: } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_REWRITER_H */ diff --git a/src/theory/quantifiers/quantifiers_state.cpp b/src/theory/quantifiers/quantifiers_state.cpp index 5e3bb3ba3..927369442 100644 --- a/src/theory/quantifiers/quantifiers_state.cpp +++ b/src/theory/quantifiers/quantifiers_state.cpp @@ -17,7 +17,7 @@ #include "options/quantifiers_options.h" #include "theory/uf/equality_engine_iterator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -160,4 +160,4 @@ QuantifiersStatistics& QuantifiersState::getStats() { return d_statistics; } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quantifiers_state.h b/src/theory/quantifiers/quantifiers_state.h index 0f1c13659..623d52289 100644 --- a/src/theory/quantifiers/quantifiers_state.h +++ b/src/theory/quantifiers/quantifiers_state.h @@ -21,7 +21,7 @@ #include "theory/theory.h" #include "theory/theory_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -86,6 +86,6 @@ class QuantifiersState : public TheoryState } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATE_H */ diff --git a/src/theory/quantifiers/quantifiers_statistics.cpp b/src/theory/quantifiers/quantifiers_statistics.cpp index e922c7080..720ae2ee0 100644 --- a/src/theory/quantifiers/quantifiers_statistics.cpp +++ b/src/theory/quantifiers/quantifiers_statistics.cpp @@ -16,7 +16,7 @@ #include "smt/smt_statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -61,4 +61,4 @@ QuantifiersStatistics::~QuantifiersStatistics() } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/quantifiers_statistics.h b/src/theory/quantifiers/quantifiers_statistics.h index 9f2678796..9eccf3ce6 100644 --- a/src/theory/quantifiers/quantifiers_statistics.h +++ b/src/theory/quantifiers/quantifiers_statistics.h @@ -20,7 +20,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -47,6 +47,6 @@ class QuantifiersStatistics } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__QUANTIFIERS_STATISTICS_H */ diff --git a/src/theory/quantifiers/query_generator.cpp b/src/theory/quantifiers/query_generator.cpp index 0860549ba..6abb8bbec 100644 --- a/src/theory/quantifiers/query_generator.cpp +++ b/src/theory/quantifiers/query_generator.cpp @@ -24,9 +24,9 @@ #include "util/random.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -425,4 +425,4 @@ void QueryGenerator::findQueries( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/query_generator.h b/src/theory/quantifiers/query_generator.h index a847a184b..cf10b42da 100644 --- a/src/theory/quantifiers/query_generator.h +++ b/src/theory/quantifiers/query_generator.h @@ -25,7 +25,7 @@ #include "theory/quantifiers/lazy_trie.h" #include "theory/quantifiers/sygus_sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -116,6 +116,6 @@ class QueryGenerator : public ExprMiner } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS___H */ diff --git a/src/theory/quantifiers/relevant_domain.cpp b/src/theory/quantifiers/relevant_domain.cpp index 3e25f4073..6fb27bec4 100644 --- a/src/theory/quantifiers/relevant_domain.cpp +++ b/src/theory/quantifiers/relevant_domain.cpp @@ -22,9 +22,9 @@ #include "theory/quantifiers/term_registry.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -338,4 +338,4 @@ void RelevantDomain::computeRelevantDomainLit( Node q, bool hasPol, bool pol, No } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/relevant_domain.h b/src/theory/quantifiers/relevant_domain.h index 56b728b34..807e4c4a2 100644 --- a/src/theory/quantifiers/relevant_domain.h +++ b/src/theory/quantifiers/relevant_domain.h @@ -20,7 +20,7 @@ #include "theory/quantifiers/first_order_model.h" #include "theory/quantifiers/quant_util.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -170,6 +170,6 @@ class RelevantDomain : public QuantifiersUtil } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__RELEVANT_DOMAIN_H */ diff --git a/src/theory/quantifiers/single_inv_partition.cpp b/src/theory/quantifiers/single_inv_partition.cpp index 1dbc24280..2fe173763 100644 --- a/src/theory/quantifiers/single_inv_partition.cpp +++ b/src/theory/quantifiers/single_inv_partition.cpp @@ -20,11 +20,11 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -615,4 +615,4 @@ void SingleInvocationPartition::debugPrint(const char* c) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/single_inv_partition.h b/src/theory/quantifiers/single_inv_partition.h index 6feff4169..604c711ad 100644 --- a/src/theory/quantifiers/single_inv_partition.h +++ b/src/theory/quantifiers/single_inv_partition.h @@ -23,7 +23,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -292,6 +292,6 @@ class SingleInvocationPartition } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SINGLE_INV_PARTITION_H */ diff --git a/src/theory/quantifiers/skolemize.cpp b/src/theory/quantifiers/skolemize.cpp index 3767fac61..2a19824ac 100644 --- a/src/theory/quantifiers/skolemize.cpp +++ b/src/theory/quantifiers/skolemize.cpp @@ -27,9 +27,9 @@ #include "theory/rewriter.h" #include "theory/sort_inference.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -399,4 +399,4 @@ bool Skolemize::isProofEnabled() const { return d_epg != nullptr; } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/skolemize.h b/src/theory/quantifiers/skolemize.h index d0a889ace..4c4d770f3 100644 --- a/src/theory/quantifiers/skolemize.h +++ b/src/theory/quantifiers/skolemize.h @@ -26,7 +26,7 @@ #include "theory/eager_proof_generator.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { class DTypeConstructor; @@ -157,6 +157,6 @@ class Skolemize } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SKOLEMIZE_H */ diff --git a/src/theory/quantifiers/solution_filter.cpp b/src/theory/quantifiers/solution_filter.cpp index 3b00f5081..d7556be40 100644 --- a/src/theory/quantifiers/solution_filter.cpp +++ b/src/theory/quantifiers/solution_filter.cpp @@ -20,9 +20,9 @@ #include "smt/smt_engine_scope.h" #include "util/random.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -103,4 +103,4 @@ bool SolutionFilterStrength::addTerm(Node n, std::ostream& out) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/solution_filter.h b/src/theory/quantifiers/solution_filter.h index cea5eb74e..bf3d9bddc 100644 --- a/src/theory/quantifiers/solution_filter.h +++ b/src/theory/quantifiers/solution_filter.h @@ -24,7 +24,7 @@ #include "theory/quantifiers/lazy_trie.h" #include "theory/quantifiers/sygus_sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -70,6 +70,6 @@ class SolutionFilterStrength : public ExprMiner } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SOLUTION_FILTER_H */ diff --git a/src/theory/quantifiers/sygus/ce_guided_single_inv.cpp b/src/theory/quantifiers/sygus/ce_guided_single_inv.cpp index 0acd7e718..5e9f2d591 100644 --- a/src/theory/quantifiers/sygus/ce_guided_single_inv.cpp +++ b/src/theory/quantifiers/sygus/ce_guided_single_inv.cpp @@ -32,9 +32,9 @@ #include "theory/rewriter.h" #include "theory/smt_engine_subsolver.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -548,4 +548,4 @@ bool CegSingleInv::solveTrivial(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/ce_guided_single_inv.h b/src/theory/quantifiers/sygus/ce_guided_single_inv.h index e2f399ffd..ca83bf973 100644 --- a/src/theory/quantifiers/sygus/ce_guided_single_inv.h +++ b/src/theory/quantifiers/sygus/ce_guided_single_inv.h @@ -24,7 +24,7 @@ #include "theory/quantifiers/single_inv_partition.h" #include "theory/quantifiers/sygus/sygus_stats.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -178,6 +178,6 @@ class CegSingleInv } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/cegis.cpp b/src/theory/quantifiers/sygus/cegis.cpp index d980db887..52adc1972 100644 --- a/src/theory/quantifiers/sygus/cegis.cpp +++ b/src/theory/quantifiers/sygus/cegis.cpp @@ -24,10 +24,10 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -706,4 +706,4 @@ bool Cegis::sampleAddRefinementLemma(const std::vector<Node>& candidates, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/cegis.h b/src/theory/quantifiers/sygus/cegis.h index a12133d23..f728d3d7e 100644 --- a/src/theory/quantifiers/sygus/cegis.h +++ b/src/theory/quantifiers/sygus/cegis.h @@ -21,7 +21,7 @@ #include "theory/quantifiers/sygus/sygus_module.h" #include "theory/quantifiers/sygus_sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -227,6 +227,6 @@ class Cegis : public SygusModule } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__CEGIS_H */ diff --git a/src/theory/quantifiers/sygus/cegis_core_connective.cpp b/src/theory/quantifiers/sygus/cegis_core_connective.cpp index 26ad62c90..6e47c2d89 100644 --- a/src/theory/quantifiers/sygus/cegis_core_connective.cpp +++ b/src/theory/quantifiers/sygus/cegis_core_connective.cpp @@ -28,9 +28,9 @@ #include "theory/smt_engine_subsolver.h" #include "util/random.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -861,4 +861,4 @@ Node CegisCoreConnective::constructSolutionFromPool(Component& ccheck, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/cegis_core_connective.h b/src/theory/quantifiers/sygus/cegis_core_connective.h index 59bf53317..2abce835a 100644 --- a/src/theory/quantifiers/sygus/cegis_core_connective.h +++ b/src/theory/quantifiers/sygus/cegis_core_connective.h @@ -25,7 +25,7 @@ #include "theory/quantifiers/sygus/cegis.h" #include "util/result.h" -namespace CVC5 { +namespace cvc5 { class SmtEngine; @@ -399,6 +399,6 @@ class CegisCoreConnective : public Cegis } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */ diff --git a/src/theory/quantifiers/sygus/cegis_unif.cpp b/src/theory/quantifiers/sygus/cegis_unif.cpp index bcd9fa67a..9a5c6146d 100644 --- a/src/theory/quantifiers/sygus/cegis_unif.cpp +++ b/src/theory/quantifiers/sygus/cegis_unif.cpp @@ -21,9 +21,9 @@ #include "theory/quantifiers/sygus/synth_conjecture.h" #include "theory/quantifiers/sygus/term_database_sygus.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -686,4 +686,4 @@ void CegisUnifEnumDecisionStrategy::registerEvalPtAtSize(Node e, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/cegis_unif.h b/src/theory/quantifiers/sygus/cegis_unif.h index e00370f2a..a543bfda0 100644 --- a/src/theory/quantifiers/sygus/cegis_unif.h +++ b/src/theory/quantifiers/sygus/cegis_unif.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/sygus/cegis.h" #include "theory/quantifiers/sygus/sygus_unif_rl.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -333,6 +333,6 @@ class CegisUnif : public Cegis } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/enum_stream_substitution.cpp b/src/theory/quantifiers/sygus/enum_stream_substitution.cpp index 17f2a0c16..2bf8b4611 100644 --- a/src/theory/quantifiers/sygus/enum_stream_substitution.cpp +++ b/src/theory/quantifiers/sygus/enum_stream_substitution.cpp @@ -24,9 +24,9 @@ #include <numeric> // for std::iota -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -621,4 +621,4 @@ bool EnumStreamConcrete::increment() Node EnumStreamConcrete::getCurrent() { return d_currTerm; } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/enum_stream_substitution.h b/src/theory/quantifiers/sygus/enum_stream_substitution.h index c7e4720d2..a72481a38 100644 --- a/src/theory/quantifiers/sygus/enum_stream_substitution.h +++ b/src/theory/quantifiers/sygus/enum_stream_substitution.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/quantifiers/sygus/synth_conjecture.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -299,6 +299,6 @@ class EnumStreamConcrete : public EnumValGenerator } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/example_eval_cache.cpp b/src/theory/quantifiers/sygus/example_eval_cache.cpp index 5056fb96d..aea6cb9ef 100644 --- a/src/theory/quantifiers/sygus/example_eval_cache.cpp +++ b/src/theory/quantifiers/sygus/example_eval_cache.cpp @@ -17,10 +17,10 @@ #include "theory/quantifiers/sygus/example_min_eval.h" #include "theory/quantifiers/sygus/synth_conjecture.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -119,4 +119,4 @@ void ExampleEvalCache::clearEvaluationAll() { d_exOutCache.clear(); } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/example_eval_cache.h b/src/theory/quantifiers/sygus/example_eval_cache.h index 97ec38ab5..1a70369a5 100644 --- a/src/theory/quantifiers/sygus/example_eval_cache.h +++ b/src/theory/quantifiers/sygus/example_eval_cache.h @@ -20,7 +20,7 @@ #include "expr/node_trie.h" #include "theory/quantifiers/sygus/example_infer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -160,6 +160,6 @@ class ExampleEvalCache } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/example_infer.cpp b/src/theory/quantifiers/sygus/example_infer.cpp index 12e4f073e..9dc99cab1 100644 --- a/src/theory/quantifiers/sygus/example_infer.cpp +++ b/src/theory/quantifiers/sygus/example_infer.cpp @@ -17,10 +17,10 @@ #include "theory/quantifiers/quant_util.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -275,4 +275,4 @@ bool ExampleInfer::hasExamplesOut(Node f) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/example_infer.h b/src/theory/quantifiers/sygus/example_infer.h index 0e5ee25ac..dd2bf8a0a 100644 --- a/src/theory/quantifiers/sygus/example_infer.h +++ b/src/theory/quantifiers/sygus/example_infer.h @@ -21,7 +21,7 @@ #include "theory/quantifiers/sygus/sygus_unif_io.h" #include "theory/quantifiers/sygus/term_database_sygus.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -157,6 +157,6 @@ class ExampleInfer } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/example_min_eval.cpp b/src/theory/quantifiers/sygus/example_min_eval.cpp index 4cb9bd345..5b3ccec4f 100644 --- a/src/theory/quantifiers/sygus/example_min_eval.cpp +++ b/src/theory/quantifiers/sygus/example_min_eval.cpp @@ -18,7 +18,7 @@ #include "expr/node_algorithm.h" #include "theory/quantifiers/sygus/term_database_sygus.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -84,4 +84,4 @@ Node EmeEvalTds::eval(TNode n, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/example_min_eval.h b/src/theory/quantifiers/sygus/example_min_eval.h index 9af07caba..2105faf2b 100644 --- a/src/theory/quantifiers/sygus/example_min_eval.h +++ b/src/theory/quantifiers/sygus/example_min_eval.h @@ -23,7 +23,7 @@ #include "expr/node.h" #include "expr/node_trie.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -118,6 +118,6 @@ class EmeEvalTds : public EmeEval } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/rcons_obligation_info.cpp b/src/theory/quantifiers/sygus/rcons_obligation_info.cpp index 7d4a41f2d..6db446dbb 100644 --- a/src/theory/quantifiers/sygus/rcons_obligation_info.cpp +++ b/src/theory/quantifiers/sygus/rcons_obligation_info.cpp @@ -17,7 +17,7 @@ #include "expr/node_algorithm.h" #include "theory/datatypes/sygus_datatype_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -97,4 +97,4 @@ void RConsObligationInfo::printCandSols( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/rcons_obligation_info.h b/src/theory/quantifiers/sygus/rcons_obligation_info.h index e05422b59..3bded2a90 100644 --- a/src/theory/quantifiers/sygus/rcons_obligation_info.h +++ b/src/theory/quantifiers/sygus/rcons_obligation_info.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -145,6 +145,6 @@ class RConsObligationInfo } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__QUANTIFIERS__RCONS_OBLIGATION_INFO_H diff --git a/src/theory/quantifiers/sygus/rcons_type_info.cpp b/src/theory/quantifiers/sygus/rcons_type_info.cpp index 37b136a1c..97ae4878d 100644 --- a/src/theory/quantifiers/sygus/rcons_type_info.cpp +++ b/src/theory/quantifiers/sygus/rcons_type_info.cpp @@ -16,7 +16,7 @@ #include "theory/datatypes/sygus_datatype_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -69,4 +69,4 @@ Node RConsTypeInfo::builtinToOb(Node builtin) { return d_ob[builtin]; } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/rcons_type_info.h b/src/theory/quantifiers/sygus/rcons_type_info.h index c2bce5720..974897023 100644 --- a/src/theory/quantifiers/sygus/rcons_type_info.h +++ b/src/theory/quantifiers/sygus/rcons_type_info.h @@ -19,7 +19,7 @@ #include "theory/quantifiers/sygus/sygus_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -97,6 +97,6 @@ class RConsTypeInfo } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__QUANTIFIERS__RCONS_TYPE_INFO_H diff --git a/src/theory/quantifiers/sygus/sygus_abduct.cpp b/src/theory/quantifiers/sygus/sygus_abduct.cpp index 71853fc76..8df45320f 100644 --- a/src/theory/quantifiers/sygus/sygus_abduct.cpp +++ b/src/theory/quantifiers/sygus/sygus_abduct.cpp @@ -29,9 +29,9 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -187,4 +187,4 @@ Node SygusAbduct::mkAbductionConjecture(const std::string& name, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_abduct.h b/src/theory/quantifiers/sygus/sygus_abduct.h index ffcefd38b..634a9a4bd 100644 --- a/src/theory/quantifiers/sygus/sygus_abduct.h +++ b/src/theory/quantifiers/sygus/sygus_abduct.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -85,6 +85,6 @@ class SygusAbduct } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ABDUCT_H */ diff --git a/src/theory/quantifiers/sygus/sygus_enumerator.cpp b/src/theory/quantifiers/sygus/sygus_enumerator.cpp index c786d2668..82d0c6c62 100644 --- a/src/theory/quantifiers/sygus/sygus_enumerator.cpp +++ b/src/theory/quantifiers/sygus/sygus_enumerator.cpp @@ -24,9 +24,9 @@ #include "theory/quantifiers/sygus/type_node_id_trie.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1214,4 +1214,4 @@ bool SygusEnumerator::TermEnumMasterFv::increment() } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_enumerator.h b/src/theory/quantifiers/sygus/sygus_enumerator.h index a0d1c9b62..f1ef115f8 100644 --- a/src/theory/quantifiers/sygus/sygus_enumerator.h +++ b/src/theory/quantifiers/sygus/sygus_enumerator.h @@ -24,7 +24,7 @@ #include "theory/quantifiers/sygus/synth_conjecture.h" #include "theory/quantifiers/sygus/term_database_sygus.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -506,6 +506,6 @@ class SygusEnumerator : public EnumValGenerator } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_H */ diff --git a/src/theory/quantifiers/sygus/sygus_enumerator_basic.cpp b/src/theory/quantifiers/sygus/sygus_enumerator_basic.cpp index 51814b07c..e9f41c916 100644 --- a/src/theory/quantifiers/sygus/sygus_enumerator_basic.cpp +++ b/src/theory/quantifiers/sygus/sygus_enumerator_basic.cpp @@ -15,10 +15,10 @@ #include "options/datatypes_options.h" -using namespace CVC5::kind; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -55,4 +55,4 @@ bool EnumValGeneratorBasic::increment() } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_enumerator_basic.h b/src/theory/quantifiers/sygus/sygus_enumerator_basic.h index c57d6f814..1f489eafc 100644 --- a/src/theory/quantifiers/sygus/sygus_enumerator_basic.h +++ b/src/theory/quantifiers/sygus/sygus_enumerator_basic.h @@ -25,7 +25,7 @@ #include "theory/quantifiers/sygus/term_database_sygus.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -65,6 +65,6 @@ class EnumValGeneratorBasic : public EnumValGenerator } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_ENUMERATOR_BASIC_H */ diff --git a/src/theory/quantifiers/sygus/sygus_eval_unfold.cpp b/src/theory/quantifiers/sygus/sygus_eval_unfold.cpp index 3e87ccfc7..5dbd7655f 100644 --- a/src/theory/quantifiers/sygus/sygus_eval_unfold.cpp +++ b/src/theory/quantifiers/sygus/sygus_eval_unfold.cpp @@ -22,10 +22,10 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -333,4 +333,4 @@ Node SygusEvalUnfold::unfold(Node en) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_eval_unfold.h b/src/theory/quantifiers/sygus/sygus_eval_unfold.h index d5e47edbc..628f01c40 100644 --- a/src/theory/quantifiers/sygus/sygus_eval_unfold.h +++ b/src/theory/quantifiers/sygus/sygus_eval_unfold.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "theory/quantifiers/sygus/sygus_invariance.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -154,6 +154,6 @@ class SygusEvalUnfold } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EVAL_UNFOLD_H */ diff --git a/src/theory/quantifiers/sygus/sygus_explain.cpp b/src/theory/quantifiers/sygus/sygus_explain.cpp index 26fab8535..95acce626 100644 --- a/src/theory/quantifiers/sygus/sygus_explain.cpp +++ b/src/theory/quantifiers/sygus/sygus_explain.cpp @@ -21,10 +21,10 @@ #include "theory/quantifiers/sygus/sygus_invariance.h" #include "theory/quantifiers/sygus/term_database_sygus.h" -using namespace CVC5::kind; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -357,4 +357,4 @@ void SygusExplain::getExplanationFor(Node n, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_explain.h b/src/theory/quantifiers/sygus/sygus_explain.h index 1b1db568f..477857794 100644 --- a/src/theory/quantifiers/sygus/sygus_explain.h +++ b/src/theory/quantifiers/sygus/sygus_explain.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -241,6 +241,6 @@ class SygusExplain } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_EXPLAIN_H */ diff --git a/src/theory/quantifiers/sygus/sygus_grammar_cons.cpp b/src/theory/quantifiers/sygus/sygus_grammar_cons.cpp index 554f587c7..1c96b1346 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_cons.cpp +++ b/src/theory/quantifiers/sygus/sygus_grammar_cons.cpp @@ -30,9 +30,9 @@ #include "theory/rewriter.h" #include "theory/strings/word.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1622,4 +1622,4 @@ bool CegGrammarConstructor::SygusDatatypeGenerator::shouldInclude(Node op) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_grammar_cons.h b/src/theory/quantifiers/sygus/sygus_grammar_cons.h index a39540452..56f469fef 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_cons.h +++ b/src/theory/quantifiers/sygus/sygus_grammar_cons.h @@ -25,7 +25,7 @@ #include "expr/node.h" #include "expr/sygus_datatype.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -266,6 +266,6 @@ public: } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_grammar_norm.cpp b/src/theory/quantifiers/sygus/sygus_grammar_norm.cpp index fa67e17c4..8a2ad109d 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_norm.cpp +++ b/src/theory/quantifiers/sygus/sygus_grammar_norm.cpp @@ -31,9 +31,9 @@ #include <numeric> // for std::iota -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -536,4 +536,4 @@ TypeNode SygusGrammarNorm::normalizeSygusType(TypeNode tn, Node sygus_vars) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_grammar_norm.h b/src/theory/quantifiers/sygus/sygus_grammar_norm.h index 8c057d2c5..eda34a251 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_norm.h +++ b/src/theory/quantifiers/sygus/sygus_grammar_norm.h @@ -25,7 +25,7 @@ #include "expr/sygus_datatype.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -426,6 +426,6 @@ class SygusGrammarNorm } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_grammar_red.cpp b/src/theory/quantifiers/sygus/sygus_grammar_red.cpp index 8e6f4fbae..a8ada94ed 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_red.cpp +++ b/src/theory/quantifiers/sygus/sygus_grammar_red.cpp @@ -22,9 +22,9 @@ #include "theory/quantifiers/term_util.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -176,4 +176,4 @@ void SygusRedundantCons::getGenericList(TermDbSygus* tds, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_grammar_red.h b/src/theory/quantifiers/sygus/sygus_grammar_red.h index 25256a68c..2144102e0 100644 --- a/src/theory/quantifiers/sygus/sygus_grammar_red.h +++ b/src/theory/quantifiers/sygus/sygus_grammar_red.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -118,6 +118,6 @@ class SygusRedundantCons } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_GRAMMAR_RED_H */ diff --git a/src/theory/quantifiers/sygus/sygus_interpol.cpp b/src/theory/quantifiers/sygus/sygus_interpol.cpp index 1c856ffa2..fe286d15c 100644 --- a/src/theory/quantifiers/sygus/sygus_interpol.cpp +++ b/src/theory/quantifiers/sygus/sygus_interpol.cpp @@ -27,7 +27,7 @@ #include "theory/rewriter.h" #include "theory/smt_engine_subsolver.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -358,4 +358,4 @@ bool SygusInterpol::solveInterpolation(const std::string& name, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_interpol.h b/src/theory/quantifiers/sygus/sygus_interpol.h index 34517b6e6..c63d096b8 100644 --- a/src/theory/quantifiers/sygus/sygus_interpol.h +++ b/src/theory/quantifiers/sygus/sygus_interpol.h @@ -23,7 +23,7 @@ #include "expr/type_node.h" #include "smt/smt_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { /** @@ -213,6 +213,6 @@ class SygusInterpol } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_INTERPOL_H */ diff --git a/src/theory/quantifiers/sygus/sygus_invariance.cpp b/src/theory/quantifiers/sygus/sygus_invariance.cpp index 7e6c5ab6c..22ef38b0d 100644 --- a/src/theory/quantifiers/sygus/sygus_invariance.cpp +++ b/src/theory/quantifiers/sygus/sygus_invariance.cpp @@ -19,10 +19,10 @@ #include "theory/quantifiers/sygus/term_database_sygus.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -261,4 +261,4 @@ bool NegContainsSygusInvarianceTest::invariant(TermDbSygus* tds, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_invariance.h b/src/theory/quantifiers/sygus/sygus_invariance.h index 88e45df45..df2e189e3 100644 --- a/src/theory/quantifiers/sygus/sygus_invariance.h +++ b/src/theory/quantifiers/sygus/sygus_invariance.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -298,6 +298,6 @@ class NegContainsSygusInvarianceTest : public SygusInvarianceTest } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_INVARIANCE_H */ diff --git a/src/theory/quantifiers/sygus/sygus_module.cpp b/src/theory/quantifiers/sygus/sygus_module.cpp index 8dac30c7e..3f2bea9cb 100644 --- a/src/theory/quantifiers/sygus/sygus_module.cpp +++ b/src/theory/quantifiers/sygus/sygus_module.cpp @@ -14,7 +14,7 @@ #include "theory/quantifiers/sygus/sygus_module.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -27,4 +27,4 @@ SygusModule::SygusModule(QuantifiersInferenceManager& qim, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_module.h b/src/theory/quantifiers/sygus/sygus_module.h index 32f404005..90460eeed 100644 --- a/src/theory/quantifiers/sygus/sygus_module.h +++ b/src/theory/quantifiers/sygus/sygus_module.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -157,6 +157,6 @@ class SygusModule } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_MODULE_H */ diff --git a/src/theory/quantifiers/sygus/sygus_pbe.cpp b/src/theory/quantifiers/sygus/sygus_pbe.cpp index 25068eb7d..b54b1c940 100644 --- a/src/theory/quantifiers/sygus/sygus_pbe.cpp +++ b/src/theory/quantifiers/sygus/sygus_pbe.cpp @@ -22,10 +22,10 @@ #include "theory/quantifiers/term_util.h" #include "util/random.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -258,4 +258,4 @@ bool SygusPbe::constructCandidates(const std::vector<Node>& enums, } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_pbe.h b/src/theory/quantifiers/sygus/sygus_pbe.h index c63dcf697..a56a22838 100644 --- a/src/theory/quantifiers/sygus/sygus_pbe.h +++ b/src/theory/quantifiers/sygus/sygus_pbe.h @@ -19,7 +19,7 @@ #include "theory/quantifiers/sygus/sygus_module.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -168,6 +168,6 @@ class SygusPbe : public SygusModule } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_process_conj.cpp b/src/theory/quantifiers/sygus/sygus_process_conj.cpp index dfb0a0f7c..822d19f29 100644 --- a/src/theory/quantifiers/sygus/sygus_process_conj.cpp +++ b/src/theory/quantifiers/sygus/sygus_process_conj.cpp @@ -22,10 +22,10 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -804,4 +804,4 @@ void SynthConjectureProcess::getComponentVector(Kind k, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_process_conj.h b/src/theory/quantifiers/sygus/sygus_process_conj.h index 0b07db89b..6f6e25d0c 100644 --- a/src/theory/quantifiers/sygus/sygus_process_conj.h +++ b/src/theory/quantifiers/sygus/sygus_process_conj.h @@ -26,7 +26,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -358,6 +358,6 @@ class SynthConjectureProcess } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_qe_preproc.cpp b/src/theory/quantifiers/sygus/sygus_qe_preproc.cpp index 72ce3f1ab..1b3a52db8 100644 --- a/src/theory/quantifiers/sygus/sygus_qe_preproc.cpp +++ b/src/theory/quantifiers/sygus/sygus_qe_preproc.cpp @@ -19,9 +19,9 @@ #include "theory/rewriter.h" #include "theory/smt_engine_subsolver.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -144,4 +144,4 @@ Node SygusQePreproc::preprocess(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_qe_preproc.h b/src/theory/quantifiers/sygus/sygus_qe_preproc.h index 49f81df02..26bbf2f92 100644 --- a/src/theory/quantifiers/sygus/sygus_qe_preproc.h +++ b/src/theory/quantifiers/sygus/sygus_qe_preproc.h @@ -17,7 +17,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -45,6 +45,6 @@ class SygusQePreproc } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_QE_PREPROC_H */ diff --git a/src/theory/quantifiers/sygus/sygus_reconstruct.cpp b/src/theory/quantifiers/sygus/sygus_reconstruct.cpp index 723d924f8..55e8c922d 100644 --- a/src/theory/quantifiers/sygus/sygus_reconstruct.cpp +++ b/src/theory/quantifiers/sygus/sygus_reconstruct.cpp @@ -19,9 +19,9 @@ #include "theory/datatypes/sygus_datatype_utils.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -488,4 +488,4 @@ void SygusReconstruct::printPool( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_reconstruct.h b/src/theory/quantifiers/sygus/sygus_reconstruct.h index 0512fe643..1f9037a26 100644 --- a/src/theory/quantifiers/sygus/sygus_reconstruct.h +++ b/src/theory/quantifiers/sygus/sygus_reconstruct.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/sygus/rcons_obligation_info.h" #include "theory/quantifiers/sygus/rcons_type_info.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -307,6 +307,6 @@ class SygusReconstruct : public expr::NotifyMatch } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif // CVC4__THEORY__QUANTIFIERS__SYGUS_RECONSTRUCT_H diff --git a/src/theory/quantifiers/sygus/sygus_repair_const.cpp b/src/theory/quantifiers/sygus/sygus_repair_const.cpp index 2d7dfc4bc..179798222 100644 --- a/src/theory/quantifiers/sygus/sygus_repair_const.cpp +++ b/src/theory/quantifiers/sygus/sygus_repair_const.cpp @@ -29,9 +29,9 @@ #include "theory/quantifiers/sygus/term_database_sygus.h" #include "theory/smt_engine_subsolver.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -621,4 +621,4 @@ bool SygusRepairConst::getFitToLogicExcludeVar(LogicInfo& logic, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_repair_const.h b/src/theory/quantifiers/sygus/sygus_repair_const.h index 1e7eeb9fc..b79fa4177 100644 --- a/src/theory/quantifiers/sygus/sygus_repair_const.h +++ b/src/theory/quantifiers/sygus/sygus_repair_const.h @@ -20,7 +20,7 @@ #include <unordered_set> #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { class LogicInfo; @@ -209,6 +209,6 @@ class SygusRepairConst } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_REPAIR_CONST_H */ diff --git a/src/theory/quantifiers/sygus/sygus_stats.cpp b/src/theory/quantifiers/sygus/sygus_stats.cpp index da08ec1b5..11dec3e61 100644 --- a/src/theory/quantifiers/sygus/sygus_stats.cpp +++ b/src/theory/quantifiers/sygus/sygus_stats.cpp @@ -17,7 +17,7 @@ #include "smt/smt_statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -60,4 +60,4 @@ SygusStatistics::~SygusStatistics() } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_stats.h b/src/theory/quantifiers/sygus/sygus_stats.h index d89fa0eca..7a8ae8ce9 100644 --- a/src/theory/quantifiers/sygus/sygus_stats.h +++ b/src/theory/quantifiers/sygus/sygus_stats.h @@ -19,7 +19,7 @@ #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -53,6 +53,6 @@ class SygusStatistics } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_unif.cpp b/src/theory/quantifiers/sygus/sygus_unif.cpp index 8eb13fef8..2d72b4fab 100644 --- a/src/theory/quantifiers/sygus/sygus_unif.cpp +++ b/src/theory/quantifiers/sygus/sygus_unif.cpp @@ -19,9 +19,9 @@ #include "util/random.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -136,4 +136,4 @@ void SygusUnif::print_val(const char* c, std::vector<Node>& vals, bool pol) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_unif.h b/src/theory/quantifiers/sygus/sygus_unif.h index 153c4603b..1ed81194a 100644 --- a/src/theory/quantifiers/sygus/sygus_unif.h +++ b/src/theory/quantifiers/sygus/sygus_unif.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "theory/quantifiers/sygus/sygus_unif_strat.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -193,6 +193,6 @@ class SygusUnif } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */ diff --git a/src/theory/quantifiers/sygus/sygus_unif_io.cpp b/src/theory/quantifiers/sygus/sygus_unif_io.cpp index be24cb9e7..9dfac1d68 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_io.cpp +++ b/src/theory/quantifiers/sygus/sygus_unif_io.cpp @@ -26,9 +26,9 @@ #include <math.h> -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1677,4 +1677,4 @@ Node SygusUnifIo::constructBestConditional(Node ce, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_unif_io.h b/src/theory/quantifiers/sygus/sygus_unif_io.h index 5d4f7fb7d..825e5741d 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_io.h +++ b/src/theory/quantifiers/sygus/sygus_unif_io.h @@ -20,7 +20,7 @@ #include <map> #include "theory/quantifiers/sygus/sygus_unif.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -468,6 +468,6 @@ class SygusUnifIo : public SygusUnif } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_IO_H */ diff --git a/src/theory/quantifiers/sygus/sygus_unif_rl.cpp b/src/theory/quantifiers/sygus/sygus_unif_rl.cpp index 436678aa9..c3cff70d9 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_rl.cpp +++ b/src/theory/quantifiers/sygus/sygus_unif_rl.cpp @@ -24,9 +24,9 @@ #include <math.h> -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1207,4 +1207,4 @@ Node SygusUnifRl::DecisionTreeInfo::PointSeparator::computeCond(Node cond, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_unif_rl.h b/src/theory/quantifiers/sygus/sygus_unif_rl.h index 82f2a80d2..51c49cbef 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_rl.h +++ b/src/theory/quantifiers/sygus/sygus_unif_rl.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/lazy_trie.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -443,6 +443,6 @@ class SygusUnifRl : public SygusUnif } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_RL_H */ diff --git a/src/theory/quantifiers/sygus/sygus_unif_strat.cpp b/src/theory/quantifiers/sygus/sygus_unif_strat.cpp index 5551be630..24bcb1eab 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_strat.cpp +++ b/src/theory/quantifiers/sygus/sygus_unif_strat.cpp @@ -24,9 +24,9 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1050,4 +1050,4 @@ void SygusUnifStrategy::indent(const char* c, int ind) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_unif_strat.h b/src/theory/quantifiers/sygus/sygus_unif_strat.h index c9d6e5d96..2508fdc9b 100644 --- a/src/theory/quantifiers/sygus/sygus_unif_strat.h +++ b/src/theory/quantifiers/sygus/sygus_unif_strat.h @@ -20,7 +20,7 @@ #include <map> #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -428,6 +428,6 @@ class SygusUnifStrategy } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_UNIF_H */ diff --git a/src/theory/quantifiers/sygus/sygus_utils.cpp b/src/theory/quantifiers/sygus/sygus_utils.cpp index ec5edd640..6c14aaa80 100644 --- a/src/theory/quantifiers/sygus/sygus_utils.cpp +++ b/src/theory/quantifiers/sygus/sygus_utils.cpp @@ -20,9 +20,9 @@ #include "theory/quantifiers/quantifiers_attributes.h" #include "theory/quantifiers/sygus/sygus_grammar_cons.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -179,4 +179,4 @@ TypeNode SygusUtils::getSygusTypeForSynthFun(Node f) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/sygus_utils.h b/src/theory/quantifiers/sygus/sygus_utils.h index 2646dd1c8..0ec497789 100644 --- a/src/theory/quantifiers/sygus/sygus_utils.h +++ b/src/theory/quantifiers/sygus/sygus_utils.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "expr/subs.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -110,6 +110,6 @@ class SygusUtils } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__SYGUS_UTILS_H */ diff --git a/src/theory/quantifiers/sygus/synth_conjecture.cpp b/src/theory/quantifiers/sygus/synth_conjecture.cpp index 0bfa73048..f7566e7a2 100644 --- a/src/theory/quantifiers/sygus/synth_conjecture.cpp +++ b/src/theory/quantifiers/sygus/synth_conjecture.cpp @@ -37,10 +37,10 @@ #include "theory/rewriter.h" #include "theory/smt_engine_subsolver.h" -using namespace CVC5::kind; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1353,4 +1353,4 @@ ExampleEvalCache* SynthConjecture::getExampleEvalCache(Node e) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/synth_conjecture.h b/src/theory/quantifiers/sygus/synth_conjecture.h index e39f65d80..7fd1ae4b3 100644 --- a/src/theory/quantifiers/sygus/synth_conjecture.h +++ b/src/theory/quantifiers/sygus/synth_conjecture.h @@ -32,7 +32,7 @@ #include "theory/quantifiers/sygus/sygus_stats.h" #include "theory/quantifiers/sygus/template_infer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -426,6 +426,6 @@ class SynthConjecture } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/synth_engine.cpp b/src/theory/quantifiers/sygus/synth_engine.cpp index 4f1a0bbbb..3d5406f27 100644 --- a/src/theory/quantifiers/sygus/synth_engine.cpp +++ b/src/theory/quantifiers/sygus/synth_engine.cpp @@ -20,9 +20,9 @@ #include "theory/quantifiers/sygus/term_database_sygus.h" #include "theory/quantifiers/term_registry.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -290,4 +290,4 @@ void SynthEngine::preregisterAssertion(Node n) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/synth_engine.h b/src/theory/quantifiers/sygus/synth_engine.h index 30f9c181e..a5fde8476 100644 --- a/src/theory/quantifiers/sygus/synth_engine.h +++ b/src/theory/quantifiers/sygus/synth_engine.h @@ -24,7 +24,7 @@ #include "theory/quantifiers/sygus/sygus_stats.h" #include "theory/quantifiers/sygus/synth_conjecture.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -115,6 +115,6 @@ class SynthEngine : public QuantifiersModule } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/template_infer.cpp b/src/theory/quantifiers/sygus/template_infer.cpp index 84fcafd05..875b25370 100644 --- a/src/theory/quantifiers/sygus/template_infer.cpp +++ b/src/theory/quantifiers/sygus/template_infer.cpp @@ -19,9 +19,9 @@ #include "theory/quantifiers/sygus/sygus_utils.h" #include "theory/quantifiers/term_util.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -203,4 +203,4 @@ Node SygusTemplateInfer::getTemplateArg(Node prog) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/template_infer.h b/src/theory/quantifiers/sygus/template_infer.h index be35025bd..1ab97b651 100644 --- a/src/theory/quantifiers/sygus/template_infer.h +++ b/src/theory/quantifiers/sygus/template_infer.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/quantifiers/sygus/transition_inference.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -71,6 +71,6 @@ class SygusTemplateInfer } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/term_database_sygus.cpp b/src/theory/quantifiers/sygus/term_database_sygus.cpp index f50e222ff..34a81467a 100644 --- a/src/theory/quantifiers/sygus/term_database_sygus.cpp +++ b/src/theory/quantifiers/sygus/term_database_sygus.cpp @@ -30,9 +30,9 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1091,4 +1091,4 @@ bool TermDbSygus::isEvaluationPoint(Node n) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/term_database_sygus.h b/src/theory/quantifiers/sygus/term_database_sygus.h index 0bd0c636a..fb7e38ff8 100644 --- a/src/theory/quantifiers/sygus/term_database_sygus.h +++ b/src/theory/quantifiers/sygus/term_database_sygus.h @@ -28,7 +28,7 @@ #include "theory/quantifiers/sygus/type_info.h" #include "theory/quantifiers/term_database.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -467,6 +467,6 @@ class TermDbSygus { } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */ diff --git a/src/theory/quantifiers/sygus/transition_inference.cpp b/src/theory/quantifiers/sygus/transition_inference.cpp index 0b5946176..7ee2f2ec6 100644 --- a/src/theory/quantifiers/sygus/transition_inference.cpp +++ b/src/theory/quantifiers/sygus/transition_inference.cpp @@ -20,9 +20,9 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -585,4 +585,4 @@ Node TransitionInference::constructFormulaTrace(DetTrace& dt) const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/transition_inference.h b/src/theory/quantifiers/sygus/transition_inference.h index aed003357..8ddc1a320 100644 --- a/src/theory/quantifiers/sygus/transition_inference.h +++ b/src/theory/quantifiers/sygus/transition_inference.h @@ -27,7 +27,7 @@ #include "theory/quantifiers/inst_match_trie.h" #include "theory/quantifiers/single_inv_partition.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -332,6 +332,6 @@ class TransitionInference } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus/type_info.cpp b/src/theory/quantifiers/sygus/type_info.cpp index 19dff9936..fdc8ca6a3 100644 --- a/src/theory/quantifiers/sygus/type_info.cpp +++ b/src/theory/quantifiers/sygus/type_info.cpp @@ -22,9 +22,9 @@ #include "theory/quantifiers/sygus/term_database_sygus.h" #include "theory/quantifiers/sygus/type_node_id_trie.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -488,4 +488,4 @@ bool SygusTypeInfo::isSubclassVarTrivial() const } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/type_info.h b/src/theory/quantifiers/sygus/type_info.h index cc78fc526..79413a03c 100644 --- a/src/theory/quantifiers/sygus/type_info.h +++ b/src/theory/quantifiers/sygus/type_info.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -253,6 +253,6 @@ class SygusTypeInfo } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_INFO_H */ diff --git a/src/theory/quantifiers/sygus/type_node_id_trie.cpp b/src/theory/quantifiers/sygus/type_node_id_trie.cpp index 064543af8..a2c7b264d 100644 --- a/src/theory/quantifiers/sygus/type_node_id_trie.cpp +++ b/src/theory/quantifiers/sygus/type_node_id_trie.cpp @@ -14,9 +14,9 @@ #include "theory/quantifiers/sygus/type_node_id_trie.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -49,4 +49,4 @@ void TypeNodeIdTrie::assignIds(std::map<Node, unsigned>& assign, } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus/type_node_id_trie.h b/src/theory/quantifiers/sygus/type_node_id_trie.h index a60afda23..6311cbabe 100644 --- a/src/theory/quantifiers/sygus/type_node_id_trie.h +++ b/src/theory/quantifiers/sygus/type_node_id_trie.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -48,6 +48,6 @@ class TypeNodeIdTrie } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS__TYPE_NODE_ID_TRIE_H */ diff --git a/src/theory/quantifiers/sygus_inst.cpp b/src/theory/quantifiers/sygus_inst.cpp index 0b1d91684..81dc5cecb 100644 --- a/src/theory/quantifiers/sygus_inst.cpp +++ b/src/theory/quantifiers/sygus_inst.cpp @@ -28,7 +28,7 @@ #include "theory/quantifiers/term_util.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -553,4 +553,4 @@ void SygusInst::addCeLemma(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus_inst.h b/src/theory/quantifiers/sygus_inst.h index 08fc5ccb3..35b66437b 100644 --- a/src/theory/quantifiers/sygus_inst.h +++ b/src/theory/quantifiers/sygus_inst.h @@ -24,7 +24,7 @@ #include "theory/decision_strategy.h" #include "theory/quantifiers/quant_module.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersEngine; @@ -147,6 +147,6 @@ class SygusInst : public QuantifiersModule } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/quantifiers/sygus_sampler.cpp b/src/theory/quantifiers/sygus_sampler.cpp index 2b89c0c7c..5c7797a1a 100644 --- a/src/theory/quantifiers/sygus_sampler.cpp +++ b/src/theory/quantifiers/sygus_sampler.cpp @@ -30,7 +30,7 @@ #include "util/random.h" #include "util/sampler.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -845,4 +845,4 @@ void SygusSampler::checkEquivalent(Node bv, Node bvr) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/sygus_sampler.h b/src/theory/quantifiers/sygus_sampler.h index 65843dc63..7350f4845 100644 --- a/src/theory/quantifiers/sygus_sampler.h +++ b/src/theory/quantifiers/sygus_sampler.h @@ -23,7 +23,7 @@ #include "theory/quantifiers/sygus/term_database_sygus.h" #include "theory/quantifiers/term_enumeration.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -320,6 +320,6 @@ class SygusSampler : public LazyTrieEvaluator } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__SYGUS_SAMPLER_H */ diff --git a/src/theory/quantifiers/term_database.cpp b/src/theory/quantifiers/term_database.cpp index d6d7933cb..64c2fda76 100644 --- a/src/theory/quantifiers/term_database.cpp +++ b/src/theory/quantifiers/term_database.cpp @@ -28,10 +28,10 @@ #include "theory/rewriter.h" #include "theory/uf/equality_engine.h" -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -1232,4 +1232,4 @@ Node TermDb::getHoTypeMatchPredicate(TypeNode tn) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/term_database.h b/src/theory/quantifiers/term_database.h index d0812d1d1..2077b3d2d 100644 --- a/src/theory/quantifiers/term_database.h +++ b/src/theory/quantifiers/term_database.h @@ -28,7 +28,7 @@ #include "theory/theory.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -422,6 +422,6 @@ class TermDb : public QuantifiersUtil { } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TERM_DATABASE_H */ diff --git a/src/theory/quantifiers/term_enumeration.cpp b/src/theory/quantifiers/term_enumeration.cpp index 2945750c1..a13a19a77 100644 --- a/src/theory/quantifiers/term_enumeration.cpp +++ b/src/theory/quantifiers/term_enumeration.cpp @@ -16,9 +16,9 @@ #include "theory/quantifiers/quant_bound_inference.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -75,4 +75,4 @@ bool TermEnumeration::getDomain(TypeNode tn, std::vector<Node>& dom) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/term_enumeration.h b/src/theory/quantifiers/term_enumeration.h index fa7eaf63e..bd545ff50 100644 --- a/src/theory/quantifiers/term_enumeration.h +++ b/src/theory/quantifiers/term_enumeration.h @@ -24,7 +24,7 @@ #include "expr/type_node.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -71,6 +71,6 @@ class TermEnumeration } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TERM_ENUMERATION_H */ diff --git a/src/theory/quantifiers/term_registry.cpp b/src/theory/quantifiers/term_registry.cpp index cf33f0a41..8317271f9 100644 --- a/src/theory/quantifiers/term_registry.cpp +++ b/src/theory/quantifiers/term_registry.cpp @@ -20,7 +20,7 @@ #include "theory/quantifiers/fmf/first_order_model_fmc.h" #include "theory/quantifiers/quantifiers_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -134,4 +134,4 @@ bool TermRegistry::useFmcModel() const { return d_useFmcModel; } } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/term_registry.h b/src/theory/quantifiers/term_registry.h index e4e4a7e9f..79070fae8 100644 --- a/src/theory/quantifiers/term_registry.h +++ b/src/theory/quantifiers/term_registry.h @@ -25,7 +25,7 @@ #include "theory/quantifiers/term_database.h" #include "theory/quantifiers/term_enumeration.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -99,6 +99,6 @@ class TermRegistry } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TERM_REGISTRY_H */ diff --git a/src/theory/quantifiers/term_tuple_enumerator.cpp b/src/theory/quantifiers/term_tuple_enumerator.cpp index 546f6aa6c..e4e63787e 100644 --- a/src/theory/quantifiers/term_tuple_enumerator.cpp +++ b/src/theory/quantifiers/term_tuple_enumerator.cpp @@ -31,7 +31,7 @@ #include "theory/quantifiers/term_util.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { template <typename T> static CVC4ostream& operator<<(CVC4ostream& out, const std::vector<T>& v) @@ -505,4 +505,4 @@ TermTupleEnumeratorInterface* mkTermTupleEnumeratorRd( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/term_tuple_enumerator.h b/src/theory/quantifiers/term_tuple_enumerator.h index b15ab2212..4d6eb52f8 100644 --- a/src/theory/quantifiers/term_tuple_enumerator.h +++ b/src/theory/quantifiers/term_tuple_enumerator.h @@ -18,7 +18,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -94,5 +94,5 @@ TermTupleEnumeratorInterface* mkTermTupleEnumeratorRd( } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* TERM_TUPLE_ENUMERATOR_H_7640 */ diff --git a/src/theory/quantifiers/term_util.cpp b/src/theory/quantifiers/term_util.cpp index 41e06a708..8b1c1aa30 100644 --- a/src/theory/quantifiers/term_util.cpp +++ b/src/theory/quantifiers/term_util.cpp @@ -22,9 +22,9 @@ #include "theory/strings/word.h" #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -601,4 +601,4 @@ bool TermUtil::hasOffsetArg(Kind ik, int arg, int& offset, Kind& ok) } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/term_util.h b/src/theory/quantifiers/term_util.h index 1ac6ca495..d8a881e2e 100644 --- a/src/theory/quantifiers/term_util.h +++ b/src/theory/quantifiers/term_util.h @@ -22,7 +22,7 @@ #include "expr/attribute.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { // attribute for "contains instantiation constants from" @@ -206,6 +206,6 @@ public: } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__TERM_UTIL_H */ diff --git a/src/theory/quantifiers/theory_quantifiers.cpp b/src/theory/quantifiers/theory_quantifiers.cpp index d89abf076..c3c3fe7b6 100644 --- a/src/theory/quantifiers/theory_quantifiers.cpp +++ b/src/theory/quantifiers/theory_quantifiers.cpp @@ -22,10 +22,10 @@ #include "theory/quantifiers/quantifiers_rewriter.h" #include "theory/valuation.h" -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -184,4 +184,4 @@ void TheoryQuantifiers::setUserAttribute(const std::string& attr, Node n, std::v } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers/theory_quantifiers.h b/src/theory/quantifiers/theory_quantifiers.h index 6af0e8648..21c30390c 100644 --- a/src/theory/quantifiers/theory_quantifiers.h +++ b/src/theory/quantifiers/theory_quantifiers.h @@ -30,7 +30,7 @@ #include "theory/theory.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -98,6 +98,6 @@ class TheoryQuantifiers : public Theory { } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_H */ diff --git a/src/theory/quantifiers/theory_quantifiers_type_rules.h b/src/theory/quantifiers/theory_quantifiers_type_rules.h index e990f5320..53c077930 100644 --- a/src/theory/quantifiers/theory_quantifiers_type_rules.h +++ b/src/theory/quantifiers/theory_quantifiers_type_rules.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace quantifiers { @@ -131,6 +131,6 @@ struct QuantifierInstPatternListTypeRule { } // namespace quantifiers } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS__THEORY_QUANTIFIERS_TYPE_RULES_H */ diff --git a/src/theory/quantifiers_engine.cpp b/src/theory/quantifiers_engine.cpp index 12942c1c4..0bcf1d19c 100644 --- a/src/theory/quantifiers_engine.cpp +++ b/src/theory/quantifiers_engine.cpp @@ -37,9 +37,9 @@ #include "theory/theory_engine.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { QuantifiersEngine::QuantifiersEngine( @@ -653,4 +653,4 @@ bool QuantifiersEngine::getSynthSolutions( } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h index 4d4599f68..101dd03e7 100644 --- a/src/theory/quantifiers_engine.h +++ b/src/theory/quantifiers_engine.h @@ -25,7 +25,7 @@ #include "context/cdlist.h" #include "theory/quantifiers/quant_util.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -52,7 +52,7 @@ class TermRegistry; // TODO: organize this more/review this, github issue #1163 class QuantifiersEngine { - friend class ::CVC5::TheoryEngine; + friend class ::cvc5::TheoryEngine; typedef context::CDHashMap< Node, bool, NodeHashFunction > BoolMap; typedef context::CDHashSet<Node, NodeHashFunction> NodeSet; @@ -209,6 +209,6 @@ public: };/* class QuantifiersEngine */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__QUANTIFIERS_ENGINE_H */ diff --git a/src/theory/relevance_manager.cpp b/src/theory/relevance_manager.cpp index 5fda45954..b00d9af68 100644 --- a/src/theory/relevance_manager.cpp +++ b/src/theory/relevance_manager.cpp @@ -16,9 +16,9 @@ #include <sstream> -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { RelevanceManager::RelevanceManager(context::UserContext* userContext, @@ -314,4 +314,4 @@ bool RelevanceManager::isRelevant(Node lit) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/relevance_manager.h b/src/theory/relevance_manager.h index eea1d2c61..0a00e8c6b 100644 --- a/src/theory/relevance_manager.h +++ b/src/theory/relevance_manager.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -149,6 +149,6 @@ class RelevanceManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__RELEVANCE_MANAGER__H */ diff --git a/src/theory/rep_set.cpp b/src/theory/rep_set.cpp index 6492ac9f0..8ca7ba283 100644 --- a/src/theory/rep_set.cpp +++ b/src/theory/rep_set.cpp @@ -18,9 +18,9 @@ #include "theory/type_enumerator.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { void RepSet::clear(){ @@ -462,4 +462,4 @@ void RepSetIterator::debugPrintSmall( const char* c ){ } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/rep_set.h b/src/theory/rep_set.h index 4c7b04045..89128f0fd 100644 --- a/src/theory/rep_set.h +++ b/src/theory/rep_set.h @@ -23,7 +23,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class QuantifiersEngine; @@ -325,6 +325,6 @@ class RepBoundExt }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__REP_SET_H */ diff --git a/src/theory/rewriter.cpp b/src/theory/rewriter.cpp index 9e248c8d6..1d9620dab 100644 --- a/src/theory/rewriter.cpp +++ b/src/theory/rewriter.cpp @@ -29,7 +29,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { /** Attribute true for nodes that have been rewritten with proofs enabled */ @@ -512,4 +512,4 @@ void Rewriter::clearCaches() { } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/rewriter.h b/src/theory/rewriter.h index c5a8cd45e..94057aa54 100644 --- a/src/theory/rewriter.h +++ b/src/theory/rewriter.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { class TConvProofGenerator; class ProofNodeManager; @@ -232,4 +232,4 @@ class Rewriter { };/* class Rewriter */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/rewriter_attributes.h b/src/theory/rewriter_attributes.h index 83961353e..19116c020 100644 --- a/src/theory/rewriter_attributes.h +++ b/src/theory/rewriter_attributes.h @@ -20,7 +20,7 @@ #include "expr/attribute.h" -namespace CVC5 { +namespace cvc5 { namespace theory { template <bool pre, theory::TheoryId theoryId> @@ -99,4 +99,4 @@ struct RewriteAttibute { };/* struct RewriteAttribute */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/rewriter_tables_template.h b/src/theory/rewriter_tables_template.h index bd9b9575e..020ac1af6 100644 --- a/src/theory/rewriter_tables_template.h +++ b/src/theory/rewriter_tables_template.h @@ -26,7 +26,7 @@ ${rewriter_includes} -namespace CVC5 { +namespace cvc5 { namespace theory { Node Rewriter::getPreRewriteCache(theory::TheoryId theoryId, TNode node) { @@ -77,7 +77,7 @@ for (size_t i = 0; i < theory::THEORY_LAST; ++i) } void Rewriter::clearCachesInternal() { - typedef CVC5::expr::attr::AttributeUniqueId AttributeUniqueId; + typedef cvc5::expr::attr::AttributeUniqueId AttributeUniqueId; std::vector<AttributeUniqueId> preids; ${pre_rewrite_attribute_ids} @@ -95,4 +95,4 @@ void Rewriter::clearCachesInternal() { } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sep/kinds b/src/theory/sep/kinds index 666e3f179..17dfed893 100644 --- a/src/theory/sep/kinds +++ b/src/theory/sep/kinds @@ -4,13 +4,13 @@ # src/theory/builtin/kinds. # -theory THEORY_SEP ::CVC5::theory::sep::TheorySep "theory/sep/theory_sep.h" +theory THEORY_SEP ::cvc5::theory::sep::TheorySep "theory/sep/theory_sep.h" typechecker "theory/sep/theory_sep_type_rules.h" properties polite stable-infinite parametric properties check presolve -rewriter ::CVC5::theory::sep::TheorySepRewriter "theory/sep/theory_sep_rewriter.h" +rewriter ::cvc5::theory::sep::TheorySepRewriter "theory/sep/theory_sep_rewriter.h" nullaryoperator SEP_NIL "separation nil" @@ -20,11 +20,11 @@ operator SEP_STAR 2: "separation star" operator SEP_WAND 2 "separation magic wand" operator SEP_LABEL 2 "separation label (internal use only)" -typerule SEP_EMP ::CVC5::theory::sep::SepEmpTypeRule -typerule SEP_PTO ::CVC5::theory::sep::SepPtoTypeRule -typerule SEP_STAR ::CVC5::theory::sep::SepStarTypeRule -typerule SEP_WAND ::CVC5::theory::sep::SepWandTypeRule -typerule SEP_LABEL ::CVC5::theory::sep::SepLabelTypeRule -typerule SEP_NIL ::CVC5::theory::sep::SepNilTypeRule +typerule SEP_EMP ::cvc5::theory::sep::SepEmpTypeRule +typerule SEP_PTO ::cvc5::theory::sep::SepPtoTypeRule +typerule SEP_STAR ::cvc5::theory::sep::SepStarTypeRule +typerule SEP_WAND ::cvc5::theory::sep::SepWandTypeRule +typerule SEP_LABEL ::cvc5::theory::sep::SepLabelTypeRule +typerule SEP_NIL ::cvc5::theory::sep::SepNilTypeRule endtheory diff --git a/src/theory/sep/theory_sep.cpp b/src/theory/sep/theory_sep.cpp index 73fc565bd..ab9b1b08d 100644 --- a/src/theory/sep/theory_sep.cpp +++ b/src/theory/sep/theory_sep.cpp @@ -34,9 +34,9 @@ #include "theory/valuation.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sep { @@ -1798,4 +1798,4 @@ Node TheorySep::HeapInfo::getValue( TypeNode tn ) { } // namespace sep } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sep/theory_sep.h b/src/theory/sep/theory_sep.h index 029cbada5..d52a3bca5 100644 --- a/src/theory/sep/theory_sep.h +++ b/src/theory/sep/theory_sep.h @@ -31,7 +31,7 @@ #include "theory/uf/equality_engine.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class TheoryModel; @@ -351,6 +351,6 @@ class TheorySep : public Theory { } // namespace sep } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SEP__THEORY_SEP_H */ diff --git a/src/theory/sep/theory_sep_rewriter.cpp b/src/theory/sep/theory_sep_rewriter.cpp index 756a82bc1..d7cebd465 100644 --- a/src/theory/sep/theory_sep_rewriter.cpp +++ b/src/theory/sep/theory_sep_rewriter.cpp @@ -20,7 +20,7 @@ #include "theory/quantifiers/quant_util.h" #include "options/sep_options.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sep { @@ -166,4 +166,4 @@ RewriteResponse TheorySepRewriter::postRewrite(TNode node) { } // namespace sep } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sep/theory_sep_rewriter.h b/src/theory/sep/theory_sep_rewriter.h index 97124bd0d..2ee969fc2 100644 --- a/src/theory/sep/theory_sep_rewriter.h +++ b/src/theory/sep/theory_sep_rewriter.h @@ -23,7 +23,7 @@ #include "theory/theory_rewriter.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sep { @@ -49,6 +49,6 @@ class TheorySepRewriter : public TheoryRewriter } // namespace sep } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SEP__THEORY_SEP_REWRITER_H */ diff --git a/src/theory/sep/theory_sep_type_rules.h b/src/theory/sep/theory_sep_type_rules.h index 8618ce4d6..a83f036c1 100644 --- a/src/theory/sep/theory_sep_type_rules.h +++ b/src/theory/sep/theory_sep_type_rules.h @@ -19,7 +19,7 @@ #ifndef CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H #define CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sep { @@ -109,6 +109,6 @@ struct SepNilTypeRule { } // namespace sep } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SEP__THEORY_SEP_TYPE_RULES_H */ diff --git a/src/theory/sets/cardinality_extension.cpp b/src/theory/sets/cardinality_extension.cpp index 84e7786e8..b67df285d 100644 --- a/src/theory/sets/cardinality_extension.cpp +++ b/src/theory/sets/cardinality_extension.cpp @@ -25,9 +25,9 @@ #include "theory/valuation.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -1114,4 +1114,4 @@ const std::vector<Node>& CardinalityExtension::getFiniteTypeMembers( } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/cardinality_extension.h b/src/theory/sets/cardinality_extension.h index 47fa18d5b..c354f3f3a 100644 --- a/src/theory/sets/cardinality_extension.h +++ b/src/theory/sets/cardinality_extension.h @@ -25,7 +25,7 @@ #include "theory/type_set.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -412,6 +412,6 @@ class CardinalityExtension } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/sets/inference_manager.cpp b/src/theory/sets/inference_manager.cpp index 305059797..2523512cc 100644 --- a/src/theory/sets/inference_manager.cpp +++ b/src/theory/sets/inference_manager.cpp @@ -18,9 +18,9 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -177,4 +177,4 @@ void InferenceManager::split(Node n, InferenceId id, int reqPol) } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/inference_manager.h b/src/theory/sets/inference_manager.h index 8e4614718..90d2ce12a 100644 --- a/src/theory/sets/inference_manager.h +++ b/src/theory/sets/inference_manager.h @@ -20,7 +20,7 @@ #include "theory/inference_manager_buffered.h" #include "theory/sets/solver_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -100,6 +100,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__INFERENCE_MANAGER_H */ diff --git a/src/theory/sets/kinds b/src/theory/sets/kinds index 4ef22d68c..564779f6a 100644 --- a/src/theory/sets/kinds +++ b/src/theory/sets/kinds @@ -5,10 +5,10 @@ # theory THEORY_SETS \ - ::CVC5::theory::sets::TheorySets \ + ::cvc5::theory::sets::TheorySets \ "theory/sets/theory_sets.h" typechecker "theory/sets/theory_sets_type_rules.h" -rewriter ::CVC5::theory::sets::TheorySetsRewriter \ +rewriter ::cvc5::theory::sets::TheorySetsRewriter \ "theory/sets/theory_sets_rewriter.h" properties parametric @@ -16,22 +16,22 @@ properties check presolve # constants constant EMPTYSET \ - ::CVC5::EmptySet \ - ::CVC5::EmptySetHashFunction \ + ::cvc5::EmptySet \ + ::cvc5::EmptySetHashFunction \ "expr/emptyset.h" \ - "the empty set constant; payload is an instance of the CVC5::EmptySet class" + "the empty set constant; payload is an instance of the cvc5::EmptySet class" # the type operator SET_TYPE 1 "set type, takes as parameter the type of the elements" cardinality SET_TYPE \ - "::CVC5::theory::sets::SetsProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::sets::SetsProperties::computeCardinality(%TYPE%)" \ "theory/sets/theory_sets_type_rules.h" well-founded SET_TYPE \ - "::CVC5::theory::sets::SetsProperties::isWellFounded(%TYPE%)" \ - "::CVC5::theory::sets::SetsProperties::mkGroundTerm(%TYPE%)" \ + "::cvc5::theory::sets::SetsProperties::isWellFounded(%TYPE%)" \ + "::cvc5::theory::sets::SetsProperties::mkGroundTerm(%TYPE%)" \ "theory/sets/theory_sets_type_rules.h" enumerator SET_TYPE \ - "::CVC5::theory::sets::SetEnumerator" \ + "::cvc5::theory::sets::SetEnumerator" \ "theory/sets/theory_sets_type_enumerator.h" # operators @@ -42,10 +42,10 @@ operator SUBSET 2 "subset predicate; first parameter a subset of second operator MEMBER 2 "set membership predicate; first parameter a member of second" constant SINGLETON_OP \ - ::CVC5::SingletonOp \ - ::CVC5::SingletonOpHashFunction \ + ::cvc5::SingletonOp \ + ::cvc5::SingletonOpHashFunction \ "theory/sets/singleton_op.h" \ - "operator for singletons; payload is an instance of the CVC5::SingletonOp class" + "operator for singletons; payload is an instance of the cvc5::SingletonOp class" parameterized SINGLETON SINGLETON_OP 1 \ "constructs a set of a single element. First parameter is a SingletonOp. Second is a term" @@ -85,30 +85,30 @@ operator TCLOSURE 1 "set transitive closure" operator JOIN_IMAGE 2 "set join image" operator IDEN 1 "set identity" -typerule UNION ::CVC5::theory::sets::SetsBinaryOperatorTypeRule -typerule INTERSECTION ::CVC5::theory::sets::SetsBinaryOperatorTypeRule -typerule SETMINUS ::CVC5::theory::sets::SetsBinaryOperatorTypeRule -typerule SUBSET ::CVC5::theory::sets::SubsetTypeRule -typerule MEMBER ::CVC5::theory::sets::MemberTypeRule +typerule UNION ::cvc5::theory::sets::SetsBinaryOperatorTypeRule +typerule INTERSECTION ::cvc5::theory::sets::SetsBinaryOperatorTypeRule +typerule SETMINUS ::cvc5::theory::sets::SetsBinaryOperatorTypeRule +typerule SUBSET ::cvc5::theory::sets::SubsetTypeRule +typerule MEMBER ::cvc5::theory::sets::MemberTypeRule typerule SINGLETON_OP "SimpleTypeRule<RBuiltinOperator>" -typerule SINGLETON ::CVC5::theory::sets::SingletonTypeRule -typerule EMPTYSET ::CVC5::theory::sets::EmptySetTypeRule -typerule INSERT ::CVC5::theory::sets::InsertTypeRule -typerule CARD ::CVC5::theory::sets::CardTypeRule -typerule COMPLEMENT ::CVC5::theory::sets::ComplementTypeRule -typerule UNIVERSE_SET ::CVC5::theory::sets::UniverseSetTypeRule -typerule COMPREHENSION ::CVC5::theory::sets::ComprehensionTypeRule -typerule CHOOSE ::CVC5::theory::sets::ChooseTypeRule -typerule IS_SINGLETON ::CVC5::theory::sets::IsSingletonTypeRule +typerule SINGLETON ::cvc5::theory::sets::SingletonTypeRule +typerule EMPTYSET ::cvc5::theory::sets::EmptySetTypeRule +typerule INSERT ::cvc5::theory::sets::InsertTypeRule +typerule CARD ::cvc5::theory::sets::CardTypeRule +typerule COMPLEMENT ::cvc5::theory::sets::ComplementTypeRule +typerule UNIVERSE_SET ::cvc5::theory::sets::UniverseSetTypeRule +typerule COMPREHENSION ::cvc5::theory::sets::ComprehensionTypeRule +typerule CHOOSE ::cvc5::theory::sets::ChooseTypeRule +typerule IS_SINGLETON ::cvc5::theory::sets::IsSingletonTypeRule -typerule JOIN ::CVC5::theory::sets::RelBinaryOperatorTypeRule -typerule PRODUCT ::CVC5::theory::sets::RelBinaryOperatorTypeRule -typerule TRANSPOSE ::CVC5::theory::sets::RelTransposeTypeRule -typerule TCLOSURE ::CVC5::theory::sets::RelTransClosureTypeRule -typerule JOIN_IMAGE ::CVC5::theory::sets::JoinImageTypeRule -typerule IDEN ::CVC5::theory::sets::RelIdenTypeRule +typerule JOIN ::cvc5::theory::sets::RelBinaryOperatorTypeRule +typerule PRODUCT ::cvc5::theory::sets::RelBinaryOperatorTypeRule +typerule TRANSPOSE ::cvc5::theory::sets::RelTransposeTypeRule +typerule TCLOSURE ::cvc5::theory::sets::RelTransClosureTypeRule +typerule JOIN_IMAGE ::cvc5::theory::sets::JoinImageTypeRule +typerule IDEN ::cvc5::theory::sets::RelIdenTypeRule -construle UNION ::CVC5::theory::sets::SetsBinaryOperatorTypeRule -construle SINGLETON ::CVC5::theory::sets::SingletonTypeRule +construle UNION ::cvc5::theory::sets::SetsBinaryOperatorTypeRule +construle SINGLETON ::cvc5::theory::sets::SingletonTypeRule endtheory diff --git a/src/theory/sets/normal_form.h b/src/theory/sets/normal_form.h index 197f31903..c0f02da7d 100644 --- a/src/theory/sets/normal_form.h +++ b/src/theory/sets/normal_form.h @@ -19,7 +19,7 @@ #ifndef CVC4__THEORY__SETS__NORMAL_FORM_H #define CVC4__THEORY__SETS__NORMAL_FORM_H -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -158,6 +158,6 @@ class NormalForm { }; } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/sets/rels_utils.h b/src/theory/sets/rels_utils.h index eb3477f5a..545e3c08c 100644 --- a/src/theory/sets/rels_utils.h +++ b/src/theory/sets/rels_utils.h @@ -21,7 +21,7 @@ #include "expr/dtype_cons.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -98,6 +98,6 @@ public: }; } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/sets/singleton_op.cpp b/src/theory/sets/singleton_op.cpp index 4e76d35e4..0fc411788 100644 --- a/src/theory/sets/singleton_op.cpp +++ b/src/theory/sets/singleton_op.cpp @@ -18,7 +18,7 @@ #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { std::ostream& operator<<(std::ostream& out, const SingletonOp& op) { @@ -47,4 +47,4 @@ bool SingletonOp::operator==(const SingletonOp& op) const return getType() == op.getType(); } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/singleton_op.h b/src/theory/sets/singleton_op.h index d17f8255e..7e338e518 100644 --- a/src/theory/sets/singleton_op.h +++ b/src/theory/sets/singleton_op.h @@ -19,7 +19,7 @@ #include <memory> -namespace CVC5 { +namespace cvc5 { class TypeNode; @@ -58,6 +58,6 @@ struct SingletonOpHashFunction size_t operator()(const SingletonOp& op) const; }; /* struct SingletonOpHashFunction */ -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__SINGLETON_OP_H */ diff --git a/src/theory/sets/skolem_cache.cpp b/src/theory/sets/skolem_cache.cpp index 3c0f33caf..c18e9406d 100644 --- a/src/theory/sets/skolem_cache.cpp +++ b/src/theory/sets/skolem_cache.cpp @@ -16,9 +16,9 @@ #include "theory/rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -61,4 +61,4 @@ bool SkolemCache::isSkolem(Node n) const } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/skolem_cache.h b/src/theory/sets/skolem_cache.h index 42369c7a9..17e4bda71 100644 --- a/src/theory/sets/skolem_cache.h +++ b/src/theory/sets/skolem_cache.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -78,6 +78,6 @@ class SkolemCache } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */ diff --git a/src/theory/sets/solver_state.cpp b/src/theory/sets/solver_state.cpp index ff604f838..31f0d4aa3 100644 --- a/src/theory/sets/solver_state.cpp +++ b/src/theory/sets/solver_state.cpp @@ -19,9 +19,9 @@ #include "theory/sets/theory_sets_private.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -595,4 +595,4 @@ bool SolverState::merge(TNode t1, } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/solver_state.h b/src/theory/sets/solver_state.h index 431aa019d..cbbb53d88 100644 --- a/src/theory/sets/solver_state.h +++ b/src/theory/sets/solver_state.h @@ -24,7 +24,7 @@ #include "theory/theory_state.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -268,6 +268,6 @@ class SolverState : public TheoryState } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__THEORY_SOLVER_STATE_H */ diff --git a/src/theory/sets/term_registry.cpp b/src/theory/sets/term_registry.cpp index 6dc18591c..a093840f7 100644 --- a/src/theory/sets/term_registry.cpp +++ b/src/theory/sets/term_registry.cpp @@ -17,9 +17,9 @@ #include "expr/emptyset.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -151,4 +151,4 @@ void TermRegistry::debugPrintSet(Node s, const char* c) const } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/term_registry.h b/src/theory/sets/term_registry.h index 913473ff0..3d1035c75 100644 --- a/src/theory/sets/term_registry.h +++ b/src/theory/sets/term_registry.h @@ -25,7 +25,7 @@ #include "theory/sets/skolem_cache.h" #include "theory/sets/solver_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -89,6 +89,6 @@ class TermRegistry } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__TERM_REGISTRY_H */ diff --git a/src/theory/sets/theory_sets.cpp b/src/theory/sets/theory_sets.cpp index 1530da809..bd682ca57 100644 --- a/src/theory/sets/theory_sets.cpp +++ b/src/theory/sets/theory_sets.cpp @@ -22,9 +22,9 @@ #include "theory/theory_model.h" #include "theory/trust_substitutions.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -238,4 +238,4 @@ void TheorySets::NotifyClass::eqNotifyDisequal(TNode t1, TNode t2, TNode reason) } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/theory_sets.h b/src/theory/sets/theory_sets.h index 4dc5d8a0d..16829bc6d 100644 --- a/src/theory/sets/theory_sets.h +++ b/src/theory/sets/theory_sets.h @@ -29,7 +29,7 @@ #include "theory/theory_eq_notify.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -120,6 +120,6 @@ class TheorySets : public Theory } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__THEORY_SETS_H */ diff --git a/src/theory/sets/theory_sets_private.cpp b/src/theory/sets/theory_sets_private.cpp index 285eac473..8d005c6fe 100644 --- a/src/theory/sets/theory_sets_private.cpp +++ b/src/theory/sets/theory_sets_private.cpp @@ -29,9 +29,9 @@ #include "util/result.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -1372,4 +1372,4 @@ void TheorySetsPrivate::presolve() { d_state.reset(); } } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/theory_sets_private.h b/src/theory/sets/theory_sets_private.h index a822d06e7..c2f266971 100644 --- a/src/theory/sets/theory_sets_private.h +++ b/src/theory/sets/theory_sets_private.h @@ -31,7 +31,7 @@ #include "theory/theory.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -236,6 +236,6 @@ class TheorySetsPrivate { } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__THEORY_SETS_PRIVATE_H */ diff --git a/src/theory/sets/theory_sets_rels.cpp b/src/theory/sets/theory_sets_rels.cpp index a160e0afd..6609e4923 100644 --- a/src/theory/sets/theory_sets_rels.cpp +++ b/src/theory/sets/theory_sets_rels.cpp @@ -19,9 +19,9 @@ #include "theory/sets/theory_sets.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -1333,4 +1333,4 @@ void TheorySetsRels::check(Theory::Effort level) } } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/theory_sets_rels.h b/src/theory/sets/theory_sets_rels.h index 93913d4f5..badf14bd0 100644 --- a/src/theory/sets/theory_sets_rels.h +++ b/src/theory/sets/theory_sets_rels.h @@ -28,7 +28,7 @@ #include "theory/theory.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -185,6 +185,6 @@ private: } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* SRC_THEORY_SETS_THEORY_SETS_RELS_H_ */ diff --git a/src/theory/sets/theory_sets_rewriter.cpp b/src/theory/sets/theory_sets_rewriter.cpp index 935eb548d..9007cc250 100644 --- a/src/theory/sets/theory_sets_rewriter.cpp +++ b/src/theory/sets/theory_sets_rewriter.cpp @@ -22,9 +22,9 @@ #include "theory/sets/normal_form.h" #include "theory/sets/rels_utils.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -542,4 +542,4 @@ RewriteResponse TheorySetsRewriter::preRewrite(TNode node) { } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/theory_sets_rewriter.h b/src/theory/sets/theory_sets_rewriter.h index 739a5f885..501a58430 100644 --- a/src/theory/sets/theory_sets_rewriter.h +++ b/src/theory/sets/theory_sets_rewriter.h @@ -21,7 +21,7 @@ #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -79,6 +79,6 @@ private: } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__THEORY_SETS_REWRITER_H */ diff --git a/src/theory/sets/theory_sets_type_enumerator.cpp b/src/theory/sets/theory_sets_type_enumerator.cpp index 30e279be7..87fcd2d8f 100644 --- a/src/theory/sets/theory_sets_type_enumerator.cpp +++ b/src/theory/sets/theory_sets_type_enumerator.cpp @@ -16,7 +16,7 @@ #include "theory/sets/theory_sets_type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -130,4 +130,4 @@ bool SetEnumerator::isFinished() } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sets/theory_sets_type_enumerator.h b/src/theory/sets/theory_sets_type_enumerator.h index 32aca5f79..006afc964 100644 --- a/src/theory/sets/theory_sets_type_enumerator.h +++ b/src/theory/sets/theory_sets_type_enumerator.h @@ -26,7 +26,7 @@ #include "theory/sets/normal_form.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -68,6 +68,6 @@ class SetEnumerator : public TypeEnumeratorBase<SetEnumerator> } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/sets/theory_sets_type_rules.h b/src/theory/sets/theory_sets_type_rules.h index 54791ac31..ab82ba710 100644 --- a/src/theory/sets/theory_sets_type_rules.h +++ b/src/theory/sets/theory_sets_type_rules.h @@ -23,7 +23,7 @@ #include "theory/sets/normal_form.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace sets { @@ -390,7 +390,7 @@ struct JoinImageTypeRule { throw TypeCheckingExceptionPrivate( n, " JoinImage cardinality constraint must be a constant"); } - CVC5::Rational r(INT_MAX); + cvc5::Rational r(INT_MAX); if (n[1].getConst<Rational>() > r) { throw TypeCheckingExceptionPrivate( n, " JoinImage Exceeded INT_MAX in cardinality constraint"); @@ -444,6 +444,6 @@ struct SetsProperties { } // namespace sets } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SETS__THEORY_SETS_TYPE_RULES_H */ diff --git a/src/theory/shared_solver.cpp b/src/theory/shared_solver.cpp index 816ceb31a..3e8eb305c 100644 --- a/src/theory/shared_solver.cpp +++ b/src/theory/shared_solver.cpp @@ -19,7 +19,7 @@ #include "theory/logic_info.h" #include "theory/theory_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { // Always creates shared terms database. In all cases, shared terms @@ -130,4 +130,4 @@ bool SharedSolver::propagateSharedEquality(theory::TheoryId theory, bool SharedSolver::isShared(TNode t) const { return d_sharedTerms.isShared(t); } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/shared_solver.h b/src/theory/shared_solver.h index 8463e1d46..7c6fb23a3 100644 --- a/src/theory/shared_solver.h +++ b/src/theory/shared_solver.h @@ -22,7 +22,7 @@ #include "theory/term_registration_visitor.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { class LogicInfo; class ProofNodeManager; @@ -134,6 +134,6 @@ class SharedSolver }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SHARED_SOLVER__H */ diff --git a/src/theory/shared_solver_distributed.cpp b/src/theory/shared_solver_distributed.cpp index 70932e6a6..aecf1fc73 100644 --- a/src/theory/shared_solver_distributed.cpp +++ b/src/theory/shared_solver_distributed.cpp @@ -16,7 +16,7 @@ #include "theory/theory_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { SharedSolverDistributed::SharedSolverDistributed(TheoryEngine& te, @@ -93,4 +93,4 @@ void SharedSolverDistributed::assertSharedEquality(TNode equality, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/shared_solver_distributed.h b/src/theory/shared_solver_distributed.h index 95e23024d..49e4974ca 100644 --- a/src/theory/shared_solver_distributed.h +++ b/src/theory/shared_solver_distributed.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/shared_solver.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -59,6 +59,6 @@ class SharedSolverDistributed : public SharedSolver }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SHARED_SOLVER_DISTRIBUTED__H */ diff --git a/src/theory/shared_terms_database.cpp b/src/theory/shared_terms_database.cpp index e82897c98..890269ce2 100644 --- a/src/theory/shared_terms_database.cpp +++ b/src/theory/shared_terms_database.cpp @@ -19,9 +19,9 @@ #include "theory/theory_engine.h" using namespace std; -using namespace CVC5::theory; +using namespace cvc5::theory; -namespace CVC5 { +namespace cvc5 { SharedTermsDatabase::SharedTermsDatabase(TheoryEngine* theoryEngine, context::Context* context, @@ -317,4 +317,4 @@ theory::TrustNode SharedTermsDatabase::explain(TNode literal) const return TrustNode::mkTrustPropExp(literal, exp, nullptr); } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/shared_terms_database.h b/src/theory/shared_terms_database.h index a7bc77251..6cb955c09 100644 --- a/src/theory/shared_terms_database.h +++ b/src/theory/shared_terms_database.h @@ -29,7 +29,7 @@ #include "theory/uf/proof_equality_engine.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -278,4 +278,4 @@ class SharedTermsDatabase : public context::ContextNotifyObj { ProofNodeManager* d_pnm; }; -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/skolem_lemma.cpp b/src/theory/skolem_lemma.cpp index 1b10d3ac8..c8125129f 100644 --- a/src/theory/skolem_lemma.cpp +++ b/src/theory/skolem_lemma.cpp @@ -16,7 +16,7 @@ #include "expr/skolem_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { SkolemLemma::SkolemLemma(TrustNode lem, Node k) : d_lemma(lem), d_skolem(k) @@ -40,4 +40,4 @@ Node SkolemLemma::getSkolemLemmaFor(Node k) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/skolem_lemma.h b/src/theory/skolem_lemma.h index c7ab08429..d67f71cf6 100644 --- a/src/theory/skolem_lemma.h +++ b/src/theory/skolem_lemma.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -59,6 +59,6 @@ class SkolemLemma }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SKOLEM_LEMMA_H */ diff --git a/src/theory/smt_engine_subsolver.cpp b/src/theory/smt_engine_subsolver.cpp index 15e9b4214..a6202a74f 100644 --- a/src/theory/smt_engine_subsolver.cpp +++ b/src/theory/smt_engine_subsolver.cpp @@ -19,7 +19,7 @@ #include "smt/smt_engine_scope.h" #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { // optimization: try to rewrite to constant @@ -119,4 +119,4 @@ Result checkWithSubsolver(Node query, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/smt_engine_subsolver.h b/src/theory/smt_engine_subsolver.h index d94f9227d..100ea2de9 100644 --- a/src/theory/smt_engine_subsolver.h +++ b/src/theory/smt_engine_subsolver.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "smt/smt_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -91,6 +91,6 @@ Result checkWithSubsolver(Node query, unsigned long timeout = 0); } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SMT_ENGINE_SUBSOLVER_H */ diff --git a/src/theory/sort_inference.cpp b/src/theory/sort_inference.cpp index cad11fcf3..fb3551e9a 100644 --- a/src/theory/sort_inference.cpp +++ b/src/theory/sort_inference.cpp @@ -30,11 +30,11 @@ #include "theory/rewriter.h" #include "theory/quantifiers/quant_util.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { void SortInference::UnionFind::print(const char * c){ @@ -869,4 +869,4 @@ bool SortInference::isHandledApplyUf(Kind k) const } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/sort_inference.h b/src/theory/sort_inference.h index b32026256..cb80df221 100644 --- a/src/theory/sort_inference.h +++ b/src/theory/sort_inference.h @@ -23,7 +23,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** sort inference @@ -166,6 +166,6 @@ private: }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/strings/arith_entail.cpp b/src/theory/strings/arith_entail.cpp index 36ead8685..a1b2c487f 100644 --- a/src/theory/strings/arith_entail.cpp +++ b/src/theory/strings/arith_entail.cpp @@ -22,9 +22,9 @@ #include "theory/strings/word.h" #include "theory/theory.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -866,4 +866,4 @@ bool ArithEntail::inferZerosInSumGeq(Node x, } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/arith_entail.h b/src/theory/strings/arith_entail.h index 22011d51b..1726dac0b 100644 --- a/src/theory/strings/arith_entail.h +++ b/src/theory/strings/arith_entail.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -175,6 +175,6 @@ class ArithEntail } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/strings/base_solver.cpp b/src/theory/strings/base_solver.cpp index b9802b9a5..4cf8c897e 100644 --- a/src/theory/strings/base_solver.cpp +++ b/src/theory/strings/base_solver.cpp @@ -22,10 +22,10 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -760,4 +760,4 @@ Node BaseSolver::TermIndex::add(TNode n, } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/base_solver.h b/src/theory/strings/base_solver.h index 43cb63b47..4ad5c3dec 100644 --- a/src/theory/strings/base_solver.h +++ b/src/theory/strings/base_solver.h @@ -26,7 +26,7 @@ #include "theory/strings/skolem_cache.h" #include "theory/strings/solver_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -243,6 +243,6 @@ class BaseSolver } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__BASE_SOLVER_H */ diff --git a/src/theory/strings/core_solver.cpp b/src/theory/strings/core_solver.cpp index 8593a1e36..6a461cb7a 100644 --- a/src/theory/strings/core_solver.cpp +++ b/src/theory/strings/core_solver.cpp @@ -26,10 +26,10 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -2651,4 +2651,4 @@ bool CoreSolver::processInferInfo(CoreInferInfo& cii) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/core_solver.h b/src/theory/strings/core_solver.h index 53bb167c4..7392659c5 100644 --- a/src/theory/strings/core_solver.h +++ b/src/theory/strings/core_solver.h @@ -27,7 +27,7 @@ #include "theory/strings/solver_state.h" #include "theory/strings/term_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -523,6 +523,6 @@ class CoreSolver } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__CORE_SOLVER_H */ diff --git a/src/theory/strings/eager_solver.cpp b/src/theory/strings/eager_solver.cpp index e2cb01408..3d23a95a0 100644 --- a/src/theory/strings/eager_solver.cpp +++ b/src/theory/strings/eager_solver.cpp @@ -16,9 +16,9 @@ #include "theory/strings/theory_strings_utils.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -148,4 +148,4 @@ void EagerSolver::notifyFact(TNode atom, } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/eager_solver.h b/src/theory/strings/eager_solver.h index 49545e622..1d4682c49 100644 --- a/src/theory/strings/eager_solver.h +++ b/src/theory/strings/eager_solver.h @@ -23,7 +23,7 @@ #include "theory/strings/eqc_info.h" #include "theory/strings/solver_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -63,6 +63,6 @@ class EagerSolver } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__EAGER_SOLVER_H */ diff --git a/src/theory/strings/eqc_info.cpp b/src/theory/strings/eqc_info.cpp index 0bb2defb6..be2d402a1 100644 --- a/src/theory/strings/eqc_info.cpp +++ b/src/theory/strings/eqc_info.cpp @@ -18,10 +18,10 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -139,4 +139,4 @@ Node EqcInfo::addEndpointConst(Node t, Node c, bool isSuf) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/eqc_info.h b/src/theory/strings/eqc_info.h index a00cd49ea..23d566ef1 100644 --- a/src/theory/strings/eqc_info.h +++ b/src/theory/strings/eqc_info.h @@ -23,7 +23,7 @@ #include "context/context.h" #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -76,6 +76,6 @@ class EqcInfo } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__EQC_INFO_H */ diff --git a/src/theory/strings/extf_solver.cpp b/src/theory/strings/extf_solver.cpp index ab7c1d0ac..39bcb8f53 100644 --- a/src/theory/strings/extf_solver.cpp +++ b/src/theory/strings/extf_solver.cpp @@ -20,10 +20,10 @@ #include "theory/strings/theory_strings_utils.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -724,4 +724,4 @@ bool StringsExtfCallback::getCurrentSubstitution( } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/extf_solver.h b/src/theory/strings/extf_solver.h index 4b63f261a..3cfe2309c 100644 --- a/src/theory/strings/extf_solver.h +++ b/src/theory/strings/extf_solver.h @@ -32,7 +32,7 @@ #include "theory/strings/strings_rewriter.h" #include "theory/strings/theory_strings_preprocess.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -227,6 +227,6 @@ class StringsExtfCallback : public ExtTheoryCallback } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__EXTF_SOLVER_H */ diff --git a/src/theory/strings/infer_info.cpp b/src/theory/strings/infer_info.cpp index 5e2006f65..bce30096f 100644 --- a/src/theory/strings/infer_info.cpp +++ b/src/theory/strings/infer_info.cpp @@ -17,7 +17,7 @@ #include "theory/strings/inference_manager.h" #include "theory/strings/theory_strings_utils.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -90,4 +90,4 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/infer_info.h b/src/theory/strings/infer_info.h index 9c228c197..45a5da2d6 100644 --- a/src/theory/strings/infer_info.h +++ b/src/theory/strings/infer_info.h @@ -25,7 +25,7 @@ #include "theory/theory_inference.h" #include "util/safe_print.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -131,6 +131,6 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii); } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__INFER_INFO_H */ diff --git a/src/theory/strings/infer_proof_cons.cpp b/src/theory/strings/infer_proof_cons.cpp index c600ce31d..3005fcd19 100644 --- a/src/theory/strings/infer_proof_cons.cpp +++ b/src/theory/strings/infer_proof_cons.cpp @@ -23,9 +23,9 @@ #include "theory/strings/regexp_operation.h" #include "theory/strings/theory_strings_utils.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -1042,4 +1042,4 @@ std::string InferProofCons::identify() const } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/infer_proof_cons.h b/src/theory/strings/infer_proof_cons.h index 7d7d7e54a..677ba2e22 100644 --- a/src/theory/strings/infer_proof_cons.h +++ b/src/theory/strings/infer_proof_cons.h @@ -28,7 +28,7 @@ #include "theory/theory_proof_step_buffer.h" #include "theory/uf/proof_equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -130,6 +130,6 @@ class InferProofCons : public ProofGenerator } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__INFER_PROOF_CONS_H */ diff --git a/src/theory/strings/inference_manager.cpp b/src/theory/strings/inference_manager.cpp index 15e608ef1..ff3803b7e 100644 --- a/src/theory/strings/inference_manager.cpp +++ b/src/theory/strings/inference_manager.cpp @@ -21,10 +21,10 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -377,4 +377,4 @@ TrustNode InferenceManager::processLemma(InferInfo& ii, LemmaProperty& p) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/inference_manager.h b/src/theory/strings/inference_manager.h index 1e57afe79..cb5560f2b 100644 --- a/src/theory/strings/inference_manager.h +++ b/src/theory/strings/inference_manager.h @@ -35,7 +35,7 @@ #include "theory/theory_inference_manager.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -271,6 +271,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/strings/kinds b/src/theory/strings/kinds index 6f366d6d7..33e94d3e6 100644 --- a/src/theory/strings/kinds +++ b/src/theory/strings/kinds @@ -4,11 +4,11 @@ # src/theory/builtin/kinds. # -theory THEORY_STRINGS ::CVC5::theory::strings::TheoryStrings "theory/strings/theory_strings.h" +theory THEORY_STRINGS ::cvc5::theory::strings::TheoryStrings "theory/strings/theory_strings.h" properties check parametric presolve -rewriter ::CVC5::theory::strings::SequencesRewriter "theory/strings/sequences_rewriter.h" +rewriter ::cvc5::theory::strings::SequencesRewriter "theory/strings/sequences_rewriter.h" typechecker "theory/strings/theory_strings_type_rules.h" @@ -42,7 +42,7 @@ operator STRING_REV 1 "string reverse" sort STRING_TYPE \ Cardinality::INTEGERS \ well-founded \ - "NodeManager::currentNM()->mkConst(::CVC5::String())" \ + "NodeManager::currentNM()->mkConst(::cvc5::String())" \ "util/string.h" \ "String type" @@ -54,31 +54,31 @@ sort REGEXP_TYPE \ "RegExp type" enumerator STRING_TYPE \ - "::CVC5::theory::strings::StringEnumerator" \ + "::cvc5::theory::strings::StringEnumerator" \ "theory/strings/type_enumerator.h" constant CONST_STRING \ - ::CVC5::String \ - ::CVC5::strings::StringHashFunction \ + ::cvc5::String \ + ::cvc5::strings::StringHashFunction \ "util/string.h" \ "a string of characters" # the type operator SEQUENCE_TYPE 1 "seuence type, takes as parameter the type of the elements" cardinality SEQUENCE_TYPE \ - "::CVC5::theory::strings::SequenceProperties::computeCardinality(%TYPE%)" \ + "::cvc5::theory::strings::SequenceProperties::computeCardinality(%TYPE%)" \ "theory/strings/theory_strings_type_rules.h" well-founded SEQUENCE_TYPE \ - "::CVC5::theory::strings::SequenceProperties::isWellFounded(%TYPE%)" \ - "::CVC5::theory::strings::SequenceProperties::mkGroundTerm(%TYPE%)" \ + "::cvc5::theory::strings::SequenceProperties::isWellFounded(%TYPE%)" \ + "::cvc5::theory::strings::SequenceProperties::mkGroundTerm(%TYPE%)" \ "theory/strings/theory_strings_type_rules.h" enumerator SEQUENCE_TYPE \ - "::CVC5::theory::strings::SequenceEnumerator" \ + "::cvc5::theory::strings::SequenceEnumerator" \ "theory/strings/type_enumerator.h" constant CONST_SEQUENCE \ - ::CVC5::Sequence \ - ::CVC5::SequenceHashFunction \ + ::cvc5::Sequence \ + ::cvc5::SequenceHashFunction \ "expr/sequence.h" \ "a sequence of characters" @@ -102,17 +102,17 @@ operator REGEXP_EMPTY 0 "regexp empty" operator REGEXP_SIGMA 0 "regexp all characters" constant REGEXP_REPEAT_OP \ - ::CVC5::RegExpRepeat \ - ::CVC5::RegExpRepeatHashFunction \ + ::cvc5::RegExpRepeat \ + ::cvc5::RegExpRepeatHashFunction \ "util/regexp.h" \ - "operator for regular expression repeat; payload is an instance of the CVC5::RegExpRepeat class" + "operator for regular expression repeat; payload is an instance of the cvc5::RegExpRepeat class" parameterized REGEXP_REPEAT REGEXP_REPEAT_OP 1 "regular expression repeat; first parameter is a REGEXP_REPEAT_OP, second is a regular expression term" constant REGEXP_LOOP_OP \ - ::CVC5::RegExpLoop \ - ::CVC5::RegExpLoopHashFunction \ + ::cvc5::RegExpLoop \ + ::cvc5::RegExpLoopHashFunction \ "util/regexp.h" \ - "operator for regular expression loop; payload is an instance of the CVC5::RegExpLoop class" + "operator for regular expression loop; payload is an instance of the cvc5::RegExpLoop class" parameterized REGEXP_LOOP REGEXP_LOOP_OP 1 "regular expression loop; first parameter is a REGEXP_LOOP_OP, second is a regular expression term" #internal @@ -128,7 +128,7 @@ typerule REGEXP_DIFF "SimpleTypeRuleVar<RRegExp, ARegExp>" typerule REGEXP_STAR "SimpleTypeRule<RRegExp, ARegExp>" typerule REGEXP_PLUS "SimpleTypeRule<RRegExp, ARegExp>" typerule REGEXP_OPT "SimpleTypeRule<RRegExp, ARegExp>" -typerule REGEXP_RANGE ::CVC5::theory::strings::RegExpRangeTypeRule +typerule REGEXP_RANGE ::cvc5::theory::strings::RegExpRangeTypeRule typerule REGEXP_REPEAT_OP "SimpleTypeRule<RBuiltinOperator>" typerule REGEXP_REPEAT "SimpleTypeRule<RRegExp, ARegExp>" typerule REGEXP_LOOP_OP "SimpleTypeRule<RBuiltinOperator>" @@ -141,18 +141,18 @@ typerule REGEXP_SIGMA "SimpleTypeRule<RRegExp>" ### operators that apply to both strings and sequences -typerule STRING_CONCAT ::CVC5::theory::strings::StringConcatTypeRule -typerule STRING_LENGTH ::CVC5::theory::strings::StringStrToIntTypeRule -typerule STRING_SUBSTR ::CVC5::theory::strings::StringSubstrTypeRule -typerule STRING_UPDATE ::CVC5::theory::strings::StringUpdateTypeRule -typerule STRING_CHARAT ::CVC5::theory::strings::StringAtTypeRule -typerule STRING_STRCTN ::CVC5::theory::strings::StringRelationTypeRule -typerule STRING_STRIDOF ::CVC5::theory::strings::StringIndexOfTypeRule -typerule STRING_STRREPL ::CVC5::theory::strings::StringReplaceTypeRule -typerule STRING_STRREPLALL ::CVC5::theory::strings::StringReplaceTypeRule -typerule STRING_PREFIX ::CVC5::theory::strings::StringStrToBoolTypeRule -typerule STRING_SUFFIX ::CVC5::theory::strings::StringStrToBoolTypeRule -typerule STRING_REV ::CVC5::theory::strings::StringStrToStrTypeRule +typerule STRING_CONCAT ::cvc5::theory::strings::StringConcatTypeRule +typerule STRING_LENGTH ::cvc5::theory::strings::StringStrToIntTypeRule +typerule STRING_SUBSTR ::cvc5::theory::strings::StringSubstrTypeRule +typerule STRING_UPDATE ::cvc5::theory::strings::StringUpdateTypeRule +typerule STRING_CHARAT ::cvc5::theory::strings::StringAtTypeRule +typerule STRING_STRCTN ::cvc5::theory::strings::StringRelationTypeRule +typerule STRING_STRIDOF ::cvc5::theory::strings::StringIndexOfTypeRule +typerule STRING_STRREPL ::cvc5::theory::strings::StringReplaceTypeRule +typerule STRING_STRREPLALL ::cvc5::theory::strings::StringReplaceTypeRule +typerule STRING_PREFIX ::cvc5::theory::strings::StringStrToBoolTypeRule +typerule STRING_SUFFIX ::cvc5::theory::strings::StringStrToBoolTypeRule +typerule STRING_REV ::cvc5::theory::strings::StringStrToStrTypeRule ### string specific operators @@ -169,9 +169,9 @@ typerule STRING_TOLOWER "SimpleTypeRule<RString, AString>" ### sequence specific operators -typerule CONST_SEQUENCE ::CVC5::theory::strings::ConstSequenceTypeRule -typerule SEQ_UNIT ::CVC5::theory::strings::SeqUnitTypeRule -typerule SEQ_NTH ::CVC5::theory::strings::SeqNthTypeRule -typerule SEQ_NTH_TOTAL ::CVC5::theory::strings::SeqNthTypeRule +typerule CONST_SEQUENCE ::cvc5::theory::strings::ConstSequenceTypeRule +typerule SEQ_UNIT ::cvc5::theory::strings::SeqUnitTypeRule +typerule SEQ_NTH ::cvc5::theory::strings::SeqNthTypeRule +typerule SEQ_NTH_TOTAL ::cvc5::theory::strings::SeqNthTypeRule endtheory diff --git a/src/theory/strings/normal_form.cpp b/src/theory/strings/normal_form.cpp index c139a5da7..ed111b4ac 100644 --- a/src/theory/strings/normal_form.cpp +++ b/src/theory/strings/normal_form.cpp @@ -21,9 +21,9 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -185,4 +185,4 @@ void NormalForm::getExplanationForPrefixEq(NormalForm& nfi, } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/normal_form.h b/src/theory/strings/normal_form.h index 65d4b3f78..fda691844 100644 --- a/src/theory/strings/normal_form.h +++ b/src/theory/strings/normal_form.h @@ -21,7 +21,7 @@ #include <vector> #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -168,6 +168,6 @@ class NormalForm } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__NORMAL_FORM_H */ diff --git a/src/theory/strings/proof_checker.cpp b/src/theory/strings/proof_checker.cpp index bf82d16ce..236607840 100644 --- a/src/theory/strings/proof_checker.cpp +++ b/src/theory/strings/proof_checker.cpp @@ -25,9 +25,9 @@ #include "theory/strings/theory_strings_utils.h" #include "theory/strings/word.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -517,4 +517,4 @@ Node StringProofRuleChecker::checkInternal(PfRule id, } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/proof_checker.h b/src/theory/strings/proof_checker.h index c55386140..ab971f62f 100644 --- a/src/theory/strings/proof_checker.h +++ b/src/theory/strings/proof_checker.h @@ -21,7 +21,7 @@ #include "expr/proof_checker.h" #include "expr/proof_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -44,6 +44,6 @@ class StringProofRuleChecker : public ProofRuleChecker } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__PROOF_CHECKER_H */ diff --git a/src/theory/strings/regexp_elim.cpp b/src/theory/strings/regexp_elim.cpp index 5dbe02230..4493d6c6c 100644 --- a/src/theory/strings/regexp_elim.cpp +++ b/src/theory/strings/regexp_elim.cpp @@ -21,9 +21,9 @@ #include "theory/strings/regexp_entail.h" #include "theory/strings/theory_strings_utils.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -613,4 +613,4 @@ bool RegExpElimination::isProofEnabled() const { return d_pnm != nullptr; } } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/regexp_elim.h b/src/theory/strings/regexp_elim.h index 3ffa9566e..f43aacdcd 100644 --- a/src/theory/strings/regexp_elim.h +++ b/src/theory/strings/regexp_elim.h @@ -21,7 +21,7 @@ #include "theory/eager_proof_generator.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -85,6 +85,6 @@ class RegExpElimination } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__REGEXP_ELIM_H */ diff --git a/src/theory/strings/regexp_entail.cpp b/src/theory/strings/regexp_entail.cpp index 94c740742..cc4027aad 100644 --- a/src/theory/strings/regexp_entail.cpp +++ b/src/theory/strings/regexp_entail.cpp @@ -19,9 +19,9 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -105,7 +105,7 @@ Node RegExpEntail::simpleRegexpConsume(std::vector<Node>& mchildren, else if (xc.isConst()) { // check for constants - CVC5::String s = xc.getConst<String>(); + cvc5::String s = xc.getConst<String>(); if (Word::isEmpty(xc)) { Trace("regexp-ext-rewrite-debug") << "- ignore empty" << std::endl; @@ -117,7 +117,7 @@ Node RegExpEntail::simpleRegexpConsume(std::vector<Node>& mchildren, { std::vector<unsigned> ssVec; ssVec.push_back(t == 0 ? s.back() : s.front()); - CVC5::String ss(ssVec); + cvc5::String ss(ssVec); if (testConstStringInRegExp(ss, 0, rc)) { // strip off one character @@ -345,7 +345,7 @@ bool RegExpEntail::isConstRegExp(TNode t) return true; } -bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, +bool RegExpEntail::testConstStringInRegExp(cvc5::String& s, unsigned index_start, TNode r) { @@ -358,7 +358,7 @@ bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, { case STRING_TO_REGEXP: { - CVC5::String s2 = s.substr(index_start, s.size() - index_start); + cvc5::String s2 = s.substr(index_start, s.size() - index_start); if (r[0].isConst()) { return (s2 == r[0].getConst<String>()); @@ -392,7 +392,7 @@ bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, { for (vec_k[i] = vec_k[i] + 1; vec_k[i] <= left; ++vec_k[i]) { - CVC5::String t = s.substr(index_start + start, vec_k[i]); + cvc5::String t = s.substr(index_start + start, vec_k[i]); if (testConstStringInRegExp(t, 0, r[i])) { start += vec_k[i]; @@ -457,7 +457,7 @@ bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, { for (unsigned i = s.size() - index_start; i > 0; --i) { - CVC5::String t = s.substr(index_start, i); + cvc5::String t = s.substr(index_start, i); if (testConstStringInRegExp(t, 0, r[0])) { if (index_start + i == s.size() @@ -525,7 +525,7 @@ bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, uint32_t u = r[2].getConst<Rational>().getNumerator().toUnsignedInt(); for (unsigned len = s.size() - index_start; len >= 1; len--) { - CVC5::String t = s.substr(index_start, len); + cvc5::String t = s.substr(index_start, len); if (testConstStringInRegExp(t, 0, r[0])) { if (len + index_start == s.size()) @@ -534,7 +534,7 @@ bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, } else { - Node num2 = nm->mkConst(CVC5::Rational(u - 1)); + Node num2 = nm->mkConst(cvc5::Rational(u - 1)); Node r2 = nm->mkNode(REGEXP_LOOP, r[0], r[1], num2); if (testConstStringInRegExp(s, index_start + len, r2)) { @@ -563,10 +563,10 @@ bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, } for (unsigned len = 1; len <= s.size() - index_start; len++) { - CVC5::String t = s.substr(index_start, len); + cvc5::String t = s.substr(index_start, len); if (testConstStringInRegExp(t, 0, r[0])) { - Node num2 = nm->mkConst(CVC5::Rational(l - 1)); + Node num2 = nm->mkConst(cvc5::Rational(l - 1)); Node r2 = nm->mkNode(REGEXP_LOOP, r[0], num2, num2); if (testConstStringInRegExp(s, index_start + len, r2)) { @@ -761,4 +761,4 @@ bool RegExpEntail::regExpIncludes(Node r1, Node r2) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/regexp_entail.h b/src/theory/strings/regexp_entail.h index 3e14d4ed0..fcad7e2ab 100644 --- a/src/theory/strings/regexp_entail.h +++ b/src/theory/strings/regexp_entail.h @@ -26,7 +26,7 @@ #include "theory/theory_rewriter.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -97,7 +97,7 @@ class RegExpEntail * Does the substring of s starting at index_start occur in constant regular * expression r? */ - static bool testConstStringInRegExp(CVC5::String& s, + static bool testConstStringInRegExp(cvc5::String& s, unsigned index_start, TNode r); /** Does regular expression node have (str.to.re "") as a child? */ @@ -127,6 +127,6 @@ class RegExpEntail } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__REGEXP_ENTAIL_H */ diff --git a/src/theory/strings/regexp_operation.cpp b/src/theory/strings/regexp_operation.cpp index 5481a0c6d..1bb85ee81 100644 --- a/src/theory/strings/regexp_operation.cpp +++ b/src/theory/strings/regexp_operation.cpp @@ -25,9 +25,9 @@ #include "theory/strings/theory_strings_utils.h" #include "theory/strings/word.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -36,8 +36,8 @@ RegExpOpr::RegExpOpr(SkolemCache* sc) d_false(NodeManager::currentNM()->mkConst(false)), d_emptyRegexp(NodeManager::currentNM()->mkNode(kind::REGEXP_EMPTY, std::vector<Node>{})), - d_zero(NodeManager::currentNM()->mkConst(::CVC5::Rational(0))), - d_one(NodeManager::currentNM()->mkConst(::CVC5::Rational(1))), + d_zero(NodeManager::currentNM()->mkConst(::cvc5::Rational(0))), + d_one(NodeManager::currentNM()->mkConst(::cvc5::Rational(1))), d_sigma(NodeManager::currentNM()->mkNode(kind::REGEXP_SIGMA, std::vector<Node>{})), d_sigma_star( @@ -266,7 +266,7 @@ int RegExpOpr::delta( Node r, Node &exp ) { } // 0-unknown, 1-yes, 2-no -int RegExpOpr::derivativeS(Node r, CVC5::String c, Node& retNode) +int RegExpOpr::derivativeS(Node r, cvc5::String c, Node& retNode) { Assert(c.size() < 2); Trace("regexp-derive") << "RegExp-derive starts with /" << mkString( r ) << "/, c=" << c << std::endl; @@ -302,8 +302,8 @@ int RegExpOpr::derivativeS(Node r, CVC5::String c, Node& retNode) break; } case kind::REGEXP_RANGE: { - CVC5::String a = r[0].getConst<String>(); - CVC5::String b = r[1].getConst<String>(); + cvc5::String a = r[0].getConst<String>(); + cvc5::String b = r[1].getConst<String>(); retNode = (a <= c && c <= b) ? d_emptySingleton : d_emptyRegexp; break; } @@ -521,7 +521,7 @@ int RegExpOpr::derivativeS(Node r, CVC5::String c, Node& retNode) return ret; } -Node RegExpOpr::derivativeSingle(Node r, CVC5::String c) +Node RegExpOpr::derivativeSingle(Node r, cvc5::String c) { Assert(c.size() < 2); Trace("regexp-derive") << "RegExp-derive starts with /" << mkString( r ) << "/, c=" << c << std::endl; @@ -555,8 +555,8 @@ Node RegExpOpr::derivativeSingle(Node r, CVC5::String c) break; } case kind::REGEXP_RANGE: { - CVC5::String a = r[0].getConst<String>(); - CVC5::String b = r[1].getConst<String>(); + cvc5::String a = r[0].getConst<String>(); + cvc5::String b = r[1].getConst<String>(); retNode = (a <= c && c <= b) ? d_emptySingleton : d_emptyRegexp; break; } @@ -1314,7 +1314,7 @@ Node RegExpOpr::intersectInternal( Node r1, Node r2, std::map< PairNodes, Node > std::map< PairNodes, Node > cache2(cache); cache2[p] = NodeManager::currentNM()->mkNode( kind::REGEXP_RV, - NodeManager::currentNM()->mkConst(CVC5::Rational(cnt))); + NodeManager::currentNM()->mkConst(cvc5::Rational(cnt))); rt = intersectInternal(r1l, r2l, cache2, cnt+1); cacheX[ pp ] = rt; } @@ -1619,4 +1619,4 @@ Node RegExpOpr::getExistsForRegExpConcatMem(Node mem) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h index 27324d971..b660e5c49 100644 --- a/src/theory/strings/regexp_operation.h +++ b/src/theory/strings/regexp_operation.h @@ -28,7 +28,7 @@ #include "theory/strings/skolem_cache.h" #include "util/string.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -55,7 +55,7 @@ enum RegExpConstType }; class RegExpOpr { - typedef std::pair<Node, CVC5::String> PairNodeStr; + typedef std::pair<Node, cvc5::String> PairNodeStr; typedef std::set< Node > SetNodes; typedef std::pair< Node, Node > PairNodes; @@ -171,8 +171,8 @@ class RegExpOpr { * - delta( (re.union (re.* "A") R) ) returns 1. */ int delta( Node r, Node &exp ); - int derivativeS(Node r, CVC5::String c, Node& retNode); - Node derivativeSingle(Node r, CVC5::String c); + int derivativeS(Node r, cvc5::String c, Node& retNode); + Node derivativeSingle(Node r, cvc5::String c); /** * Returns the regular expression intersection of r1 and r2. If r1 or r2 is * not constant, then this method returns null. @@ -209,6 +209,6 @@ class RegExpOpr { } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__REGEXP__OPERATION_H */ diff --git a/src/theory/strings/regexp_solver.cpp b/src/theory/strings/regexp_solver.cpp index 861f7c694..2d4404c10 100644 --- a/src/theory/strings/regexp_solver.cpp +++ b/src/theory/strings/regexp_solver.cpp @@ -25,10 +25,10 @@ #include "theory/theory_model.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -48,7 +48,7 @@ RegExpSolver::RegExpSolver(SolverState& s, d_processed_memberships(s.getSatContext()), d_regexp_opr(skc) { - d_emptyString = NodeManager::currentNM()->mkConst(::CVC5::String("")); + d_emptyString = NodeManager::currentNM()->mkConst(::cvc5::String("")); std::vector<Node> nvec; d_emptyRegexp = NodeManager::currentNM()->mkNode(REGEXP_EMPTY, nvec); d_true = NodeManager::currentNM()->mkConst(true); @@ -582,7 +582,7 @@ bool RegExpSolver::checkPDerivative( return true; } -CVC5::String RegExpSolver::getHeadConst(Node x) +cvc5::String RegExpSolver::getHeadConst(Node x) { if (x.isConst()) { @@ -606,7 +606,7 @@ bool RegExpSolver::deriveRegExp(Node x, Assert(x != d_emptyString); Trace("regexp-derive") << "RegExpSolver::deriveRegExp: x=" << x << ", r= " << r << std::endl; - CVC5::String s = getHeadConst(x); + cvc5::String s = getHeadConst(x); // only allow RE_DERIVE for concrete constant regular expressions if (!s.empty() && d_regexp_opr.getRegExpConstType(r) == RE_C_CONRETE_CONSTANT) { @@ -615,7 +615,7 @@ bool RegExpSolver::deriveRegExp(Node x, bool flag = true; for (unsigned i = 0; i < s.size(); ++i) { - CVC5::String c = s.substr(i, 1); + cvc5::String c = s.substr(i, 1); Node dc2; int rt = d_regexp_opr.derivativeS(dc, c, dc2); dc = dc2; @@ -706,4 +706,4 @@ Node RegExpSolver::getNormalSymRegExp(Node r, std::vector<Node>& nf_exp) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/regexp_solver.h b/src/theory/strings/regexp_solver.h index d35a822a7..440d0fcb7 100644 --- a/src/theory/strings/regexp_solver.h +++ b/src/theory/strings/regexp_solver.h @@ -31,7 +31,7 @@ #include "theory/strings/solver_state.h" #include "util/string.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -137,7 +137,7 @@ class RegExpSolver Node x, Node r, Node atom, bool& addedLemma, std::vector<Node>& nf_exp); Node getMembership(Node n, bool isPos, unsigned i); unsigned getNumMemberships(Node n, bool isPos); - CVC5::String getHeadConst(Node x); + cvc5::String getHeadConst(Node x); bool deriveRegExp(Node x, Node r, Node atom, std::vector<Node>& ant); Node getNormalSymRegExp(Node r, std::vector<Node>& nf_exp); // regular expression memberships @@ -154,6 +154,6 @@ class RegExpSolver } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ diff --git a/src/theory/strings/rewrites.cpp b/src/theory/strings/rewrites.cpp index cdf41d9ad..41b972514 100644 --- a/src/theory/strings/rewrites.cpp +++ b/src/theory/strings/rewrites.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -224,4 +224,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/rewrites.h b/src/theory/strings/rewrites.h index af9b636cf..37ef61bee 100644 --- a/src/theory/strings/rewrites.h +++ b/src/theory/strings/rewrites.h @@ -19,7 +19,7 @@ #include <iosfwd> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -239,6 +239,6 @@ std::ostream& operator<<(std::ostream& out, Rewrite r); } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__REWRITES_H */ diff --git a/src/theory/strings/sequences_rewriter.cpp b/src/theory/strings/sequences_rewriter.cpp index 9cec9ad40..302f7dc0b 100644 --- a/src/theory/strings/sequences_rewriter.cpp +++ b/src/theory/strings/sequences_rewriter.cpp @@ -27,9 +27,9 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -1028,7 +1028,7 @@ Node SequencesRewriter::rewriteLoopRegExp(TNode node) return returnRewrite(node, r, Rewrite::RE_LOOP_STAR); } NodeManager* nm = NodeManager::currentNM(); - CVC5::Rational rMaxInt(String::maxSize()); + cvc5::Rational rMaxInt(String::maxSize()); uint32_t l = utils::getLoopMinOccurrences(node); std::vector<Node> vec_nodes; for (unsigned i = 0; i < l; i++) @@ -1141,7 +1141,7 @@ Node SequencesRewriter::rewriteMembership(TNode node) else if (x.isConst() && RegExpEntail::isConstRegExp(r)) { // test whether x in node[1] - CVC5::String s = x.getConst<String>(); + cvc5::String s = x.getConst<String>(); bool test = RegExpEntail::testConstStringInRegExp(s, 0, r); Node retNode = NodeManager::currentNM()->mkConst(test); return returnRewrite(node, retNode, Rewrite::RE_IN_EVAL); @@ -1571,7 +1571,7 @@ Node SequencesRewriter::rewriteSubstr(Node node) if (node[1].isConst() && node[2].isConst()) { Node s = node[0]; - CVC5::Rational rMaxInt(String::maxSize()); + cvc5::Rational rMaxInt(String::maxSize()); uint32_t start; if (node[1].getConst<Rational>() > rMaxInt) { @@ -1628,7 +1628,7 @@ Node SequencesRewriter::rewriteSubstr(Node node) } } } - Node zero = nm->mkConst(CVC5::Rational(0)); + Node zero = nm->mkConst(cvc5::Rational(0)); // if entailed non-positive length or negative start point if (ArithEntail::check(zero, node[1], true)) @@ -1858,7 +1858,7 @@ Node SequencesRewriter::rewriteUpdate(Node node) // rewriting for constant arguments if (node[1].isConst()) { - CVC5::Rational rMaxInt(String::maxSize()); + cvc5::Rational rMaxInt(String::maxSize()); if (node[1].getConst<Rational>() > rMaxInt) { // start beyond the maximum size of strings @@ -2266,7 +2266,7 @@ Node SequencesRewriter::rewriteIndexof(Node node) utils::getConcat(node[0], children0); if (children0[0].isConst() && node[1].isConst() && node[2].isConst()) { - CVC5::Rational rMaxInt(CVC5::String::maxSize()); + cvc5::Rational rMaxInt(cvc5::String::maxSize()); if (node[2].getConst<Rational>() > rMaxInt) { // We know that, due to limitations on the size of string constants @@ -3230,7 +3230,7 @@ Node SequencesRewriter::rewritePrefixSuffix(Node n) Node val; if (isPrefix) { - val = NodeManager::currentNM()->mkConst(::CVC5::Rational(0)); + val = NodeManager::currentNM()->mkConst(::cvc5::Rational(0)); } else { @@ -3396,4 +3396,4 @@ Node SequencesRewriter::returnRewrite(Node node, Node ret, Rewrite r) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/sequences_rewriter.h b/src/theory/strings/sequences_rewriter.h index 750589f72..eda8bc1df 100644 --- a/src/theory/strings/sequences_rewriter.h +++ b/src/theory/strings/sequences_rewriter.h @@ -26,7 +26,7 @@ #include "theory/strings/strings_entail.h" #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -296,6 +296,6 @@ class SequencesRewriter : public TheoryRewriter } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__SEQUENCES_REWRITER_H */ diff --git a/src/theory/strings/sequences_stats.cpp b/src/theory/strings/sequences_stats.cpp index 919b950ab..e0d14f93e 100644 --- a/src/theory/strings/sequences_stats.cpp +++ b/src/theory/strings/sequences_stats.cpp @@ -16,7 +16,7 @@ #include "smt/smt_statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -63,4 +63,4 @@ SequencesStatistics::~SequencesStatistics() } } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/sequences_stats.h b/src/theory/strings/sequences_stats.h index 417f79046..5bd48e877 100644 --- a/src/theory/strings/sequences_stats.h +++ b/src/theory/strings/sequences_stats.h @@ -23,7 +23,7 @@ #include "util/statistics_registry.h" #include "util/stats_histogram.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -99,6 +99,6 @@ class SequencesStatistics } } -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__SEQUENCES_STATS_H */ diff --git a/src/theory/strings/skolem_cache.cpp b/src/theory/strings/skolem_cache.cpp index 5e2d8981d..ad36b8edd 100644 --- a/src/theory/strings/skolem_cache.cpp +++ b/src/theory/strings/skolem_cache.cpp @@ -23,9 +23,9 @@ #include "theory/strings/word.h" #include "util/rational.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -291,4 +291,4 @@ Node SkolemCache::mkIndexVar(Node t) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/skolem_cache.h b/src/theory/strings/skolem_cache.h index b6deea6eb..5c5fc8d57 100644 --- a/src/theory/strings/skolem_cache.h +++ b/src/theory/strings/skolem_cache.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "expr/skolem_manager.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -211,6 +211,6 @@ class SkolemCache } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__SKOLEM_CACHE_H */ diff --git a/src/theory/strings/solver_state.cpp b/src/theory/strings/solver_state.cpp index 00bb39d5c..39fe6dd11 100644 --- a/src/theory/strings/solver_state.cpp +++ b/src/theory/strings/solver_state.cpp @@ -19,10 +19,10 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -223,4 +223,4 @@ void SolverState::separateByLength( } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/solver_state.h b/src/theory/strings/solver_state.h index 8c5d29196..e54a5e7b1 100644 --- a/src/theory/strings/solver_state.h +++ b/src/theory/strings/solver_state.h @@ -29,7 +29,7 @@ #include "theory/uf/equality_engine.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -161,6 +161,6 @@ class SolverState : public TheoryState } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__SOLVER_STATE_H */ diff --git a/src/theory/strings/strategy.cpp b/src/theory/strings/strategy.cpp index 56c1cbe98..54f8e43f8 100644 --- a/src/theory/strings/strategy.cpp +++ b/src/theory/strings/strategy.cpp @@ -16,7 +16,7 @@ #include "options/strings_options.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -158,4 +158,4 @@ void Strategy::initializeStrategy() } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/strategy.h b/src/theory/strings/strategy.h index 4c2e587c9..1eb2fe902 100644 --- a/src/theory/strings/strategy.h +++ b/src/theory/strings/strategy.h @@ -22,7 +22,7 @@ #include "theory/theory.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -111,6 +111,6 @@ class Strategy } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__STRATEGY_H */ diff --git a/src/theory/strings/strings_entail.cpp b/src/theory/strings/strings_entail.cpp index 926a43159..62ba41743 100644 --- a/src/theory/strings/strings_entail.cpp +++ b/src/theory/strings/strings_entail.cpp @@ -21,9 +21,9 @@ #include "theory/strings/theory_strings_utils.h" #include "theory/strings/word.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -117,7 +117,7 @@ bool StringsEntail::stripSymbolicLength(std::vector<Node>& n1, Assert(dir == 1 || dir == -1); Assert(nr.empty()); NodeManager* nm = NodeManager::currentNM(); - Node zero = nm->mkConst(CVC5::Rational(0)); + Node zero = nm->mkConst(cvc5::Rational(0)); bool ret = false; bool success = true; unsigned sindex = 0; @@ -139,7 +139,7 @@ bool StringsEntail::stripSymbolicLength(std::vector<Node>& n1, Assert(ArithEntail::check(curr, true)); Node s = n1[sindex_use]; size_t slen = Word::getLength(s); - Node ncl = nm->mkConst(CVC5::Rational(slen)); + Node ncl = nm->mkConst(cvc5::Rational(slen)); Node next_s = nm->mkNode(MINUS, lowerBound, ncl); next_s = Rewriter::rewrite(next_s); Assert(next_s.isConst()); @@ -602,7 +602,7 @@ bool StringsEntail::stripConstantEndpoints(std::vector<Node>& n1, if (n2[index1].isConst()) { Assert(n2[index1].getType().isString()); // string-only - CVC5::String t = n2[index1].getConst<String>(); + cvc5::String t = n2[index1].getConst<String>(); if (n1.size() == 1) { // if n1.size()==1, then if n2[index1] is not a number, we can drop @@ -993,4 +993,4 @@ Node StringsEntail::inferEqsFromContains(Node x, Node y) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/strings_entail.h b/src/theory/strings/strings_entail.h index 16643332a..cce0bf05b 100644 --- a/src/theory/strings/strings_entail.h +++ b/src/theory/strings/strings_entail.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -379,6 +379,6 @@ class StringsEntail } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__STRING_ENTAIL_H */ diff --git a/src/theory/strings/strings_fmf.cpp b/src/theory/strings/strings_fmf.cpp index 11a743d0d..e543f173c 100644 --- a/src/theory/strings/strings_fmf.cpp +++ b/src/theory/strings/strings_fmf.cpp @@ -16,10 +16,10 @@ #include "theory/strings/strings_fmf.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -102,4 +102,4 @@ std::string StringsFmf::StringSumLengthDecisionStrategy::identify() const } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/strings_fmf.h b/src/theory/strings/strings_fmf.h index 1ef610289..a2496dec3 100644 --- a/src/theory/strings/strings_fmf.h +++ b/src/theory/strings/strings_fmf.h @@ -25,7 +25,7 @@ #include "theory/strings/term_registry.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -106,6 +106,6 @@ class StringsFmf } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__STRINGS_FMF_H */ diff --git a/src/theory/strings/strings_rewriter.cpp b/src/theory/strings/strings_rewriter.cpp index d41a86c18..1a7ca7f6a 100644 --- a/src/theory/strings/strings_rewriter.cpp +++ b/src/theory/strings/strings_rewriter.cpp @@ -19,9 +19,9 @@ #include "theory/strings/theory_strings_utils.h" #include "util/rational.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -324,4 +324,4 @@ Node StringsRewriter::rewriteStringIsDigit(Node n) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/strings_rewriter.h b/src/theory/strings/strings_rewriter.h index 226a66b34..e7ad40d51 100644 --- a/src/theory/strings/strings_rewriter.h +++ b/src/theory/strings/strings_rewriter.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "theory/strings/sequences_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -103,6 +103,6 @@ class StringsRewriter : public SequencesRewriter } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__STRINGS_REWRITER_H */ diff --git a/src/theory/strings/term_registry.cpp b/src/theory/strings/term_registry.cpp index d82a2333e..4f5c09b5e 100644 --- a/src/theory/strings/term_registry.cpp +++ b/src/theory/strings/term_registry.cpp @@ -24,10 +24,10 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -618,4 +618,4 @@ void TermRegistry::removeProxyEqs(Node n, std::vector<Node>& unproc) const } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/term_registry.h b/src/theory/strings/term_registry.h index 2f03647fd..1eb000e09 100644 --- a/src/theory/strings/term_registry.h +++ b/src/theory/strings/term_registry.h @@ -28,7 +28,7 @@ #include "theory/strings/solver_state.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -279,6 +279,6 @@ class TermRegistry } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__TERM_REGISTRY_H */ diff --git a/src/theory/strings/theory_strings.cpp b/src/theory/strings/theory_strings.cpp index 03d93f8f4..5bd92267e 100644 --- a/src/theory/strings/theory_strings.cpp +++ b/src/theory/strings/theory_strings.cpp @@ -29,10 +29,10 @@ #include "theory/valuation.h" using namespace std; -using namespace CVC5::context; -using namespace CVC5::kind; +using namespace cvc5::context; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -1088,4 +1088,4 @@ std::string TheoryStrings::debugPrintStringsEqc() } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h index 94a96fc33..e1fc20d29 100644 --- a/src/theory/strings/theory_strings.h +++ b/src/theory/strings/theory_strings.h @@ -46,7 +46,7 @@ #include "theory/theory.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -301,6 +301,6 @@ class TheoryStrings : public Theory { } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ diff --git a/src/theory/strings/theory_strings_preprocess.cpp b/src/theory/strings/theory_strings_preprocess.cpp index f89ffa5fa..8deba50ca 100644 --- a/src/theory/strings/theory_strings_preprocess.cpp +++ b/src/theory/strings/theory_strings_preprocess.cpp @@ -26,10 +26,10 @@ #include "theory/strings/sequences_rewriter.h" #include "theory/strings/word.h" -using namespace CVC5; -using namespace CVC5::kind; +using namespace cvc5; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -1028,4 +1028,4 @@ Node StringsPreprocess::mkForallInternal(Node bvl, Node body) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/theory_strings_preprocess.h b/src/theory/strings/theory_strings_preprocess.h index acf9edad7..7c8c4308c 100644 --- a/src/theory/strings/theory_strings_preprocess.h +++ b/src/theory/strings/theory_strings_preprocess.h @@ -27,7 +27,7 @@ #include "theory/theory.h" #include "util/hash.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -104,6 +104,6 @@ class StringsPreprocess { } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__PREPROCESS_H */ diff --git a/src/theory/strings/theory_strings_type_rules.h b/src/theory/strings/theory_strings_type_rules.h index 32605f0f1..0892af4de 100644 --- a/src/theory/strings/theory_strings_type_rules.h +++ b/src/theory/strings/theory_strings_type_rules.h @@ -22,7 +22,7 @@ #include "expr/sequence.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -426,6 +426,6 @@ struct SequenceProperties } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_TYPE_RULES_H */ diff --git a/src/theory/strings/theory_strings_utils.cpp b/src/theory/strings/theory_strings_utils.cpp index 821319df5..510214e0f 100644 --- a/src/theory/strings/theory_strings_utils.cpp +++ b/src/theory/strings/theory_strings_utils.cpp @@ -24,9 +24,9 @@ #include "theory/strings/strings_entail.h" #include "theory/strings/word.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { namespace utils { @@ -423,4 +423,4 @@ unsigned getLoopMinOccurrences(TNode node) } // namespace utils } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/theory_strings_utils.h b/src/theory/strings/theory_strings_utils.h index e720ce0b2..e3c85d562 100644 --- a/src/theory/strings/theory_strings_utils.h +++ b/src/theory/strings/theory_strings_utils.h @@ -23,7 +23,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { namespace utils { @@ -220,6 +220,6 @@ unsigned getLoopMinOccurrences(TNode node); } // namespace utils } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/strings/type_enumerator.cpp b/src/theory/strings/type_enumerator.cpp index 7b89e970e..146cf434f 100644 --- a/src/theory/strings/type_enumerator.cpp +++ b/src/theory/strings/type_enumerator.cpp @@ -17,7 +17,7 @@ #include "theory/strings/theory_strings_utils.h" #include "util/string.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -271,4 +271,4 @@ bool SequenceEnumerator::isFinished() { return d_wenum.isFinished(); } } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/type_enumerator.h b/src/theory/strings/type_enumerator.h index 7d340be64..644fe1092 100644 --- a/src/theory/strings/type_enumerator.h +++ b/src/theory/strings/type_enumerator.h @@ -23,7 +23,7 @@ #include "expr/type_node.h" #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -199,6 +199,6 @@ class SequenceEnumerator : public TypeEnumeratorBase<SequenceEnumerator> } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/strings/word.cpp b/src/theory/strings/word.cpp index d2e809571..612acb80a 100644 --- a/src/theory/strings/word.cpp +++ b/src/theory/strings/word.cpp @@ -17,9 +17,9 @@ #include "expr/sequence.h" #include "util/string.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -486,4 +486,4 @@ Node Word::reverse(TNode x) } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/strings/word.h b/src/theory/strings/word.h index 090c36be3..6cf073cc1 100644 --- a/src/theory/strings/word.h +++ b/src/theory/strings/word.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace strings { @@ -165,6 +165,6 @@ class Word } // namespace strings } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/subs_minimize.cpp b/src/theory/subs_minimize.cpp index b9e9e13b2..a61f2d49c 100644 --- a/src/theory/subs_minimize.cpp +++ b/src/theory/subs_minimize.cpp @@ -20,9 +20,9 @@ #include "theory/strings/word.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { SubstitutionMinimize::SubstitutionMinimize() {} @@ -466,4 +466,4 @@ bool SubstitutionMinimize::isSingularArg(Node n, Kind k, unsigned arg) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/subs_minimize.h b/src/theory/subs_minimize.h index 9275277e6..026cd441f 100644 --- a/src/theory/subs_minimize.h +++ b/src/theory/subs_minimize.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** SubstitutionMinimize @@ -95,6 +95,6 @@ class SubstitutionMinimize }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SUBS_MINIMIZE_H */ diff --git a/src/theory/substitutions.cpp b/src/theory/substitutions.cpp index bdb6d2668..7a4516996 100644 --- a/src/theory/substitutions.cpp +++ b/src/theory/substitutions.cpp @@ -20,7 +20,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { struct substitution_stack_element { @@ -223,4 +223,4 @@ std::ostream& operator<<(std::ostream& out, const theory::SubstitutionMap::itera return out << "[CDMap-iterator]"; } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/substitutions.h b/src/theory/substitutions.h index a925d7fab..96cc37b29 100644 --- a/src/theory/substitutions.h +++ b/src/theory/substitutions.h @@ -30,7 +30,7 @@ #include "context/cdhashmap.h" #include "util/hash.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -179,6 +179,6 @@ inline std::ostream& operator << (std::ostream& out, const SubstitutionMap& subs std::ostream& operator<<(std::ostream& out, const theory::SubstitutionMap::iterator& i); -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SUBSTITUTIONS_H */ diff --git a/src/theory/term_registration_visitor.cpp b/src/theory/term_registration_visitor.cpp index eab124bc5..eb2305d32 100644 --- a/src/theory/term_registration_visitor.cpp +++ b/src/theory/term_registration_visitor.cpp @@ -20,9 +20,9 @@ #include "smt/logic_exception.h" #include "theory/theory_engine.h" -using namespace CVC5::theory; +using namespace cvc5::theory; -namespace CVC5 { +namespace cvc5 { std::string PreRegisterVisitor::toString() const { std::stringstream ss; @@ -292,4 +292,4 @@ void SharedTermsVisitor::clear() { d_visited.clear(); } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/term_registration_visitor.h b/src/theory/term_registration_visitor.h index 19406ea62..593af791b 100644 --- a/src/theory/term_registration_visitor.h +++ b/src/theory/term_registration_visitor.h @@ -22,7 +22,7 @@ #include <unordered_map> -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -189,4 +189,4 @@ class SharedTermsVisitor { TNodeToTheorySetMap d_preregistered; }; -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory.cpp b/src/theory/theory.cpp index 143bf92b8..c15652eef 100644 --- a/src/theory/theory.cpp +++ b/src/theory/theory.cpp @@ -39,7 +39,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { /** Default value for the uninterpreted sorts is the UF theory */ @@ -565,4 +565,4 @@ eq::EqualityEngine* Theory::getEqualityEngine() } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory.h b/src/theory/theory.h index 1dd0c584e..4b06a5fa8 100644 --- a/src/theory/theory.h +++ b/src/theory/theory.h @@ -39,7 +39,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { class ProofNodeManager; class TheoryEngine; @@ -95,7 +95,7 @@ namespace eq { * after the quantifiers engine and model objects have been set up. */ class Theory { - friend class ::CVC5::TheoryEngine; + friend class ::cvc5::TheoryEngine; private: // Disallow default construction, copy, assignment. @@ -916,7 +916,7 @@ inline theory::Assertion Theory::get() { } inline std::ostream& operator<<(std::ostream& out, - const CVC5::theory::Theory& theory) + const cvc5::theory::Theory& theory) { return out << theory.identify(); } @@ -936,6 +936,6 @@ inline std::ostream& operator << (std::ostream& out, theory::Theory::PPAssertSta } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__THEORY_H */ diff --git a/src/theory/theory_engine.cpp b/src/theory/theory_engine.cpp index e6eeaf8a5..6271f0afb 100644 --- a/src/theory/theory_engine.cpp +++ b/src/theory/theory_engine.cpp @@ -50,9 +50,9 @@ using namespace std; -using namespace CVC5::theory; +using namespace cvc5::theory; -namespace CVC5 { +namespace cvc5 { /* -------------------------------------------------------------------------- */ @@ -65,19 +65,19 @@ namespace theory { */ #define CVC4_FOR_EACH_THEORY \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_BUILTIN) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_BOOL) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_UF) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_ARITH) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_BV) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_FP) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_ARRAYS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_DATATYPES) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_SEP) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_SETS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_BAGS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_STRINGS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC5::theory::THEORY_QUANTIFIERS) + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_BUILTIN) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_BOOL) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_UF) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_ARITH) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_BV) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_FP) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_ARRAYS) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_DATATYPES) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_SEP) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_SETS) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_BAGS) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_STRINGS) \ + CVC4_FOR_EACH_THEORY_STATEMENT(cvc5::theory::THEORY_QUANTIFIERS) } // namespace theory @@ -1894,4 +1894,4 @@ void TheoryEngine::spendResource(ResourceManager::Resource r) d_resourceManager->spendResource(r); } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h index cc96c4f9d..7b91191f9 100644 --- a/src/theory/theory_engine.h +++ b/src/theory/theory_engine.h @@ -41,7 +41,7 @@ #include "util/statistics_registry.h" #include "util/unsafe_interrupt_exception.h" -namespace CVC5 { +namespace cvc5 { class ResourceManager; class OutputManager; @@ -668,6 +668,6 @@ private: void checkTheoryAssertionsWithModel(bool hardFailure); };/* class TheoryEngine */ -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY_ENGINE_H */ diff --git a/src/theory/theory_engine_proof_generator.cpp b/src/theory/theory_engine_proof_generator.cpp index bfe29976e..5d8ffdb8a 100644 --- a/src/theory/theory_engine_proof_generator.cpp +++ b/src/theory/theory_engine_proof_generator.cpp @@ -18,9 +18,9 @@ #include "expr/proof_node.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { TheoryEngineProofGenerator::TheoryEngineProofGenerator(ProofNodeManager* pnm, context::UserContext* u) @@ -128,4 +128,4 @@ std::string TheoryEngineProofGenerator::identify() const return "TheoryEngineProofGenerator"; } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_engine_proof_generator.h b/src/theory/theory_engine_proof_generator.h index 462c40fdf..f42f8d868 100644 --- a/src/theory/theory_engine_proof_generator.h +++ b/src/theory/theory_engine_proof_generator.h @@ -26,7 +26,7 @@ #include "expr/proof_node_manager.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { /** * A simple proof generator class used by the theory engine. This class @@ -75,6 +75,6 @@ class TheoryEngineProofGenerator : public ProofGenerator Node d_false; }; -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY_ENGINE_PROOF_GENERATOR_H */ diff --git a/src/theory/theory_eq_notify.h b/src/theory/theory_eq_notify.h index 17ba7b50e..40aa07f3b 100644 --- a/src/theory/theory_eq_notify.h +++ b/src/theory/theory_eq_notify.h @@ -21,7 +21,7 @@ #include "theory/theory_inference_manager.h" #include "theory/uf/equality_engine_notify.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -77,6 +77,6 @@ class TheoryEqNotifyClass : public eq::EqualityEngineNotify }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/theory_id.cpp b/src/theory/theory_id.cpp index 60fb752a7..e12096582 100644 --- a/src/theory/theory_id.cpp +++ b/src/theory/theory_id.cpp @@ -22,7 +22,7 @@ #include "base/check.h" #include "lib/ffs.h" -namespace CVC5 { +namespace cvc5 { namespace theory { TheoryId& operator++(TheoryId& id) @@ -162,4 +162,4 @@ std::string TheoryIdSetUtil::setToString(TheoryIdSet theorySet) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_id.h b/src/theory/theory_id.h index 685dd7864..d923413d5 100644 --- a/src/theory/theory_id.h +++ b/src/theory/theory_id.h @@ -22,7 +22,7 @@ #include <iosfwd> -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -106,5 +106,5 @@ class TheoryIdSetUtil }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/theory_inference.cpp b/src/theory/theory_inference.cpp index 00217e0d6..e265c62a8 100644 --- a/src/theory/theory_inference.cpp +++ b/src/theory/theory_inference.cpp @@ -16,9 +16,9 @@ #include "theory/theory_inference_manager.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { SimpleTheoryLemma::SimpleTheoryLemma(InferenceId id, @@ -53,4 +53,4 @@ Node SimpleTheoryInternalFact::processFact(std::vector<Node>& exp, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_inference.h b/src/theory/theory_inference.h index e356fb3c8..0be1c3d83 100644 --- a/src/theory/theory_inference.h +++ b/src/theory/theory_inference.h @@ -21,7 +21,7 @@ #include "theory/inference_id.h" #include "theory/output_channel.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class TheoryInferenceManager; @@ -118,6 +118,6 @@ class SimpleTheoryInternalFact : public TheoryInference }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/theory_inference_manager.cpp b/src/theory/theory_inference_manager.cpp index 031570318..e7c89e703 100644 --- a/src/theory/theory_inference_manager.cpp +++ b/src/theory/theory_inference_manager.cpp @@ -22,9 +22,9 @@ #include "theory/uf/equality_engine.h" #include "theory/uf/proof_equality_engine.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { TheoryInferenceManager::TheoryInferenceManager(Theory& t, @@ -520,4 +520,4 @@ void TheoryInferenceManager::safePoint(ResourceManager::Resource r) void TheoryInferenceManager::setIncomplete() { d_out.setIncomplete(); } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_inference_manager.h b/src/theory/theory_inference_manager.h index 063b9a008..e911fb41e 100644 --- a/src/theory/theory_inference_manager.h +++ b/src/theory/theory_inference_manager.h @@ -28,7 +28,7 @@ #include "util/statistics_registry.h" #include "util/stats_histogram.h" -namespace CVC5 { +namespace cvc5 { class ProofNodeManager; @@ -461,6 +461,6 @@ class TheoryInferenceManager }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__THEORY_INFERENCE_MANAGER_H */ diff --git a/src/theory/theory_model.cpp b/src/theory/theory_model.cpp index b20a011ae..814aa7ee4 100644 --- a/src/theory/theory_model.cpp +++ b/src/theory/theory_model.cpp @@ -22,10 +22,10 @@ #include "theory/rewriter.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { TheoryModel::TheoryModel(context::Context* c, @@ -765,4 +765,4 @@ std::string TheoryModel::debugPrintModelEqc() const } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_model.h b/src/theory/theory_model.h index ce3ecfbc0..7e7439867 100644 --- a/src/theory/theory_model.h +++ b/src/theory/theory_model.h @@ -27,7 +27,7 @@ #include "theory/type_set.h" #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** Theory Model class. @@ -433,6 +433,6 @@ public: };/* class TheoryModel */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__THEORY_MODEL_H */ diff --git a/src/theory/theory_model_builder.cpp b/src/theory/theory_model_builder.cpp index 44e3d08e3..a8dd647f0 100644 --- a/src/theory/theory_model_builder.cpp +++ b/src/theory/theory_model_builder.cpp @@ -23,10 +23,10 @@ #include "theory/uf/theory_uf_model.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { void TheoryEngineModelBuilder::Assigner::initialize( @@ -1429,4 +1429,4 @@ void TheoryEngineModelBuilder::assignFunctions(TheoryModel* m) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_model_builder.h b/src/theory/theory_model_builder.h index cc49111d8..b73693681 100644 --- a/src/theory/theory_model_builder.h +++ b/src/theory/theory_model_builder.h @@ -22,7 +22,7 @@ #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -314,6 +314,6 @@ class TheoryEngineModelBuilder }; /* class TheoryEngineModelBuilder */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__THEORY_MODEL_BUILDER_H */ diff --git a/src/theory/theory_preprocessor.cpp b/src/theory/theory_preprocessor.cpp index f6ba13551..78a4e6526 100644 --- a/src/theory/theory_preprocessor.cpp +++ b/src/theory/theory_preprocessor.cpp @@ -23,7 +23,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { TheoryPreprocessor::TheoryPreprocessor(TheoryEngine& engine, @@ -520,4 +520,4 @@ void TheoryPreprocessor::registerTrustedRewrite(TrustNode trn, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_preprocessor.h b/src/theory/theory_preprocessor.h index 21157fa52..5d8ef253c 100644 --- a/src/theory/theory_preprocessor.h +++ b/src/theory/theory_preprocessor.h @@ -29,7 +29,7 @@ #include "theory/skolem_lemma.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { class LogicInfo; class TheoryEngine; @@ -223,6 +223,6 @@ class TheoryPreprocessor }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__THEORY_PREPROCESSOR_H */ diff --git a/src/theory/theory_proof_step_buffer.cpp b/src/theory/theory_proof_step_buffer.cpp index 85d2aef7a..bcb446b86 100644 --- a/src/theory/theory_proof_step_buffer.cpp +++ b/src/theory/theory_proof_step_buffer.cpp @@ -16,9 +16,9 @@ #include "expr/proof.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { TheoryProofStepBuffer::TheoryProofStepBuffer(ProofChecker* pc) @@ -232,4 +232,4 @@ Node TheoryProofStepBuffer::elimDoubleNegLit(Node n) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_proof_step_buffer.h b/src/theory/theory_proof_step_buffer.h index 80e2c2e6a..0015af105 100644 --- a/src/theory/theory_proof_step_buffer.h +++ b/src/theory/theory_proof_step_buffer.h @@ -23,7 +23,7 @@ #include "expr/proof_step_buffer.h" #include "theory/builtin/proof_checker.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** * Class used to speculatively try and buffer a set of proof steps before @@ -110,6 +110,6 @@ class TheoryProofStepBuffer : public ProofStepBuffer }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__THEORY_PROOF_STEP_BUFFER_H */ diff --git a/src/theory/theory_rewriter.cpp b/src/theory/theory_rewriter.cpp index 13b6ecdd0..6f7531140 100644 --- a/src/theory/theory_rewriter.cpp +++ b/src/theory/theory_rewriter.cpp @@ -16,7 +16,7 @@ #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { TrustRewriteResponse::TrustRewriteResponse(RewriteStatus status, @@ -60,4 +60,4 @@ TrustNode TheoryRewriter::rewriteEqualityExtWithProof(Node node) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_rewriter.h b/src/theory/theory_rewriter.h index e508477d3..1617997a4 100644 --- a/src/theory/theory_rewriter.h +++ b/src/theory/theory_rewriter.h @@ -22,7 +22,7 @@ #include "expr/node.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class Rewriter; @@ -140,6 +140,6 @@ class TheoryRewriter }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__THEORY_REWRITER_H */ diff --git a/src/theory/theory_state.cpp b/src/theory/theory_state.cpp index d155e12a6..958a76d28 100644 --- a/src/theory/theory_state.cpp +++ b/src/theory/theory_state.cpp @@ -16,7 +16,7 @@ #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { TheoryState::TheoryState(context::Context* c, @@ -174,4 +174,4 @@ context::CDList<Assertion>::const_iterator TheoryState::factsEnd(TheoryId tid) Valuation& TheoryState::getValuation() { return d_valuation; } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/theory_state.h b/src/theory/theory_state.h index 8c863144b..14776761e 100644 --- a/src/theory/theory_state.h +++ b/src/theory/theory_state.h @@ -21,7 +21,7 @@ #include "expr/node.h" #include "theory/valuation.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -121,6 +121,6 @@ class TheoryState }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__SOLVER_STATE_H */ diff --git a/src/theory/theory_traits_template.h b/src/theory/theory_traits_template.h index e30507cf8..f7ec9aac2 100644 --- a/src/theory/theory_traits_template.h +++ b/src/theory/theory_traits_template.h @@ -26,7 +26,7 @@ ${theory_includes} -namespace CVC5 { +namespace cvc5 { namespace theory { template <TheoryId theoryId> @@ -43,7 +43,7 @@ ${theory_constructors} default: Unhandled() << id; } } -}; /* struct CVC5::theory::TheoryConstructor */ +}; /* struct cvc5::theory::TheoryConstructor */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/trust_node.cpp b/src/theory/trust_node.cpp index 7458b95e5..5a3c9e080 100644 --- a/src/theory/trust_node.cpp +++ b/src/theory/trust_node.cpp @@ -17,7 +17,7 @@ #include "expr/proof_ensure_closed.h" #include "expr/proof_generator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { const char* toString(TrustNodeKind tnk) @@ -146,4 +146,4 @@ std::ostream& operator<<(std::ostream& out, TrustNode n) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/trust_node.h b/src/theory/trust_node.h index 13769dccd..c53496730 100644 --- a/src/theory/trust_node.h +++ b/src/theory/trust_node.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { class ProofGenerator; class ProofNode; @@ -172,6 +172,6 @@ class TrustNode std::ostream& operator<<(std::ostream& out, TrustNode n); } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__TRUST_NODE_H */ diff --git a/src/theory/trust_substitutions.cpp b/src/theory/trust_substitutions.cpp index a42608c31..fe28645ba 100644 --- a/src/theory/trust_substitutions.cpp +++ b/src/theory/trust_substitutions.cpp @@ -16,7 +16,7 @@ #include "theory/rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { TrustSubstitutionMap::TrustSubstitutionMap(context::Context* c, @@ -246,4 +246,4 @@ Node TrustSubstitutionMap::getCurrentSubstitution() } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/trust_substitutions.h b/src/theory/trust_substitutions.h index 20b240ce8..f90e5623f 100644 --- a/src/theory/trust_substitutions.h +++ b/src/theory/trust_substitutions.h @@ -28,7 +28,7 @@ #include "theory/theory_proof_step_buffer.h" #include "theory/trust_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /** @@ -133,6 +133,6 @@ class TrustSubstitutionMap }; } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__TRUST_SUBSTITUTIONS_H */ diff --git a/src/theory/type_enumerator.h b/src/theory/type_enumerator.h index f0cfacee7..a80702c36 100644 --- a/src/theory/type_enumerator.h +++ b/src/theory/type_enumerator.h @@ -24,7 +24,7 @@ #include "expr/node.h" #include "expr/type_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class NoMoreValuesException : public Exception { @@ -184,6 +184,6 @@ class TypeEnumerator { };/* class TypeEnumerator */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__TYPE_ENUMERATOR_H */ diff --git a/src/theory/type_enumerator_template.cpp b/src/theory/type_enumerator_template.cpp index 803787f5e..310b42b30 100644 --- a/src/theory/type_enumerator_template.cpp +++ b/src/theory/type_enumerator_template.cpp @@ -25,7 +25,7 @@ ${type_enumerator_includes} using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { TypeEnumeratorInterface* TypeEnumerator::mkTypeEnumerator( @@ -47,4 +47,4 @@ TypeEnumeratorInterface* TypeEnumerator::mkTypeEnumerator( } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/type_set.cpp b/src/theory/type_set.cpp index 6cf8814a7..8f0fcf551 100644 --- a/src/theory/type_set.cpp +++ b/src/theory/type_set.cpp @@ -14,9 +14,9 @@ #include "theory/type_set.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { TypeSet::~TypeSet() @@ -137,4 +137,4 @@ void TypeSet::addSubTerms(TNode n, } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/type_set.h b/src/theory/type_set.h index 3e57033ef..0949a026b 100644 --- a/src/theory/type_set.h +++ b/src/theory/type_set.h @@ -22,7 +22,7 @@ #include "theory/type_enumerator.h" -namespace CVC5 { +namespace cvc5 { namespace theory { /* Type set @@ -85,6 +85,6 @@ class TypeSet }; /* class TypeSet */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__TYPE_SET_H */ diff --git a/src/theory/uf/cardinality_extension.cpp b/src/theory/uf/cardinality_extension.cpp index eebe14226..6b3b5ba0e 100644 --- a/src/theory/uf/cardinality_extension.cpp +++ b/src/theory/uf/cardinality_extension.cpp @@ -28,10 +28,10 @@ #include "theory/uf/theory_uf.h" using namespace std; -using namespace CVC5::kind; -using namespace CVC5::context; +using namespace cvc5::kind; +using namespace cvc5::context; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -1766,4 +1766,4 @@ CardinalityExtension::Statistics::~Statistics() } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/cardinality_extension.h b/src/theory/uf/cardinality_extension.h index 85129a89b..66f0d8d1d 100644 --- a/src/theory/uf/cardinality_extension.h +++ b/src/theory/uf/cardinality_extension.h @@ -23,7 +23,7 @@ #include "theory/theory.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -463,6 +463,6 @@ class CardinalityExtension } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY_UF_STRONG_SOLVER_H */ diff --git a/src/theory/uf/eq_proof.cpp b/src/theory/uf/eq_proof.cpp index fec9179f3..25f5a3faa 100644 --- a/src/theory/uf/eq_proof.cpp +++ b/src/theory/uf/eq_proof.cpp @@ -20,7 +20,7 @@ #include "expr/proof_checker.h" #include "options/uf_options.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -1438,4 +1438,4 @@ Node EqProof::addToProof( } // namespace eq } // Namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/eq_proof.h b/src/theory/uf/eq_proof.h index 665731d2b..0578ce270 100644 --- a/src/theory/uf/eq_proof.h +++ b/src/theory/uf/eq_proof.h @@ -17,7 +17,7 @@ #include "expr/node.h" #include "theory/uf/equality_engine_types.h" -namespace CVC5 { +namespace cvc5 { class CDProof; @@ -355,4 +355,4 @@ class EqProof } // Namespace eq } // Namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/equality_engine.cpp b/src/theory/uf/equality_engine.cpp index a4bb76245..8f006d8ff 100644 --- a/src/theory/uf/equality_engine.cpp +++ b/src/theory/uf/equality_engine.cpp @@ -24,7 +24,7 @@ #include "theory/rewriter.h" #include "theory/uf/eq_proof.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -2635,4 +2635,4 @@ EqualityNodeId EqualityEngine::TriggerTermSet::getTrigger(TheoryId tag) const } // Namespace uf } // Namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/equality_engine.h b/src/theory/uf/equality_engine.h index 74af68227..464e1d07a 100644 --- a/src/theory/uf/equality_engine.h +++ b/src/theory/uf/equality_engine.h @@ -35,7 +35,7 @@ #include "theory/uf/equality_engine_types.h" #include "util/statistics_registry.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -845,6 +845,6 @@ private: } // Namespace eq } // Namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/uf/equality_engine_iterator.cpp b/src/theory/uf/equality_engine_iterator.cpp index c9a35f6e3..4be4f5462 100644 --- a/src/theory/uf/equality_engine_iterator.cpp +++ b/src/theory/uf/equality_engine_iterator.cpp @@ -16,7 +16,7 @@ #include "theory/uf/equality_engine.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -132,4 +132,4 @@ bool EqClassIterator::isFinished() const { return d_current == null_id; } } // namespace eq } // Namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/equality_engine_iterator.h b/src/theory/uf/equality_engine_iterator.h index 33562a99e..12dfea34a 100644 --- a/src/theory/uf/equality_engine_iterator.h +++ b/src/theory/uf/equality_engine_iterator.h @@ -20,7 +20,7 @@ #include "expr/node.h" #include "theory/uf/equality_engine_types.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -79,6 +79,6 @@ class EqClassIterator } // Namespace eq } // Namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/uf/equality_engine_notify.h b/src/theory/uf/equality_engine_notify.h index bd353375f..4187c067f 100644 --- a/src/theory/uf/equality_engine_notify.h +++ b/src/theory/uf/equality_engine_notify.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -115,6 +115,6 @@ class EqualityEngineNotifyNone : public EqualityEngineNotify } // Namespace eq } // Namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/uf/equality_engine_types.h b/src/theory/uf/equality_engine_types.h index 092b4bd89..030c3b998 100644 --- a/src/theory/uf/equality_engine_types.h +++ b/src/theory/uf/equality_engine_types.h @@ -26,7 +26,7 @@ #include "util/hash.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -359,6 +359,6 @@ struct TriggerInfo { } // namespace eq } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__UF__EQUALITY_ENGINE_TYPES_H */ diff --git a/src/theory/uf/ho_extension.cpp b/src/theory/uf/ho_extension.cpp index c159ff3b4..75965e2c9 100644 --- a/src/theory/uf/ho_extension.cpp +++ b/src/theory/uf/ho_extension.cpp @@ -21,9 +21,9 @@ #include "theory/uf/theory_uf_rewriter.h" using namespace std; -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -455,4 +455,4 @@ bool HoExtension::collectModelInfoHoTerm(Node n, TheoryModel* m) } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/ho_extension.h b/src/theory/uf/ho_extension.h index 3ca647f28..d703feb88 100644 --- a/src/theory/uf/ho_extension.h +++ b/src/theory/uf/ho_extension.h @@ -25,7 +25,7 @@ #include "theory/theory_model.h" #include "theory/theory_state.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -198,6 +198,6 @@ class HoExtension } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* __CVC4__THEORY__UF__HO_EXTENSION_H */ diff --git a/src/theory/uf/kinds b/src/theory/uf/kinds index ab2e422ee..e4b946105 100644 --- a/src/theory/uf/kinds +++ b/src/theory/uf/kinds @@ -4,32 +4,32 @@ # src/theory/builtin/kinds. # -theory THEORY_UF ::CVC5::theory::uf::TheoryUF "theory/uf/theory_uf.h" +theory THEORY_UF ::cvc5::theory::uf::TheoryUF "theory/uf/theory_uf.h" typechecker "theory/uf/theory_uf_type_rules.h" properties stable-infinite parametric properties check ppStaticLearn presolve -rewriter ::CVC5::theory::uf::TheoryUfRewriter "theory/uf/theory_uf_rewriter.h" +rewriter ::cvc5::theory::uf::TheoryUfRewriter "theory/uf/theory_uf_rewriter.h" parameterized APPLY_UF VARIABLE 1: "application of an uninterpreted function; first parameter is the function, remaining ones are parameters to that function" -typerule APPLY_UF ::CVC5::theory::uf::UfTypeRule +typerule APPLY_UF ::cvc5::theory::uf::UfTypeRule variable BOOLEAN_TERM_VARIABLE "Boolean term variable" operator CARDINALITY_CONSTRAINT 2 "cardinality constraint on sort S: first parameter is (any) term of sort S, second is a positive integer constant k that bounds the cardinality of S" -typerule CARDINALITY_CONSTRAINT ::CVC5::theory::uf::CardinalityConstraintTypeRule +typerule CARDINALITY_CONSTRAINT ::cvc5::theory::uf::CardinalityConstraintTypeRule operator COMBINED_CARDINALITY_CONSTRAINT 1 "combined cardinality constraint; parameter is a positive integer constant k that bounds the sum of the cardinalities of all sorts in the signature" -typerule COMBINED_CARDINALITY_CONSTRAINT ::CVC5::theory::uf::CombinedCardinalityConstraintTypeRule +typerule COMBINED_CARDINALITY_CONSTRAINT ::cvc5::theory::uf::CombinedCardinalityConstraintTypeRule parameterized PARTIAL_APPLY_UF APPLY_UF 1: "partial uninterpreted function application" -typerule PARTIAL_APPLY_UF ::CVC5::theory::uf::PartialTypeRule +typerule PARTIAL_APPLY_UF ::cvc5::theory::uf::PartialTypeRule operator CARDINALITY_VALUE 1 "cardinality value of sort S: first parameter is (any) term of sort S" -typerule CARDINALITY_VALUE ::CVC5::theory::uf::CardinalityValueTypeRule +typerule CARDINALITY_VALUE ::cvc5::theory::uf::CardinalityValueTypeRule operator HO_APPLY 2 "higher-order (partial) function application" -typerule HO_APPLY ::CVC5::theory::uf::HoApplyTypeRule +typerule HO_APPLY ::cvc5::theory::uf::HoApplyTypeRule endtheory diff --git a/src/theory/uf/proof_checker.cpp b/src/theory/uf/proof_checker.cpp index 2688c0574..cc1630b98 100644 --- a/src/theory/uf/proof_checker.cpp +++ b/src/theory/uf/proof_checker.cpp @@ -16,9 +16,9 @@ #include "theory/uf/theory_uf_rewriter.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -207,4 +207,4 @@ Node UfProofRuleChecker::checkInternal(PfRule id, } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/proof_checker.h b/src/theory/uf/proof_checker.h index 502aeaa59..011b2868d 100644 --- a/src/theory/uf/proof_checker.h +++ b/src/theory/uf/proof_checker.h @@ -21,7 +21,7 @@ #include "expr/proof_checker.h" #include "expr/proof_node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -44,6 +44,6 @@ class UfProofRuleChecker : public ProofRuleChecker } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__UF__PROOF_CHECKER_H */ diff --git a/src/theory/uf/proof_equality_engine.cpp b/src/theory/uf/proof_equality_engine.cpp index 2837a02aa..5292f754f 100644 --- a/src/theory/uf/proof_equality_engine.cpp +++ b/src/theory/uf/proof_equality_engine.cpp @@ -22,9 +22,9 @@ #include "theory/uf/equality_engine.h" #include "theory/uf/proof_checker.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace eq { @@ -549,4 +549,4 @@ void ProofEqEngine::explainWithProof(Node lit, } // namespace eq } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/proof_equality_engine.h b/src/theory/uf/proof_equality_engine.h index 5129ad1df..ca0b58b5d 100644 --- a/src/theory/uf/proof_equality_engine.h +++ b/src/theory/uf/proof_equality_engine.h @@ -26,7 +26,7 @@ #include "expr/node.h" #include "theory/eager_proof_generator.h" -namespace CVC5 { +namespace cvc5 { class ProofNode; class ProofNodeManager; @@ -296,6 +296,6 @@ class ProofEqEngine : public EagerProofGenerator } // namespace eq } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__STRINGS__PROOF_MANAGER_H */ diff --git a/src/theory/uf/symmetry_breaker.cpp b/src/theory/uf/symmetry_breaker.cpp index 9b25c8906..558838bd8 100644 --- a/src/theory/uf/symmetry_breaker.cpp +++ b/src/theory/uf/symmetry_breaker.cpp @@ -48,11 +48,11 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { -using namespace ::CVC5::context; +using namespace ::cvc5::context; SymmetryBreaker::Template::Template() : d_template(), @@ -816,4 +816,4 @@ std::ostream& operator<<(std::ostream& out, const theory::uf::SymmetryBreaker::P return out; } -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h index 8ce0c2c44..b4ea3640d 100644 --- a/src/theory/uf/symmetry_breaker.h +++ b/src/theory/uf/symmetry_breaker.h @@ -57,7 +57,7 @@ #include "util/statistics_registry.h" #include "util/stats_timer.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -175,8 +175,8 @@ private: std::ostream& operator<<( std::ostream& out, - const ::CVC5::theory::uf::SymmetryBreaker::Permutation& p); + const ::cvc5::theory::uf::SymmetryBreaker::Permutation& p); -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__UF__SYMMETRY_BREAKER_H */ diff --git a/src/theory/uf/theory_uf.cpp b/src/theory/uf/theory_uf.cpp index 29bb6ba7d..f3c0a0ba0 100644 --- a/src/theory/uf/theory_uf.cpp +++ b/src/theory/uf/theory_uf.cpp @@ -35,7 +35,7 @@ using namespace std; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -693,4 +693,4 @@ bool TheoryUF::isHigherOrderType(TypeNode tn) } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h index 97cfc1fa5..f6f4b3ee9 100644 --- a/src/theory/uf/theory_uf.h +++ b/src/theory/uf/theory_uf.h @@ -29,7 +29,7 @@ #include "theory/uf/symmetry_breaker.h" #include "theory/uf/theory_uf_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -183,6 +183,6 @@ private: } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__UF__THEORY_UF_H */ diff --git a/src/theory/uf/theory_uf_model.cpp b/src/theory/uf/theory_uf_model.cpp index 5727d62cd..f43543fce 100644 --- a/src/theory/uf/theory_uf_model.cpp +++ b/src/theory/uf/theory_uf_model.cpp @@ -21,9 +21,9 @@ #include "theory/rewriter.h" #include "theory/theory_model.h" -using namespace CVC5::kind; +using namespace cvc5::kind; -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -243,4 +243,4 @@ Node UfModelTree::getFunctionValue( const char* argPrefix, bool simplify ){ } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/uf/theory_uf_model.h b/src/theory/uf/theory_uf_model.h index b1e0eea8f..949586976 100644 --- a/src/theory/uf/theory_uf_model.h +++ b/src/theory/uf/theory_uf_model.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC5 { +namespace cvc5 { namespace theory { class TheoryModel; @@ -114,6 +114,6 @@ public: } } -} // namespace CVC5 +} // namespace cvc5 #endif diff --git a/src/theory/uf/theory_uf_rewriter.h b/src/theory/uf/theory_uf_rewriter.h index ffa0ec22f..60a394126 100644 --- a/src/theory/uf/theory_uf_rewriter.h +++ b/src/theory/uf/theory_uf_rewriter.h @@ -26,7 +26,7 @@ #include "theory/substitutions.h" #include "theory/theory_rewriter.h" -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -210,6 +210,6 @@ public: //conversion between HO_APPLY AND APPLY_UF } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__UF__THEORY_UF_REWRITER_H */ diff --git a/src/theory/uf/theory_uf_type_rules.h b/src/theory/uf/theory_uf_type_rules.h index c21b36669..8493c8a38 100644 --- a/src/theory/uf/theory_uf_type_rules.h +++ b/src/theory/uf/theory_uf_type_rules.h @@ -21,7 +21,7 @@ #include <climits> -namespace CVC5 { +namespace cvc5 { namespace theory { namespace uf { @@ -80,7 +80,7 @@ class CardinalityConstraintTypeRule { throw TypeCheckingExceptionPrivate( n, "cardinality constraint must be a constant"); } - CVC5::Rational r(INT_MAX); + cvc5::Rational r(INT_MAX); if (n[1].getConst<Rational>() > r) { throw TypeCheckingExceptionPrivate( n, "Exceeded INT_MAX in cardinality constraint"); @@ -108,7 +108,7 @@ class CombinedCardinalityConstraintTypeRule { throw TypeCheckingExceptionPrivate( n, "combined cardinality constraint must be a constant"); } - CVC5::Rational r(INT_MAX); + cvc5::Rational r(INT_MAX); if (n[0].getConst<Rational>() > r) { throw TypeCheckingExceptionPrivate( n, "Exceeded INT_MAX in combined cardinality constraint"); @@ -178,6 +178,6 @@ class HoApplyTypeRule { } // namespace uf } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H */ diff --git a/src/theory/valuation.cpp b/src/theory/valuation.cpp index f77dff234..9dad48a04 100644 --- a/src/theory/valuation.cpp +++ b/src/theory/valuation.cpp @@ -24,7 +24,7 @@ #include "theory/theory_engine.h" #include "theory/theory_model.h" -namespace CVC5 { +namespace cvc5 { namespace theory { std::ostream& operator<<(std::ostream& os, EqualityStatus s) @@ -222,4 +222,4 @@ context::CDList<Assertion>::const_iterator Valuation::factsEnd(TheoryId tid) } } // namespace theory -} // namespace CVC5 +} // namespace cvc5 diff --git a/src/theory/valuation.h b/src/theory/valuation.h index c79c3bf9b..ce4e95247 100644 --- a/src/theory/valuation.h +++ b/src/theory/valuation.h @@ -25,7 +25,7 @@ #include "expr/node.h" #include "options/theory_options.h" -namespace CVC5 { +namespace cvc5 { class TheoryEngine; @@ -217,6 +217,6 @@ public: };/* class Valuation */ } // namespace theory -} // namespace CVC5 +} // namespace cvc5 #endif /* CVC4__THEORY__VALUATION_H */ |