diff options
Diffstat (limited to 'src/theory')
777 files changed, 2825 insertions, 2849 deletions
diff --git a/src/theory/arith/approx_simplex.cpp b/src/theory/arith/approx_simplex.cpp index 8d98475ce..c911d03e9 100644 --- a/src/theory/arith/approx_simplex.cpp +++ b/src/theory/arith/approx_simplex.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -367,9 +367,9 @@ public: double sumInfeasibilities(bool mip) const override { return 0.0; } }; -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -535,14 +535,14 @@ private: int ApproxGLPK::s_verbosity = 0; -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 #endif /*#ifdef CVC4_USE_GLPK */ /* End the declaration of GLPK specific code. */ /* Begin GPLK/NOGLPK Glue code. */ -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { ApproximateSimplex* ApproximateSimplex::mkApproximateSimplexSolver(const ArithVariables& vars, TreeLog& l, ApproximateStatistics& s){ @@ -559,15 +559,14 @@ bool ApproximateSimplex::enabled() { return false; #endif } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 /* End GPLK/NOGLPK Glue code. */ - /* Begin GPLK implementation. */ #ifdef CVC4_USE_GLPK -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -3175,9 +3174,8 @@ void ApproxGLPK::tryCut(int nid, CutInfo& cut) } } - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 a9b179e31..5835c57c1 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -163,7 +163,6 @@ class ApproximateSimplex{ static Integer s_defaultMaxDenom; };/* class ApproximateSimplex */ - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/arith_ite_utils.cpp b/src/theory/arith/arith_ite_utils.cpp index fa6fd108c..42189f86a 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -47,7 +47,7 @@ Node ArithIteUtils::applyReduceVariablesInItes(Node n){ } Node ArithIteUtils::reduceVariablesInItes(Node n){ - using namespace CVC4::kind; + using namespace CVC5::kind; if(d_reduceVar.find(n) != d_reduceVar.end()){ Node res = d_reduceVar[n]; return res.isNull() ? n : res; @@ -455,7 +455,6 @@ bool ArithIteUtils::solveBinOr(TNode binor){ return false; } - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/arith_ite_utils.h b/src/theory/arith/arith_ite_utils.h index e1e27884d..263ddda8e 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 CVC4 { +namespace CVC5 { namespace preprocessing { namespace util { class ContainsTermITEVisitor; @@ -109,8 +109,8 @@ private: }; /* class ArithIteUtils */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 83b8b67c2..9190dac7d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { bool ArithMSum::getMonomial(Node n, Node& c, Node& v) @@ -321,5 +321,5 @@ void ArithMSum::debugPrintMonomialSum(std::map<Node, Node>& msum, const char* c) Trace(c) << std::endl; } -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/arith_msum.h b/src/theory/arith/arith_msum.h index f7470d4e0..f4a2bf824 100644 --- a/src/theory/arith/arith_msum.h +++ b/src/theory/arith/arith_msum.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { /** Arithmetic utilities regarding monomial sums. @@ -182,7 +182,7 @@ class ArithMSum static void debugPrintMonomialSum(std::map<Node, Node>& msum, const char* c); }; -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // 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 a075c87fe..2b120c9c7 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -80,4 +80,4 @@ bool ArithPreprocess::isReduced(TNode atom) const } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/arith_preprocess.h b/src/theory/arith/arith_preprocess.h index db0fd7d5e..45ce0c597 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 CVC4 { +namespace CVC5 { namespace theory { class SkolemLemma; @@ -86,6 +86,6 @@ class ArithPreprocess } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/arith_rewriter.cpp b/src/theory/arith/arith_rewriter.cpp index 2de8cf66b..01e88b1a8 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 CVC4 { +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()){ - CVC4::Rational r(expr::NodeValue::MAX_CHILDREN); + CVC5::Rational r(expr::NodeValue::MAX_CHILDREN); if (exp <= r) { unsigned num = exp.getNumerator().toUnsignedInt(); @@ -899,6 +899,6 @@ RewriteResponse ArithRewriter::returnRewrite(TNode t, Node ret, Rewrite r) return RewriteResponse(REWRITE_AGAIN_FULL, ret); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h index 9bf88dfe6..556a7bda7 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -71,8 +71,8 @@ class ArithRewriter : public TheoryRewriter static RewriteResponse returnRewrite(TNode t, Node ret, Rewrite r); }; /* class ArithRewriter */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 1c41ecf81..bab1d6eb9 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -35,4 +35,4 @@ bool ArithState::isInConflict() const } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/arith_state.h b/src/theory/arith/arith_state.h index ffb4a2abc..dfe2bc877 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -52,6 +52,6 @@ class ArithState : public TheoryState } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/arith_static_learner.cpp b/src/theory/arith/arith_static_learner.cpp index b7169df1f..b0129970e 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -271,6 +271,6 @@ void ArithStaticLearner::addBound(TNode n) { } } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h index 799d0bcee..668527c0f 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 CVC4 { +namespace CVC5 { namespace context { class Context; } @@ -69,8 +69,8 @@ private: };/* class ArithStaticLearner */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 4f1f50b7a..16c412546 100644 --- a/src/theory/arith/arith_utilities.cpp +++ b/src/theory/arith/arith_utilities.cpp @@ -16,9 +16,9 @@ #include <cmath> -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -325,4 +325,4 @@ Node negateProofLiteral(TNode n) } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/arith_utilities.h b/src/theory/arith/arith_utilities.h index 40ca7b8f6..9c0edb893 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -342,8 +342,8 @@ Rational greatestIntLessThan(const Rational&); /** Negates a node in arithmetic proof normal form. */ Node negateProofLiteral(TNode n); -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__ARITH__ARITH_UTILITIES_H */ diff --git a/src/theory/arith/arithvar.cpp b/src/theory/arith/arithvar.cpp index 59253e87c..a0c29cb84 100644 --- a/src/theory/arith/arithvar.cpp +++ b/src/theory/arith/arithvar.cpp @@ -19,7 +19,7 @@ #include <limits> #include <set> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -30,6 +30,6 @@ bool debugIsASet(const std::vector<ArithVar>& variables){ return asSet.size() == variables.size(); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/arithvar.h b/src/theory/arith/arithvar.h index dd5ea70d9..a49797845 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -39,7 +39,6 @@ typedef std::vector< ArithRatPair > ArithRatPairVec; extern bool debugIsASet(const ArithVarVec& variables); - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/arithvar_node_map.h b/src/theory/arith/arithvar_node_map.h index f01b0c7ac..dceeeb407 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -88,8 +88,8 @@ public: };/* class ArithVarNodeMap */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 e5c995971..292fccb34 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -151,6 +151,6 @@ Result::Sat AttemptSolutionSDP::attempt(const ApproximateSimplex::Solution& sol) } } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/attempt_solution_simplex.h b/src/theory/arith/attempt_solution_simplex.h index b7266a1e2..faca0cb25 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -90,6 +90,6 @@ public: } d_statistics; };/* class AttemptSolutionSDP */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/bound_counts.h b/src/theory/arith/bound_counts.h index cb9053669..949828aeb 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -229,6 +229,6 @@ public: virtual void operator()(ArithVar v, const BoundsInfo& up) = 0; }; -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/bound_inference.cpp b/src/theory/arith/bound_inference.cpp index d2adc94af..126954144 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/bound_inference.h b/src/theory/arith/bound_inference.h index dc32ff179..7041777d8 100644 --- a/src/theory/arith/bound_inference.h +++ b/src/theory/arith/bound_inference.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +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 CVC4 +} // namespace CVC5 #endif
\ No newline at end of file diff --git a/src/theory/arith/callbacks.cpp b/src/theory/arith/callbacks.cpp index 81f48ad00..7fe8e4934 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -194,6 +194,6 @@ BoundCounts BoundCountingLookup::hasBounds(ArithVar basic) const { return boundsInfo(basic).hasBounds(); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/callbacks.h b/src/theory/arith/callbacks.h index 9f0ae1017..66004871b 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 CVC4 { +namespace CVC5 { class ProofNode; @@ -197,6 +197,6 @@ public: BoundCounts hasBounds(ArithVar basic) const; }; -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/congruence_manager.cpp b/src/theory/arith/congruence_manager.cpp index f2210574b..f2e51be02 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -689,6 +689,6 @@ std::vector<Node> andComponents(TNode an) return a; } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/congruence_manager.h b/src/theory/arith/congruence_manager.h index 9815ad9c8..540e985f7 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 CVC4 { +namespace CVC5 { class ProofNodeManager; @@ -297,6 +297,6 @@ private: std::vector<Node> andComponents(TNode an); -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/constraint.cpp b/src/theory/arith/constraint.cpp index f2de5da6c..cc1129f50 100644 --- a/src/theory/arith/constraint.cpp +++ b/src/theory/arith/constraint.cpp @@ -32,9 +32,9 @@ using namespace std; -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -2426,6 +2426,6 @@ std::pair<int, int> Constraint::unateFarkasSigns(ConstraintCP ca, ConstraintCP c return make_pair(a_sgn, b_sgn); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/constraint.h b/src/theory/arith/constraint.h index 6ac03bb82..3caa5a030 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 CVC4 { +namespace CVC5 { class ProofNodeManager; @@ -1275,9 +1275,8 @@ private: }; /* ConstraintDatabase */ - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 9a42b8a97..8d36df304 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -44,8 +44,8 @@ typedef const RationalVector* RationalVectorCP; static const RationalVectorCP RationalVectorCPSentinel = NULL; static const RationalVectorP RationalVectorPSentinel = NULL; -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 426e10956..36c8d06f1 100644 --- a/src/theory/arith/cut_log.cpp +++ b/src/theory/arith/cut_log.cpp @@ -31,7 +31,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -702,6 +702,6 @@ void DenseVector::print(ostream& out, const DenseMap<Rational>& v){ out << "]"; } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/cut_log.h b/src/theory/arith/cut_log.h index 2b67026dc..961092f6e 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -288,8 +288,6 @@ public: void printBranchInfo(std::ostream& os) const; }; - - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/delta_rational.cpp b/src/theory/arith/delta_rational.cpp index b7f641338..7d20a1859 100644 --- a/src/theory/arith/delta_rational.cpp +++ b/src/theory/arith/delta_rational.cpp @@ -21,7 +21,7 @@ using namespace std; -namespace CVC4 { +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 } } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/theory/arith/delta_rational.h b/src/theory/arith/delta_rational.h index ce0a2cffd..e2b769b18 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 CVC4 { +namespace CVC5 { class DeltaRational; @@ -46,22 +46,20 @@ class DeltaRationalException : public Exception { */ class DeltaRational { private: - CVC4::Rational c; - CVC4::Rational k; + CVC5::Rational c; + CVC5::Rational k; public: DeltaRational() : c(0,1), k(0,1) {} - DeltaRational(const CVC4::Rational& base) : c(base), k(0,1) {} - DeltaRational(const CVC4::Rational& base, const CVC4::Rational& coeff) : - c(base), k(coeff) {} - - const CVC4::Rational& getInfinitesimalPart() const { - return k; + DeltaRational(const CVC5::Rational& base) : c(base), k(0, 1) {} + DeltaRational(const CVC5::Rational& base, const CVC5::Rational& coeff) + : c(base), k(coeff) + { } - const CVC4::Rational& getNoninfinitesimalPart() const { - return c; - } + const CVC5::Rational& getInfinitesimalPart() const { return k; } + + const CVC5::Rational& getNoninfinitesimalPart() const { return c; } int sgn() const { int s = getNoninfinitesimalPart().sgn(); @@ -99,14 +97,14 @@ public: } DeltaRational operator+(const DeltaRational& other) const{ - CVC4::Rational tmpC = c+other.c; - CVC4::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{ - CVC4::Rational tmpC = a*c; - CVC4::Rational tmpK = a*k; + CVC5::Rational tmpC = a * c; + CVC5::Rational tmpK = a * k; return DeltaRational(tmpC, tmpK); } @@ -129,7 +127,7 @@ public: DeltaRational operator-(const DeltaRational& a) const{ - CVC4::Rational negOne(CVC4::Integer(-1)); + CVC5::Rational negOne(CVC5::Integer(-1)); return *(this) + (a * negOne); } @@ -138,14 +136,14 @@ public: } DeltaRational operator/(const Rational& a) const{ - CVC4::Rational tmpC = c/a; - CVC4::Rational tmpK = k/a; + CVC5::Rational tmpC = c / a; + CVC5::Rational tmpK = k / a; return DeltaRational(tmpC, tmpK); } DeltaRational operator/(const Integer& a) const{ - CVC4::Rational tmpC = c/a; - CVC4::Rational tmpK = k/a; + CVC5::Rational tmpC = c / a; + CVC5::Rational tmpK = k / a; return DeltaRational(tmpC, tmpK); } @@ -206,7 +204,8 @@ public: return *(this); } - DeltaRational& operator*=(const CVC4::Rational& a){ + DeltaRational& operator*=(const CVC5::Rational& a) + { c *= a; k *= a; @@ -300,4 +299,4 @@ public: std::ostream& operator<<(std::ostream& os, const DeltaRational& n); -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/theory/arith/dio_solver.cpp b/src/theory/arith/dio_solver.cpp index a232464e5..51dd69650 100644 --- a/src/theory/arith/dio_solver.cpp +++ b/src/theory/arith/dio_solver.cpp @@ -24,7 +24,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -833,6 +833,6 @@ Node DioSolver::trailIndexToEquality(TrailIndex i) const { return eq; } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/dio_solver.h b/src/theory/arith/dio_solver.h index dc4711800..7892bec52 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 CVC4 { +namespace CVC5 { namespace context { class Context; } @@ -421,8 +421,8 @@ public: Statistics d_statistics; };/* class DioSolver */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 5ad2f16c0..d4e26600d 100644 --- a/src/theory/arith/dual_simplex.cpp +++ b/src/theory/arith/dual_simplex.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -273,6 +273,6 @@ bool DualSimplexDecisionProcedure::searchForFeasibleSolution(uint32_t remainingI return false; } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/dual_simplex.h b/src/theory/arith/dual_simplex.h index 174a91c75..3e1bc0ee7 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -111,6 +111,6 @@ private: } d_statistics; };/* class DualSimplexDecisionProcedure */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/error_set.cpp b/src/theory/arith/error_set.cpp index 9c88ccfad..142a060ec 100644 --- a/src/theory/arith/error_set.cpp +++ b/src/theory/arith/error_set.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -477,6 +477,6 @@ void ErrorSet::pushFocusInto(ArithVarVec& vec) const{ } } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/error_set.h b/src/theory/arith/error_set.h index 7400a229f..cdf155c6d 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -412,6 +412,6 @@ private: Statistics d_statistics; }; -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/fc_simplex.cpp b/src/theory/arith/fc_simplex.cpp index c85c3df2a..61280d651 100644 --- a/src/theory/arith/fc_simplex.cpp +++ b/src/theory/arith/fc_simplex.cpp @@ -25,7 +25,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -859,6 +859,6 @@ const Rational& FCSimplexDecisionProcedure::focusCoefficient(ArithVar nb) const } } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/fc_simplex.h b/src/theory/arith/fc_simplex.h index 45a9b79bb..73e5ae54f 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -254,6 +254,6 @@ private: } d_statistics; };/* class FCSimplexDecisionProcedure */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/infer_bounds.cpp b/src/theory/arith/infer_bounds.cpp index 0475e2472..25494bdee 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -264,4 +264,4 @@ std::ostream& operator<<(std::ostream& os, const Algorithms a){ } /* namespace arith */ } /* namespace theory */ -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/arith/infer_bounds.h b/src/theory/arith/infer_bounds.h index 03ab8e53b..251c7cbb8 100644 --- a/src/theory/arith/infer_bounds.h +++ b/src/theory/arith/infer_bounds.h @@ -27,8 +27,7 @@ #include "util/maybe.h" #include "util/rational.h" - -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -161,4 +160,4 @@ private: } /* namespace arith */ } /* namespace theory */ -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/arith/inference_manager.cpp b/src/theory/arith/inference_manager.cpp index a281c825b..66b628302 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -147,4 +147,4 @@ bool InferenceManager::isEntailedFalse(const SimpleTheoryLemma& lem) } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/inference_manager.h b/src/theory/arith/inference_manager.h index dd617f4a3..bf5ed7b10 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -117,6 +117,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/kinds b/src/theory/arith/kinds index 04bdc277e..b839ccc22 100644 --- a/src/theory/arith/kinds +++ b/src/theory/arith/kinds @@ -4,13 +4,13 @@ # src/theory/builtin/kinds. # -theory THEORY_ARITH ::CVC4::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 ::CVC4::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 \ - ::CVC4::Divisible \ - ::CVC4::DivisibleHashFunction \ + ::CVC5::Divisible \ + ::CVC5::DivisibleHashFunction \ "util/divisible.h" \ - "operator for the divisibility-by-k predicate; payload is an instance of the CVC4::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 \ - ::CVC4::Rational \ - ::CVC4::RationalHashFunction \ + ::CVC5::Rational \ + ::CVC5::RationalHashFunction \ "util/rational.h" \ - "a multiple-precision rational constant; payload is an instance of the CVC4::Rational class" + "a multiple-precision rational constant; payload is an instance of the CVC5::Rational class" enumerator REAL_TYPE \ - "::CVC4::theory::arith::RationalEnumerator" \ + "::CVC5::theory::arith::RationalEnumerator" \ "theory/arith/type_enumerator.h" enumerator INTEGER_TYPE \ - "::CVC4::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 \ - ::CVC4::IndexedRootPredicate \ - ::CVC4::IndexedRootPredicateHashFunction \ + ::CVC5::IndexedRootPredicate \ + ::CVC5::IndexedRootPredicateHashFunction \ "util/indexed_root_predicate.h" \ - "operator for the indexed root predicate; payload is an instance of the CVC4::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 ::CVC4::theory::arith::ArithOperatorTypeRule -typerule MULT ::CVC4::theory::arith::ArithOperatorTypeRule -typerule NONLINEAR_MULT ::CVC4::theory::arith::ArithOperatorTypeRule -typerule MINUS ::CVC4::theory::arith::ArithOperatorTypeRule -typerule UMINUS ::CVC4::theory::arith::ArithOperatorTypeRule -typerule DIVISION ::CVC4::theory::arith::ArithOperatorTypeRule -typerule POW ::CVC4::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 ::CVC4::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 ::CVC4::theory::arith::IndexedRootPredicateTypeRule +typerule INDEXED_ROOT_PREDICATE ::CVC5::theory::arith::IndexedRootPredicateTypeRule -typerule TO_REAL ::CVC4::theory::arith::ArithOperatorTypeRule -typerule CAST_TO_REAL ::CVC4::theory::arith::ArithOperatorTypeRule -typerule TO_INTEGER ::CVC4::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 ::CVC4::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 ::CVC4::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 \ - ::CVC4::IntAnd \ - "::CVC4::UnsignedHashFunction< ::CVC4::IntAnd >" \ + ::CVC5::IntAnd \ + "::CVC5::UnsignedHashFunction< ::CVC5::IntAnd >" \ "util/iand.h" \ - "operator for integer AND; payload is an instance of the CVC4::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 ::CVC4::theory::arith::IAndOpTypeRule -typerule IAND ::CVC4::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 943f3216e..28f386e2a 100644 --- a/src/theory/arith/linear_equality.cpp +++ b/src/theory/arith/linear_equality.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -1411,6 +1411,6 @@ void LinearEqualityModule::directlyAddToCoefficient(ArithVar row, ArithVar col, d_tableau.directlyAddToCoefficient(row, col, mult, d_trackCallback); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/linear_equality.h b/src/theory/arith/linear_equality.h index df4e5f30e..4a923b677 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -756,6 +756,6 @@ public: } }; -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/matrix.cpp b/src/theory/arith/matrix.cpp index fb8c02379..dd7f28228 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -26,6 +26,6 @@ void NoEffectCCCB::update(RowIndex ridx, ArithVar nb, int oldSgn, int currSgn) { void NoEffectCCCB::multiplyRow(RowIndex ridx, int sgn){} bool NoEffectCCCB::canUseRow(RowIndex ridx) const { return false; } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/matrix.h b/src/theory/arith/matrix.h index 09fdc2e91..553cef7d4 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -368,8 +368,8 @@ public: typedef MatrixEntry<T> Entry; protected: - typedef CVC4::theory::arith::RowVector<T> RowVectorT; - typedef CVC4::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; @@ -997,7 +997,6 @@ protected: };/* class Matrix<T> */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ - +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/nl/cad/cdcac.cpp b/src/theory/arith/nl/cad/cdcac.cpp index c4ecfbbfa..7fd22fb76 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) { - CVC4::container_to_stream(os, v); + CVC5::container_to_stream(os, v); return os; } } // namespace std -namespace CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/cdcac.h b/src/theory/arith/nl/cad/cdcac.h index 15230d14c..2b607ae78 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -210,7 +210,7 @@ class CDCAC } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/cdcac_utils.cpp b/src/theory/arith/nl/cad/cdcac_utils.cpp index 24bad8d60..f40d528ff 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/cdcac_utils.h b/src/theory/arith/nl/cad/cdcac_utils.h index dad9bbd7a..3b3a3638b 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/constraints.cpp b/src/theory/arith/nl/cad/constraints.cpp index 028a61833..1ea172d11 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -79,6 +79,6 @@ void Constraints::sortConstraints() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/constraints.h b/src/theory/arith/nl/cad/constraints.h index 42f8920c8..70c52e85c 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -87,7 +87,7 @@ class Constraints } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/projections.cpp b/src/theory/arith/nl/cad/projections.cpp index 5d72f5a2e..b9e17f844 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/projections.h b/src/theory/arith/nl/cad/projections.h index 33267cb7a..3b8eb412f 100644 --- a/src/theory/arith/nl/cad/projections.h +++ b/src/theory/arith/nl/cad/projections.h @@ -25,7 +25,7 @@ #include <vector> -namespace CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/proof_checker.cpp b/src/theory/arith/nl/cad/proof_checker.cpp index 45c43e2aa..f1ab2d6a9 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -58,4 +58,4 @@ Node CADProofRuleChecker::checkInternal(PfRule id, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/cad/proof_checker.h b/src/theory/arith/nl/cad/proof_checker.h index 5ebe0c6b7..26bbcc3a9 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -53,6 +53,6 @@ class CADProofRuleChecker : public ProofRuleChecker } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 9f0799e7c..fe3734dce 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/proof_generator.h b/src/theory/arith/nl/cad/proof_generator.h index 4709b8e59..c1bb4be1e 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 CVC4 { +namespace CVC5 { class ProofGenerator; @@ -144,7 +144,7 @@ std::ostream& operator<<(std::ostream& os, const CADProofGenerator& proof); } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 958191fe1..63db35553 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad/variable_ordering.h b/src/theory/arith/nl/cad/variable_ordering.h index 43e85b3cb..7fda3faa4 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/cad_solver.cpp b/src/theory/arith/nl/cad_solver.cpp index c72c9d48d..dc18fbdf5 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/cad_solver.h b/src/theory/arith/nl/cad_solver.h index b83398cd6..de97c48cc 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 CVC4 { +namespace CVC5 { class ProofNodeManager; @@ -110,6 +110,6 @@ class CadSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 9ec3b1fc1..41331d041 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/ext/constraint.h b/src/theory/arith/nl/ext/constraint.h index d5ed7ccfd..9e6451c99 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -84,6 +84,6 @@ class ConstraintDb } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 28373223b..fc806199e 100644 --- a/src/theory/arith/nl/ext/ext_state.cpp +++ b/src/theory/arith/nl/ext/ext_state.cpp @@ -23,8 +23,7 @@ #include "theory/arith/nl/nl_model.h" #include "theory/arith/nl/nl_lemma_utils.h" - -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -110,4 +109,4 @@ CDProof* ExtState::getProof() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/ext/ext_state.h b/src/theory/arith/nl/ext/ext_state.h index 46ccaeb14..1d8e7ea0a 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 CVC4 { +namespace CVC5 { class CDProof; @@ -91,6 +91,6 @@ struct ExtState } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/ext/factoring_check.cpp b/src/theory/arith/nl/ext/factoring_check.cpp index 7a0da42aa..675368843 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/ext/factoring_check.h b/src/theory/arith/nl/ext/factoring_check.h index 4c017d198..89c5fce30 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 CVC4 { +namespace CVC5 { class CDProof; @@ -69,6 +69,6 @@ class FactoringCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/ext/monomial.cpp b/src/theory/arith/nl/ext/monomial.cpp index a0d388dca..86abed70c 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -333,4 +333,4 @@ Node MonomialDb::mkMonomialRemFactor(Node n, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/ext/monomial.h b/src/theory/arith/nl/ext/monomial.h index 19f855233..98083b996 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -144,6 +144,6 @@ class MonomialDb } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 f1a2f45b9..c8194bbd0 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -520,4 +520,4 @@ void MonomialBoundsCheck::checkResBounds() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 e7ba4d861..e63dd454a 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -86,6 +86,6 @@ class MonomialBoundsCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/ext/monomial_check.cpp b/src/theory/arith/nl/ext/monomial_check.cpp index 7f99b876d..9fc2ba10a 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -757,4 +757,4 @@ void MonomialCheck::setMonomialFactor(Node a, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/ext/monomial_check.h b/src/theory/arith/nl/ext/monomial_check.h index a08554476..948368542 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -194,6 +194,6 @@ class MonomialCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/ext/proof_checker.cpp b/src/theory/arith/nl/ext/proof_checker.cpp index ca600ad55..26db3c9e0 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -158,4 +158,4 @@ Node ExtProofRuleChecker::checkInternal(PfRule id, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/ext/proof_checker.h b/src/theory/arith/nl/ext/proof_checker.h index d53b674b2..7bd4b7e38 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -51,6 +51,6 @@ class ExtProofRuleChecker : public ProofRuleChecker } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 45f4160a0..543b6a0bd 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -57,4 +57,4 @@ void SplitZeroCheck::check() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 030445737..316e304ff 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -50,6 +50,6 @@ class SplitZeroCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 64ea19f3c..bdeca7a29 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -164,4 +164,4 @@ void TangentPlaneCheck::check(bool asWaitingLemmas) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 a771ae543..7d48d249b 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -67,6 +67,6 @@ class TangentPlaneCheck } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/ext_theory_callback.cpp b/src/theory/arith/nl/ext_theory_callback.cpp index 214d2a51a..125fbb05a 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -129,4 +129,4 @@ bool NlExtTheoryCallback::isExtfReduced(int effort, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/ext_theory_callback.h b/src/theory/arith/nl/ext_theory_callback.h index a3dc74ec8..c747eef69 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { class EqualityEngine; @@ -84,6 +84,6 @@ class NlExtTheoryCallback : public ExtTheoryCallback } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 7272bb6e3..01f4c6e15 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -298,4 +298,4 @@ Node IAndSolver::bitwiseLemma(Node i) } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/iand_solver.h b/src/theory/arith/nl/iand_solver.h index 137d430c0..95d9632aa 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -132,6 +132,6 @@ class IAndSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 cb3a03aed..cd96021b0 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/iand_utils.h b/src/theory/arith/nl/iand_utils.h index a84fcf978..da5f8f04f 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -169,6 +169,6 @@ class IAndUtils } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 df894ee12..87d823018 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/icp/candidate.h b/src/theory/arith/nl/icp/candidate.h index 5d8c2b2d0..d4ad11fcf 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/icp/contraction_origins.cpp b/src/theory/arith/nl/icp/contraction_origins.cpp index a076dbdb0..c0b0cb768 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/icp/contraction_origins.h b/src/theory/arith/nl/icp/contraction_origins.h index bef6b2848..0f22b5463 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/icp/icp_solver.cpp b/src/theory/arith/nl/icp/icp_solver.cpp index 5b505b070..e09264a25 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -384,4 +384,4 @@ void ICPSolver::check() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/icp/icp_solver.h b/src/theory/arith/nl/icp/icp_solver.h index 85b2e86c6..56ec03706 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -153,6 +153,6 @@ class ICPSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/icp/intersection.cpp b/src/theory/arith/nl/icp/intersection.cpp index 3dc0ca815..6cdba297c 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/icp/intersection.h b/src/theory/arith/nl/icp/intersection.h index 1670a8f68..c453f8314 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/icp/interval.h b/src/theory/arith/nl/icp/interval.h index ff4bbfcac..8acbfec05 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/nl_lemma_utils.cpp b/src/theory/arith/nl/nl_lemma_utils.cpp index d7785dbc9..f3c2d70c8 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/nl_lemma_utils.h b/src/theory/arith/nl/nl_lemma_utils.h index 6f3ef077a..71d86b08a 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -144,6 +144,6 @@ class ArgTrie } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 5467c64ce..f7edefff7 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -1342,4 +1342,4 @@ void NlModel::getModelValueRepair( } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/nl_model.h b/src/theory/arith/nl/nl_model.h index cd52cb159..b2c435098 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 CVC4 { +namespace CVC5 { namespace context { class Context; @@ -329,6 +329,6 @@ class NlModel } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 781fb0c71..ff1962629 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -621,4 +621,4 @@ void NonlinearExtension::runStrategy(Theory::Effort effort, } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/nonlinear_extension.h b/src/theory/arith/nl/nonlinear_extension.h index bc8f48c26..b6fb53651 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { class EqualityEngine; @@ -296,6 +296,6 @@ class NonlinearExtension } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 0dd7cc070..5738dccfc 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { -poly::Variable VariableMapper::operator()(const CVC4::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 CVC4::Node& n) return it->second; } -CVC4::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 @@ CVC4::Node VariableMapper::operator()(const poly::Variable& n) return it->second; } -CVC4::Node as_cvc_upolynomial(const poly::UPolynomial& p, const CVC4::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 @@ CVC4::Node as_cvc_upolynomial(const poly::UPolynomial& p, const CVC4::Node& var) return res; } -poly::UPolynomial as_poly_upolynomial_impl(const CVC4::Node& n, +poly::UPolynomial as_poly_upolynomial_impl(const CVC5::Node& n, poly::Integer& denominator, - const CVC4::Node& var) + const CVC5::Node& var) { denominator = poly::Integer(1); if (n.isVar()) @@ -140,14 +140,14 @@ poly::UPolynomial as_poly_upolynomial_impl(const CVC4::Node& n, return poly::UPolynomial(); } -poly::UPolynomial as_poly_upolynomial(const CVC4::Node& n, - const CVC4::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 CVC4::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 CVC4::Node& n, } return poly::Polynomial(); } -poly::Polynomial as_poly_polynomial(const CVC4::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 CVC4::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 -CVC4::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 @@ CVC4::Node as_cvc_polynomial(const poly::Polynomial& p, VariableMapper& vm) return cmd.d_nm->mkNode(Kind::PLUS, cmd.d_terms); } -poly::SignCondition normalize_kind(CVC4::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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/poly_conversion.h b/src/theory/arith/nl/poly_conversion.h index 47a66d5f1..9adc9a996 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -42,23 +42,23 @@ namespace nl { struct VariableMapper { /** A mapping from CVC4 variables to poly variables. */ - std::map<CVC4::Node, poly::Variable> mVarCVCpoly; + std::map<CVC5::Node, poly::Variable> mVarCVCpoly; /** A mapping from poly variables to CVC4 variables. */ - std::map<poly::Variable, CVC4::Node> mVarpolyCVC; + std::map<poly::Variable, CVC5::Node> mVarpolyCVC; /** Retrieves the according poly variable. */ - poly::Variable operator()(const CVC4::Node& n); + poly::Variable operator()(const CVC5::Node& n); /** Retrieves the according CVC4 variable. */ - CVC4::Node operator()(const poly::Variable& n); + CVC5::Node operator()(const poly::Variable& n); }; -/** Convert a poly univariate polynomial to a CVC4::Node. */ -CVC4::Node as_cvc_upolynomial(const poly::UPolynomial& p, - const CVC4::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 CVC4::Node to a poly univariate polynomial. */ -poly::UPolynomial as_poly_upolynomial(const CVC4::Node& n, - const CVC4::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 CVC4::Node& n, * in the context of ICP) the second overload provides the denominator in the * third argument. */ -poly::Polynomial as_poly_polynomial(const CVC4::Node& n, VariableMapper& vm); -poly::Polynomial as_poly_polynomial(const CVC4::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 CVC4::Node& n, * multiplications with one or use NONLINEAR_MULT where regular MULT may be * sufficient), so it may be sensible to rewrite it afterwards. */ -CVC4::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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arith/nl/stats.cpp b/src/theory/arith/nl/stats.cpp index c707dd9bc..92cebc8fc 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -38,4 +38,4 @@ NlStats::~NlStats() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/stats.h b/src/theory/arith/nl/stats.h index 94e1882b3..66157d0a3 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -44,6 +44,6 @@ class NlStats } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 5d6eeea9e..af23f67f9 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -173,4 +173,4 @@ StepGenerator Strategy::getStrategy() } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/strategy.h b/src/theory/arith/nl/strategy.h index 3540f9ad1..9caf6322b 100644 --- a/src/theory/arith/nl/strategy.h +++ b/src/theory/arith/nl/strategy.h @@ -18,7 +18,7 @@ #include <iosfwd> #include <vector> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -173,6 +173,6 @@ class Strategy } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 8b6f4484d..05849a579 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/transcendental/exponential_solver.h b/src/theory/arith/nl/transcendental/exponential_solver.h index 484174d5f..8bd00c456 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -108,6 +108,6 @@ class ExponentialSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 223db8355..fe071c36a 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -402,4 +402,4 @@ Node TranscendentalProofRuleChecker::checkInternal( } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/transcendental/proof_checker.h b/src/theory/arith/nl/transcendental/proof_checker.h index b00c1811c..2a6837590 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -53,6 +53,6 @@ class TranscendentalProofRuleChecker : public ProofRuleChecker } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 528e0bea2..052b6c056 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/transcendental/sine_solver.h b/src/theory/arith/nl/transcendental/sine_solver.h index c628559fc..c20c50f6d 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -175,6 +175,6 @@ class SineSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 ced202308..f2817344a 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/transcendental/taylor_generator.h b/src/theory/arith/nl/transcendental/taylor_generator.h index 7cb03cd7c..b13be57f0 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -118,6 +118,6 @@ class TaylorGenerator } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 f236b472a..bedfe4d3b 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/transcendental/transcendental_solver.h b/src/theory/arith/nl/transcendental/transcendental_solver.h index 290e74322..e22bf3e64 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -200,6 +200,6 @@ class TranscendentalSolver } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 593354794..6ab136d39 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/nl/transcendental/transcendental_state.h b/src/theory/arith/nl/transcendental/transcendental_state.h index cd5466e89..21a60e038 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 CVC4 { +namespace CVC5 { class CDProof; namespace theory { namespace arith { @@ -278,6 +278,6 @@ struct TranscendentalState } // namespace nl } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 537a39a77..d1ef6486e 100644 --- a/src/theory/arith/normal_form.cpp +++ b/src/theory/arith/normal_form.cpp @@ -24,7 +24,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -1412,4 +1412,4 @@ bool Polynomial::isNonlinear() const { } //namespace arith } //namespace theory -} //namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/normal_form.h b/src/theory/arith/normal_form.h index c3500e699..c4d0e2268 100644 --- a/src/theory/arith/normal_form.h +++ b/src/theory/arith/normal_form.h @@ -28,8 +28,7 @@ #include "theory/arith/delta_rational.h" #include "util/rational.h" - -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -1403,8 +1402,8 @@ public: };/* class Comparison */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 ee15e0f11..15e09eaa5 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -499,4 +499,4 @@ Node OperatorElim::mkWitnessTerm(Node v, } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/operator_elim.h b/src/theory/arith/operator_elim.h index 489974eac..fa09ad26b 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 CVC4 { +namespace CVC5 { class TConvProofGenerator; @@ -142,4 +142,4 @@ class OperatorElim : public EagerProofGenerator } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/partial_model.cpp b/src/theory/arith/partial_model.cpp index 32c61e815..6e4fa6bed 100644 --- a/src/theory/arith/partial_model.cpp +++ b/src/theory/arith/partial_model.cpp @@ -22,7 +22,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -684,6 +684,6 @@ void ArithVariables::UpperBoundCleanUp::operator()(AVCPair* p){ d_pm->popUpperBound(p); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/partial_model.h b/src/theory/arith/partial_model.h index af0fe37ec..b7a1a0efe 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 CVC4 { +namespace CVC5 { namespace context { class Context; } @@ -412,9 +412,8 @@ private: };/* class ArithVariables */ - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 c595791ab..09ef5bf34 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -360,4 +360,4 @@ Node ArithProofRuleChecker::checkInternal(PfRule id, } } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/proof_checker.h b/src/theory/arith/proof_checker.h index 0745bdd61..5b9a50387 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -43,6 +43,6 @@ class ArithProofRuleChecker : public ProofRuleChecker } // namespace arith } // namespace theory -} // namespace CVC4 +} // 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 d453285d6..169e4e2db 100644 --- a/src/theory/arith/proof_macros.h +++ b/src/theory/arith/proof_macros.h @@ -20,12 +20,12 @@ #include "options/smt_options.h" -#define ARITH_PROOF(x) \ - if (CVC4::options::produceProofs()) \ - { \ - x; \ +#define ARITH_PROOF(x) \ + if (CVC5::options::produceProofs()) \ + { \ + x; \ } -#define ARITH_NULLPROOF(x) (CVC4::options::produceProofs()) ? x : NULL -#define ARITH_PROOF_ON() CVC4::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 f2eef7013..9522ef4f4 100644 --- a/src/theory/arith/rewrites.cpp +++ b/src/theory/arith/rewrites.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -47,4 +47,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r) } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arith/rewrites.h b/src/theory/arith/rewrites.h index 6b5e8fc9f..250eacb09 100644 --- a/src/theory/arith/rewrites.h +++ b/src/theory/arith/rewrites.h @@ -19,7 +19,7 @@ #include <iosfwd> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -77,6 +77,6 @@ std::ostream& operator<<(std::ostream& out, Rewrite r); } // namespace arith } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__ARITH__REWRITES_H */ diff --git a/src/theory/arith/simplex.cpp b/src/theory/arith/simplex.cpp index 49267034c..fe6fad4d7 100644 --- a/src/theory/arith/simplex.cpp +++ b/src/theory/arith/simplex.cpp @@ -26,7 +26,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -278,6 +278,6 @@ SimplexDecisionProcedure::sgn_table::const_iterator SimplexDecisionProcedure::fi pair<ArithVar, int> p = make_pair(col, determinizeSgn(sgn)); return sgns.find(p); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/simplex.h b/src/theory/arith/simplex.h index 5edfc1608..a1ee18adf 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -219,6 +219,6 @@ protected: };/* class SimplexDecisionProcedure */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/simplex_update.cpp b/src/theory/arith/simplex_update.cpp index 98bf07ccf..ea868a886 100644 --- a/src/theory/arith/simplex_update.cpp +++ b/src/theory/arith/simplex_update.cpp @@ -19,7 +19,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -186,6 +186,6 @@ std::ostream& operator<<(std::ostream& out, WitnessImprovement w){ return out; } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/simplex_update.h b/src/theory/arith/simplex_update.h index f8a6bf957..833e92dd4 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -352,6 +352,6 @@ private: std::ostream& operator<<(std::ostream& out, const UpdateInfo& up); -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/soi_simplex.cpp b/src/theory/arith/soi_simplex.cpp index eef0ede43..0efc33d02 100644 --- a/src/theory/arith/soi_simplex.cpp +++ b/src/theory/arith/soi_simplex.cpp @@ -28,7 +28,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -1022,6 +1022,6 @@ Result::Sat SumOfInfeasibilitiesSPD::sumOfInfeasibilities(){ } } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/soi_simplex.h b/src/theory/arith/soi_simplex.h index d9d11dcc5..16af7292d 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -240,6 +240,6 @@ private: } d_statistics; };/* class FCSimplexDecisionProcedure */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/tableau.cpp b/src/theory/arith/tableau.cpp index 1d57a40dd..c39b3aae7 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -190,6 +190,6 @@ void Tableau::printBasicRow(ArithVar basic, std::ostream& out){ printRow(basicToRowIndex(basic), out); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/tableau.h b/src/theory/arith/tableau.h index 9ee33d7b6..0834c7f35 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -157,8 +157,6 @@ private: };/* class Tableau */ - - -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/tableau_sizes.cpp b/src/theory/arith/tableau_sizes.cpp index 4b699a019..a167cf1a8 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -31,6 +31,6 @@ uint32_t TableauSizes::getColumnLength(ArithVar x) const { return d_tab->getColLength(x); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/tableau_sizes.h b/src/theory/arith/tableau_sizes.h index 16e58bb2e..3bbb5c818 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -37,7 +37,6 @@ public: uint32_t getColumnLength(ArithVar x) const; }; /* TableauSizes */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ - +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/theory_arith.cpp b/src/theory/arith/theory_arith.cpp index a179336af..12603ea7d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -311,6 +311,6 @@ eq::ProofEqEngine* TheoryArith::getProofEqEngine() return d_im.getProofEqEngine(); } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/theory_arith.h b/src/theory/arith/theory_arith.h index e0fa1b2d0..e430f6da6 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { namespace nl { @@ -163,6 +163,6 @@ class TheoryArith : public Theory { };/* class TheoryArith */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/theory_arith_private.cpp b/src/theory/arith/theory_arith_private.cpp index b85aeb135..1e9e8ca3f 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -5712,6 +5712,6 @@ std::pair<Node, DeltaRational> TheoryArithPrivate::entailmentCheckSimplex(int sg // return result; // } -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/theory_arith_private.h b/src/theory/arith/theory_arith_private.h index 4b2fcf8a8..e0b7cea56 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 CVC4 { +namespace CVC5 { namespace theory { class EagerProofGenerator; @@ -884,6 +884,6 @@ private: Statistics d_statistics; };/* class TheoryArithPrivate */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arith/theory_arith_type_rules.h b/src/theory/arith/theory_arith_type_rules.h index fbf31e6e2..dc8885e55 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -157,8 +157,8 @@ class IndexedRootPredicateTypeRule } }; /* class IndexedRootPredicateTypeRule */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 a9e35cdc3..a32073ad9 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 CVC4 { +namespace CVC5 { namespace theory { namespace arith { @@ -100,8 +100,8 @@ class IntegerEnumerator : public TypeEnumeratorBase<IntegerEnumerator> { bool isFinished() override { return false; } };/* class IntegerEnumerator */ -}/* CVC4::theory::arith namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arith +} // namespace theory +} // 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 7919892c6..64e1d81c8 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -517,7 +517,6 @@ void ArrayInfo::mergeInfo(const TNode a, const TNode b){ } - -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arrays/array_info.h b/src/theory/arrays/array_info.h index 174980474..405a40ead 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -205,8 +205,8 @@ public: void mergeInfo(const TNode a, const TNode b); };/* class ArrayInfo */ -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // 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 02ef6bb70..f53fe8cc3 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -129,4 +129,4 @@ void InferenceManager::convert(PfRule& id, } // namespace arrays } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arrays/inference_manager.h b/src/theory/arrays/inference_manager.h index 0bff656d7..60336dd63 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -71,6 +71,6 @@ class InferenceManager : public TheoryInferenceManager } // namespace arrays } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arrays/kinds b/src/theory/arrays/kinds index 629064d99..d8d4b2bae 100644 --- a/src/theory/arrays/kinds +++ b/src/theory/arrays/kinds @@ -4,25 +4,25 @@ # src/theory/builtin/kinds. # -theory THEORY_ARRAYS ::CVC4::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 ::CVC4::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 \ - "::CVC4::theory::arrays::ArraysProperties::computeCardinality(%TYPE%)" \ + "::CVC5::theory::arrays::ArraysProperties::computeCardinality(%TYPE%)" \ "theory/arrays/theory_arrays_type_rules.h" well-founded ARRAY_TYPE \ - "::CVC4::theory::arrays::ArraysProperties::isWellFounded(%TYPE%)" \ - "::CVC4::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 \ - "::CVC4::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 \ - ::CVC4::ArrayStoreAll \ - ::CVC4::ArrayStoreAllHashFunction \ + ::CVC5::ArrayStoreAll \ + ::CVC5::ArrayStoreAllHashFunction \ "expr/array_store_all.h" \ - "array store-all; payload is an instance of the CVC4::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 ::CVC4::theory::arrays::ArraySelectTypeRule -typerule STORE ::CVC4::theory::arrays::ArrayStoreTypeRule -typerule STORE_ALL ::CVC4::theory::arrays::ArrayStoreTypeRule -typerule ARR_TABLE_FUN ::CVC4::theory::arrays::ArrayTableFunTypeRule -typerule ARRAY_LAMBDA ::CVC4::theory::arrays::ArrayLambdaTypeRule -typerule EQ_RANGE ::CVC4::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 ::CVC4::theory::arrays::ArrayPartialSelectTypeRule -typerule PARTIAL_SELECT_1 ::CVC4::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 ::CVC4::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 e67ec3011..72e444d63 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -115,4 +115,4 @@ Node ArraysProofRuleChecker::checkInternal(PfRule id, } // namespace arrays } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arrays/proof_checker.h b/src/theory/arrays/proof_checker.h index 053502788..64d5d785f 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -43,6 +43,6 @@ class ArraysProofRuleChecker : public ProofRuleChecker } // namespace arrays } // namespace theory -} // namespace CVC4 +} // 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 2c755658a..a1f2fddc4 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -78,4 +78,4 @@ Node SkolemCache::getExtIndexVar(Node deq) } // namespace arrays } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/arrays/skolem_cache.h b/src/theory/arrays/skolem_cache.h index 7b0facd97..a95dc9a4f 100644 --- a/src/theory/arrays/skolem_cache.h +++ b/src/theory/arrays/skolem_cache.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -52,6 +52,6 @@ class SkolemCache } // namespace arrays } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/arrays/theory_arrays.cpp b/src/theory/arrays/theory_arrays.cpp index 15ccd400d..665ad8da0 100644 --- a/src/theory/arrays/theory_arrays.cpp +++ b/src/theory/arrays/theory_arrays.cpp @@ -36,7 +36,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -2269,6 +2269,6 @@ void TheoryArrays::computeRelevantTerms(std::set<Node>& termSet) } while (changed); } -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h index 6a723d680..a7db2db7a 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -488,8 +488,8 @@ class TheoryArrays : public Theory { void computeRelevantTerms(std::set<Node>& termSet) override; };/* class TheoryArrays */ -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // 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 5bb916968..e91844a9c 100644 --- a/src/theory/arrays/theory_arrays_rewriter.cpp +++ b/src/theory/arrays/theory_arrays_rewriter.cpp @@ -18,14 +18,14 @@ #include "expr/attribute.h" #include "theory/arrays/theory_arrays_rewriter.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arrays { namespace attr { struct ArrayConstantMostFrequentValueTag { }; struct ArrayConstantMostFrequentValueCountTag { }; -}/* CVC4::theory::arrays::attr namespace */ + } // namespace attr typedef expr::Attribute<attr::ArrayConstantMostFrequentValueCountTag, uint64_t> ArrayConstantMostFrequentValueCountAttr; typedef expr::Attribute<attr::ArrayConstantMostFrequentValueTag, Node> ArrayConstantMostFrequentValueAttr; @@ -44,6 +44,6 @@ void setMostFrequentValueCount(TNode store, uint64_t count) { return store.setAttribute(ArrayConstantMostFrequentValueCountAttr(), count); } -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arrays/theory_arrays_rewriter.h b/src/theory/arrays/theory_arrays_rewriter.h index 72cbdd475..114913ee7 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -501,8 +501,8 @@ class TheoryArraysRewriter : public TheoryRewriter }; /* class TheoryArraysRewriter */ -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // 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 310d8495a..fc3340251 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -274,8 +274,8 @@ struct ArrayEqRangeTypeRule } }; /* struct ArrayEqRangeTypeRule */ -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // 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 f81a9b54d..4f5b981b2 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 CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -155,8 +155,8 @@ class ArrayEnumerator : public TypeEnumeratorBase<ArrayEnumerator> { };/* class ArrayEnumerator */ -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // 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 eeb870775..e178e9dbb 100644 --- a/src/theory/arrays/union_find.cpp +++ b/src/theory/arrays/union_find.cpp @@ -23,7 +23,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace arrays { @@ -51,6 +51,6 @@ template void UnionFind<Node, NodeHashFunction>::notify(); template void UnionFind<TNode, TNodeHashFunction>::notify(); -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/arrays/union_find.h b/src/theory/arrays/union_find.h index e6886ec11..ebe31baad 100644 --- a/src/theory/arrays/union_find.h +++ b/src/theory/arrays/union_find.h @@ -28,11 +28,11 @@ #include "expr/node.h" #include "context/cdo.h" -namespace CVC4 { +namespace CVC5 { namespace context { class Context; -}/* CVC4::context namespace */ + } // namespace context namespace theory { namespace arrays { @@ -135,8 +135,8 @@ inline void UnionFind<NodeType, NodeHash>::setCanon(TNode n, TNode newParent) { } } -}/* CVC4::theory::arrays namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace arrays +} // namespace theory +} // namespace CVC5 #endif /*CVC4__THEORY__ARRAYS__UNION_FIND_H */ diff --git a/src/theory/assertion.cpp b/src/theory/assertion.cpp index c0ba30c5b..b21025314 100644 --- a/src/theory/assertion.cpp +++ b/src/theory/assertion.cpp @@ -16,12 +16,12 @@ #include "theory/assertion.h" -namespace CVC4 { +namespace CVC5 { namespace theory { std::ostream& operator<<(std::ostream& out, const Assertion& a) { return out << a.d_assertion; } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/assertion.h b/src/theory/assertion.h index 90fb0cfac..10f300d69 100644 --- a/src/theory/assertion.h +++ b/src/theory/assertion.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { /** Information about an assertion for the theories. */ @@ -47,7 +47,7 @@ struct Assertion { std::ostream& operator<<(std::ostream& out, const Assertion& a); -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__ASSERTION_H */ diff --git a/src/theory/atom_requests.cpp b/src/theory/atom_requests.cpp index 0bcd07dbd..c3305417f 100644 --- a/src/theory/atom_requests.cpp +++ b/src/theory/atom_requests.cpp @@ -17,7 +17,7 @@ #include "theory/atom_requests.h" -using namespace CVC4; +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 b8a653bc3..906fec303 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 CVC4 { +namespace CVC5 { class AtomRequests { @@ -114,8 +114,4 @@ private: }; -} - - - - +} // namespace CVC5 diff --git a/src/theory/bags/bag_solver.cpp b/src/theory/bags/bag_solver.cpp index a7a0f8796..fd80a03f7 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -212,4 +212,4 @@ void BagSolver::checkDisequalBagTerms() } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/bag_solver.h b/src/theory/bags/bag_solver.h index 914a12ae2..9d0e597dd 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -90,6 +90,6 @@ class BagSolver } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 54b279e66..ccee08aab 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -503,4 +503,4 @@ BagsRewriteResponse BagsRewriter::postRewriteEqual(const TNode& n) const } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/bags_rewriter.h b/src/theory/bags/bags_rewriter.h index 6c440c512..4552ed9da 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -223,6 +223,6 @@ class BagsRewriter : public TheoryRewriter } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 8ec686d87..369831c70 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -32,4 +32,4 @@ BagsStatistics::~BagsStatistics() } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/bags_statistics.h b/src/theory/bags/bags_statistics.h index c8f7ed420..e0a1c4133 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -40,6 +40,6 @@ class BagsStatistics } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 d7638c89c..444597eb5 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -79,4 +79,4 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii) } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/infer_info.h b/src/theory/bags/infer_info.h index c76f74c0c..18765bbe7 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 CVC4 { +namespace CVC5 { namespace theory { class TheoryInferenceManager; @@ -85,6 +85,6 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii); } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 0d56080c4..2f6a36b9c 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -270,4 +270,4 @@ Node InferenceGenerator::getMultiplicityTerm(Node element, Node bag) } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/inference_generator.h b/src/theory/bags/inference_generator.h index bfaf5d0fc..4f0b498c2 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -188,6 +188,6 @@ class InferenceGenerator } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 dcc5387e9..3fa425f7a 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -48,4 +48,4 @@ void InferenceManager::doPending() } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/inference_manager.h b/src/theory/bags/inference_manager.h index d74d3c189..34f6621aa 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -63,6 +63,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__BAGS__INFERENCE_MANAGER_H */ diff --git a/src/theory/bags/kinds b/src/theory/bags/kinds index f84b811e7..cd53484eb 100644 --- a/src/theory/bags/kinds +++ b/src/theory/bags/kinds @@ -5,10 +5,10 @@ # theory THEORY_BAGS \ - ::CVC4::theory::bags::TheoryBags \ + ::CVC5::theory::bags::TheoryBags \ "theory/bags/theory_bags.h" typechecker "theory/bags/theory_bags_type_rules.h" -rewriter ::CVC4::theory::bags::BagsRewriter \ +rewriter ::CVC5::theory::bags::BagsRewriter \ "theory/bags/bags_rewriter.h" properties parametric @@ -16,22 +16,22 @@ properties check propagate presolve # constants constant EMPTYBAG \ - ::CVC4::EmptyBag \ - ::CVC4::EmptyBagHashFunction \ + ::CVC5::EmptyBag \ + ::CVC5::EmptyBagHashFunction \ "expr/emptybag.h" \ - "the empty bag constant; payload is an instance of the CVC4::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 \ - "::CVC4::theory::bags::BagsProperties::computeCardinality(%TYPE%)" \ + "::CVC5::theory::bags::BagsProperties::computeCardinality(%TYPE%)" \ "theory/bags/theory_bags_type_rules.h" well-founded BAG_TYPE \ - "::CVC4::theory::bags::BagsProperties::isWellFounded(%TYPE%)" \ - "::CVC4::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 \ - "::CVC4::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 \ - ::CVC4::MakeBagOp \ - ::CVC4::MakeBagOpHashFunction \ + ::CVC5::MakeBagOp \ + ::CVC5::MakeBagOpHashFunction \ "theory/bags/make_bag_op.h" \ - "operator for MK_BAG; payload is an instance of the CVC4::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 ::CVC4::theory::bags::BinaryOperatorTypeRule -typerule UNION_DISJOINT ::CVC4::theory::bags::BinaryOperatorTypeRule -typerule INTERSECTION_MIN ::CVC4::theory::bags::BinaryOperatorTypeRule -typerule DIFFERENCE_SUBTRACT ::CVC4::theory::bags::BinaryOperatorTypeRule -typerule DIFFERENCE_REMOVE ::CVC4::theory::bags::BinaryOperatorTypeRule -typerule SUBBAG ::CVC4::theory::bags::SubBagTypeRule -typerule BAG_COUNT ::CVC4::theory::bags::CountTypeRule -typerule DUPLICATE_REMOVAL ::CVC4::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 ::CVC4::theory::bags::MkBagTypeRule -typerule EMPTYBAG ::CVC4::theory::bags::EmptyBagTypeRule -typerule BAG_CARD ::CVC4::theory::bags::CardTypeRule -typerule BAG_CHOOSE ::CVC4::theory::bags::ChooseTypeRule -typerule BAG_IS_SINGLETON ::CVC4::theory::bags::IsSingletonTypeRule -typerule BAG_FROM_SET ::CVC4::theory::bags::FromSetTypeRule -typerule BAG_TO_SET ::CVC4::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 ::CVC4::theory::bags::BinaryOperatorTypeRule -construle MK_BAG ::CVC4::theory::bags::MkBagTypeRule +construle UNION_DISJOINT ::CVC5::theory::bags::BinaryOperatorTypeRule +construle MK_BAG ::CVC5::theory::bags::MkBagTypeRule endtheory
\ No newline at end of file diff --git a/src/theory/bags/make_bag_op.cpp b/src/theory/bags/make_bag_op.cpp index 92cf49203..15e3a30c7 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/make_bag_op.h b/src/theory/bags/make_bag_op.h index e8610e7db..4c2a3e933 100644 --- a/src/theory/bags/make_bag_op.h +++ b/src/theory/bags/make_bag_op.h @@ -19,7 +19,7 @@ #include <memory> -namespace CVC4 { +namespace CVC5 { class TypeNode; @@ -57,6 +57,6 @@ struct MakeBagOpHashFunction size_t operator()(const MakeBagOp& op) const; }; /* struct MakeBagOpHashFunction */ -} // namespace CVC4 +} // 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 ad723d293..5952b66d8 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -674,4 +674,4 @@ Node NormalForm::evaluateToSet(TNode n) } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/normal_form.h b/src/theory/bags/normal_form.h index a779d3321..1c7f05d8e 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -192,6 +192,6 @@ class NormalForm }; } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__BAGS__NORMAL_FORM_H */ diff --git a/src/theory/bags/rewrites.cpp b/src/theory/bags/rewrites.cpp index ab2ca2901..d0299d52a 100644 --- a/src/theory/bags/rewrites.cpp +++ b/src/theory/bags/rewrites.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -79,4 +79,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r) } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/rewrites.h b/src/theory/bags/rewrites.h index 5d0b8a087..9e7bb54fa 100644 --- a/src/theory/bags/rewrites.h +++ b/src/theory/bags/rewrites.h @@ -19,7 +19,7 @@ #include <iosfwd> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -92,6 +92,6 @@ std::ostream& operator<<(std::ostream& out, Rewrite r); } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 4fead8ab7..4011a3fc4 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -136,4 +136,4 @@ void SolverState::collectDisequalBagTerms() } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/solver_state.h b/src/theory/bags/solver_state.h index d8820d8c4..e6b2a2504 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -90,6 +90,6 @@ class SolverState : public TheoryState } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 192fd6809..072655834 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -45,4 +45,4 @@ Node TermRegistry::getEmptyBag(TypeNode tn) } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/term_registry.h b/src/theory/bags/term_registry.h index 87e61a026..adf97fd5f 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -59,6 +59,6 @@ class TermRegistry } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 2950739e4..f91fd40f0 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/theory_bags.h b/src/theory/bags/theory_bags.h index df64c3f1c..6bd9ddc65 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -114,6 +114,6 @@ class TheoryBags : public Theory } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 d9284b862..02494727c 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -83,4 +83,4 @@ bool BagEnumerator::isFinished() } // namespace bags } // namespace theory -} // namespace CVC4
\ 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 aa59a72e6..c13946388 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -86,6 +86,6 @@ class BagEnumerator : public TypeEnumeratorBase<BagEnumerator> } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 5a97155fc..2acbb1e27 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 CVC4 { +namespace CVC5 { namespace theory { namespace bags { @@ -279,4 +279,4 @@ TypeNode ToSetTypeRule::computeType(NodeManager* nodeManager, } } // namespace bags } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bags/theory_bags_type_rules.h b/src/theory/bags/theory_bags_type_rules.h index 41e1164c2..dd93186ad 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 CVC4 { +namespace CVC5 { class NodeManager; @@ -102,6 +102,6 @@ struct BagsProperties } // namespace bags } // namespace theory -} // namespace CVC4 +} // 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 b50ec34c7..897c86e93 100644 --- a/src/theory/booleans/circuit_propagator.cpp +++ b/src/theory/booleans/circuit_propagator.cpp @@ -31,7 +31,7 @@ using namespace std; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/booleans/circuit_propagator.h b/src/theory/booleans/circuit_propagator.h index ba8c5782d..6caccef08 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 CVC4 { +namespace CVC5 { class ProofGenerator; class ProofNode; @@ -274,6 +274,6 @@ class CircuitPropagator } // namespace booleans } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__BOOLEANS__CIRCUIT_PROPAGATOR_H */ diff --git a/src/theory/booleans/kinds b/src/theory/booleans/kinds index 9d7b3fbd6..d8009ad12 100644 --- a/src/theory/booleans/kinds +++ b/src/theory/booleans/kinds @@ -4,12 +4,12 @@ # src/theory/builtin/kinds. # -theory THEORY_BOOL ::CVC4::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 ::CVC4::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 \ - ::CVC4::BoolHashFunction \ + ::CVC5::BoolHashFunction \ "util/bool.h" \ "truth and falsity; payload is a (C++) bool" enumerator BOOLEAN_TYPE \ - "::CVC4::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 ::CVC4::theory::boolean::BooleanTypeRule +typerule CONST_BOOLEAN ::CVC5::theory::boolean::BooleanTypeRule -typerule NOT ::CVC4::theory::boolean::BooleanTypeRule -typerule AND ::CVC4::theory::boolean::BooleanTypeRule -typerule IMPLIES ::CVC4::theory::boolean::BooleanTypeRule -typerule OR ::CVC4::theory::boolean::BooleanTypeRule -typerule XOR ::CVC4::theory::boolean::BooleanTypeRule -typerule ITE ::CVC4::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 6244ff3f4..a51f238a2 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 CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -948,4 +948,4 @@ Node BoolProofRuleChecker::checkInternal(PfRule id, } // namespace booleans } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/booleans/proof_checker.h b/src/theory/booleans/proof_checker.h index 1d807fd90..93c3baf1e 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 CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -43,6 +43,6 @@ class BoolProofRuleChecker : public ProofRuleChecker } // namespace booleans } // namespace theory -} // namespace CVC4 +} // 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 aaff82933..b84cf5488 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 CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -587,4 +587,4 @@ std::shared_ptr<ProofNode> ProofCircuitPropagatorForward::xorEval(bool x, } // namespace booleans } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/booleans/proof_circuit_propagator.h b/src/theory/booleans/proof_circuit_propagator.h index fa472b602..671c6e964 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 CVC4 { +namespace CVC5 { class ProofNode; class ProofNodeManager; @@ -212,6 +212,6 @@ class ProofCircuitPropagatorForward : public ProofCircuitPropagator } // namespace booleans } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/booleans/theory_bool.cpp b/src/theory/booleans/theory_bool.cpp index bdd428245..2df179e27 100644 --- a/src/theory/booleans/theory_bool.cpp +++ b/src/theory/booleans/theory_bool.cpp @@ -31,7 +31,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -80,6 +80,6 @@ Theory::PPAssertStatus TheoryBool::ppAssert( return Theory::ppAssert(tin, outSubstitutions); } -}/* CVC4::theory::booleans namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace booleans +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/booleans/theory_bool.h b/src/theory/booleans/theory_bool.h index 12c9fa72f..cbd9ec381 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 CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -51,8 +51,8 @@ class TheoryBool : public Theory { BoolProofRuleChecker d_bProofChecker; };/* class TheoryBool */ -}/* CVC4::theory::booleans namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace booleans +} // namespace theory +} // 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 4c15b2d8f..3cc19a520 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 CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -429,6 +429,6 @@ RewriteResponse TheoryBoolRewriter::preRewrite(TNode n) { return RewriteResponse(REWRITE_DONE, n); } -}/* CVC4::theory::booleans namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace booleans +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/booleans/theory_bool_rewriter.h b/src/theory/booleans/theory_bool_rewriter.h index 7af1abc0c..4caf5c681 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 CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -34,8 +34,8 @@ class TheoryBoolRewriter : public TheoryRewriter }; /* class TheoryBoolRewriter */ -}/* CVC4::theory::booleans namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace booleans +} // namespace theory +} // 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 afb5ef92e..2f59a032e 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 CVC4 { +namespace CVC5 { namespace theory { namespace boolean { @@ -70,8 +70,8 @@ public: } };/* class IteTypeRule */ -}/* CVC4::theory::boolean namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace boolean +} // namespace theory +} // 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 b2aeecae0..9b6619961 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 CVC4 { +namespace CVC5 { namespace theory { namespace booleans { @@ -63,8 +63,8 @@ class BooleanEnumerator : public TypeEnumeratorBase<BooleanEnumerator> { bool isFinished() override { return d_value == DONE; } };/* class BooleanEnumerator */ -}/* CVC4::theory::booleans namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace booleans +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__BOOLEANS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/builtin/kinds b/src/theory/builtin/kinds index cf68e060c..48ceaf103 100644 --- a/src/theory/builtin/kinds +++ b/src/theory/builtin/kinds @@ -196,7 +196,7 @@ # is with your type checker: # # cardinality MY_TYPE \ -# ::CVC4::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 ::CVC4::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 ::CVC4::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 \ - "::CVC4::theory::builtin::SortProperties::isWellFounded(%TYPE%)" \ - "::CVC4::theory::builtin::SortProperties::mkGroundTerm(%TYPE%)" + "::CVC5::theory::builtin::SortProperties::isWellFounded(%TYPE%)" \ + "::CVC5::theory::builtin::SortProperties::mkGroundTerm(%TYPE%)" constant UNINTERPRETED_CONSTANT \ - ::CVC4::UninterpretedConstant \ - ::CVC4::UninterpretedConstantHashFunction \ + ::CVC5::UninterpretedConstant \ + ::CVC5::UninterpretedConstantHashFunction \ "expr/uninterpreted_constant.h" \ - "the kind of expressions representing uninterpreted constants; payload is an instance of the CVC4::UninterpretedConstant class (used in models)" -typerule UNINTERPRETED_CONSTANT ::CVC4::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 \ - ::CVC4::theory::builtin::UninterpretedSortEnumerator \ + ::CVC5::theory::builtin::UninterpretedSortEnumerator \ "theory/builtin/type_enumerator.h" constant ABSTRACT_VALUE \ - ::CVC4::AbstractValue \ - ::CVC4::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 CVC4::AbstractValue class (used in models)" -typerule ABSTRACT_VALUE ::CVC4::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 \ - ::CVC4::Kind \ - ::CVC4::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 \ - ::CVC4::TypeConstant \ - ::CVC4::TypeConstantHashFunction \ + ::CVC5::TypeConstant \ + ::CVC5::TypeConstantHashFunction \ "expr/kind.h" \ "a representation for basic types" operator FUNCTION_TYPE 2: "a function type" cardinality FUNCTION_TYPE \ - "::CVC4::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ + "::CVC5::theory::builtin::FunctionProperties::computeCardinality(%TYPE%)" \ "theory/builtin/theory_builtin_type_rules.h" well-founded FUNCTION_TYPE \ - "::CVC4::theory::builtin::FunctionProperties::isWellFounded(%TYPE%)" \ - "::CVC4::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 \ - ::CVC4::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 ::CVC4::theory::builtin::EqualityTypeRule -typerule DISTINCT ::CVC4::theory::builtin::DistinctTypeRule -typerule SEXPR ::CVC4::theory::builtin::SExprTypeRule -typerule LAMBDA ::CVC4::theory::builtin::LambdaTypeRule -typerule WITNESS ::CVC4::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 ::CVC4::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 3e0eca128..62f0f1b9a 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { const char* toString(MethodId id) @@ -497,4 +497,4 @@ Node BuiltinProofRuleChecker::mkTheoryIdNode(TheoryId tid) } // namespace builtin } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/builtin/proof_checker.h b/src/theory/builtin/proof_checker.h index 77cb2593a..ed68f1215 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -179,6 +179,6 @@ class BuiltinProofRuleChecker : public ProofRuleChecker } // namespace builtin } // namespace theory -} // namespace CVC4 +} // 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 13162960c..83e9d3fed 100644 --- a/src/theory/builtin/theory_builtin.cpp +++ b/src/theory/builtin/theory_builtin.cpp @@ -24,7 +24,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -62,4 +62,4 @@ void TheoryBuiltin::finishInit() } // namespace builtin } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/builtin/theory_builtin.h b/src/theory/builtin/theory_builtin.h index 94a00b7e3..449282ae6 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 CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -53,6 +53,6 @@ class TheoryBuiltin : public Theory } // namespace builtin } // namespace theory -} // namespace CVC4 +} // 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 16e454e04..16fc59a5a 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 CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -502,6 +502,6 @@ Node TheoryBuiltinRewriter::getArrayRepresentationForLambda(TNode n) return Rewriter::rewrite(anode); } -}/* CVC4::theory::builtin namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace builtin +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/builtin/theory_builtin_rewriter.h b/src/theory/builtin/theory_builtin_rewriter.h index bf84d543b..c419abdb3 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 CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -117,8 +117,8 @@ class TheoryBuiltinRewriter : public TheoryRewriter static Node getArrayRepresentationForLambda(TNode n); }; /* class TheoryBuiltinRewriter */ -}/* CVC4::theory::builtin namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace builtin +} // namespace theory +} // 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 3abdbd48f..d5a5c9ab7 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 CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -47,4 +47,4 @@ Node SortProperties::mkGroundTerm(TypeNode type) } // namespace builtin } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/builtin/theory_builtin_type_rules.h b/src/theory/builtin/theory_builtin_type_rules.h index e0c68aa0f..815483507 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 CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -246,8 +246,8 @@ class FunctionProperties { } };/* class FuctionProperties */ -}/* CVC4::theory::builtin namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace builtin +} // namespace theory +} // 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 6f7082191..4dda11070 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 CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -47,6 +47,6 @@ FunctionEnumerator& FunctionEnumerator::operator++() return *this; } -} /* CVC4::theory::builtin namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace builtin +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/builtin/type_enumerator.h b/src/theory/builtin/type_enumerator.h index 7b4b09f84..50cd50dda 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 CVC4 { +namespace CVC5 { namespace theory { namespace builtin { @@ -104,8 +104,8 @@ class FunctionEnumerator : public TypeEnumeratorBase<FunctionEnumerator> Node d_bvl; }; /* class FunctionEnumerator */ -}/* CVC4::theory::builtin namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace builtin +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__BUILTIN_TYPE_ENUMERATOR_H */ diff --git a/src/theory/bv/abstraction.cpp b/src/theory/bv/abstraction.cpp index 3b9df3518..ee4b467b8 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 CVC4; -using namespace CVC4::theory; -using namespace CVC4::theory::bv; -using namespace CVC4::context; +using namespace CVC5; +using namespace CVC5::theory; +using namespace CVC5::theory::bv; +using namespace CVC5::context; using namespace std; -using namespace CVC4::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 e22e221f2..6c36de34c 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -246,6 +246,6 @@ public: } } -} +} // namespace CVC5 #endif diff --git a/src/theory/bv/bitblast/aig_bitblaster.cpp b/src/theory/bv/bitblast/aig_bitblaster.cpp index 465a8eb65..002a4f631 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 CVC4 { +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[] = "CVC4::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 CVC4 +} // 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 d3326f853..3eccbd3ec 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 CVC4 { +namespace CVC5 { namespace prop { class SatSolver; } @@ -121,6 +121,6 @@ class AigBitblaster : public TBitblaster<Abc_Obj_t*> } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 01eabfab5..7ae55015f 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -899,6 +899,6 @@ void DefaultRotateLeftBB (TNode node, std::vector<T>& bits, TBitblaster<T>* bb) } } -} +} // namespace CVC5 #endif diff --git a/src/theory/bv/bitblast/bitblast_utils.h b/src/theory/bv/bitblast/bitblast_utils.h index 37618bd06..e342d4410 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 CVC4 { +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 CVC4 +} // 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 738f511b6..90ea5ac2b 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -268,6 +268,6 @@ Node TBitblaster<T>::getTermModel(TNode node, bool fullModel) } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 bbddf82cd..5e22262e2 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -288,4 +288,4 @@ bool EagerBitblaster::isSharedTerm(TNode node) { } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bitblast/eager_bitblaster.h b/src/theory/bv/bitblast/eager_bitblaster.h index d66b46505..dead462b5 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -85,5 +85,5 @@ class BitblastingRegistrar : public prop::Registrar } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 7e36f63dd..e20a6f6b5 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -590,4 +590,4 @@ void TLazyBitblaster::clearSolver() { } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bitblast/lazy_bitblaster.h b/src/theory/bv/bitblast/lazy_bitblaster.h index 622369043..1a963e67d 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 CVC4 { +namespace CVC5 { namespace prop { class CnfStream; class NullRegistrat; @@ -176,5 +176,5 @@ class TLazyBitblaster : public TBitblaster<Node> } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 4210c4a86..b0cf68609 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -84,4 +84,4 @@ bool BBProof::collectModelValues(TheoryModel* m, } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bitblast/proof_bitblaster.h b/src/theory/bv/bitblast/proof_bitblaster.h index 6c4c04349..894a9a916 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -47,5 +47,5 @@ class BBProof } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/bv/bitblast/simple_bitblaster.cpp b/src/theory/bv/bitblast/simple_bitblaster.cpp index 10eac275e..76677e2db 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -155,4 +155,4 @@ bool BBSimple::isVariable(TNode node) } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bitblast/simple_bitblaster.h b/src/theory/bv/bitblast/simple_bitblaster.h index d337dbc08..1b48f9a68 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -75,6 +75,6 @@ class BBSimple : public TBitblaster<Node> } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/bv/bv_eager_solver.cpp b/src/theory/bv/bv_eager_solver.cpp index e71b200c6..9c478791c 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -125,4 +125,4 @@ bool EagerBitblastSolver::collectModelInfo(TheoryModel* m, bool fullModel) } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bv_eager_solver.h b/src/theory/bv/bv_eager_solver.h index 6a1d61a3b..0fe1ed32b 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -60,6 +60,6 @@ class EagerBitblastSolver { } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 1caae9b5e..67554525a 100644 --- a/src/theory/bv/bv_inequality_graph.cpp +++ b/src/theory/bv/bv_inequality_graph.cpp @@ -18,16 +18,15 @@ #include "theory/bv/theory_bv_utils.h" using namespace std; -using namespace CVC4; -using namespace CVC4::context; -using namespace CVC4::theory; -using namespace CVC4::theory::bv; -using namespace CVC4::theory::bv::utils; - -const TermId CVC4::theory::bv::UndefinedTermId = -1; -const ReasonId CVC4::theory::bv::UndefinedReasonId = -1; -const ReasonId CVC4::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 be5da70b2..caa7220cf 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -291,6 +291,6 @@ public: } } -} +} // 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 36e77b0b7..bbb2f1ca9 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 CVC4::prop; +using namespace CVC5::prop; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -381,4 +381,4 @@ QuickXPlain::Statistics::~Statistics() { } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bv_quick_check.h b/src/theory/bv/bv_quick_check.h index f509c3cb4..3d30d912d 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 CVC4 { +namespace CVC5 { namespace theory { class TheoryModel; @@ -181,6 +181,6 @@ class QuickXPlain } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 d79f69e53..f08f7527a 100644 --- a/src/theory/bv/bv_solver.h +++ b/src/theory/bv/bv_solver.h @@ -21,7 +21,7 @@ #include "theory/theory.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -117,6 +117,6 @@ class BVSolver } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 e6dfd8286..16a99c2e4 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -281,4 +281,4 @@ Node BVSolverBitblast::getValue(TNode node) } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bv_solver_bitblast.h b/src/theory/bv/bv_solver_bitblast.h index d1252659a..794b9fa9b 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -143,6 +143,6 @@ class BVSolverBitblast : public BVSolver } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/bv/bv_solver_lazy.cpp b/src/theory/bv/bv_solver_lazy.cpp index 9562b69c7..ed71fccbe 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 CVC4::theory::bv::utils; +using namespace CVC5::theory::bv::utils; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -828,4 +828,4 @@ void BVSolverLazy::setConflict(Node conflict) } // namespace bv } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/bv/bv_solver_lazy.h b/src/theory/bv/bv_solver_lazy.h index 4c769fb7a..6511900eb 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -229,6 +229,6 @@ class BVSolverLazy : public BVSolver } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 db89c29bb..65d46e861 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -151,4 +151,4 @@ bool BVSolverSimple::collectModelValues(TheoryModel* m, } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bv_solver_simple.h b/src/theory/bv/bv_solver_simple.h index a34ec98ad..1b6976abb 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -81,6 +81,6 @@ class BVSolverSimple : public BVSolver } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/bv/bv_subtheory.h b/src/theory/bv/bv_subtheory.h index d4bba4c5e..e558ea7c7 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 CVC4 { +namespace CVC5 { namespace theory { @@ -107,6 +107,6 @@ class SubtheorySolver { } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 8f774e552..2343d72d1 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 CVC4::context; -using namespace CVC4::prop; -using namespace CVC4::theory::bv::utils; +using namespace CVC5::context; +using namespace CVC5::prop; +using namespace CVC5::theory::bv::utils; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -990,6 +990,6 @@ Node mergeExplanations(TNode expl1, TNode expl2) { return mergeExplanations(expls); } -} /* namespace CVC4::theory::bv */ +} // namespace bv } /* namespace CVc4::theory */ -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/bv/bv_subtheory_algebraic.h b/src/theory/bv/bv_subtheory_algebraic.h index 71db94cf8..e7156a33e 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -245,4 +245,4 @@ class AlgebraicSolver : public SubtheorySolver } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/bv_subtheory_bitblast.cpp b/src/theory/bv/bv_subtheory_bitblast.cpp index 89bca151e..2d21a8f0c 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 CVC4::context; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -276,6 +276,6 @@ void BitblastSolver::setConflict(TNode conflict) d_bv->setConflict(final_conflict); } -}/* namespace CVC4::theory::bv */ -}/* namespace CVC4::theory */ -}/* namespace CVC4 */ +} // namespace bv +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/bv/bv_subtheory_bitblast.h b/src/theory/bv/bv_subtheory_bitblast.h index ca6e53dea..f964fb995 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -83,4 +83,4 @@ class BitblastSolver : public SubtheorySolver } // namespace bv } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/bv/bv_subtheory_core.cpp b/src/theory/bv/bv_subtheory_core.cpp index bda3393e5..486adfdb7 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 CVC4; -using namespace CVC4::context; -using namespace CVC4::theory; -using namespace CVC4::theory::bv; -using namespace CVC4::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 969ded528..700d8c4f5 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -164,4 +164,4 @@ class CoreSolver : public SubtheorySolver { } } -} +} // namespace CVC5 diff --git a/src/theory/bv/bv_subtheory_inequality.cpp b/src/theory/bv/bv_subtheory_inequality.cpp index aa3607a66..d67a5c550 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 CVC4; -using namespace CVC4::context; -using namespace CVC4::theory; -using namespace CVC4::theory::bv; -using namespace CVC4::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 277449026..232c8676e 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -89,6 +89,6 @@ class InequalitySolver : public SubtheorySolver } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 80f47509e..65a8b5480 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 CVC4 { +namespace CVC5 { /* ** Converts bit-vector formulas to integer formulas. @@ -349,6 +349,6 @@ class IntBlaster bool d_introduceFreshIntVars; }; -} // namespace CVC4 +} // namespace CVC5 #endif /* __CVC4__THEORY__BV__INT_BLASTER_H */ diff --git a/src/theory/bv/kinds b/src/theory/bv/kinds index 32e0e9e85..884ee49e6 100644 --- a/src/theory/bv/kinds +++ b/src/theory/bv/kinds @@ -4,36 +4,36 @@ # src/theory/builtin/kinds. # -theory THEORY_BV ::CVC4::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 ::CVC4::theory::bv::TheoryBVRewriter "theory/bv/theory_bv_rewriter.h" +rewriter ::CVC5::theory::bv::TheoryBVRewriter "theory/bv/theory_bv_rewriter.h" constant BITVECTOR_TYPE \ - ::CVC4::BitVectorSize \ - "::CVC4::UnsignedHashFunction< ::CVC4::BitVectorSize >" \ + ::CVC5::BitVectorSize \ + "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorSize >" \ "util/bitvector.h" \ "bit-vector type" cardinality BITVECTOR_TYPE \ - "::CVC4::theory::bv::CardinalityComputer::computeCardinality(%TYPE%)" \ + "::CVC5::theory::bv::CardinalityComputer::computeCardinality(%TYPE%)" \ "theory/bv/theory_bv_type_rules.h" constant CONST_BITVECTOR \ - ::CVC4::BitVector \ - ::CVC4::BitVectorHashFunction \ + ::CVC5::BitVector \ + ::CVC5::BitVectorHashFunction \ "util/bitvector.h" \ - "a fixed-width bit-vector constant; payload is an instance of the CVC4::BitVector class" + "a fixed-width bit-vector constant; payload is an instance of the CVC5::BitVector class" enumerator BITVECTOR_TYPE \ - "::CVC4::theory::bv::BitVectorEnumerator" \ + "::CVC5::theory::bv::BitVectorEnumerator" \ "theory/bv/type_enumerator.h" well-founded BITVECTOR_TYPE \ true \ - "(*CVC4::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 \ - ::CVC4::BitVectorBitOf \ - ::CVC4::BitVectorBitOfHashFunction \ + ::CVC5::BitVectorBitOf \ + ::CVC5::BitVectorBitOfHashFunction \ "util/bitvector.h" \ - "operator for the bit-vector boolean bit extract; payload is an instance of the CVC4::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 \ - ::CVC4::BitVectorExtract \ - ::CVC4::BitVectorExtractHashFunction \ + ::CVC5::BitVectorExtract \ + ::CVC5::BitVectorExtractHashFunction \ "util/bitvector.h" \ - "operator for the bit-vector extract; payload is an instance of the CVC4::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 \ - ::CVC4::BitVectorRepeat \ - "::CVC4::UnsignedHashFunction< ::CVC4::BitVectorRepeat >" \ + ::CVC5::BitVectorRepeat \ + "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorRepeat >" \ "util/bitvector.h" \ - "operator for the bit-vector repeat; payload is an instance of the CVC4::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 \ - ::CVC4::BitVectorRotateLeft \ - "::CVC4::UnsignedHashFunction< ::CVC4::BitVectorRotateLeft >" \ + ::CVC5::BitVectorRotateLeft \ + "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorRotateLeft >" \ "util/bitvector.h" \ - "operator for the bit-vector rotate left; payload is an instance of the CVC4::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 \ - ::CVC4::BitVectorRotateRight \ - "::CVC4::UnsignedHashFunction< ::CVC4::BitVectorRotateRight >" \ + ::CVC5::BitVectorRotateRight \ + "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorRotateRight >" \ "util/bitvector.h" \ - "operator for the bit-vector rotate right; payload is an instance of the CVC4::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 \ - ::CVC4::BitVectorSignExtend \ - "::CVC4::UnsignedHashFunction< ::CVC4::BitVectorSignExtend >" \ + ::CVC5::BitVectorSignExtend \ + "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorSignExtend >" \ "util/bitvector.h" \ - "operator for the bit-vector sign-extend; payload is an instance of the CVC4::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 \ - ::CVC4::BitVectorZeroExtend \ - "::CVC4::UnsignedHashFunction< ::CVC4::BitVectorZeroExtend >" \ + ::CVC5::BitVectorZeroExtend \ + "::CVC5::UnsignedHashFunction< ::CVC5::BitVectorZeroExtend >" \ "util/bitvector.h" \ - "operator for the bit-vector zero-extend; payload is an instance of the CVC4::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 \ - ::CVC4::IntToBitVector \ - "::CVC4::UnsignedHashFunction< ::CVC4::IntToBitVector >" \ + ::CVC5::IntToBitVector \ + "::CVC5::UnsignedHashFunction< ::CVC5::IntToBitVector >" \ "util/bitvector.h" \ - "operator for the integer conversion to bit-vector; payload is an instance of the CVC4::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 ::CVC4::theory::bv::BitVectorConstantTypeRule +typerule CONST_BITVECTOR ::CVC5::theory::bv::BitVectorConstantTypeRule ## concatentation kind -typerule BITVECTOR_CONCAT ::CVC4::theory::bv::BitVectorConcatTypeRule +typerule BITVECTOR_CONCAT ::CVC5::theory::bv::BitVectorConcatTypeRule ## bit-wise kinds -typerule BITVECTOR_AND ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_COMP ::CVC4::theory::bv::BitVectorBVPredTypeRule -typerule BITVECTOR_NAND ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_NOR ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_NOT ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_OR ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_XNOR ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_XOR ::CVC4::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 ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_NEG ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_PLUS ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SUB ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_UDIV ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_UREM ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SDIV ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SMOD ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SREM ::CVC4::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 ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_LSHR ::CVC4::theory::bv::BitVectorFixedWidthTypeRule -typerule BITVECTOR_SHL ::CVC4::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 ::CVC4::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_ULT ::CVC4::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_UGE ::CVC4::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_UGT ::CVC4::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SLE ::CVC4::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SLT ::CVC4::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SGE ::CVC4::theory::bv::BitVectorPredicateTypeRule -typerule BITVECTOR_SGT ::CVC4::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 ::CVC4::theory::bv::BitVectorBVPredTypeRule -typerule BITVECTOR_SLTBV ::CVC4::theory::bv::BitVectorBVPredTypeRule +typerule BITVECTOR_ULTBV ::CVC5::theory::bv::BitVectorBVPredTypeRule +typerule BITVECTOR_SLTBV ::CVC5::theory::bv::BitVectorBVPredTypeRule ## if-then-else kind -typerule BITVECTOR_ITE ::CVC4::theory::bv::BitVectorITETypeRule +typerule BITVECTOR_ITE ::CVC5::theory::bv::BitVectorITETypeRule ## reduction kinds -typerule BITVECTOR_REDAND ::CVC4::theory::bv::BitVectorUnaryPredicateTypeRule -typerule BITVECTOR_REDOR ::CVC4::theory::bv::BitVectorUnaryPredicateTypeRule +typerule BITVECTOR_REDAND ::CVC5::theory::bv::BitVectorUnaryPredicateTypeRule +typerule BITVECTOR_REDOR ::CVC5::theory::bv::BitVectorUnaryPredicateTypeRule ## conversion kinds -typerule BITVECTOR_TO_NAT ::CVC4::theory::bv::BitVectorConversionTypeRule +typerule BITVECTOR_TO_NAT ::CVC5::theory::bv::BitVectorConversionTypeRule ## internal kinds -typerule BITVECTOR_ACKERMANNIZE_UDIV ::CVC4::theory::bv::BitVectorAckermanizationUdivTypeRule -typerule BITVECTOR_ACKERMANNIZE_UREM ::CVC4::theory::bv::BitVectorAckermanizationUremTypeRule -typerule BITVECTOR_EAGER_ATOM ::CVC4::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 ::CVC4::theory::bv::BitVectorBitOfTypeRule +typerule BITVECTOR_BITOF ::CVC5::theory::bv::BitVectorBitOfTypeRule typerule BITVECTOR_EXTRACT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_EXTRACT ::CVC4::theory::bv::BitVectorExtractTypeRule +typerule BITVECTOR_EXTRACT ::CVC5::theory::bv::BitVectorExtractTypeRule typerule BITVECTOR_REPEAT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_REPEAT ::CVC4::theory::bv::BitVectorRepeatTypeRule +typerule BITVECTOR_REPEAT ::CVC5::theory::bv::BitVectorRepeatTypeRule typerule BITVECTOR_ROTATE_LEFT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_ROTATE_LEFT ::CVC4::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_ROTATE_LEFT ::CVC5::theory::bv::BitVectorFixedWidthTypeRule typerule BITVECTOR_ROTATE_RIGHT_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_ROTATE_RIGHT ::CVC4::theory::bv::BitVectorFixedWidthTypeRule +typerule BITVECTOR_ROTATE_RIGHT ::CVC5::theory::bv::BitVectorFixedWidthTypeRule typerule BITVECTOR_SIGN_EXTEND_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_SIGN_EXTEND ::CVC4::theory::bv::BitVectorExtendTypeRule +typerule BITVECTOR_SIGN_EXTEND ::CVC5::theory::bv::BitVectorExtendTypeRule typerule BITVECTOR_ZERO_EXTEND_OP "SimpleTypeRule<RBuiltinOperator>" -typerule BITVECTOR_ZERO_EXTEND ::CVC4::theory::bv::BitVectorExtendTypeRule -typerule INT_TO_BITVECTOR_OP ::CVC4::theory::bv::IntToBitVectorOpTypeRule -typerule INT_TO_BITVECTOR ::CVC4::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 862e2034a..82f37c552 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -50,4 +50,4 @@ Node BVProofRuleChecker::checkInternal(PfRule id, } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/proof_checker.h b/src/theory/bv/proof_checker.h index 119aa4924..efa319322 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -45,6 +45,6 @@ class BVProofRuleChecker : public ProofRuleChecker } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__BV__PROOF_CHECKER_H */ diff --git a/src/theory/bv/slicer.cpp b/src/theory/bv/slicer.cpp index a19c18df8..e8c032a61 100644 --- a/src/theory/bv/slicer.cpp +++ b/src/theory/bv/slicer.cpp @@ -20,9 +20,9 @@ #include "theory/bv/theory_bv_utils.h" #include "theory/rewriter.h" -using namespace std; +using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -83,4 +83,4 @@ std::string Base::debugPrint() const { } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/slicer.h b/src/theory/bv/slicer.h index 49c3cfaa7..56ed0ecba 100644 --- a/src/theory/bv/slicer.h +++ b/src/theory/bv/slicer.h @@ -23,7 +23,7 @@ #include <vector> #include "util/index.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -47,10 +47,10 @@ public: } return true; } -}; +}; -}/* CVC4::theory::bv namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace bv +} // namespace theory +} // 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 3d8a5d3ea..185f7ad2a 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -236,4 +236,4 @@ bool TheoryBV::applyAbstraction(const std::vector<Node>& assertions, } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/theory_bv.h b/src/theory/bv/theory_bv.h index 93e03e5ca..1608dc3cf 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -124,6 +124,6 @@ class TheoryBV : public Theory } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 6cf1934f0..f9bd4215d 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -770,4 +770,4 @@ struct FixpointRewriteStrategy { } // End namespace bv } // End namespace theory -} // End namespace CVC4 +} // 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 57cb5f28e..917d77637 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -492,4 +492,4 @@ Node RewriteRule<EvalComp>::apply(TNode node) { } } -} +} // 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 c1aa034e8..c24c3ac48 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -302,4 +302,4 @@ Node RewriteRule<ReflexivityEq>::apply(TNode node) { } } -} +} // 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 db8e588e4..cf7bc4a8f 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -1571,4 +1571,4 @@ inline Node RewriteRule<NormalizeEqPlusNeg>::apply(TNode node) } } -} +} // 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 1272f303d..3750ef5b0 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -788,4 +788,4 @@ inline Node RewriteRule<RedandEliminate>::apply(TNode node) } } -} +} // 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 bbf7c62e7..c6dcb9f1e 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -2257,4 +2257,4 @@ Node RewriteRule<MultSltMult>::apply(TNode node) } // namespace bv } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/bv/theory_bv_rewriter.cpp b/src/theory/bv/theory_bv_rewriter.cpp index 614261e34..9b2d929ed 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 CVC4; -using namespace CVC4::theory; -using namespace CVC4::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 9ecc25973..e6c42f117 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -103,8 +103,8 @@ class TheoryBVRewriter : public TheoryRewriter RewriteFunction d_rewriteTable[kind::LAST_KIND]; }; /* class TheoryBVRewriter */ -}/* CVC4::theory::bv namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace bv +} // namespace theory +} // 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 54e8c6175..54ed4579b 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -450,6 +450,6 @@ class BitVectorAckermanizationUremTypeRule } // namespace bv } // namespace theory -} // namespace CVC4 +} // 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 1a6b7a873..4a68e3724 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { namespace utils { @@ -508,7 +508,7 @@ Node eliminateInt2Bv(TNode node) return Node(result); } -}/* CVC4::theory::bv::utils namespace */ -}/* CVC4::theory::bv namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace utils +} // namespace bv +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/bv/theory_bv_utils.h b/src/theory/bv/theory_bv_utils.h index c6c03e561..5795b5f14 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -226,4 +226,4 @@ Node eliminateInt2Bv(TNode node); } } } -} +} // namespace CVC5 diff --git a/src/theory/bv/type_enumerator.h b/src/theory/bv/type_enumerator.h index 58f8f5b80..31fe11715 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 CVC4 { +namespace CVC5 { namespace theory { namespace bv { @@ -59,8 +59,8 @@ public: bool isFinished() override { return d_bits != d_bits.modByPow2(d_size); } };/* BitVectorEnumerator */ -}/* CVC4::theory::bv namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace bv +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__BV__TYPE_ENUMERATOR_H */ diff --git a/src/theory/care_graph.h b/src/theory/care_graph.h index 91873b03f..687378887 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -60,6 +60,6 @@ struct CarePair { typedef std::set<CarePair> CareGraph; } // namespace theory -} // namespace CVC4 +} // 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 567a16636..df757c4a9 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 CVC4 { +namespace CVC5 { namespace theory { CombinationCareGraph::CombinationCareGraph( @@ -99,4 +99,4 @@ bool CombinationCareGraph::buildModel() } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/combination_care_graph.h b/src/theory/combination_care_graph.h index 70d651e1f..a59fa154e 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -47,6 +47,6 @@ class CombinationCareGraph : public CombinationEngine }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__COMBINATION_DISTRIBUTED__H */ diff --git a/src/theory/combination_engine.cpp b/src/theory/combination_engine.cpp index 160b56625..639a7e201 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 CVC4 { +namespace CVC5 { namespace theory { CombinationEngine::CombinationEngine(TheoryEngine& te, @@ -118,4 +118,4 @@ void CombinationEngine::resetRound() } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/combination_engine.h b/src/theory/combination_engine.h index a6331b406..6798404e9 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -137,6 +137,6 @@ class CombinationEngine }; } // namespace theory -} // namespace CVC4 +} // 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 dadd0d240..18332a972 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -794,6 +794,6 @@ Node DatatypesRewriter::replaceDebruijn(Node n, return n; } -} /* CVC4::theory::datatypes namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace datatypes +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/datatypes/datatypes_rewriter.h b/src/theory/datatypes/datatypes_rewriter.h index 8ad927ce4..4126a505d 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -142,8 +142,8 @@ class DatatypesRewriter : public TheoryRewriter unsigned depth); }; /* class DatatypesRewriter */ -}/* CVC4::theory::datatypes namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace datatypes +} // namespace theory +} // 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 b231e8fd4..d87ff15a5 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -275,4 +275,4 @@ std::string InferProofCons::identify() const } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/infer_proof_cons.h b/src/theory/datatypes/infer_proof_cons.h index eeb8214e2..70fa8fad5 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 CVC4 { +namespace CVC5 { class ProofNodeManager; @@ -95,6 +95,6 @@ class InferProofCons : public ProofGenerator } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // 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 2d482deaf..9749d7a2d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -80,4 +80,4 @@ Node DatatypesInference::processFact(std::vector<Node>& exp, } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/inference.h b/src/theory/datatypes/inference.h index 9c19608c1..bff56afdc 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -69,6 +69,6 @@ class DatatypesInference : public SimpleTheoryInternalFact } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/datatypes/inference_manager.cpp b/src/theory/datatypes/inference_manager.cpp index 1a837e73b..f4a0f45d9 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -171,4 +171,4 @@ Node InferenceManager::prepareDtInference(Node conc, } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/inference_manager.h b/src/theory/datatypes/inference_manager.h index 83876817b..c7b20ec83 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 CVC4 { +namespace CVC5 { namespace theory { class EagerProofGenerator; @@ -109,6 +109,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/datatypes/kinds b/src/theory/datatypes/kinds index f3e5be5c7..3fd59d9cb 100644 --- a/src/theory/datatypes/kinds +++ b/src/theory/datatypes/kinds @@ -4,31 +4,31 @@ # src/theory/builtin/kinds. # -theory THEORY_DATATYPES ::CVC4::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 ::CVC4::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 \ - "::CVC4::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 \ - "::CVC4::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 \ - "::CVC4::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 \ - ::CVC4::DatatypeIndexConstant \ - "::CVC4::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 \ - "::CVC4::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 \ - "::CVC4::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 \ - ::CVC4::AscriptionType \ - ::CVC4::AscriptionTypeHashFunction \ + ::CVC5::AscriptionType \ + ::CVC5::AscriptionTypeHashFunction \ "expr/ascription_type.h" \ - "a type parameter for type ascription; payload is an instance of the CVC4::AscriptionType class" + "a type parameter for type ascription; payload is an instance of the CVC5::AscriptionType class" -typerule APPLY_CONSTRUCTOR ::CVC4::theory::datatypes::DatatypeConstructorTypeRule -typerule APPLY_SELECTOR ::CVC4::theory::datatypes::DatatypeSelectorTypeRule -typerule APPLY_SELECTOR_TOTAL ::CVC4::theory::datatypes::DatatypeSelectorTypeRule -typerule APPLY_TESTER ::CVC4::theory::datatypes::DatatypeTesterTypeRule -typerule APPLY_TYPE_ASCRIPTION ::CVC4::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 ::CVC4::theory::datatypes::DatatypeConstructorTypeRule +construle APPLY_CONSTRUCTOR ::CVC5::theory::datatypes::DatatypeConstructorTypeRule constant TUPLE_UPDATE_OP \ - ::CVC4::TupleUpdate \ - ::CVC4::TupleUpdateHashFunction \ + ::CVC5::TupleUpdate \ + ::CVC5::TupleUpdateHashFunction \ "util/tuple.h" \ - "operator for a tuple update; payload is an instance of the CVC4::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 ::CVC4::theory::datatypes::TupleUpdateOpTypeRule -typerule TUPLE_UPDATE ::CVC4::theory::datatypes::TupleUpdateTypeRule +typerule TUPLE_UPDATE_OP ::CVC5::theory::datatypes::TupleUpdateOpTypeRule +typerule TUPLE_UPDATE ::CVC5::theory::datatypes::TupleUpdateTypeRule constant RECORD_UPDATE_OP \ - ::CVC4::RecordUpdate \ - ::CVC4::RecordUpdateHashFunction \ + ::CVC5::RecordUpdate \ + ::CVC5::RecordUpdateHashFunction \ "expr/record.h" \ - "operator for a record update; payload is an instance CVC4::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 ::CVC4::theory::datatypes::RecordUpdateOpTypeRule -typerule RECORD_UPDATE ::CVC4::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 ::CVC4::theory::datatypes::DtSizeTypeRule +typerule DT_SIZE ::CVC5::theory::datatypes::DtSizeTypeRule operator DT_HEIGHT_BOUND 2 "datatypes height bound" -typerule DT_HEIGHT_BOUND ::CVC4::theory::datatypes::DtBoundTypeRule +typerule DT_HEIGHT_BOUND ::CVC5::theory::datatypes::DtBoundTypeRule operator DT_SIZE_BOUND 2 "datatypes height bound" -typerule DT_SIZE_BOUND ::CVC4::theory::datatypes::DtBoundTypeRule +typerule DT_SIZE_BOUND ::CVC5::theory::datatypes::DtBoundTypeRule operator DT_SYGUS_BOUND 2 "datatypes sygus bound" -typerule DT_SYGUS_BOUND ::CVC4::theory::datatypes::DtSygusBoundTypeRule +typerule DT_SYGUS_BOUND ::CVC5::theory::datatypes::DtSygusBoundTypeRule operator DT_SYGUS_EVAL 1: "datatypes sygus evaluation function" -typerule DT_SYGUS_EVAL ::CVC4::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 ::CVC4::theory::datatypes::MatchTypeRule -typerule MATCH_CASE ::CVC4::theory::datatypes::MatchCaseTypeRule -typerule MATCH_BIND_CASE ::CVC4::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 \ - ::CVC4::TupleProjectOp \ - ::CVC4::TupleProjectOpHashFunction \ + ::CVC5::TupleProjectOp \ + ::CVC5::TupleProjectOpHashFunction \ "theory/datatypes/tuple_project_op.h" \ - "operator for TUPLE_PROJECT; payload is an instance of the CVC4::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 ::CVC4::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 71352783d..f55b45541 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -133,4 +133,4 @@ Node DatatypesProofRuleChecker::checkInternal(PfRule id, } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/proof_checker.h b/src/theory/datatypes/proof_checker.h index 03092e3b1..a66cac8d8 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -44,6 +44,6 @@ class DatatypesProofRuleChecker : public ProofRuleChecker } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // 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 50202fefd..4f328619b 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { namespace utils { @@ -777,4 +777,4 @@ TypeNode substituteAndGeneralizeSygusType(TypeNode sdt, } // namespace utils } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/sygus_datatype_utils.h b/src/theory/datatypes/sygus_datatype_utils.h index 1164c0404..e1af9250b 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 CVC4 { +namespace CVC5 { namespace theory { // ----------------------- sygus datatype attributes @@ -237,6 +237,6 @@ TypeNode substituteAndGeneralizeSygusType(TypeNode sdt, } // namespace utils } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/datatypes/sygus_extension.cpp b/src/theory/datatypes/sygus_extension.cpp index fa99ca659..a53799baf 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 CVC4; -using namespace CVC4::kind; -using namespace CVC4::context; -using namespace CVC4::theory; -using namespace CVC4::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 86f15ba6d..7b49faa6d 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { class SynthConjecture; @@ -709,7 +709,7 @@ private: } } -} +} // namespace CVC5 #endif diff --git a/src/theory/datatypes/sygus_simple_sym.cpp b/src/theory/datatypes/sygus_simple_sym.cpp index 07f748236..ed6357244 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -584,4 +584,4 @@ int SygusSimpleSymBreak::getFirstArgOccurrence(const DTypeConstructor& c, } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/sygus_simple_sym.h b/src/theory/datatypes/sygus_simple_sym.h index 713d1bdc2..5b5b816b7 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -98,6 +98,6 @@ class SygusSimpleSymBreak } // namespace datatypes } // namespace theory -} // namespace CVC4 +} // 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 7af0686f8..48a2a8a99 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -2039,6 +2039,6 @@ std::pair<bool, Node> TheoryDatatypes::entailmentCheck(TNode lit) return make_pair(false, Node::null()); } -} /* namepsace CVC4::theory::datatypes */ -} /* namepsace CVC4::theory */ -} /* namepsace CVC4 */ +} // namespace datatypes +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/datatypes/theory_datatypes.h b/src/theory/datatypes/theory_datatypes.h index 447c4371a..03ea69fc4 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -312,8 +312,8 @@ private: DatatypesProofRuleChecker d_pchecker; };/* class TheoryDatatypes */ -}/* CVC4::theory::datatypes namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace datatypes +} // namespace theory +} // 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 58bc2f09f..8084763b2 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -626,8 +626,8 @@ class TupleProjectTypeRule } }; /* class TupleProjectTypeRule */ -} /* CVC4::theory::datatypes namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace datatypes +} // namespace theory +} // 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 bd24b4910..72c032e4e 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/theory_datatypes_utils.h b/src/theory/datatypes/theory_datatypes_utils.h index b73d8223d..be7f5d4af 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/datatypes/tuple_project_op.cpp b/src/theory/datatypes/tuple_project_op.cpp index 397fd420f..ebc229eb4 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/datatypes/tuple_project_op.h b/src/theory/datatypes/tuple_project_op.h index 361cf4f60..8272e7487 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 CVC4 { +namespace CVC5 { class TypeNode; @@ -53,6 +53,6 @@ struct TupleProjectOpHashFunction size_t operator()(const TupleProjectOp& op) const; }; /* struct TupleProjectOpHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__PROJECT_OP_H */ diff --git a/src/theory/datatypes/type_enumerator.cpp b/src/theory/datatypes/type_enumerator.cpp index e0500e254..54b042307 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 CVC4; +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 607036615..3d1264a80 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 CVC4 { +namespace CVC5 { namespace theory { namespace datatypes { @@ -162,8 +162,8 @@ class DatatypesEnumerator : public TypeEnumeratorBase<DatatypesEnumerator> { };/* DatatypesEnumerator */ -}/* CVC4::theory::datatypes namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace datatypes +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__DATATYPES__TYPE_ENUMERATOR_H */ diff --git a/src/theory/decision_manager.cpp b/src/theory/decision_manager.cpp index 4fb950ee1..3abbb83e7 100644 --- a/src/theory/decision_manager.cpp +++ b/src/theory/decision_manager.cpp @@ -17,9 +17,9 @@ #include "theory/rewriter.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { DecisionManager::DecisionManager(context::Context* userContext) @@ -107,4 +107,4 @@ Node DecisionManager::getNextDecisionRequest() } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/decision_manager.h b/src/theory/decision_manager.h index 327535f6e..c6e7a44a1 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 CVC4 { +namespace CVC5 { namespace theory { /** DecisionManager @@ -141,6 +141,6 @@ class DecisionManager }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__DECISION_MANAGER__H */ diff --git a/src/theory/decision_strategy.cpp b/src/theory/decision_strategy.cpp index 8adc6fae1..b8ef264dd 100644 --- a/src/theory/decision_strategy.cpp +++ b/src/theory/decision_strategy.cpp @@ -17,9 +17,9 @@ #include "theory/rewriter.h" -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/decision_strategy.h b/src/theory/decision_strategy.h index 74edde7f9..e9d8b8bbc 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -140,6 +140,6 @@ class DecisionStrategySingleton : public DecisionStrategyFmf }; } // namespace theory -} // namespace CVC4 +} // 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 7bbdc91d3..1763969e6 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/eager_proof_generator.h b/src/theory/eager_proof_generator.h index 256dfeee9..2c94d2074 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 CVC4 { +namespace CVC5 { class ProofNode; class ProofNodeManager; @@ -193,6 +193,6 @@ class EagerProofGenerator : public ProofGenerator }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__PROOF_GENERATOR_H */ diff --git a/src/theory/ee_manager.cpp b/src/theory/ee_manager.cpp index 1f5560410..d2254fc6c 100644 --- a/src/theory/ee_manager.cpp +++ b/src/theory/ee_manager.cpp @@ -16,7 +16,7 @@ #include "theory/theory_model.h" -namespace CVC4 { +namespace CVC5 { namespace theory { EqEngineManager::EqEngineManager(TheoryEngine& te, SharedSolver& shs) @@ -47,4 +47,4 @@ eq::EqualityEngine* EqEngineManager::allocateEqualityEngine(EeSetupInfo& esi, } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/ee_manager.h b/src/theory/ee_manager.h index 4bcb92c38..dd400c188 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -95,6 +95,6 @@ class EqEngineManager }; } // namespace theory -} // namespace CVC4 +} // 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 3757f153a..289725e30 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 CVC4 { +namespace CVC5 { namespace theory { EqEngineManagerDistributed::EqEngineManagerDistributed(TheoryEngine& te, @@ -115,4 +115,4 @@ void EqEngineManagerDistributed::MasterNotifyClass::eqNotifyNewClass(TNode t) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/ee_manager_distributed.h b/src/theory/ee_manager_distributed.h index 26f3d9430..d7d6688fb 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -97,6 +97,6 @@ class EqEngineManagerDistributed : public EqEngineManager }; } // namespace theory -} // namespace CVC4 +} // 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 523252918..7859773f0 100644 --- a/src/theory/ee_setup_info.h +++ b/src/theory/ee_setup_info.h @@ -19,7 +19,7 @@ #include <string> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -55,6 +55,6 @@ struct EeSetupInfo }; } // namespace theory -} // namespace CVC4 +} // 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 bfc85321e..40d1d59d5 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { EngineOutputChannel::Statistics::Statistics(theory::TheoryId theory) @@ -188,4 +188,4 @@ void EngineOutputChannel::trustedLemma(TrustNode plem, LemmaProperty p) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/engine_output_channel.h b/src/theory/engine_output_channel.h index 0bdccab1b..115566bdc 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -108,6 +108,6 @@ class EngineOutputChannel : public theory::OutputChannel }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__ENGINE_OUTPUT_CHANNEL_H */ diff --git a/src/theory/evaluator.cpp b/src/theory/evaluator.cpp index 8cc203a09..758930859 100644 --- a/src/theory/evaluator.cpp +++ b/src/theory/evaluator.cpp @@ -22,7 +22,7 @@ #include "theory/theory.h" #include "util/integer.h" -namespace CVC4 { +namespace CVC5 { namespace theory { EvalResult::EvalResult(const EvalResult& other) @@ -952,4 +952,4 @@ Node Evaluator::reconstruct( } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/evaluator.h b/src/theory/evaluator.h index 6db8a6f4b..ee76c6210 100644 --- a/src/theory/evaluator.h +++ b/src/theory/evaluator.h @@ -30,7 +30,7 @@ #include "util/rational.h" #include "util/string.h" -namespace CVC4 { +namespace CVC5 { namespace theory { /** @@ -159,6 +159,6 @@ class Evaluator }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__EVALUATOR_H */ diff --git a/src/theory/ext_theory.cpp b/src/theory/ext_theory.cpp index 0accc2341..2e39b2a35 100644 --- a/src/theory/ext_theory.cpp +++ b/src/theory/ext_theory.cpp @@ -27,7 +27,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { bool ExtTheoryCallback::getCurrentSubstitution( @@ -557,5 +557,5 @@ std::vector<Node> ExtTheory::getActive(Kind k) const void ExtTheory::clearCache() { d_gst_cache.clear(); } -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/ext_theory.h b/src/theory/ext_theory.h index f2235c6bf..3d8df356c 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 CVC4 { +namespace CVC5 { namespace theory { class OutputChannel; @@ -301,7 +301,7 @@ class ExtTheory std::map<int, std::map<Node, SubsTermInfo> > d_gst_cache; }; -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // 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 359079948..879cd2988 100644 --- a/src/theory/fp/fp_converter.cpp +++ b/src/theory/fp/fp_converter.cpp @@ -41,75 +41,75 @@ #ifdef CVC4_USE_SYMFPU namespace symfpu { -using namespace ::CVC4::theory::fp::symfpuSymbolic; +using namespace ::CVC5::theory::fp::symfpuSymbolic; #define CVC4_SYM_ITE_DFN(T) \ template <> \ struct ite<symbolicProposition, T> \ { \ - static const T iteOp(const symbolicProposition &_cond, \ - const T &_l, \ - const T &_r) \ + static const T iteOp(const symbolicProposition& _cond, \ + const T& _l, \ + const T& _r) \ { \ - ::CVC4::NodeManager *nm = ::CVC4::NodeManager::currentNM(); \ + ::CVC5::NodeManager* nm = ::CVC5::NodeManager::currentNM(); \ \ - ::CVC4::Node cond = _cond; \ - ::CVC4::Node l = _l; \ - ::CVC4::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(::CVC4::BitVector(1U, 1U))) ? l : r; \ + return (cond == nm->mkConst(::CVC5::BitVector(1U, 1U))) ? l : r; \ } \ else \ { \ - if (l.getKind() == ::CVC4::kind::BITVECTOR_ITE) \ + if (l.getKind() == ::CVC5::kind::BITVECTOR_ITE) \ { \ if (l[1] == r) \ { \ return nm->mkNode( \ - ::CVC4::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC4::kind::BITVECTOR_AND, \ + ::CVC5::kind::BITVECTOR_ITE, \ + nm->mkNode(::CVC5::kind::BITVECTOR_AND, \ cond, \ - nm->mkNode(::CVC4::kind::BITVECTOR_NOT, l[0])), \ + nm->mkNode(::CVC5::kind::BITVECTOR_NOT, l[0])), \ l[2], \ r); \ } \ else if (l[2] == r) \ { \ return nm->mkNode( \ - ::CVC4::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC4::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() == ::CVC4::kind::BITVECTOR_ITE) \ + else if (r.getKind() == ::CVC5::kind::BITVECTOR_ITE) \ { \ if (r[1] == l) \ { \ return nm->mkNode( \ - ::CVC4::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC4::kind::BITVECTOR_AND, \ - nm->mkNode(::CVC4::kind::BITVECTOR_NOT, cond), \ - nm->mkNode(::CVC4::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( \ - ::CVC4::kind::BITVECTOR_ITE, \ - nm->mkNode(::CVC4::kind::BITVECTOR_AND, \ - nm->mkNode(::CVC4::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(::CVC4::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 CVC4 { +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>(::CVC4::NodeManager::currentNM()->mkNode( - ::CVC4::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>(::CVC4::NodeManager::currentNM()->mkNode( - ::CVC4::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(::CVC4::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 CVC4 +} // namespace CVC5 diff --git a/src/theory/fp/fp_converter.h b/src/theory/fp/fp_converter.h index 6623f308c..e952699a7 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 CVC4 { +namespace CVC5 { namespace theory { namespace fp { @@ -97,7 +97,7 @@ class traits typedef traits::bwt bwt; /** - * Wrap the CVC4::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 CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__FP__THEORY_FP_H */ diff --git a/src/theory/fp/kinds b/src/theory/fp/kinds index 49ed92dee..4a4d16b55 100644 --- a/src/theory/fp/kinds +++ b/src/theory/fp/kinds @@ -4,9 +4,9 @@ # src/theory/builtin/kinds. # -theory THEORY_FP ::CVC4::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 ::CVC4::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 \ - ::CVC4::FloatingPoint \ - ::CVC4::FloatingPointHashFunction \ + ::CVC5::FloatingPoint \ + ::CVC5::FloatingPointHashFunction \ "util/floatingpoint.h" \ "a floating-point literal" -typerule CONST_FLOATINGPOINT ::CVC4::theory::fp::FloatingPointConstantTypeRule +typerule CONST_FLOATINGPOINT ::CVC5::theory::fp::FloatingPointConstantTypeRule constant CONST_ROUNDINGMODE \ - ::CVC4::RoundingMode \ - ::CVC4::RoundingModeHashFunction \ + ::CVC5::RoundingMode \ + ::CVC5::RoundingModeHashFunction \ "util/floatingpoint.h" \ "a floating-point rounding mode" -typerule CONST_ROUNDINGMODE ::CVC4::theory::fp::RoundingModeConstantTypeRule +typerule CONST_ROUNDINGMODE ::CVC5::theory::fp::RoundingModeConstantTypeRule @@ -39,272 +39,272 @@ sort ROUNDINGMODE_TYPE \ "floating-point rounding mode" enumerator ROUNDINGMODE_TYPE \ - "::CVC4::theory::fp::RoundingModeEnumerator" \ + "::CVC5::theory::fp::RoundingModeEnumerator" \ "theory/fp/type_enumerator.h" constant FLOATINGPOINT_TYPE \ - ::CVC4::FloatingPointSize \ - ::CVC4::FloatingPointSizeHashFunction \ + ::CVC5::FloatingPointSize \ + ::CVC5::FloatingPointSizeHashFunction \ "util/floatingpoint.h" \ "floating-point type" cardinality FLOATINGPOINT_TYPE \ - "::CVC4::theory::fp::CardinalityComputer::computeCardinality(%TYPE%)" \ + "::CVC5::theory::fp::CardinalityComputer::computeCardinality(%TYPE%)" \ "theory/fp/theory_fp_type_rules.h" enumerator FLOATINGPOINT_TYPE \ - "::CVC4::theory::fp::FloatingPointEnumerator" \ + "::CVC5::theory::fp::FloatingPointEnumerator" \ "theory/fp/type_enumerator.h" well-founded FLOATINGPOINT_TYPE \ true \ - "(*CVC4::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 ::CVC4::theory::fp::FloatingPointFPTypeRule +typerule FLOATINGPOINT_FP ::CVC5::theory::fp::FloatingPointFPTypeRule operator FLOATINGPOINT_EQ 2: "floating-point equality" -typerule FLOATINGPOINT_EQ ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_EQ ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ABS 1 "floating-point absolute value" -typerule FLOATINGPOINT_ABS ::CVC4::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_ABS ::CVC5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_NEG 1 "floating-point negation" -typerule FLOATINGPOINT_NEG ::CVC4::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_NEG ::CVC5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_PLUS 3 "floating-point addition" -typerule FLOATINGPOINT_PLUS ::CVC4::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_PLUS ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_SUB 3 "floating-point sutraction" -typerule FLOATINGPOINT_SUB ::CVC4::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_SUB ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_MULT 3 "floating-point multiply" -typerule FLOATINGPOINT_MULT ::CVC4::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_MULT ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_DIV 3 "floating-point division" -typerule FLOATINGPOINT_DIV ::CVC4::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_DIV ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_FMA 4 "floating-point fused multiply and add" -typerule FLOATINGPOINT_FMA ::CVC4::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_FMA ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_SQRT 2 "floating-point square root" -typerule FLOATINGPOINT_SQRT ::CVC4::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_SQRT ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_REM 2 "floating-point remainder" -typerule FLOATINGPOINT_REM ::CVC4::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_REM ::CVC5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_RTI 2 "floating-point round to integral" -typerule FLOATINGPOINT_RTI ::CVC4::theory::fp::FloatingPointRoundingOperationTypeRule +typerule FLOATINGPOINT_RTI ::CVC5::theory::fp::FloatingPointRoundingOperationTypeRule operator FLOATINGPOINT_MIN 2 "floating-point minimum" -typerule FLOATINGPOINT_MIN ::CVC4::theory::fp::FloatingPointOperationTypeRule +typerule FLOATINGPOINT_MIN ::CVC5::theory::fp::FloatingPointOperationTypeRule operator FLOATINGPOINT_MAX 2 "floating-point maximum" -typerule FLOATINGPOINT_MAX ::CVC4::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 ::CVC4::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 ::CVC4::theory::fp::FloatingPointPartialOperationTypeRule +typerule FLOATINGPOINT_MAX_TOTAL ::CVC5::theory::fp::FloatingPointPartialOperationTypeRule operator FLOATINGPOINT_LEQ 2: "floating-point less than or equal" -typerule FLOATINGPOINT_LEQ ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_LEQ ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_LT 2: "floating-point less than" -typerule FLOATINGPOINT_LT ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_LT ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_GEQ 2: "floating-point greater than or equal" -typerule FLOATINGPOINT_GEQ ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_GEQ ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_GT 2: "floating-point greater than" -typerule FLOATINGPOINT_GT ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_GT ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISN 1 "floating-point is normal" -typerule FLOATINGPOINT_ISN ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISN ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISSN 1 "floating-point is sub-normal" -typerule FLOATINGPOINT_ISSN ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISSN ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISZ 1 "floating-point is zero" -typerule FLOATINGPOINT_ISZ ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISZ ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISINF 1 "floating-point is infinite" -typerule FLOATINGPOINT_ISINF ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISINF ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISNAN 1 "floating-point is NaN" -typerule FLOATINGPOINT_ISNAN ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISNAN ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISNEG 1 "floating-point is negative" -typerule FLOATINGPOINT_ISNEG ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISNEG ::CVC5::theory::fp::FloatingPointTestTypeRule operator FLOATINGPOINT_ISPOS 1 "floating-point is positive" -typerule FLOATINGPOINT_ISPOS ::CVC4::theory::fp::FloatingPointTestTypeRule +typerule FLOATINGPOINT_ISPOS ::CVC5::theory::fp::FloatingPointTestTypeRule constant FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP \ - ::CVC4::FloatingPointToFPIEEEBitVector \ - "::CVC4::FloatingPointConvertSortHashFunction<0x1>" \ + ::CVC5::FloatingPointToFPIEEEBitVector \ + "::CVC5::FloatingPointConvertSortHashFunction<0x1>" \ "util/floatingpoint.h" \ "operator for to_fp from bit vector" -typerule FLOATINGPOINT_TO_FP_IEEE_BITVECTOR_OP ::CVC4::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 ::CVC4::theory::fp::FloatingPointToFPIEEEBitVectorTypeRule +typerule FLOATINGPOINT_TO_FP_IEEE_BITVECTOR ::CVC5::theory::fp::FloatingPointToFPIEEEBitVectorTypeRule constant FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP \ - ::CVC4::FloatingPointToFPFloatingPoint \ - "::CVC4::FloatingPointConvertSortHashFunction<0x2>" \ + ::CVC5::FloatingPointToFPFloatingPoint \ + "::CVC5::FloatingPointConvertSortHashFunction<0x2>" \ "util/floatingpoint.h" \ "operator for to_fp from floating point" -typerule FLOATINGPOINT_TO_FP_FLOATINGPOINT_OP ::CVC4::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 ::CVC4::theory::fp::FloatingPointToFPFloatingPointTypeRule +typerule FLOATINGPOINT_TO_FP_FLOATINGPOINT ::CVC5::theory::fp::FloatingPointToFPFloatingPointTypeRule constant FLOATINGPOINT_TO_FP_REAL_OP \ - ::CVC4::FloatingPointToFPReal \ - "::CVC4::FloatingPointConvertSortHashFunction<0x4>" \ + ::CVC5::FloatingPointToFPReal \ + "::CVC5::FloatingPointConvertSortHashFunction<0x4>" \ "util/floatingpoint.h" \ "operator for to_fp from real" -typerule FLOATINGPOINT_TO_FP_REAL_OP ::CVC4::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 ::CVC4::theory::fp::FloatingPointToFPRealTypeRule +typerule FLOATINGPOINT_TO_FP_REAL ::CVC5::theory::fp::FloatingPointToFPRealTypeRule constant FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR_OP \ - ::CVC4::FloatingPointToFPSignedBitVector \ - "::CVC4::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 ::CVC4::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 ::CVC4::theory::fp::FloatingPointToFPSignedBitVectorTypeRule +typerule FLOATINGPOINT_TO_FP_SIGNED_BITVECTOR ::CVC5::theory::fp::FloatingPointToFPSignedBitVectorTypeRule constant FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR_OP \ - ::CVC4::FloatingPointToFPUnsignedBitVector \ - "::CVC4::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 ::CVC4::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 ::CVC4::theory::fp::FloatingPointToFPUnsignedBitVectorTypeRule +typerule FLOATINGPOINT_TO_FP_UNSIGNED_BITVECTOR ::CVC5::theory::fp::FloatingPointToFPUnsignedBitVectorTypeRule constant FLOATINGPOINT_TO_FP_GENERIC_OP \ - ::CVC4::FloatingPointToFPGeneric \ - "::CVC4::FloatingPointConvertSortHashFunction<0x11>" \ + ::CVC5::FloatingPointToFPGeneric \ + "::CVC5::FloatingPointConvertSortHashFunction<0x11>" \ "util/floatingpoint.h" \ "operator for a generic to_fp" -typerule FLOATINGPOINT_TO_FP_GENERIC_OP ::CVC4::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 ::CVC4::theory::fp::FloatingPointToFPGenericTypeRule +typerule FLOATINGPOINT_TO_FP_GENERIC ::CVC5::theory::fp::FloatingPointToFPGenericTypeRule constant FLOATINGPOINT_TO_UBV_OP \ - ::CVC4::FloatingPointToUBV \ - "::CVC4::FloatingPointToBVHashFunction<0x1>" \ + ::CVC5::FloatingPointToUBV \ + "::CVC5::FloatingPointToBVHashFunction<0x1>" \ "util/floatingpoint.h" \ "operator for to_ubv" -typerule FLOATINGPOINT_TO_UBV_OP ::CVC4::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 ::CVC4::theory::fp::FloatingPointToUBVTypeRule +typerule FLOATINGPOINT_TO_UBV ::CVC5::theory::fp::FloatingPointToUBVTypeRule constant FLOATINGPOINT_TO_UBV_TOTAL_OP \ - ::CVC4::FloatingPointToUBVTotal \ - "::CVC4::FloatingPointToBVHashFunction<0x4>" \ + ::CVC5::FloatingPointToUBVTotal \ + "::CVC5::FloatingPointToBVHashFunction<0x4>" \ "util/floatingpoint.h" \ "operator for to_ubv_total" -typerule FLOATINGPOINT_TO_UBV_TOTAL_OP ::CVC4::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 ::CVC4::theory::fp::FloatingPointToUBVTotalTypeRule +typerule FLOATINGPOINT_TO_UBV_TOTAL ::CVC5::theory::fp::FloatingPointToUBVTotalTypeRule constant FLOATINGPOINT_TO_SBV_OP \ - ::CVC4::FloatingPointToSBV \ - "::CVC4::FloatingPointToBVHashFunction<0x2>" \ + ::CVC5::FloatingPointToSBV \ + "::CVC5::FloatingPointToBVHashFunction<0x2>" \ "util/floatingpoint.h" \ "operator for to_sbv" -typerule FLOATINGPOINT_TO_SBV_OP ::CVC4::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 ::CVC4::theory::fp::FloatingPointToSBVTypeRule +typerule FLOATINGPOINT_TO_SBV ::CVC5::theory::fp::FloatingPointToSBVTypeRule constant FLOATINGPOINT_TO_SBV_TOTAL_OP \ - ::CVC4::FloatingPointToSBVTotal \ - "::CVC4::FloatingPointToBVHashFunction<0x8>" \ + ::CVC5::FloatingPointToSBVTotal \ + "::CVC5::FloatingPointToBVHashFunction<0x8>" \ "util/floatingpoint.h" \ "operator for to_sbv_total" -typerule FLOATINGPOINT_TO_SBV_TOTAL_OP ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 3099d9aab..ea9ea902c 100644 --- a/src/theory/fp/theory_fp.cpp +++ b/src/theory/fp/theory_fp.cpp @@ -33,7 +33,7 @@ using namespace std; -namespace CVC4 { +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(::CVC4::BitVector(1U, 1U)))); + nm->mkNode(kind::EQUAL, addA, nm->mkConst(::CVC5::BitVector(1U, 1U)))); #endif ++oldAdditionalAssertions; @@ -791,10 +791,11 @@ void TheoryFp::convertAndEquateTerm(TNode node) { #ifdef SYMFPUPROPISBOOL handleLemma(nm->mkNode(kind::EQUAL, node, converted)); #else - handleLemma( - nm->mkNode(kind::EQUAL, node, - nm->mkNode(kind::EQUAL, converted, - nm->mkConst(::CVC4::BitVector(1U, 1U))))); + handleLemma(nm->mkNode( + kind::EQUAL, + node, + nm->mkNode( + kind::EQUAL, converted, nm->mkConst(::CVC5::BitVector(1U, 1U))))); #endif } else { @@ -1156,4 +1157,4 @@ void TheoryFp::NotifyClass::eqNotifyConstantTermMerge(TNode t1, TNode t2) { } // namespace fp } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/fp/theory_fp.h b/src/theory/fp/theory_fp.h index b15b5c2dd..2607a33c6 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 CVC4 { +namespace CVC5 { namespace theory { namespace fp { @@ -189,6 +189,6 @@ class TheoryFp : public Theory } // namespace fp } // namespace theory -} // namespace CVC4 +} // 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 3e03bbdbe..65e27fc48 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 CVC4 { +namespace CVC5 { namespace theory { namespace fp { @@ -324,8 +324,7 @@ namespace rewrite { return RewriteResponse(REWRITE_DONE, node); } -}; /* CVC4::theory::fp::rewrite */ - + }; // namespace rewrite namespace constantFold { @@ -978,8 +977,7 @@ namespace constantFold { NodeManager::currentNM()->mkConst(value)); } -}; /* CVC4::theory::fp::constantFold */ - + }; // namespace constantFold /** * Initialize the rewriter. @@ -1421,8 +1419,6 @@ TheoryFpRewriter::TheoryFpRewriter() return res; } - -}/* CVC4::theory::fp namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ - + } // namespace fp + } // namespace theory + } // namespace CVC5 diff --git a/src/theory/fp/theory_fp_rewriter.h b/src/theory/fp/theory_fp_rewriter.h index 5591246b4..bfdf90d44 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 CVC4 { +namespace CVC5 { namespace theory { namespace fp { @@ -51,8 +51,8 @@ class TheoryFpRewriter : public TheoryRewriter RewriteFunction d_constantFoldTable[kind::LAST_KIND]; }; /* class TheoryFpRewriter */ -}/* CVC4::theory::fp namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace fp +} // namespace theory +} // 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 165c9b924..6b87f8af3 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 CVC4 { +namespace CVC5 { namespace theory { namespace fp { @@ -812,4 +812,4 @@ Cardinality CardinalityComputer::computeCardinality(TypeNode type) } // namespace fp } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/fp/theory_fp_type_rules.h b/src/theory/fp/theory_fp_type_rules.h index aef2d0a50..632ae660d 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 CVC4 { +namespace CVC5 { class NodeManager; @@ -229,6 +229,6 @@ class CardinalityComputer } // namespace fp } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/fp/type_enumerator.h b/src/theory/fp/type_enumerator.h index 01145472d..535ed7c69 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 CVC4 { +namespace CVC5 { namespace theory { namespace fp { @@ -120,6 +120,6 @@ class RoundingModeEnumerator } // namespace fp } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__FP__TYPE_ENUMERATOR_H */ diff --git a/src/theory/inference_id.cpp b/src/theory/inference_id.cpp index 50ede2726..f96a9e244 100644 --- a/src/theory/inference_id.cpp +++ b/src/theory/inference_id.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC4 { +namespace CVC5 { namespace theory { const char* toString(InferenceId i) @@ -357,4 +357,4 @@ std::ostream& operator<<(std::ostream& out, InferenceId i) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/inference_id.h b/src/theory/inference_id.h index 1b57e966f..aa34d45ae 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__INFERENCE_H */ diff --git a/src/theory/inference_manager_buffered.cpp b/src/theory/inference_manager_buffered.cpp index edd8d8446..26434f802 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { InferenceManagerBuffered::InferenceManagerBuffered(Theory& t, @@ -187,4 +187,4 @@ void InferenceManagerBuffered::assertInternalFactTheoryInference( } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/inference_manager_buffered.h b/src/theory/inference_manager_buffered.h index 2772385d2..77ed1329a 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -174,6 +174,6 @@ class InferenceManagerBuffered : public TheoryInferenceManager }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/interrupted.h b/src/theory/interrupted.h index 76dc36e79..75c8f93a5 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 CVC4::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,13 +31,14 @@ #include "base/exception.h" -namespace CVC4 { +namespace CVC5 { namespace theory { -class Interrupted : public CVC4::Exception { -};/* class Interrupted */ +class Interrupted : public CVC5::Exception +{ +}; /* class Interrupted */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // 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 3ea567979..0a466fec4 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 CVC4 { +namespace CVC5 { namespace theory { LazyTreeProofGenerator::LazyTreeProofGenerator(ProofNodeManager* pnm, @@ -142,4 +142,4 @@ std::ostream& operator<<(std::ostream& os, const LazyTreeProofGenerator& ltpg) } } // namespace theory -} // namespace CVC4
\ 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 7e97b1cc5..3c02380c1 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/logic_info.cpp b/src/theory/logic_info.cpp index 7f55b4d88..841ec097e 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 CVC4::theory; +using namespace CVC5::theory; -namespace CVC4 { +namespace CVC5 { LogicInfo::LogicInfo() : d_logicString(""), @@ -725,4 +725,4 @@ std::ostream& operator<<(std::ostream& out, const LogicInfo& logic) { return out << logic.getLogicString(); } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/theory/logic_info.h b/src/theory/logic_info.h index 72913a0c2..fb23f4f2d 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 CVC4 { +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); -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__LOGIC_INFO_H */ diff --git a/src/theory/mkrewriter b/src/theory/mkrewriter index 871927760..9fa3c64c8 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., ::CVC4::theory::foo)" >&2 - elif ! expr "$2" : '\(::CVC4::theory::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class not under ::CVC4::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 1b1350abe..81e551a10 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., ::CVC4::theory::foo)" >&2 - elif ! expr "$2" : '\(::CVC4::theory::*\)' >/dev/null; then - echo "$kf:$lineno: warning: theory class not under ::CVC4::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 d77a88d67..8ca7a2c48 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 CVC4 { +namespace CVC5 { namespace theory { ModelManager::ModelManager(TheoryEngine& te, EqEngineManager& eem) @@ -239,4 +239,4 @@ void ModelManager::collectTerms(TheoryId tid, } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/model_manager.h b/src/theory/model_manager.h index 1e4c39066..4f4d06a43 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -152,6 +152,6 @@ class ModelManager }; } // namespace theory -} // namespace CVC4 +} // 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 838cf0ad6..3b9c1aad4 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 CVC4 { +namespace CVC5 { namespace theory { ModelManagerDistributed::ModelManagerDistributed(TheoryEngine& te, @@ -114,4 +114,4 @@ bool ModelManagerDistributed::finishBuildModel() const } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/model_manager_distributed.h b/src/theory/model_manager_distributed.h index d41b6fa3b..dd7cf2b78 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -56,6 +56,6 @@ class ModelManagerDistributed : public ModelManager }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__MODEL_MANAGER_DISTRIBUTED__H */ diff --git a/src/theory/output_channel.cpp b/src/theory/output_channel.cpp index 35b55ecc5..0fd475563 100644 --- a/src/theory/output_channel.cpp +++ b/src/theory/output_channel.cpp @@ -14,7 +14,7 @@ #include "theory/output_channel.h" -namespace CVC4 { +namespace CVC5 { namespace theory { LemmaProperty operator|(LemmaProperty lhs, LemmaProperty rhs) @@ -91,4 +91,4 @@ void OutputChannel::trustedLemma(TrustNode lem, LemmaProperty p) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/output_channel.h b/src/theory/output_channel.h index 8c10a1348..16fc5a483 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 CVC4 { +namespace CVC5 { namespace theory { /** Properties of lemmas */ @@ -66,7 +66,7 @@ class Theory; /** * Generic "theory output channel" interface. * - * All methods can throw unrecoverable CVC4::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 CVC4 +} // 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 ac52338a9..eb977960b 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -110,4 +110,4 @@ Node AlphaEquivalence::reduceQuantifier(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/alpha_equivalence.h b/src/theory/quantifiers/alpha_equivalence.h index 48d667325..822b674e2 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -101,6 +101,6 @@ class AlphaEquivalence } } -} +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/bv_inverter.cpp b/src/theory/quantifiers/bv_inverter.cpp index d81e23056..c4bd2c083 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -442,4 +442,4 @@ Node BvInverter::solveBvLit(Node sv, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/bv_inverter.h b/src/theory/quantifiers/bv_inverter.h index fa7d4b073..c033b26d7 100644 --- a/src/theory/quantifiers/bv_inverter.h +++ b/src/theory/quantifiers/bv_inverter.h @@ -24,7 +24,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -128,6 +128,6 @@ class BvInverter } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 f951b29df..459c3f93f 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/bv_inverter_utils.h b/src/theory/quantifiers/bv_inverter_utils.h index af7343739..c6400bd60 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 CVC4 { +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 CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/candidate_rewrite_database.cpp b/src/theory/quantifiers/candidate_rewrite_database.cpp index a0b9b20f4..1319e5c38 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -294,6 +294,6 @@ void CandidateRewriteDatabase::setExtendedRewriter(ExtendedRewriter* er) d_ext_rewrite = er; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/candidate_rewrite_database.h b/src/theory/quantifiers/candidate_rewrite_database.h index 321880dc0..396ef0d03 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -126,8 +126,8 @@ class CandidateRewriteDatabase : public ExprMiner std::unordered_map<Node, Node, NodeHashFunction> d_add_term_cache; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 aca65fd83..0ab85ccf7 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -277,4 +277,4 @@ bool CandidateRewriteFilter::notify(Node s, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/candidate_rewrite_filter.h b/src/theory/quantifiers/candidate_rewrite_filter.h index 6df804dff..faf675bcb 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -171,6 +171,6 @@ class CandidateRewriteFilter } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 b0a5688b2..29881a3a4 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1036,4 +1036,4 @@ Node ArithInstantiator::getModelBasedProjectionValue(CegInstantiator* ci, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h b/src/theory/quantifiers/cegqi/ceg_arith_instantiator.h index 00b23307e..e6cfa31c6 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -209,6 +209,6 @@ class ArithInstantiator : public Instantiator } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 1c60058ff..2c163421e 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -759,4 +759,4 @@ void BvInstantiatorPreprocess::collectExtracts( } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h b/src/theory/quantifiers/cegqi/ceg_bv_instantiator.h index 743a27af3..4bfda133e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -209,6 +209,6 @@ class BvInstantiatorPreprocess : public InstantiatorPreprocess } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 c0ef3561f..85faea4b1 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace utils { @@ -342,4 +342,4 @@ Node normalizePvEqual( } // namespace utils } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 13b86cff4..576d68d06 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -104,5 +104,5 @@ Node normalizePvEqual( } // namespace utils } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.cpp b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.cpp index c9bc63308..bb81d2790 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h b/src/theory/quantifiers/cegqi/ceg_dt_instantiator.h index 97cb7a4ee..c0386465d 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -91,6 +91,6 @@ class DtInstantiator : public Instantiator } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 5c6a932fd..118c505fc 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1636,6 +1636,6 @@ bool Instantiator::processEqualTerm(CegInstantiator* ci, return ci->constructInstantiationInc(pv, n, pv_prop, sf); } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/cegqi/ceg_instantiator.h b/src/theory/quantifiers/cegqi/ceg_instantiator.h index 800398fb9..03161399c 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -820,8 +820,8 @@ class InstantiatorPreprocess } }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.cpp b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.cpp index 59b4cc7bd..d6a504713 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -546,4 +546,4 @@ bool InstStrategyCegqi::processNestedQe(Node q, bool isPreregister) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h b/src/theory/quantifiers/cegqi/inst_strategy_cegqi.h index e0496a462..a5b79fb00 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -215,6 +215,6 @@ class InstStrategyCegqi : public QuantifiersModule } } -} +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/cegqi/nested_qe.cpp b/src/theory/quantifiers/cegqi/nested_qe.cpp index 0e938ddae..9efc0ec31 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -152,4 +152,4 @@ Node NestedQe::doQe(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/cegqi/nested_qe.h b/src/theory/quantifiers/cegqi/nested_qe.h index 21a49424a..29df5d16b 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -81,6 +81,6 @@ class NestedQe } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/cegqi/vts_term_cache.cpp b/src/theory/quantifiers/cegqi/vts_term_cache.cpp index 912fee2fd..1a7431038 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -296,4 +296,4 @@ bool VtsTermCache::containsVtsInfinity(Node n, bool isFree) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/cegqi/vts_term_cache.h b/src/theory/quantifiers/cegqi/vts_term_cache.h index 4f18933ec..53c198213 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 CVC4 { +namespace CVC5 { namespace theory { /** Attribute to mark Skolems as virtual terms */ @@ -140,6 +140,6 @@ class VtsTermCache } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 c095e3864..ffe06a7ad 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 CVC4; -using namespace CVC4::kind; -using namespace CVC4::theory; -using namespace CVC4::theory::quantifiers; +using namespace CVC5; +using namespace CVC5::kind; +using namespace CVC5::theory; +using namespace CVC5::theory::quantifiers; using namespace std; -namespace CVC4 { +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 diff --git a/src/theory/quantifiers/conjecture_generator.h b/src/theory/quantifiers/conjecture_generator.h index b1a1ddf2b..cc3314f82 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -466,6 +466,6 @@ private: //information about ground equivalence classes } } -} +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/dynamic_rewrite.cpp b/src/theory/quantifiers/dynamic_rewrite.cpp index cf3f5fa2f..6e7601072 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -181,6 +181,6 @@ Node DynamicRewriter::OpInternalSymTrie::getSymbol(Node n) return f; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/dynamic_rewrite.h b/src/theory/quantifiers/dynamic_rewrite.h index e4abdbe76..79b4824b4 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -117,8 +117,8 @@ class DynamicRewriter NodeList d_rewrites; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 60350f882..4c9da3632 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -348,4 +348,4 @@ Node CandidateGeneratorSelector::getNextCandidate() } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/candidate_generator.h b/src/theory/quantifiers/ematching/candidate_generator.h index 45eec1d4c..b21a96225 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -240,9 +240,9 @@ class CandidateGeneratorSelector : public CandidateGeneratorQE Node d_ufOp; }; -}/* CVC4::theory::inst namespace */ +} // namespace inst } // namespace quantifiers -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // 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 a267246a8..14f514b73 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -526,4 +526,4 @@ uint64_t HigherOrderTrigger::addHoTypeMatchPredicateLemmas() } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/ho_trigger.h b/src/theory/quantifiers/ematching/ho_trigger.h index d3489783c..66b374ea8 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -275,6 +275,6 @@ class HigherOrderTrigger : public Trigger } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 06d17dea4..2f415779a 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/im_generator.h b/src/theory/quantifiers/ematching/im_generator.h index b277ec180..b0d937120 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -117,6 +117,6 @@ protected: } // namespace inst } } -} +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/ematching/inst_match_generator.cpp b/src/theory/quantifiers/ematching/inst_match_generator.cpp index 04b8a3fcf..79b6927f7 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -673,4 +673,4 @@ InstMatchGenerator* InstMatchGenerator::getInstMatchGenerator(Trigger* tparent, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/inst_match_generator.h b/src/theory/quantifiers/ematching/inst_match_generator.h index 375fe73e1..32d6e38f1 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -325,6 +325,6 @@ class InstMatchGenerator : public IMGenerator { } // namespace inst } } -} +} // 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 fe0fa8082..6ac910e2e 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -315,4 +315,4 @@ void InstMatchGeneratorMulti::processNewInstantiations(InstMatch& m, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 1e25baea4..644a47bee 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -103,6 +103,6 @@ class InstMatchGeneratorMulti : public IMGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 18708092a..94b7921ed 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // 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 b46960400..00a372c8f 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -85,6 +85,6 @@ class InstMatchGeneratorMultiLinear : public InstMatchGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 ab30b4b2d..7d7b3e1c0 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -198,4 +198,4 @@ int InstMatchGeneratorSimple::getActiveScore() } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 6ae2f915b..8361628da 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -100,6 +100,6 @@ class InstMatchGeneratorSimple : public IMGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/ematching/inst_strategy.cpp b/src/theory/quantifiers/ematching/inst_strategy.cpp index 5e9899ec3..a56e7efeb 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -44,4 +44,4 @@ options::UserPatMode InstStrategy::getInstUserPatMode() const } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/inst_strategy.h b/src/theory/quantifiers/ematching/inst_strategy.h index 9d304368c..0537d92ce 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -85,6 +85,6 @@ class InstStrategy } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 45d5f13a7..c62a034e4 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 CVC4::kind; -using namespace CVC4::theory::quantifiers::inst; +using namespace CVC5::kind; +using namespace CVC5::theory::quantifiers::inst; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -686,6 +686,6 @@ void InstStrategyAutoGenTriggers::addUserNoPattern( Node q, Node pat ) { } } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 a17e7bbb5..bc52d605c 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -111,7 +111,7 @@ class InstStrategyAutoGenTriggers : public InstStrategy QuantRelevance* d_quant_rel; }; /* class InstStrategyAutoGenTriggers */ } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // 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 a15baa5e4..4b0d619bc 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 CVC4::kind; -using namespace CVC4::theory::quantifiers::inst; +using namespace CVC5::kind; +using namespace CVC5::theory::quantifiers::inst; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -175,4 +175,4 @@ void InstStrategyUserPatterns::addUserPattern(Node q, Node pat) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 821d7de77..1bb50af7b 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -64,6 +64,6 @@ class InstStrategyUserPatterns : public InstStrategy } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/ematching/instantiation_engine.cpp b/src/theory/quantifiers/ematching/instantiation_engine.cpp index 52bf58263..94054b8f9 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 CVC4::kind; -using namespace CVC4::context; -using namespace CVC4::theory::quantifiers::inst; +using namespace CVC5::kind; +using namespace CVC5::context; +using namespace CVC5::theory::quantifiers::inst; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -272,4 +272,4 @@ bool InstantiationEngine::shouldProcess(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/instantiation_engine.h b/src/theory/quantifiers/ematching/instantiation_engine.h index c5a82d114..8dface27e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -73,8 +73,8 @@ class InstantiationEngine : public QuantifiersModule { std::unique_ptr<QuantRelevance> d_quant_rel; }; /* class InstantiationEngine */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 7ab54fcfe..467ed46be 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -729,4 +729,4 @@ void PatternTermSelector::getTriggerVariables(Node n, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/pattern_term_selector.h b/src/theory/quantifiers/ematching/pattern_term_selector.h index 9cbf4cf5e..6f26f2cec 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -192,6 +192,6 @@ class PatternTermSelector } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/ematching/trigger.cpp b/src/theory/quantifiers/ematching/trigger.cpp index c739623bc..234940b54 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/trigger.h b/src/theory/quantifiers/ematching/trigger.h index 5dd8db452..c6d3b3cd5 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersEngine; @@ -219,6 +219,6 @@ class Trigger { } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 fae7a10a0..327d2bba1 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -185,4 +185,4 @@ bool TriggerDatabase::mkTriggerTerms(Node q, } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/trigger_database.h b/src/theory/quantifiers/ematching/trigger_database.h index 21df0e536..2c28c77bc 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -105,6 +105,6 @@ class TriggerDatabase } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 4bc74dd96..1f3ca0577 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/trigger_term_info.h b/src/theory/quantifiers/ematching/trigger_term_info.h index 5bf7e8099..603a1ab77 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -124,6 +124,6 @@ class TriggerTermInfo } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/ematching/trigger_trie.cpp b/src/theory/quantifiers/ematching/trigger_trie.cpp index 04e9dabb0..c8a13d447 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/trigger_trie.h b/src/theory/quantifiers/ematching/trigger_trie.h index ad221ee21..355ad6c31 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -58,6 +58,6 @@ class TriggerTrie } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 45c9e20d7..e2dd3f37d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/ematching/var_match_generator.h b/src/theory/quantifiers/ematching/var_match_generator.h index d85a20189..6ee179e91 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace inst { @@ -53,6 +53,6 @@ class VarMatchGeneratorTermSubs : public InstMatchGenerator } // namespace inst } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/equality_query.cpp b/src/theory/quantifiers/equality_query.cpp index 48e5682f2..7846a60bd 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -185,6 +185,6 @@ int32_t EqualityQuery::getRepScore(Node n, Node q, size_t index, TypeNode v_tn) return quantifiers::TermUtil::getTermDepth(n); } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/equality_query.h b/src/theory/quantifiers/equality_query.h index 887c54f42..d863c830b 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -88,8 +88,8 @@ class EqualityQuery : public QuantifiersUtil int32_t getRepScore(Node n, Node f, size_t index, TypeNode v_tn); }; /* EqualityQuery */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 71d5d7a7a..20f3afe63 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -104,4 +104,4 @@ Result ExprMiner::doCheck(Node query) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/expr_miner.h b/src/theory/quantifiers/expr_miner.h index 67ab2b768..7046dad83 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -90,6 +90,6 @@ class ExprMiner } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 6a77d8e45..867e6748a 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -165,4 +165,4 @@ bool ExpressionMinerManager::addTerm(Node sol, std::ostream& out) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/expr_miner_manager.h b/src/theory/quantifiers/expr_miner_manager.h index eb2a01fac..6e775f586 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersEngine; @@ -118,6 +118,6 @@ class ExpressionMinerManager } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 9c6dd3964..01d573607 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 CVC4::kind; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1724,6 +1724,6 @@ void ExtendedRewriter::debugExtendedRewrite(Node n, } } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/extended_rewrite.h b/src/theory/quantifiers/extended_rewrite.h index 0c4d0a1b3..f04f9eaae 100644 --- a/src/theory/quantifiers/extended_rewrite.h +++ b/src/theory/quantifiers/extended_rewrite.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -248,8 +248,8 @@ class ExtendedRewriter //--------------------------------------end theory-specific top-level calls }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 fd84dc500..bbd6443fa 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -361,6 +361,6 @@ unsigned FirstOrderModel::getModelBasisArg(Node n) return n.getAttribute(ModelBasisArgAttribute()); } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/first_order_model.h b/src/theory/quantifiers/first_order_model.h index b86abd960..7a578a33a 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersEngine; @@ -194,8 +194,8 @@ class FirstOrderModel : public TheoryModel void computeModelBasisArgAttribute(Node n); };/* class FirstOrderModel */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 9324ce36a..6044de049 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 CVC4; +using namespace CVC5; using namespace std; -using namespace CVC4::theory; -using namespace CVC4::theory::quantifiers; -using namespace CVC4::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 30589d40d..f2abf743a 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 CVC4 { +namespace CVC5 { namespace theory { class RepSetIterator; @@ -238,6 +238,6 @@ private: } } -} +} // 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 9577e296b..7c9aacd76 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // 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 d8ae054ad..86665aef4 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace fmcheck { @@ -54,6 +54,6 @@ class FirstOrderModelFmc : public FirstOrderModel } // namespace fmcheck } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 fcbd8e83f..3a7209f00 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/fmf/full_model_check.h b/src/theory/quantifiers/fmf/full_model_check.h index 972c977e8..19ecc8ddc 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { namespace fmcheck { @@ -184,9 +184,9 @@ protected: bool isHandled(Node q) const; };/* class FullModelChecker */ -}/* CVC4::theory::quantifiers::fmcheck namespace */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace fmcheck +} // namespace quantifiers +} // namespace theory +} // 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 f30f811d5..17935f6b4 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 CVC4; -using namespace CVC4::kind; -using namespace CVC4::context; -using namespace CVC4::theory; -using namespace CVC4::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 af5dee3cf..2b102c0a8 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -71,8 +71,8 @@ class QModelBuilder : public TheoryEngineModelBuilder quantifiers::QuantifiersInferenceManager& d_qim; }; -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 f3807aa9e..9943744f7 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -343,4 +343,4 @@ void ModelEngine::debugPrint( const char* c ){ } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/fmf/model_engine.h b/src/theory/quantifiers/fmf/model_engine.h index caafe3840..078894de6 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -69,8 +69,8 @@ private: QModelBuilder* d_builder; };/* class ModelEngine */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 661d45a9f..326de79fa 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -252,4 +252,4 @@ bool FunDefEvaluator::hasDefinitions() const { return !d_funDefMap.empty(); } } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/fun_def_evaluator.h b/src/theory/quantifiers/fun_def_evaluator.h index d9af82f21..be4070840 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -70,6 +70,6 @@ class FunDefEvaluator } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/index_trie.cpp b/src/theory/quantifiers/index_trie.cpp index 728d51fc3..444882729 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -114,4 +114,4 @@ IndexTrieNode* IndexTrie::addRec(IndexTrieNode* n, } } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/index_trie.h b/src/theory/quantifiers/index_trie.h index b77095181..4ac754252 100644 --- a/src/theory/quantifiers/index_trie.h +++ b/src/theory/quantifiers/index_trie.h @@ -21,7 +21,7 @@ #include "base/check.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -106,5 +106,5 @@ class IndexTrie } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 c215a1700..3db8db74e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -101,5 +101,5 @@ bool InstMatch::set(QuantifiersState& qs, size_t i, TNode n) } } // namespace quantifiers -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/inst_match.h b/src/theory/quantifiers/inst_match.h index 6e6796bb1..9ff507917 100644 --- a/src/theory/quantifiers/inst_match.h +++ b/src/theory/quantifiers/inst_match.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -88,7 +88,7 @@ inline std::ostream& operator<<(std::ostream& out, const InstMatch& m) { } } // namespace quantifiers -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // 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 756550828..879eb8479 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 CVC4::context; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -368,5 +368,5 @@ bool InstMatchTrieOrdered::existsInstMatch(quantifiers::QuantifiersState& qs, } } // namespace quantifiers -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/inst_match_trie.h b/src/theory/quantifiers/inst_match_trie.h index 5164f1820..da8858e8a 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -223,7 +223,7 @@ class InstMatchTrieOrdered }; } // namespace quantifiers -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // 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 16d92d405..c2ee94d1e 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -220,4 +220,4 @@ bool InstStrategyEnum::process(Node quantifier, bool fullEffort, bool isRd) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/inst_strategy_enumerative.h b/src/theory/quantifiers/inst_strategy_enumerative.h index d570e3039..05e5f7352 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -114,8 +114,8 @@ class InstStrategyEnum : public QuantifiersModule int32_t d_fullSaturateLimit; }; /* class InstStrategyEnum */ -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/instantiate.cpp b/src/theory/quantifiers/instantiate.cpp index 21faaa13f..4f878c79b 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -758,6 +758,6 @@ Instantiate::Statistics::~Statistics() smtStatisticsRegistry()->unregisterStat(&d_inst_duplicate_ent); } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/instantiate.h b/src/theory/quantifiers/instantiate.h index 94e16b526..3fb194589 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 CVC4 { +namespace CVC5 { class LazyCDProof; @@ -359,8 +359,8 @@ class Instantiate : public QuantifiersUtil std::unique_ptr<CDProof> d_pfInst; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 f38a5f9a8..1c3a0bcac 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/instantiation_list.h b/src/theory/quantifiers/instantiation_list.h index 91d2e284c..da8d5c3b5 100644 --- a/src/theory/quantifiers/instantiation_list.h +++ b/src/theory/quantifiers/instantiation_list.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC4 { +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 CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__QUANTIFIERS__INSTANTIATION_LIST_H */ diff --git a/src/theory/quantifiers/kinds b/src/theory/quantifiers/kinds index fa24275b1..6a32969e3 100644 --- a/src/theory/quantifiers/kinds +++ b/src/theory/quantifiers/kinds @@ -4,12 +4,12 @@ # src/theory/builtin/kinds. # -theory THEORY_QUANTIFIERS ::CVC4::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 ::CVC4::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 ::CVC4::theory::quantifiers::QuantifierTypeRule -typerule EXISTS ::CVC4::theory::quantifiers::QuantifierTypeRule -typerule BOUND_VAR_LIST ::CVC4::theory::quantifiers::QuantifierBoundVarListTypeRule -typerule INST_PATTERN_LIST ::CVC4::theory::quantifiers::QuantifierInstPatternListTypeRule - -typerule INST_PATTERN ::CVC4::theory::quantifiers::QuantifierInstPatternTypeRule -typerule INST_NO_PATTERN ::CVC4::theory::quantifiers::QuantifierAnnotationTypeRule -typerule INST_ATTRIBUTE ::CVC4::theory::quantifiers::QuantifierAnnotationTypeRule -typerule INST_POOL ::CVC4::theory::quantifiers::QuantifierAnnotationTypeRule -typerule INST_ADD_TO_POOL ::CVC4::theory::quantifiers::QuantifierAnnotationTypeRule -typerule SKOLEM_ADD_TO_POOL ::CVC4::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 3b1abb168..1b706d904 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -154,6 +154,6 @@ void LazyTrieMulti::clear() d_rep_to_class.clear(); } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/lazy_trie.h b/src/theory/quantifiers/lazy_trie.h index de53e738c..2d92b13fd 100644 --- a/src/theory/quantifiers/lazy_trie.h +++ b/src/theory/quantifiers/lazy_trie.h @@ -17,7 +17,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -166,8 +166,8 @@ class LazyTrieMulti LazyTrie d_trie; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 afbc9efca..572c631e1 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -123,4 +123,4 @@ Node QuantifiersProofRuleChecker::checkInternal( } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/proof_checker.h b/src/theory/quantifiers/proof_checker.h index 7d2f1baf1..da78daf90 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -44,6 +44,6 @@ class QuantifiersProofRuleChecker : public ProofRuleChecker } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 45c2b5e42..6d7e2e9cd 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -127,4 +127,4 @@ bool QuantifiersBoundInference::getBoundElements( } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quant_bound_inference.h b/src/theory/quantifiers/quant_bound_inference.h index 58b4e3db9..62ac0ea58 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 CVC4 { +namespace CVC5 { namespace theory { class RepSetIterator; @@ -122,6 +122,6 @@ class QuantifiersBoundInference } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 c71964565..5fa617670 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 CVC4::kind; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -2349,6 +2349,6 @@ bool QuantConflictFind::isPropagatingInstance(Node n) const return true; } -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/quant_conflict_find.h b/src/theory/quantifiers/quant_conflict_find.h index 7778da4d0..ef605a48a 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -311,8 +311,8 @@ public: std::ostream& operator<<(std::ostream& os, const QuantConflictFind::Effort& e); -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/quant_module.cpp b/src/theory/quantifiers/quant_module.cpp index 156dd54fe..811dc8642 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { QuantifiersModule::QuantifiersModule( @@ -75,4 +75,4 @@ quantifiers::QuantifiersRegistry& QuantifiersModule::getQuantifiersRegistry() } } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/quantifiers/quant_module.h b/src/theory/quantifiers/quant_module.h index fe518d61f..53fb55aa0 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { class TermDb; @@ -174,6 +174,6 @@ class QuantifiersModule }; /* class QuantifiersModule */ } // namespace theory -} // namespace CVC4 +} // 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 2a20800c2..2ce79d285 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -60,6 +60,6 @@ size_t QuantRelevance::getNumQuantifiersForSymbol(Node s) const return it->second.size(); } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/quant_relevance.h b/src/theory/quantifiers/quant_relevance.h index 66a31b58d..73b62489e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -61,8 +61,8 @@ class QuantRelevance : public QuantifiersUtil void computeSymbols(Node n, std::vector<Node>& syms); }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 f29e2e224..2a70e5d4e 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -86,4 +86,4 @@ bool QRepBoundExt::getVariableOrder(Node owner, std::vector<unsigned>& varOrder) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quant_rep_bound_ext.h b/src/theory/quantifiers/quant_rep_bound_ext.h index 30dbd520b..7e8f5d386 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -67,6 +67,6 @@ class QRepBoundExt : public RepBoundExt } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 cb4e4d8b6..85fb291f0 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -207,4 +207,4 @@ void QuantDSplit::check(Theory::Effort e, QEffort quant_e) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quant_split.h b/src/theory/quantifiers/quant_split.h index e7468dd34..eb85a2c28 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersEngine; @@ -73,6 +73,6 @@ class QuantDSplit : public QuantifiersModule { } } -} +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/quant_util.cpp b/src/theory/quantifiers/quant_util.cpp index 45fe078d5..841778a89 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { QuantPhaseReq::QuantPhaseReq( Node n, bool computeEq ){ @@ -130,5 +130,5 @@ void QuantPhaseReq::getEntailPolarity( Node n, int child, bool hasPol, bool pol, } } -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/quant_util.h b/src/theory/quantifiers/quant_util.h index d536fa84d..f41f394e8 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 CVC4 { +namespace CVC5 { namespace theory { /** Quantifiers utility @@ -78,6 +78,6 @@ public: }; } -} +} // 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 30b3ebcbe..8c068e06c 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -376,6 +376,6 @@ void QuantAttributes::setInstantiationLevelAttr(Node n, uint64_t level) } } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/quantifiers_attributes.h b/src/theory/quantifiers/quantifiers_attributes.h index ab1f7369e..4f7f1e22c 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 CVC4 { +namespace CVC5 { namespace theory { /** Attribute true for function definition quantifiers */ @@ -244,6 +244,6 @@ class QuantAttributes } } -} +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/quantifiers_inference_manager.cpp b/src/theory/quantifiers/quantifiers_inference_manager.cpp index b25c1aed3..687e17e4a 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -53,4 +53,4 @@ void QuantifiersInferenceManager::doPending() } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quantifiers_inference_manager.h b/src/theory/quantifiers/quantifiers_inference_manager.h index f16f91f04..afe8dd40a 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -59,6 +59,6 @@ class QuantifiersInferenceManager : public InferenceManagerBuffered } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 9c8a4c7d0..e39e38ea7 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -122,4 +122,4 @@ void QuantifiersModules::initialize(QuantifiersState& qs, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quantifiers_modules.h b/src/theory/quantifiers/quantifiers_modules.h index e58fcb8d5..71928502d 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersEngine; @@ -45,7 +45,8 @@ namespace quantifiers { */ class QuantifiersModules { - friend class ::CVC4::theory::QuantifiersEngine; + friend class ::CVC5::theory::QuantifiersEngine; + public: QuantifiersModules(); ~QuantifiersModules(); @@ -93,6 +94,6 @@ class QuantifiersModules } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 daaaea0ad..3cd59c834 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quantifiers_registry.h b/src/theory/quantifiers/quantifiers_registry.h index f2d3f085e..a3dffb063 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersModule; @@ -129,6 +129,6 @@ class QuantifiersRegistry : public QuantifiersUtil } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 4b7aba7d3..d31b22f88 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -2028,6 +2028,6 @@ TrustNode QuantifiersRewriter::preprocess(Node n, bool isInst) return TrustNode::null(); } -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/quantifiers_rewriter.h b/src/theory/quantifiers/quantifiers_rewriter.h index 3c83aef03..7bbe32da7 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -301,8 +301,8 @@ public: bool marked = false); }; /* class QuantifiersRewriter */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 be691ae27..5e3bb3ba3 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -160,4 +160,4 @@ QuantifiersStatistics& QuantifiersState::getStats() { return d_statistics; } } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quantifiers_state.h b/src/theory/quantifiers/quantifiers_state.h index 6b4daec61..0f1c13659 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -86,6 +86,6 @@ class QuantifiersState : public TheoryState } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 4567a6d4f..e922c7080 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -61,4 +61,4 @@ QuantifiersStatistics::~QuantifiersStatistics() } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/quantifiers_statistics.h b/src/theory/quantifiers/quantifiers_statistics.h index 1fa053484..9f2678796 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -47,6 +47,6 @@ class QuantifiersStatistics } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 61ad4b87f..0860549ba 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -425,4 +425,4 @@ void QueryGenerator::findQueries( } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/query_generator.h b/src/theory/quantifiers/query_generator.h index 570226f85..a847a184b 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -116,6 +116,6 @@ class QueryGenerator : public ExprMiner } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__QUANTIFIERS___H */ diff --git a/src/theory/quantifiers/relevant_domain.cpp b/src/theory/quantifiers/relevant_domain.cpp index 8210c5e8a..3e25f4073 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/relevant_domain.h b/src/theory/quantifiers/relevant_domain.h index 8fbd70f3e..56b728b34 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -168,9 +168,8 @@ class RelevantDomain : public QuantifiersUtil void computeRelevantDomainLit( Node q, bool hasPol, bool pol, Node n ); };/* class RelevantDomain */ - -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 72a1a2856..1dbc24280 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -613,6 +613,6 @@ void SingleInvocationPartition::debugPrint(const char* c) Trace(c) << std::endl; } -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/single_inv_partition.h b/src/theory/quantifiers/single_inv_partition.h index 6c55dc959..6feff4169 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -290,8 +290,8 @@ class SingleInvocationPartition Node getConjunct(int index); }; -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // 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 9d6d30790..3767fac61 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -397,6 +397,6 @@ void Skolemize::getSkolemTermVectors( bool Skolemize::isProofEnabled() const { return d_epg != nullptr; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/skolemize.h b/src/theory/quantifiers/skolemize.h index 3770cc223..d0a889ace 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 CVC4 { +namespace CVC5 { class DTypeConstructor; @@ -155,8 +155,8 @@ class Skolemize std::unique_ptr<EagerProofGenerator> d_epg; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 c66b83170..3b00f5081 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -103,4 +103,4 @@ bool SolutionFilterStrength::addTerm(Node n, std::ostream& out) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/solution_filter.h b/src/theory/quantifiers/solution_filter.h index 212b3c7dd..cea5eb74e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -70,6 +70,6 @@ class SolutionFilterStrength : public ExprMiner } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 c9b2559c1..0acd7e718 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -548,4 +548,4 @@ bool CegSingleInv::solveTrivial(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 8a2ed3a71..e2f399ffd 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -176,8 +176,8 @@ class CegSingleInv //-------------- end decomposed conjecture }; -}/* namespace CVC4::theory::quantifiers */ -}/* namespace CVC4::theory */ -}/* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/cegis.cpp b/src/theory/quantifiers/sygus/cegis.cpp index 9022a9ba0..d980db887 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -704,6 +704,6 @@ bool Cegis::sampleAddRefinementLemma(const std::vector<Node>& candidates, return false; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/cegis.h b/src/theory/quantifiers/sygus/cegis.h index 9d91a3d66..a12133d23 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -225,8 +225,8 @@ class Cegis : public SygusModule //---------------------------------end for symbolic constructors }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 a21632bb3..26ad62c90 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -861,4 +861,4 @@ Node CegisCoreConnective::constructSolutionFromPool(Component& ccheck, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/cegis_core_connective.h b/src/theory/quantifiers/sygus/cegis_core_connective.h index 5b8be444e..59bf53317 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 CVC4 { +namespace CVC5 { class SmtEngine; @@ -399,6 +399,6 @@ class CegisCoreConnective : public Cegis } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 75e4c2465..bcd9fa67a 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -686,4 +686,4 @@ void CegisUnifEnumDecisionStrategy::registerEvalPtAtSize(Node e, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/cegis_unif.h b/src/theory/quantifiers/sygus/cegis_unif.h index e450c3fa7..e00370f2a 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -333,6 +333,6 @@ class CegisUnif : public Cegis } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/enum_stream_substitution.cpp b/src/theory/quantifiers/sygus/enum_stream_substitution.cpp index d4838de7a..17f2a0c16 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -621,4 +621,4 @@ bool EnumStreamConcrete::increment() Node EnumStreamConcrete::getCurrent() { return d_currTerm; } } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/enum_stream_substitution.h b/src/theory/quantifiers/sygus/enum_stream_substitution.h index 46b51c443..c7e4720d2 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -299,6 +299,6 @@ class EnumStreamConcrete : public EnumValGenerator } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/example_eval_cache.cpp b/src/theory/quantifiers/sygus/example_eval_cache.cpp index 4508e0a09..5056fb96d 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -119,4 +119,4 @@ void ExampleEvalCache::clearEvaluationAll() { d_exOutCache.clear(); } } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/example_eval_cache.h b/src/theory/quantifiers/sygus/example_eval_cache.h index 35adb889c..97ec38ab5 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -160,6 +160,6 @@ class ExampleEvalCache } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/example_infer.cpp b/src/theory/quantifiers/sygus/example_infer.cpp index 7219b8f4b..12e4f073e 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -275,4 +275,4 @@ bool ExampleInfer::hasExamplesOut(Node f) const } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/example_infer.h b/src/theory/quantifiers/sygus/example_infer.h index 61c0327b7..0e5ee25ac 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -157,6 +157,6 @@ class ExampleInfer } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/example_min_eval.cpp b/src/theory/quantifiers/sygus/example_min_eval.cpp index 22b0cb121..4cb9bd345 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -84,4 +84,4 @@ Node EmeEvalTds::eval(TNode n, } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/example_min_eval.h b/src/theory/quantifiers/sygus/example_min_eval.h index 088036945..9af07caba 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -118,6 +118,6 @@ class EmeEvalTds : public EmeEval } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/rcons_obligation_info.cpp b/src/theory/quantifiers/sygus/rcons_obligation_info.cpp index 25aac1e93..7d4a41f2d 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -97,4 +97,4 @@ void RConsObligationInfo::printCandSols( } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/rcons_obligation_info.h b/src/theory/quantifiers/sygus/rcons_obligation_info.h index 5ebddd794..e05422b59 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -145,6 +145,6 @@ class RConsObligationInfo } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 d24c4d25d..37b136a1c 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -69,4 +69,4 @@ Node RConsTypeInfo::builtinToOb(Node builtin) { return d_ob[builtin]; } } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/rcons_type_info.h b/src/theory/quantifiers/sygus/rcons_type_info.h index 432d07687..c2bce5720 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -97,6 +97,6 @@ class RConsTypeInfo } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 7bdc4ff9d..71853fc76 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -187,4 +187,4 @@ Node SygusAbduct::mkAbductionConjecture(const std::string& name, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_abduct.h b/src/theory/quantifiers/sygus/sygus_abduct.h index 85f4ff60b..ffcefd38b 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -85,6 +85,6 @@ class SygusAbduct } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 4f870830e..c786d2668 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1214,4 +1214,4 @@ bool SygusEnumerator::TermEnumMasterFv::increment() } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_enumerator.h b/src/theory/quantifiers/sygus/sygus_enumerator.h index cbf24ada1..a0d1c9b62 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -506,6 +506,6 @@ class SygusEnumerator : public EnumValGenerator } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 1b3404757..51814b07c 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 CVC4::kind; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -55,4 +55,4 @@ bool EnumValGeneratorBasic::increment() } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_enumerator_basic.h b/src/theory/quantifiers/sygus/sygus_enumerator_basic.h index b6a56b6e3..c57d6f814 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -65,6 +65,6 @@ class EnumValGeneratorBasic : public EnumValGenerator } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 92d77adff..3e87ccfc7 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -333,4 +333,4 @@ Node SygusEvalUnfold::unfold(Node en) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_eval_unfold.h b/src/theory/quantifiers/sygus/sygus_eval_unfold.h index f39092a04..d5e47edbc 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -154,6 +154,6 @@ class SygusEvalUnfold } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 9025b1a51..26fab8535 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 CVC4::kind; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -355,6 +355,6 @@ void SygusExplain::getExplanationFor(Node n, getExplanationFor(trb, n, vn, exp, var_count, et, vnr, vnr_exp, sz); } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_explain.h b/src/theory/quantifiers/sygus/sygus_explain.h index 262062f14..1b1db568f 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -239,8 +239,8 @@ class SygusExplain int& sz); }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 7645cc237..554f587c7 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1620,6 +1620,6 @@ bool CegGrammarConstructor::SygusDatatypeGenerator::shouldInclude(Node op) const return true; } -}/* namespace CVC4::theory::quantifiers */ -}/* namespace CVC4::theory */ -}/* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_grammar_cons.h b/src/theory/quantifiers/sygus/sygus_grammar_cons.h index 0bd471922..a39540452 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -264,8 +264,8 @@ public: //---------------- end grammar construction }; -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_grammar_norm.cpp b/src/theory/quantifiers/sygus/sygus_grammar_norm.cpp index 964d64655..fa67e17c4 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -536,4 +536,4 @@ TypeNode SygusGrammarNorm::normalizeSygusType(TypeNode tn, Node sygus_vars) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_grammar_norm.h b/src/theory/quantifiers/sygus/sygus_grammar_norm.h index bb4bb6384..8c057d2c5 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -426,6 +426,6 @@ class SygusGrammarNorm } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_grammar_red.cpp b/src/theory/quantifiers/sygus/sygus_grammar_red.cpp index 3a4596a1e..8e6f4fbae 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -174,6 +174,6 @@ void SygusRedundantCons::getGenericList(TermDbSygus* tds, } } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_grammar_red.h b/src/theory/quantifiers/sygus/sygus_grammar_red.h index 565aafe28..25256a68c 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -116,8 +116,8 @@ class SygusRedundantCons std::vector<Node>& terms); }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 2335a3a28..1c856ffa2 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -358,4 +358,4 @@ bool SygusInterpol::solveInterpolation(const std::string& name, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_interpol.h b/src/theory/quantifiers/sygus/sygus_interpol.h index 07bdde2a8..34517b6e6 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { /** @@ -213,6 +213,6 @@ class SygusInterpol } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 1740ecc3d..7e6c5ab6c 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 CVC4::kind; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -259,6 +259,6 @@ bool NegContainsSygusInvarianceTest::invariant(TermDbSygus* tds, return d_isUniversal; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_invariance.h b/src/theory/quantifiers/sygus/sygus_invariance.h index 0f8c22f72..88e45df45 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -296,8 +296,8 @@ class NegContainsSygusInvarianceTest : public SygusInvarianceTest bool d_isUniversal; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 870363c07..8dac30c7e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -25,6 +25,6 @@ SygusModule::SygusModule(QuantifiersInferenceManager& qim, { } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_module.h b/src/theory/quantifiers/sygus/sygus_module.h index 9c543c6b6..32f404005 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -155,8 +155,8 @@ class SygusModule SynthConjecture* d_parent; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 170cf6fd7..25068eb7d 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -258,4 +258,4 @@ bool SygusPbe::constructCandidates(const std::vector<Node>& enums, } } -} +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_pbe.h b/src/theory/quantifiers/sygus/sygus_pbe.h index cbd307cab..c63dcf697 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -166,8 +166,8 @@ class SygusPbe : public SygusModule std::map<Node, Node> d_enum_to_candidate; }; -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_process_conj.cpp b/src/theory/quantifiers/sygus/sygus_process_conj.cpp index e58c209d4..dfb0a0f7c 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 CVC4::kind; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -802,6 +802,6 @@ void SynthConjectureProcess::getComponentVector(Kind k, } } -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_process_conj.h b/src/theory/quantifiers/sygus/sygus_process_conj.h index de136d546..0b07db89b 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -356,8 +356,8 @@ class SynthConjectureProcess void getComponentVector(Kind k, Node n, std::vector<Node>& args); }; -} /* namespace CVC4::theory::quantifiers */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_qe_preproc.cpp b/src/theory/quantifiers/sygus/sygus_qe_preproc.cpp index c8582cce5..72ce3f1ab 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -144,4 +144,4 @@ Node SygusQePreproc::preprocess(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_qe_preproc.h b/src/theory/quantifiers/sygus/sygus_qe_preproc.h index 4cfa8a624..49f81df02 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -45,6 +45,6 @@ class SygusQePreproc } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 bd0f7c4dd..723d924f8 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -488,4 +488,4 @@ void SygusReconstruct::printPool( } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_reconstruct.h b/src/theory/quantifiers/sygus/sygus_reconstruct.h index 2d55c3f3d..0512fe643 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -307,6 +307,6 @@ class SygusReconstruct : public expr::NotifyMatch } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 a7d352740..2d7dfc4bc 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -619,6 +619,6 @@ bool SygusRepairConst::getFitToLogicExcludeVar(LogicInfo& logic, return true; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_repair_const.h b/src/theory/quantifiers/sygus/sygus_repair_const.h index 78c17280c..1e7eeb9fc 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 CVC4 { +namespace CVC5 { class LogicInfo; @@ -207,8 +207,8 @@ class SygusRepairConst bool getFitToLogicExcludeVar(LogicInfo& logic, Node n, Node& exvar); }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 cd75a1e5e..da08ec1b5 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -60,4 +60,4 @@ SygusStatistics::~SygusStatistics() } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_stats.h b/src/theory/quantifiers/sygus/sygus_stats.h index 0824e846f..d89fa0eca 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -53,6 +53,6 @@ class SygusStatistics } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/sygus_unif.cpp b/src/theory/quantifiers/sygus/sygus_unif.cpp index e590f704f..8eb13fef8 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -134,6 +134,6 @@ void SygusUnif::print_val(const char* c, std::vector<Node>& vals, bool pol) } } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_unif.h b/src/theory/quantifiers/sygus/sygus_unif.h index ca5eb0a73..153c4603b 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -191,8 +191,8 @@ class SygusUnif Node getMinimalTerm(const std::vector<Node>& terms); }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 813aaa2b5..be24cb9e7 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1675,6 +1675,6 @@ Node SygusUnifIo::constructBestConditional(Node ce, return conds[bestIndex]; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_unif_io.h b/src/theory/quantifiers/sygus/sygus_unif_io.h index d7b0e231c..5d4f7fb7d 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -466,8 +466,8 @@ class SygusUnifIo : public SygusUnif const std::vector<Node>& conds) override; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 8859ba72b..436678aa9 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1207,4 +1207,4 @@ Node SygusUnifRl::DecisionTreeInfo::PointSeparator::computeCond(Node cond, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_unif_rl.h b/src/theory/quantifiers/sygus/sygus_unif_rl.h index 4c40e39db..82f2a80d2 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -443,6 +443,6 @@ class SygusUnifRl : public SygusUnif } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 3a61c5635..5551be630 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1048,6 +1048,6 @@ void SygusUnifStrategy::indent(const char* c, int ind) } } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_unif_strat.h b/src/theory/quantifiers/sygus/sygus_unif_strat.h index a1d34ad4e..c9d6e5d96 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -426,8 +426,8 @@ class SygusUnifStrategy //------------------------------ end strategy registration }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 04acad0e6..ec5edd640 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -179,4 +179,4 @@ TypeNode SygusUtils::getSygusTypeForSynthFun(Node f) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/sygus_utils.h b/src/theory/quantifiers/sygus/sygus_utils.h index 41cdb85b2..2646dd1c8 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -110,6 +110,6 @@ class SygusUtils } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 72e69afae..0bfa73048 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 CVC4::kind; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1353,4 +1353,4 @@ ExampleEvalCache* SynthConjecture::getExampleEvalCache(Node e) } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/synth_conjecture.h b/src/theory/quantifiers/sygus/synth_conjecture.h index efb559889..e39f65d80 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -426,6 +426,6 @@ class SynthConjecture } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/synth_engine.cpp b/src/theory/quantifiers/sygus/synth_engine.cpp index 811730d4a..4f1a0bbbb 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -290,4 +290,4 @@ void SynthEngine::preregisterAssertion(Node n) } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/synth_engine.h b/src/theory/quantifiers/sygus/synth_engine.h index 813981395..30f9c181e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -115,6 +115,6 @@ class SynthEngine : public QuantifiersModule } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/template_infer.cpp b/src/theory/quantifiers/sygus/template_infer.cpp index 5cfc09d7c..84fcafd05 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -203,4 +203,4 @@ Node SygusTemplateInfer::getTemplateArg(Node prog) const } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/template_infer.h b/src/theory/quantifiers/sygus/template_infer.h index a00239df9..be35025bd 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -71,6 +71,6 @@ class SygusTemplateInfer } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/term_database_sygus.cpp b/src/theory/quantifiers/sygus/term_database_sygus.cpp index e7bbc947a..f50e222ff 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1089,6 +1089,6 @@ bool TermDbSygus::isEvaluationPoint(Node n) const return true; } -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/term_database_sygus.h b/src/theory/quantifiers/sygus/term_database_sygus.h index f2188469e..0bd0c636a 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -465,8 +465,8 @@ class TermDbSygus { }; -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 543d5e7f0..0b5946176 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -585,4 +585,4 @@ Node TransitionInference::constructFormulaTrace(DetTrace& dt) const } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/transition_inference.h b/src/theory/quantifiers/sygus/transition_inference.h index aa060de4e..aed003357 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -332,6 +332,6 @@ class TransitionInference } // namespace quantifiers } // namespace theory -} /* namespace CVC4 */ +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus/type_info.cpp b/src/theory/quantifiers/sygus/type_info.cpp index 9266a3f9d..19dff9936 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -488,4 +488,4 @@ bool SygusTypeInfo::isSubclassVarTrivial() const } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus/type_info.h b/src/theory/quantifiers/sygus/type_info.h index 7b45d115b..cc78fc526 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -253,6 +253,6 @@ class SygusTypeInfo } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 93162b50e..064543af8 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -49,4 +49,4 @@ void TypeNodeIdTrie::assignIds(std::map<Node, unsigned>& assign, } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 020c8d086..a60afda23 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -48,6 +48,6 @@ class TypeNodeIdTrie } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 8732f1715..0b1d91684 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -553,4 +553,4 @@ void SygusInst::addCeLemma(Node q) } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus_inst.h b/src/theory/quantifiers/sygus_inst.h index 402846e87..08fc5ccb3 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersEngine; @@ -147,6 +147,6 @@ class SygusInst : public QuantifiersModule } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/quantifiers/sygus_sampler.cpp b/src/theory/quantifiers/sygus_sampler.cpp index ea530da67..2b89c0c7c 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -843,6 +843,6 @@ void SygusSampler::checkEquivalent(Node bv, Node bvr) } } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/sygus_sampler.h b/src/theory/quantifiers/sygus_sampler.h index a51f1e015..65843dc63 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -318,8 +318,8 @@ class SygusSampler : public LazyTrieEvaluator void registerSygusType(TypeNode tn); }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 2d857a4d3..d6d7933cb 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -1230,6 +1230,6 @@ Node TermDb::getHoTypeMatchPredicate(TypeNode tn) return k; } -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/term_database.h b/src/theory/quantifiers/term_database.h index bafaa8bdd..d0812d1d1 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -420,8 +420,8 @@ class TermDb : public QuantifiersUtil { //------------------------------end higher-order term indexing };/* class TermDb */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 0b1b1cdae..2945750c1 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -73,6 +73,6 @@ bool TermEnumeration::getDomain(TypeNode tn, std::vector<Node>& dom) return true; } -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/term_enumeration.h b/src/theory/quantifiers/term_enumeration.h index 9cd57bfd0..fa7eaf63e 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -69,8 +69,8 @@ class TermEnumeration std::vector<TypeEnumerator> d_typ_enum; }; -} /* CVC4::theory::quantifiers namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 74dad6cc7..cf33f0a41 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -134,4 +134,4 @@ bool TermRegistry::useFmcModel() const { return d_useFmcModel; } } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/term_registry.h b/src/theory/quantifiers/term_registry.h index d70b7acf8..e4e4a7e9f 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -99,6 +99,6 @@ class TermRegistry } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 209196110..546f6aa6c 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/term_tuple_enumerator.h b/src/theory/quantifiers/term_tuple_enumerator.h index 28831baf5..b15ab2212 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -94,5 +94,5 @@ TermTupleEnumeratorInterface* mkTermTupleEnumeratorRd( } // namespace quantifiers } // namespace theory -} // namespace CVC4 +} // 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 daf291d18..41e06a708 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -599,6 +599,6 @@ bool TermUtil::hasOffsetArg(Kind ik, int arg, int& offset, Kind& ok) return false; } -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/quantifiers/term_util.h b/src/theory/quantifiers/term_util.h index 6fd9d32d6..1ac6ca495 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 CVC4 { +namespace CVC5 { namespace theory { // attribute for "contains instantiation constants from" @@ -204,8 +204,8 @@ public: static Node mkTypeConst(TypeNode tn, bool pol); };/* class TermUtil */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 ace7b79ff..d89abf076 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers/theory_quantifiers.h b/src/theory/quantifiers/theory_quantifiers.h index 91f12c0ed..6af0e8648 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -96,8 +96,8 @@ class TheoryQuantifiers : public Theory { std::unique_ptr<QuantifiersEngine> d_qengine; };/* class TheoryQuantifiers */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 6758cde28..e990f5320 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 CVC4 { +namespace CVC5 { namespace theory { namespace quantifiers { @@ -129,8 +129,8 @@ struct QuantifierInstPatternListTypeRule { } };/* struct QuantifierInstPatternListTypeRule */ -}/* CVC4::theory::quantifiers namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace quantifiers +} // namespace theory +} // 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 fa02ae516..12942c1c4 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { QuantifiersEngine::QuantifiersEngine( @@ -653,4 +653,4 @@ bool QuantifiersEngine::getSynthSolutions( } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/quantifiers_engine.h b/src/theory/quantifiers_engine.h index fd24abcf9..4d4599f68 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -52,7 +52,7 @@ class TermRegistry; // TODO: organize this more/review this, github issue #1163 class QuantifiersEngine { - friend class ::CVC4::TheoryEngine; + friend class ::CVC5::TheoryEngine; typedef context::CDHashMap< Node, bool, NodeHashFunction > BoolMap; typedef context::CDHashSet<Node, NodeHashFunction> NodeSet; @@ -208,7 +208,7 @@ public: std::map<Node, Node> d_quants_red_lem; };/* class QuantifiersEngine */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__QUANTIFIERS_ENGINE_H */ diff --git a/src/theory/relevance_manager.cpp b/src/theory/relevance_manager.cpp index d38170563..5fda45954 100644 --- a/src/theory/relevance_manager.cpp +++ b/src/theory/relevance_manager.cpp @@ -16,9 +16,9 @@ #include <sstream> -using namespace CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { RelevanceManager::RelevanceManager(context::UserContext* userContext, @@ -314,4 +314,4 @@ bool RelevanceManager::isRelevant(Node lit) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/relevance_manager.h b/src/theory/relevance_manager.h index 3d1baffc6..eea1d2c61 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -149,6 +149,6 @@ class RelevanceManager }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__RELEVANCE_MANAGER__H */ diff --git a/src/theory/rep_set.cpp b/src/theory/rep_set.cpp index cad77b62b..6492ac9f0 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { void RepSet::clear(){ @@ -461,5 +461,5 @@ void RepSetIterator::debugPrintSmall( const char* c ){ Debug( c ) << std::endl; } -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/rep_set.h b/src/theory/rep_set.h index 55751efa3..4c7b04045 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 CVC4 { +namespace CVC5 { namespace theory { class QuantifiersEngine; @@ -324,7 +324,7 @@ class RepBoundExt } }; -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__REP_SET_H */ diff --git a/src/theory/rewriter.cpp b/src/theory/rewriter.cpp index 9c69915b4..9e248c8d6 100644 --- a/src/theory/rewriter.cpp +++ b/src/theory/rewriter.cpp @@ -29,7 +29,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { /** Attribute true for nodes that have been rewritten with proofs enabled */ @@ -511,5 +511,5 @@ void Rewriter::clearCaches() { rewriter->clearCachesInternal(); } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/rewriter.h b/src/theory/rewriter.h index 9a669988b..c5a8cd45e 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 CVC4 { +namespace CVC5 { class TConvProofGenerator; class ProofNodeManager; @@ -231,5 +231,5 @@ class Rewriter { #endif /* CVC4_ASSERTIONS */ };/* class Rewriter */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/rewriter_attributes.h b/src/theory/rewriter_attributes.h index 49f77f0e3..83961353e 100644 --- a/src/theory/rewriter_attributes.h +++ b/src/theory/rewriter_attributes.h @@ -20,7 +20,7 @@ #include "expr/attribute.h" -namespace CVC4 { +namespace CVC5 { namespace theory { template <bool pre, theory::TheoryId theoryId> @@ -98,5 +98,5 @@ struct RewriteAttibute { } };/* struct RewriteAttribute */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/rewriter_tables_template.h b/src/theory/rewriter_tables_template.h index 0c2ecb5c9..bd9b9575e 100644 --- a/src/theory/rewriter_tables_template.h +++ b/src/theory/rewriter_tables_template.h @@ -26,7 +26,7 @@ ${rewriter_includes} -namespace CVC4 { +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 CVC4::expr::attr::AttributeUniqueId AttributeUniqueId; + typedef CVC5::expr::attr::AttributeUniqueId AttributeUniqueId; std::vector<AttributeUniqueId> preids; ${pre_rewrite_attribute_ids} @@ -94,5 +94,5 @@ void Rewriter::clearCachesInternal() { NodeManager::currentNM()->deleteAttributes(allids); } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/sep/kinds b/src/theory/sep/kinds index 7a3fb00a4..666e3f179 100644 --- a/src/theory/sep/kinds +++ b/src/theory/sep/kinds @@ -4,13 +4,13 @@ # src/theory/builtin/kinds. # -theory THEORY_SEP ::CVC4::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 ::CVC4::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 ::CVC4::theory::sep::SepEmpTypeRule -typerule SEP_PTO ::CVC4::theory::sep::SepPtoTypeRule -typerule SEP_STAR ::CVC4::theory::sep::SepStarTypeRule -typerule SEP_WAND ::CVC4::theory::sep::SepWandTypeRule -typerule SEP_LABEL ::CVC4::theory::sep::SepLabelTypeRule -typerule SEP_NIL ::CVC4::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 00e3e8251..73fc565bd 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sep { @@ -1796,6 +1796,6 @@ Node TheorySep::HeapInfo::getValue( TypeNode tn ) { return curr; } -}/* CVC4::theory::sep namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sep +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/sep/theory_sep.h b/src/theory/sep/theory_sep.h index 824fe70e9..029cbada5 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 CVC4 { +namespace CVC5 { namespace theory { class TheoryModel; @@ -349,8 +349,8 @@ class TheorySep : public Theory { void initializeBounds(); };/* class TheorySep */ -}/* CVC4::theory::sep namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sep +} // namespace theory +} // 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 9f34fa4b2..756a82bc1 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 CVC4 { +namespace CVC5 { namespace theory { namespace sep { @@ -164,6 +164,6 @@ RewriteResponse TheorySepRewriter::postRewrite(TNode node) { return RewriteResponse(node==retNode ? REWRITE_DONE : REWRITE_AGAIN_FULL, retNode); } -}/* CVC4::theory::sep namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sep +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/sep/theory_sep_rewriter.h b/src/theory/sep/theory_sep_rewriter.h index 745eef4ac..97124bd0d 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 CVC4 { +namespace CVC5 { namespace theory { namespace sep { @@ -47,8 +47,8 @@ class TheorySepRewriter : public TheoryRewriter static bool isSpatial(Node n, std::map<Node, bool>& visited); }; /* class TheorySepRewriter */ -}/* CVC4::theory::sep namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sep +} // namespace theory +} // 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 bbaf61483..8618ce4d6 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 CVC4 { +namespace CVC5 { namespace theory { namespace sep { @@ -107,9 +107,8 @@ struct SepNilTypeRule { } };/* struct SepLabelTypeRule */ - -}/* CVC4::theory::sep namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sep +} // namespace theory +} // 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 ef1b3e8d5..84e7786e8 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -1114,4 +1114,4 @@ const std::vector<Node>& CardinalityExtension::getFiniteTypeMembers( } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/cardinality_extension.h b/src/theory/sets/cardinality_extension.h index c353f86b8..47fa18d5b 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -412,6 +412,6 @@ class CardinalityExtension } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/sets/inference_manager.cpp b/src/theory/sets/inference_manager.cpp index 9e16bfb97..305059797 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -177,4 +177,4 @@ void InferenceManager::split(Node n, InferenceId id, int reqPol) } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/inference_manager.h b/src/theory/sets/inference_manager.h index ce561f454..8e4614718 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -100,6 +100,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__SETS__INFERENCE_MANAGER_H */ diff --git a/src/theory/sets/kinds b/src/theory/sets/kinds index 57120e42e..4ef22d68c 100644 --- a/src/theory/sets/kinds +++ b/src/theory/sets/kinds @@ -5,10 +5,10 @@ # theory THEORY_SETS \ - ::CVC4::theory::sets::TheorySets \ + ::CVC5::theory::sets::TheorySets \ "theory/sets/theory_sets.h" typechecker "theory/sets/theory_sets_type_rules.h" -rewriter ::CVC4::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 \ - ::CVC4::EmptySet \ - ::CVC4::EmptySetHashFunction \ + ::CVC5::EmptySet \ + ::CVC5::EmptySetHashFunction \ "expr/emptyset.h" \ - "the empty set constant; payload is an instance of the CVC4::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 \ - "::CVC4::theory::sets::SetsProperties::computeCardinality(%TYPE%)" \ + "::CVC5::theory::sets::SetsProperties::computeCardinality(%TYPE%)" \ "theory/sets/theory_sets_type_rules.h" well-founded SET_TYPE \ - "::CVC4::theory::sets::SetsProperties::isWellFounded(%TYPE%)" \ - "::CVC4::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 \ - "::CVC4::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 \ - ::CVC4::SingletonOp \ - ::CVC4::SingletonOpHashFunction \ + ::CVC5::SingletonOp \ + ::CVC5::SingletonOpHashFunction \ "theory/sets/singleton_op.h" \ - "operator for singletons; payload is an instance of the CVC4::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 ::CVC4::theory::sets::SetsBinaryOperatorTypeRule -typerule INTERSECTION ::CVC4::theory::sets::SetsBinaryOperatorTypeRule -typerule SETMINUS ::CVC4::theory::sets::SetsBinaryOperatorTypeRule -typerule SUBSET ::CVC4::theory::sets::SubsetTypeRule -typerule MEMBER ::CVC4::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 ::CVC4::theory::sets::SingletonTypeRule -typerule EMPTYSET ::CVC4::theory::sets::EmptySetTypeRule -typerule INSERT ::CVC4::theory::sets::InsertTypeRule -typerule CARD ::CVC4::theory::sets::CardTypeRule -typerule COMPLEMENT ::CVC4::theory::sets::ComplementTypeRule -typerule UNIVERSE_SET ::CVC4::theory::sets::UniverseSetTypeRule -typerule COMPREHENSION ::CVC4::theory::sets::ComprehensionTypeRule -typerule CHOOSE ::CVC4::theory::sets::ChooseTypeRule -typerule IS_SINGLETON ::CVC4::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 ::CVC4::theory::sets::RelBinaryOperatorTypeRule -typerule PRODUCT ::CVC4::theory::sets::RelBinaryOperatorTypeRule -typerule TRANSPOSE ::CVC4::theory::sets::RelTransposeTypeRule -typerule TCLOSURE ::CVC4::theory::sets::RelTransClosureTypeRule -typerule JOIN_IMAGE ::CVC4::theory::sets::JoinImageTypeRule -typerule IDEN ::CVC4::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 ::CVC4::theory::sets::SetsBinaryOperatorTypeRule -construle SINGLETON ::CVC4::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 4033a6b44..197f31903 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -158,6 +158,6 @@ class NormalForm { }; } } -} +} // namespace CVC5 #endif diff --git a/src/theory/sets/rels_utils.h b/src/theory/sets/rels_utils.h index a85e2d27c..eb3477f5a 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -95,9 +95,9 @@ public: kind::APPLY_CONSTRUCTOR, dt[0].getConstructor(), a, b); } -}; -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +}; +} // namespace sets +} // namespace theory +} // namespace CVC5 #endif diff --git a/src/theory/sets/singleton_op.cpp b/src/theory/sets/singleton_op.cpp index 5ef863fe8..4e76d35e4 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/singleton_op.h b/src/theory/sets/singleton_op.h index 7d7bb85b6..d17f8255e 100644 --- a/src/theory/sets/singleton_op.h +++ b/src/theory/sets/singleton_op.h @@ -19,7 +19,7 @@ #include <memory> -namespace CVC4 { +namespace CVC5 { class TypeNode; @@ -58,6 +58,6 @@ struct SingletonOpHashFunction size_t operator()(const SingletonOp& op) const; }; /* struct SingletonOpHashFunction */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__SINGLETON_OP_H */ diff --git a/src/theory/sets/skolem_cache.cpp b/src/theory/sets/skolem_cache.cpp index 1deb28688..3c0f33caf 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -61,4 +61,4 @@ bool SkolemCache::isSkolem(Node n) const } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/skolem_cache.h b/src/theory/sets/skolem_cache.h index a4997baf0..42369c7a9 100644 --- a/src/theory/sets/skolem_cache.h +++ b/src/theory/sets/skolem_cache.h @@ -22,7 +22,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -78,6 +78,6 @@ class SkolemCache } // namespace sets } // namespace theory -} // namespace CVC4 +} // 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 43f8a7d17..ff604f838 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -595,4 +595,4 @@ bool SolverState::merge(TNode t1, } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/solver_state.h b/src/theory/sets/solver_state.h index 06ae41c9a..431aa019d 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -268,6 +268,6 @@ class SolverState : public TheoryState } // namespace sets } // namespace theory -} // namespace CVC4 +} // 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 e32255eab..6dc18591c 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -151,4 +151,4 @@ void TermRegistry::debugPrintSet(Node s, const char* c) const } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/term_registry.h b/src/theory/sets/term_registry.h index 204b14504..913473ff0 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -89,6 +89,6 @@ class TermRegistry } // namespace sets } // namespace theory -} // namespace CVC4 +} // 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 f3ad57535..1530da809 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -236,6 +236,6 @@ void TheorySets::NotifyClass::eqNotifyDisequal(TNode t1, TNode t2, TNode reason) d_theory.eqNotifyDisequal(t1, t2, reason); } -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sets +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/sets/theory_sets.h b/src/theory/sets/theory_sets.h index 56b0d6290..4dc5d8a0d 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -118,8 +118,8 @@ class TheorySets : public Theory NotifyClass d_notify; }; /* class TheorySets */ -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sets +} // namespace theory +} // 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 da2958c5c..285eac473 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -1372,4 +1372,4 @@ void TheorySetsPrivate::presolve() { d_state.reset(); } } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/theory_sets_private.h b/src/theory/sets/theory_sets_private.h index 329fbfc17..a822d06e7 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -234,9 +234,8 @@ class TheorySetsPrivate { std::map<Node, Node> d_isSingletonNodes; };/* class TheorySetsPrivate */ - -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sets +} // namespace theory +} // 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 3570aa9d8..a160e0afd 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -1333,4 +1333,4 @@ void TheorySetsRels::check(Theory::Effort level) } } } -} +} // namespace CVC5 diff --git a/src/theory/sets/theory_sets_rels.h b/src/theory/sets/theory_sets_rels.h index 6820c6f15..93913d4f5 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -183,11 +183,8 @@ private: bool isRel( Node n ) {return n.getType().isSet() && n.getType().getSetElementType().isTuple();} }; - -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ - - +} // namespace sets +} // namespace theory +} // 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 6eef046e6..935eb548d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -540,6 +540,6 @@ RewriteResponse TheorySetsRewriter::preRewrite(TNode node) { return RewriteResponse(REWRITE_DONE, node); } -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sets +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/sets/theory_sets_rewriter.h b/src/theory/sets/theory_sets_rewriter.h index eeecf06a7..739a5f885 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -77,8 +77,8 @@ private: bool checkConstantMembership(TNode elementTerm, TNode setTerm); }; /* class TheorySetsRewriter */ -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sets +} // namespace theory +} // 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 ceb87d8ec..30e279be7 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -130,4 +130,4 @@ bool SetEnumerator::isFinished() } // namespace sets } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sets/theory_sets_type_enumerator.h b/src/theory/sets/theory_sets_type_enumerator.h index 4aaf07035..32aca5f79 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -68,6 +68,6 @@ class SetEnumerator : public TypeEnumeratorBase<SetEnumerator> } // namespace sets } // namespace theory -} // namespace CVC4 +} // 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 9f7875e18..54791ac31 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 CVC4 { +namespace CVC5 { namespace theory { namespace sets { @@ -390,7 +390,7 @@ struct JoinImageTypeRule { throw TypeCheckingExceptionPrivate( n, " JoinImage cardinality constraint must be a constant"); } - CVC4::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"); @@ -442,8 +442,8 @@ struct SetsProperties { } };/* struct SetsProperties */ -}/* CVC4::theory::sets namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace sets +} // namespace theory +} // 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 87625291c..816ceb31a 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 CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/shared_solver.h b/src/theory/shared_solver.h index a4d08bd1b..8463e1d46 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 CVC4 { +namespace CVC5 { class LogicInfo; class ProofNodeManager; @@ -134,6 +134,6 @@ class SharedSolver }; } // namespace theory -} // namespace CVC4 +} // 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 958cfa617..70932e6a6 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 CVC4 { +namespace CVC5 { namespace theory { SharedSolverDistributed::SharedSolverDistributed(TheoryEngine& te, @@ -93,4 +93,4 @@ void SharedSolverDistributed::assertSharedEquality(TNode equality, } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/shared_solver_distributed.h b/src/theory/shared_solver_distributed.h index 6c090fd09..95e23024d 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -59,6 +59,6 @@ class SharedSolverDistributed : public SharedSolver }; } // namespace theory -} // namespace CVC4 +} // 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 4b3c1f612..e82897c98 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 CVC4::theory; +using namespace CVC5::theory; -namespace CVC4 { +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 CVC4 */ +} // namespace CVC5 diff --git a/src/theory/shared_terms_database.h b/src/theory/shared_terms_database.h index 2a6e5ebbf..a7bc77251 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -278,4 +278,4 @@ class SharedTermsDatabase : public context::ContextNotifyObj { ProofNodeManager* d_pnm; }; -} +} // namespace CVC5 diff --git a/src/theory/skolem_lemma.cpp b/src/theory/skolem_lemma.cpp index 7c8f00dd7..1b10d3ac8 100644 --- a/src/theory/skolem_lemma.cpp +++ b/src/theory/skolem_lemma.cpp @@ -16,7 +16,7 @@ #include "expr/skolem_manager.h" -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/skolem_lemma.h b/src/theory/skolem_lemma.h index c669b527d..c7ab08429 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -59,6 +59,6 @@ class SkolemLemma }; } // namespace theory -} // namespace CVC4 +} // 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 041ed41a1..15e9b4214 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 CVC4 { +namespace CVC5 { namespace theory { // optimization: try to rewrite to constant @@ -119,4 +119,4 @@ Result checkWithSubsolver(Node query, } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/smt_engine_subsolver.h b/src/theory/smt_engine_subsolver.h index cc99e75b4..d94f9227d 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -91,6 +91,6 @@ Result checkWithSubsolver(Node query, unsigned long timeout = 0); } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__SMT_ENGINE_SUBSOLVER_H */ diff --git a/src/theory/sort_inference.cpp b/src/theory/sort_inference.cpp index e9e788160..cad11fcf3 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { void SortInference::UnionFind::print(const char * c){ @@ -869,4 +869,4 @@ bool SortInference::isHandledApplyUf(Kind k) const } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/sort_inference.h b/src/theory/sort_inference.h index 822416da3..b32026256 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 CVC4 { +namespace CVC5 { namespace theory { /** sort inference @@ -166,6 +166,6 @@ private: }; } // namespace theory -} +} // namespace CVC5 #endif diff --git a/src/theory/strings/arith_entail.cpp b/src/theory/strings/arith_entail.cpp index f8abc9aef..36ead8685 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -866,4 +866,4 @@ bool ArithEntail::inferZerosInSumGeq(Node x, } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/arith_entail.h b/src/theory/strings/arith_entail.h index cd933ad26..22011d51b 100644 --- a/src/theory/strings/arith_entail.h +++ b/src/theory/strings/arith_entail.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -175,6 +175,6 @@ class ArithEntail } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/strings/base_solver.cpp b/src/theory/strings/base_solver.cpp index 8a8abbf81..b9802b9a5 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -760,4 +760,4 @@ Node BaseSolver::TermIndex::add(TNode n, } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/base_solver.h b/src/theory/strings/base_solver.h index 76273c747..43cb63b47 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -243,6 +243,6 @@ class BaseSolver } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 3c5bcc98d..8593a1e36 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -2649,6 +2649,6 @@ bool CoreSolver::processInferInfo(CoreInferInfo& cii) return true; } -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/strings/core_solver.h b/src/theory/strings/core_solver.h index 94f47f6c3..53bb167c4 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -523,6 +523,6 @@ class CoreSolver } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 be122f869..e2cb01408 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -148,4 +148,4 @@ void EagerSolver::notifyFact(TNode atom, } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/eager_solver.h b/src/theory/strings/eager_solver.h index b30968e0b..49545e622 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -63,6 +63,6 @@ class EagerSolver } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 81515fc54..0bb2defb6 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -139,4 +139,4 @@ Node EqcInfo::addEndpointConst(Node t, Node c, bool isSuf) } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/eqc_info.h b/src/theory/strings/eqc_info.h index 842360f5d..a00cd49ea 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -76,6 +76,6 @@ class EqcInfo } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 d721abf71..ab7c1d0ac 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -724,4 +724,4 @@ bool StringsExtfCallback::getCurrentSubstitution( } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/extf_solver.h b/src/theory/strings/extf_solver.h index 10e380e94..4b63f261a 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -227,6 +227,6 @@ class StringsExtfCallback : public ExtTheoryCallback } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 8d276d60e..5e2006f65 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -90,4 +90,4 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii) } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/infer_info.h b/src/theory/strings/infer_info.h index af415ecd9..9c228c197 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -131,6 +131,6 @@ std::ostream& operator<<(std::ostream& out, const InferInfo& ii); } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 a02566a41..c600ce31d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -1042,4 +1042,4 @@ std::string InferProofCons::identify() const } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/infer_proof_cons.h b/src/theory/strings/infer_proof_cons.h index 7484959b8..7d7d7e54a 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -130,6 +130,6 @@ class InferProofCons : public ProofGenerator } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 0d4839238..15e608ef1 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -377,4 +377,4 @@ TrustNode InferenceManager::processLemma(InferInfo& ii, LemmaProperty& p) } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/inference_manager.h b/src/theory/strings/inference_manager.h index 9fbe10637..1e57afe79 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -271,6 +271,6 @@ class InferenceManager : public InferenceManagerBuffered } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/strings/kinds b/src/theory/strings/kinds index 427e2e4e6..6f366d6d7 100644 --- a/src/theory/strings/kinds +++ b/src/theory/strings/kinds @@ -4,11 +4,11 @@ # src/theory/builtin/kinds. # -theory THEORY_STRINGS ::CVC4::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 ::CVC4::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(::CVC4::String())" \ + "NodeManager::currentNM()->mkConst(::CVC5::String())" \ "util/string.h" \ "String type" @@ -54,31 +54,31 @@ sort REGEXP_TYPE \ "RegExp type" enumerator STRING_TYPE \ - "::CVC4::theory::strings::StringEnumerator" \ + "::CVC5::theory::strings::StringEnumerator" \ "theory/strings/type_enumerator.h" constant CONST_STRING \ - ::CVC4::String \ - ::CVC4::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 \ - "::CVC4::theory::strings::SequenceProperties::computeCardinality(%TYPE%)" \ + "::CVC5::theory::strings::SequenceProperties::computeCardinality(%TYPE%)" \ "theory/strings/theory_strings_type_rules.h" well-founded SEQUENCE_TYPE \ - "::CVC4::theory::strings::SequenceProperties::isWellFounded(%TYPE%)" \ - "::CVC4::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 \ - "::CVC4::theory::strings::SequenceEnumerator" \ + "::CVC5::theory::strings::SequenceEnumerator" \ "theory/strings/type_enumerator.h" constant CONST_SEQUENCE \ - ::CVC4::Sequence \ - ::CVC4::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 \ - ::CVC4::RegExpRepeat \ - ::CVC4::RegExpRepeatHashFunction \ + ::CVC5::RegExpRepeat \ + ::CVC5::RegExpRepeatHashFunction \ "util/regexp.h" \ - "operator for regular expression repeat; payload is an instance of the CVC4::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 \ - ::CVC4::RegExpLoop \ - ::CVC4::RegExpLoopHashFunction \ + ::CVC5::RegExpLoop \ + ::CVC5::RegExpLoopHashFunction \ "util/regexp.h" \ - "operator for regular expression loop; payload is an instance of the CVC4::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 ::CVC4::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 ::CVC4::theory::strings::StringConcatTypeRule -typerule STRING_LENGTH ::CVC4::theory::strings::StringStrToIntTypeRule -typerule STRING_SUBSTR ::CVC4::theory::strings::StringSubstrTypeRule -typerule STRING_UPDATE ::CVC4::theory::strings::StringUpdateTypeRule -typerule STRING_CHARAT ::CVC4::theory::strings::StringAtTypeRule -typerule STRING_STRCTN ::CVC4::theory::strings::StringRelationTypeRule -typerule STRING_STRIDOF ::CVC4::theory::strings::StringIndexOfTypeRule -typerule STRING_STRREPL ::CVC4::theory::strings::StringReplaceTypeRule -typerule STRING_STRREPLALL ::CVC4::theory::strings::StringReplaceTypeRule -typerule STRING_PREFIX ::CVC4::theory::strings::StringStrToBoolTypeRule -typerule STRING_SUFFIX ::CVC4::theory::strings::StringStrToBoolTypeRule -typerule STRING_REV ::CVC4::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 ::CVC4::theory::strings::ConstSequenceTypeRule -typerule SEQ_UNIT ::CVC4::theory::strings::SeqUnitTypeRule -typerule SEQ_NTH ::CVC4::theory::strings::SeqNthTypeRule -typerule SEQ_NTH_TOTAL ::CVC4::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 5cc101a9f..c139a5da7 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -185,4 +185,4 @@ void NormalForm::getExplanationForPrefixEq(NormalForm& nfi, } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/normal_form.h b/src/theory/strings/normal_form.h index cadaa2c6e..65d4b3f78 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -168,6 +168,6 @@ class NormalForm } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 5cae7c69f..bf82d16ce 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -517,4 +517,4 @@ Node StringProofRuleChecker::checkInternal(PfRule id, } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/proof_checker.h b/src/theory/strings/proof_checker.h index 5f6b779c0..c55386140 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -44,6 +44,6 @@ class StringProofRuleChecker : public ProofRuleChecker } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 de67fc9bf..5dbe02230 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -613,4 +613,4 @@ bool RegExpElimination::isProofEnabled() const { return d_pnm != nullptr; } } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/regexp_elim.h b/src/theory/strings/regexp_elim.h index 9c9733a95..3ffa9566e 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -85,6 +85,6 @@ class RegExpElimination } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 0e4d6dd8e..94c740742 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -105,7 +105,7 @@ Node RegExpEntail::simpleRegexpConsume(std::vector<Node>& mchildren, else if (xc.isConst()) { // check for constants - CVC4::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()); - CVC4::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(CVC4::String& s, +bool RegExpEntail::testConstStringInRegExp(CVC5::String& s, unsigned index_start, TNode r) { @@ -358,7 +358,7 @@ bool RegExpEntail::testConstStringInRegExp(CVC4::String& s, { case STRING_TO_REGEXP: { - CVC4::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(CVC4::String& s, { for (vec_k[i] = vec_k[i] + 1; vec_k[i] <= left; ++vec_k[i]) { - CVC4::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(CVC4::String& s, { for (unsigned i = s.size() - index_start; i > 0; --i) { - CVC4::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(CVC4::String& s, uint32_t u = r[2].getConst<Rational>().getNumerator().toUnsignedInt(); for (unsigned len = s.size() - index_start; len >= 1; len--) { - CVC4::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(CVC4::String& s, } else { - Node num2 = nm->mkConst(CVC4::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(CVC4::String& s, } for (unsigned len = 1; len <= s.size() - index_start; len++) { - CVC4::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(CVC4::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 CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/regexp_entail.h b/src/theory/strings/regexp_entail.h index f4359aa76..3e14d4ed0 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 CVC4 { +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(CVC4::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 CVC4 +} // 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 ad71e98fd..5481a0c6d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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(::CVC4::Rational(0))), - d_one(NodeManager::currentNM()->mkConst(::CVC4::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,8 @@ int RegExpOpr::delta( Node r, Node &exp ) { } // 0-unknown, 1-yes, 2-no -int RegExpOpr::derivativeS( Node r, CVC4::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; @@ -301,8 +302,8 @@ int RegExpOpr::derivativeS( Node r, CVC4::String c, Node &retNode ) { break; } case kind::REGEXP_RANGE: { - CVC4::String a = r[0].getConst<String>(); - CVC4::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; } @@ -520,7 +521,8 @@ int RegExpOpr::derivativeS( Node r, CVC4::String c, Node &retNode ) { return ret; } -Node RegExpOpr::derivativeSingle( Node r, CVC4::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; Node retNode = d_emptyRegexp; @@ -553,8 +555,8 @@ Node RegExpOpr::derivativeSingle( Node r, CVC4::String c ) { break; } case kind::REGEXP_RANGE: { - CVC4::String a = r[0].getConst<String>(); - CVC4::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; } @@ -1310,7 +1312,9 @@ Node RegExpOpr::intersectInternal( Node r1, Node r2, std::map< PairNodes, Node > rt = itr2->second; } else { std::map< PairNodes, Node > cache2(cache); - cache2[ p ] = NodeManager::currentNM()->mkNode(kind::REGEXP_RV, NodeManager::currentNM()->mkConst(CVC4::Rational(cnt))); + cache2[p] = NodeManager::currentNM()->mkNode( + kind::REGEXP_RV, + NodeManager::currentNM()->mkConst(CVC5::Rational(cnt))); rt = intersectInternal(r1l, r2l, cache2, cnt+1); cacheX[ pp ] = rt; } @@ -1613,6 +1617,6 @@ Node RegExpOpr::getExistsForRegExpConcatMem(Node mem) return eform; } -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h index 8c0cd6c14..27324d971 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -55,7 +55,7 @@ enum RegExpConstType }; class RegExpOpr { - typedef std::pair< Node, CVC4::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, CVC4::String c, Node &retNode ); - Node derivativeSingle( Node r, CVC4::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. @@ -207,8 +207,8 @@ class RegExpOpr { SkolemCache* d_sc; }; -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // 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 f252196d8..861f7c694 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +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(::CVC4::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; } -CVC4::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; - CVC4::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) { - CVC4::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 CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/regexp_solver.h b/src/theory/strings/regexp_solver.h index 50e58140d..d35a822a7 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 CVC4 { +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); - CVC4::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 CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__STRINGS__THEORY_STRINGS_H */ diff --git a/src/theory/strings/rewrites.cpp b/src/theory/strings/rewrites.cpp index 9788bc173..cdf41d9ad 100644 --- a/src/theory/strings/rewrites.cpp +++ b/src/theory/strings/rewrites.cpp @@ -16,7 +16,7 @@ #include <iostream> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -224,4 +224,4 @@ std::ostream& operator<<(std::ostream& out, Rewrite r) } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/rewrites.h b/src/theory/strings/rewrites.h index 26e3629ff..af9b636cf 100644 --- a/src/theory/strings/rewrites.h +++ b/src/theory/strings/rewrites.h @@ -19,7 +19,7 @@ #include <iosfwd> -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -239,6 +239,6 @@ std::ostream& operator<<(std::ostream& out, Rewrite r); } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 c54cdfb50..9cec9ad40 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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(); - CVC4::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] - CVC4::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]; - CVC4::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(CVC4::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()) { - CVC4::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()) { - CVC4::Rational rMaxInt(CVC4::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(::CVC4::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 CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/sequences_rewriter.h b/src/theory/strings/sequences_rewriter.h index 9f5b002af..750589f72 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -296,6 +296,6 @@ class SequencesRewriter : public TheoryRewriter } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 c679bc414..919b950ab 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -63,4 +63,4 @@ SequencesStatistics::~SequencesStatistics() } } -} +} // namespace CVC5 diff --git a/src/theory/strings/sequences_stats.h b/src/theory/strings/sequences_stats.h index 1a0e94cdb..417f79046 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -99,6 +99,6 @@ class SequencesStatistics } } -} +} // 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 3ddcdbf71..5e2d8981d 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -291,4 +291,4 @@ Node SkolemCache::mkIndexVar(Node t) } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/skolem_cache.h b/src/theory/strings/skolem_cache.h index e4a9ef17e..b6deea6eb 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -211,6 +211,6 @@ class SkolemCache } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 456cd492b..00bb39d5c 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -223,4 +223,4 @@ void SolverState::separateByLength( } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/solver_state.h b/src/theory/strings/solver_state.h index e9786526c..8c5d29196 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -161,6 +161,6 @@ class SolverState : public TheoryState } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__STRINGS__SOLVER_STATE_H */ diff --git a/src/theory/strings/strategy.cpp b/src/theory/strings/strategy.cpp index 2e2e8bc22..56c1cbe98 100644 --- a/src/theory/strings/strategy.cpp +++ b/src/theory/strings/strategy.cpp @@ -16,7 +16,7 @@ #include "options/strings_options.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -158,4 +158,4 @@ void Strategy::initializeStrategy() } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/strategy.h b/src/theory/strings/strategy.h index fde01878d..4c2e587c9 100644 --- a/src/theory/strings/strategy.h +++ b/src/theory/strings/strategy.h @@ -22,7 +22,7 @@ #include "theory/theory.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -111,6 +111,6 @@ class Strategy } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 f4c91d39f..926a43159 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +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(CVC4::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(CVC4::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 - CVC4::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 CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/strings_entail.h b/src/theory/strings/strings_entail.h index d5f4ac0d4..16643332a 100644 --- a/src/theory/strings/strings_entail.h +++ b/src/theory/strings/strings_entail.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -379,6 +379,6 @@ class StringsEntail } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 0ce83dbd0..11a743d0d 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -102,4 +102,4 @@ std::string StringsFmf::StringSumLengthDecisionStrategy::identify() const } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/strings_fmf.h b/src/theory/strings/strings_fmf.h index 6832da5a7..1ef610289 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -106,6 +106,6 @@ class StringsFmf } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 33e7cd895..d41a86c18 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -324,4 +324,4 @@ Node StringsRewriter::rewriteStringIsDigit(Node n) } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/strings_rewriter.h b/src/theory/strings/strings_rewriter.h index 1398d4703..226a66b34 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -103,6 +103,6 @@ class StringsRewriter : public SequencesRewriter } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 f24fe12e5..d82a2333e 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/term_registry.h b/src/theory/strings/term_registry.h index cb1b50816..2f03647fd 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -279,6 +279,6 @@ class TermRegistry } // namespace strings } // namespace theory -} // namespace CVC4 +} // 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 7a8b44625..03d93f8f4 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 CVC4::context; -using namespace CVC4::kind; +using namespace CVC5::context; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -1086,6 +1086,6 @@ std::string TheoryStrings::debugPrintStringsEqc() return ss.str(); } -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h index f35c67da6..94a96fc33 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -299,8 +299,8 @@ class TheoryStrings : public Theory { Strategy d_strat; };/* class TheoryStrings */ -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // 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 d6fa91f34..f89ffa5fa 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 CVC4; -using namespace CVC4::kind; +using namespace CVC5; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -1026,6 +1026,6 @@ Node StringsPreprocess::mkForallInternal(Node bvl, Node body) return nm->mkNode(FORALL, bvl, body, ipl); } -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/strings/theory_strings_preprocess.h b/src/theory/strings/theory_strings_preprocess.h index a947c6da6..acf9edad7 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -102,8 +102,8 @@ class StringsPreprocess { static Node mkForallInternal(Node bvl, Node body); }; -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // 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 fd5d2611e..32605f0f1 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -424,8 +424,8 @@ struct SequenceProperties } }; /* struct SequenceProperties */ -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // 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 73cdf1ddb..821319df5 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { namespace utils { @@ -423,4 +423,4 @@ unsigned getLoopMinOccurrences(TNode node) } // namespace utils } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/theory_strings_utils.h b/src/theory/strings/theory_strings_utils.h index 6b53a102d..e720ce0b2 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { namespace utils { @@ -220,6 +220,6 @@ unsigned getLoopMinOccurrences(TNode node); } // namespace utils } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/strings/type_enumerator.cpp b/src/theory/strings/type_enumerator.cpp index 5def8ec4b..7b89e970e 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -271,4 +271,4 @@ bool SequenceEnumerator::isFinished() { return d_wenum.isFinished(); } } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/type_enumerator.h b/src/theory/strings/type_enumerator.h index 02d3e7f41..7d340be64 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -197,8 +197,8 @@ class SequenceEnumerator : public TypeEnumeratorBase<SequenceEnumerator> SeqEnumLen d_wenum; }; /* class SequenceEnumerator */ -}/* CVC4::theory::strings namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace strings +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__STRINGS__TYPE_ENUMERATOR_H */ diff --git a/src/theory/strings/word.cpp b/src/theory/strings/word.cpp index 0c743dd93..d2e809571 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -486,4 +486,4 @@ Node Word::reverse(TNode x) } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/strings/word.h b/src/theory/strings/word.h index 1b2c94af5..090c36be3 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 CVC4 { +namespace CVC5 { namespace theory { namespace strings { @@ -165,6 +165,6 @@ class Word } // namespace strings } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/subs_minimize.cpp b/src/theory/subs_minimize.cpp index 88434cba2..b9e9e13b2 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { SubstitutionMinimize::SubstitutionMinimize() {} @@ -466,4 +466,4 @@ bool SubstitutionMinimize::isSingularArg(Node n, Kind k, unsigned arg) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/subs_minimize.h b/src/theory/subs_minimize.h index 018e0e11b..9275277e6 100644 --- a/src/theory/subs_minimize.h +++ b/src/theory/subs_minimize.h @@ -21,7 +21,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { namespace theory { /** SubstitutionMinimize @@ -95,6 +95,6 @@ class SubstitutionMinimize }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__SUBS_MINIMIZE_H */ diff --git a/src/theory/substitutions.cpp b/src/theory/substitutions.cpp index 3618cc0d5..bdb6d2668 100644 --- a/src/theory/substitutions.cpp +++ b/src/theory/substitutions.cpp @@ -20,7 +20,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { struct substitution_stack_element { @@ -217,10 +217,10 @@ void SubstitutionMap::print(ostream& out) const { void SubstitutionMap::debugPrint() const { print(CVC4Message.getStream()); } -}/* CVC4::theory namespace */ +} // namespace theory std::ostream& operator<<(std::ostream& out, const theory::SubstitutionMap::iterator& i) { return out << "[CDMap-iterator]"; } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/theory/substitutions.h b/src/theory/substitutions.h index 2258bb724..a925d7fab 100644 --- a/src/theory/substitutions.h +++ b/src/theory/substitutions.h @@ -30,7 +30,7 @@ #include "context/cdhashmap.h" #include "util/hash.h" -namespace CVC4 { +namespace CVC5 { namespace theory { /** @@ -175,10 +175,10 @@ inline std::ostream& operator << (std::ostream& out, const SubstitutionMap& subs return out; } -}/* CVC4::theory namespace */ +} // namespace theory std::ostream& operator<<(std::ostream& out, const theory::SubstitutionMap::iterator& i); -}/* CVC4 namespace */ +} // namespace CVC5 #endif /* CVC4__THEORY__SUBSTITUTIONS_H */ diff --git a/src/theory/term_registration_visitor.cpp b/src/theory/term_registration_visitor.cpp index 253f21d98..eab124bc5 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 CVC4::theory; +using namespace CVC5::theory; -namespace CVC4 { +namespace CVC5 { std::string PreRegisterVisitor::toString() const { std::stringstream ss; @@ -292,4 +292,4 @@ void SharedTermsVisitor::clear() { d_visited.clear(); } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/term_registration_visitor.h b/src/theory/term_registration_visitor.h index c99ed6b99..19406ea62 100644 --- a/src/theory/term_registration_visitor.h +++ b/src/theory/term_registration_visitor.h @@ -22,7 +22,7 @@ #include <unordered_map> -namespace CVC4 { +namespace CVC5 { class TheoryEngine; @@ -189,5 +189,4 @@ class SharedTermsVisitor { TNodeToTheorySetMap d_preregistered; }; - -} +} // namespace CVC5 diff --git a/src/theory/theory.cpp b/src/theory/theory.cpp index b697b004c..143bf92b8 100644 --- a/src/theory/theory.cpp +++ b/src/theory/theory.cpp @@ -39,7 +39,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { /** Default value for the uninterpreted sorts is the UF theory */ @@ -564,5 +564,5 @@ eq::EqualityEngine* Theory::getEqualityEngine() return d_equalityEngine; } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/theory.h b/src/theory/theory.h index 1261f2ce8..1dd0c584e 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 CVC4 { +namespace CVC5 { class ProofNodeManager; class TheoryEngine; @@ -58,7 +58,7 @@ class TrustSubstitutionMap; namespace eq { class EqualityEngine; -}/* CVC4::theory::eq namespace */ + } // namespace eq /** * Base class for T-solvers. Abstract DPLL(T). @@ -95,7 +95,7 @@ namespace eq { * after the quantifiers engine and model objects have been set up. */ class Theory { - friend class ::CVC4::TheoryEngine; + friend class ::CVC5::TheoryEngine; private: // Disallow default construction, copy, assignment. @@ -916,7 +916,8 @@ inline theory::Assertion Theory::get() { } inline std::ostream& operator<<(std::ostream& out, - const CVC4::theory::Theory& theory) { + const CVC5::theory::Theory& theory) +{ return out << theory.identify(); } @@ -934,7 +935,7 @@ inline std::ostream& operator << (std::ostream& out, theory::Theory::PPAssertSta return out; } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__THEORY_H */ diff --git a/src/theory/theory_engine.cpp b/src/theory/theory_engine.cpp index cabd57240..e6eeaf8a5 100644 --- a/src/theory/theory_engine.cpp +++ b/src/theory/theory_engine.cpp @@ -50,9 +50,9 @@ using namespace std; -using namespace CVC4::theory; +using namespace CVC5::theory; -namespace CVC4 { +namespace CVC5 { /* -------------------------------------------------------------------------- */ @@ -65,19 +65,19 @@ namespace theory { */ #define CVC4_FOR_EACH_THEORY \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_BUILTIN) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_BOOL) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_UF) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_ARITH) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_BV) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_FP) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_ARRAYS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_DATATYPES) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_SEP) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_SETS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_BAGS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::theory::THEORY_STRINGS) \ - CVC4_FOR_EACH_THEORY_STATEMENT(CVC4::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); } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/theory/theory_engine.h b/src/theory/theory_engine.h index db7cc4997..cc96c4f9d 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 CVC4 { +namespace CVC5 { class ResourceManager; class OutputManager; @@ -84,7 +84,7 @@ class SharedSolver; class DecisionManager; class RelevanceManager; -}/* CVC4::theory namespace */ +} // namespace theory namespace prop { class PropEngine; @@ -668,6 +668,6 @@ private: void checkTheoryAssertionsWithModel(bool hardFailure); };/* class TheoryEngine */ -}/* CVC4 namespace */ +} // 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 1e5c2d723..bfe29976e 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { TheoryEngineProofGenerator::TheoryEngineProofGenerator(ProofNodeManager* pnm, context::UserContext* u) @@ -128,4 +128,4 @@ std::string TheoryEngineProofGenerator::identify() const return "TheoryEngineProofGenerator"; } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_engine_proof_generator.h b/src/theory/theory_engine_proof_generator.h index d4b3b2919..462c40fdf 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 CVC4 { +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 CVC4 +} // 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 d44781931..17ba7b50e 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -77,6 +77,6 @@ class TheoryEqNotifyClass : public eq::EqualityEngineNotify }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/theory_id.cpp b/src/theory/theory_id.cpp index f0c787daf..60fb752a7 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 CVC4 { +namespace CVC5 { namespace theory { TheoryId& operator++(TheoryId& id) @@ -162,4 +162,4 @@ std::string TheoryIdSetUtil::setToString(TheoryIdSet theorySet) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_id.h b/src/theory/theory_id.h index cca3bf2d6..685dd7864 100644 --- a/src/theory/theory_id.h +++ b/src/theory/theory_id.h @@ -22,7 +22,7 @@ #include <iosfwd> -namespace CVC4 { +namespace CVC5 { namespace theory { /** @@ -106,5 +106,5 @@ class TheoryIdSetUtil }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/theory_inference.cpp b/src/theory/theory_inference.cpp index 04c095033..00217e0d6 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { SimpleTheoryLemma::SimpleTheoryLemma(InferenceId id, @@ -53,4 +53,4 @@ Node SimpleTheoryInternalFact::processFact(std::vector<Node>& exp, } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_inference.h b/src/theory/theory_inference.h index 0dd211f10..e356fb3c8 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 CVC4 { +namespace CVC5 { namespace theory { class TheoryInferenceManager; @@ -118,6 +118,6 @@ class SimpleTheoryInternalFact : public TheoryInference }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/theory_inference_manager.cpp b/src/theory/theory_inference_manager.cpp index 11a889a6b..e6f7fd5eb 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { TheoryInferenceManager::TheoryInferenceManager(Theory& t, @@ -517,4 +517,4 @@ void TheoryInferenceManager::safePoint(ResourceManager::Resource r) void TheoryInferenceManager::setIncomplete() { d_out.setIncomplete(); } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_inference_manager.h b/src/theory/theory_inference_manager.h index dca11524b..ad92f5380 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 CVC4 { +namespace CVC5 { class ProofNodeManager; @@ -460,6 +460,6 @@ class TheoryInferenceManager }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__THEORY_INFERENCE_MANAGER_H */ diff --git a/src/theory/theory_model.cpp b/src/theory/theory_model.cpp index a5f8afec4..b20a011ae 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { TheoryModel::TheoryModel(context::Context* c, @@ -764,5 +764,5 @@ std::string TheoryModel::debugPrintModelEqc() const return ss.str(); } -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/theory_model.h b/src/theory/theory_model.h index 0c7f092bc..ce3ecfbc0 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 CVC4 { +namespace CVC5 { namespace theory { /** Theory Model class. @@ -432,7 +432,7 @@ public: //---------------------------- end function values };/* class TheoryModel */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // 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 acfd24fbc..44e3d08e3 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { void TheoryEngineModelBuilder::Assigner::initialize( @@ -1428,5 +1428,5 @@ void TheoryEngineModelBuilder::assignFunctions(TheoryModel* m) Trace("model-builder") << "Finished assigning function values." << std::endl; } -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/theory_model_builder.h b/src/theory/theory_model_builder.h index 048b40316..cc49111d8 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -313,7 +313,7 @@ class TheoryEngineModelBuilder }; /* class TheoryEngineModelBuilder */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__THEORY_MODEL_BUILDER_H */ diff --git a/src/theory/theory_preprocessor.cpp b/src/theory/theory_preprocessor.cpp index a9e16f48f..f6ba13551 100644 --- a/src/theory/theory_preprocessor.cpp +++ b/src/theory/theory_preprocessor.cpp @@ -23,7 +23,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { TheoryPreprocessor::TheoryPreprocessor(TheoryEngine& engine, @@ -520,4 +520,4 @@ void TheoryPreprocessor::registerTrustedRewrite(TrustNode trn, } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_preprocessor.h b/src/theory/theory_preprocessor.h index e9abccad9..21157fa52 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 CVC4 { +namespace CVC5 { class LogicInfo; class TheoryEngine; @@ -223,6 +223,6 @@ class TheoryPreprocessor }; } // namespace theory -} // namespace CVC4 +} // 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 c40f8dc74..85d2aef7a 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { TheoryProofStepBuffer::TheoryProofStepBuffer(ProofChecker* pc) @@ -232,4 +232,4 @@ Node TheoryProofStepBuffer::elimDoubleNegLit(Node n) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_proof_step_buffer.h b/src/theory/theory_proof_step_buffer.h index 60bbc62e1..80e2c2e6a 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 CVC4 { +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 CVC4 +} // 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 19bb6e2e5..13b6ecdd0 100644 --- a/src/theory/theory_rewriter.cpp +++ b/src/theory/theory_rewriter.cpp @@ -16,7 +16,7 @@ #include "theory/theory_rewriter.h" -namespace CVC4 { +namespace CVC5 { namespace theory { TrustRewriteResponse::TrustRewriteResponse(RewriteStatus status, @@ -60,4 +60,4 @@ TrustNode TheoryRewriter::rewriteEqualityExtWithProof(Node node) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_rewriter.h b/src/theory/theory_rewriter.h index 83310ce07..e508477d3 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 CVC4 { +namespace CVC5 { namespace theory { class Rewriter; @@ -140,6 +140,6 @@ class TheoryRewriter }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__THEORY_REWRITER_H */ diff --git a/src/theory/theory_state.cpp b/src/theory/theory_state.cpp index 979b95e93..d155e12a6 100644 --- a/src/theory/theory_state.cpp +++ b/src/theory/theory_state.cpp @@ -16,7 +16,7 @@ #include "theory/uf/equality_engine.h" -namespace CVC4 { +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 CVC4 +} // namespace CVC5 diff --git a/src/theory/theory_state.h b/src/theory/theory_state.h index e946fb639..8c863144b 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -121,6 +121,6 @@ class TheoryState }; } // namespace theory -} // namespace CVC4 +} // 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 b0951db70..e30507cf8 100644 --- a/src/theory/theory_traits_template.h +++ b/src/theory/theory_traits_template.h @@ -26,7 +26,7 @@ ${theory_includes} -namespace CVC4 { +namespace CVC5 { namespace theory { template <TheoryId theoryId> @@ -43,7 +43,7 @@ ${theory_constructors} default: Unhandled() << id; } } -};/* struct CVC4::theory::TheoryConstructor */ +}; /* struct CVC5::theory::TheoryConstructor */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/trust_node.cpp b/src/theory/trust_node.cpp index f42ad1371..7458b95e5 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 CVC4 { +namespace CVC5 { namespace theory { const char* toString(TrustNodeKind tnk) @@ -146,4 +146,4 @@ std::ostream& operator<<(std::ostream& out, TrustNode n) } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/trust_node.h b/src/theory/trust_node.h index b376bb32a..13769dccd 100644 --- a/src/theory/trust_node.h +++ b/src/theory/trust_node.h @@ -19,7 +19,7 @@ #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { class ProofGenerator; class ProofNode; @@ -172,6 +172,6 @@ class TrustNode std::ostream& operator<<(std::ostream& out, TrustNode n); } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__TRUST_NODE_H */ diff --git a/src/theory/trust_substitutions.cpp b/src/theory/trust_substitutions.cpp index 367d2f5c4..a42608c31 100644 --- a/src/theory/trust_substitutions.cpp +++ b/src/theory/trust_substitutions.cpp @@ -16,7 +16,7 @@ #include "theory/rewriter.h" -namespace CVC4 { +namespace CVC5 { namespace theory { TrustSubstitutionMap::TrustSubstitutionMap(context::Context* c, @@ -246,4 +246,4 @@ Node TrustSubstitutionMap::getCurrentSubstitution() } } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/trust_substitutions.h b/src/theory/trust_substitutions.h index 223204945..20b240ce8 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 CVC4 { +namespace CVC5 { namespace theory { /** @@ -133,6 +133,6 @@ class TrustSubstitutionMap }; } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__THEORY__TRUST_SUBSTITUTIONS_H */ diff --git a/src/theory/type_enumerator.h b/src/theory/type_enumerator.h index 5c39fdecd..f0cfacee7 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 CVC4 { +namespace CVC5 { namespace theory { class NoMoreValuesException : public Exception { @@ -183,7 +183,7 @@ class TypeEnumerator { TypeNode getType() const { return d_te->getType(); } };/* class TypeEnumerator */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // 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 bd8b7e0a4..803787f5e 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 CVC4 { +namespace CVC5 { namespace theory { TypeEnumeratorInterface* TypeEnumerator::mkTypeEnumerator( @@ -46,5 +46,5 @@ TypeEnumeratorInterface* TypeEnumerator::mkTypeEnumerator( Unreachable(); } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/type_set.cpp b/src/theory/type_set.cpp index a1ecd4ab8..6cf8814a7 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { TypeSet::~TypeSet() @@ -136,5 +136,5 @@ void TypeSet::addSubTerms(TNode n, } } -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/type_set.h b/src/theory/type_set.h index 02ae7e138..3e57033ef 100644 --- a/src/theory/type_set.h +++ b/src/theory/type_set.h @@ -22,7 +22,7 @@ #include "theory/type_enumerator.h" -namespace CVC4 { +namespace CVC5 { namespace theory { /* Type set @@ -84,7 +84,7 @@ class TypeSet bool topLevel = true); }; /* class TypeSet */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace theory +} // 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 b36c6eb96..eebe14226 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 CVC4::kind; -using namespace CVC4::context; +using namespace CVC5::kind; +using namespace CVC5::context; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -1764,6 +1764,6 @@ CardinalityExtension::Statistics::~Statistics() smtStatisticsRegistry()->unregisterStat(&d_max_model_size); } -}/* CVC4::theory namespace::uf */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace uf +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/uf/cardinality_extension.h b/src/theory/uf/cardinality_extension.h index d701adfc4..85129a89b 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 CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -461,8 +461,8 @@ class CardinalityExtension NodeBoolMap d_rel_eqc; }; /* class CardinalityExtension */ -}/* CVC4::theory namespace::uf */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace uf +} // namespace theory +} // 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 3cbac95a2..fec9179f3 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -1438,4 +1438,4 @@ Node EqProof::addToProof( } // namespace eq } // Namespace theory -} // Namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/eq_proof.h b/src/theory/uf/eq_proof.h index 2effb88a9..665731d2b 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 CVC4 { +namespace CVC5 { class CDProof; @@ -355,4 +355,4 @@ class EqProof } // Namespace eq } // Namespace theory -} // Namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/equality_engine.cpp b/src/theory/uf/equality_engine.cpp index 2d34bd547..a4bb76245 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -2635,4 +2635,4 @@ EqualityNodeId EqualityEngine::TriggerTermSet::getTrigger(TheoryId tag) const } // Namespace uf } // Namespace theory -} // Namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/equality_engine.h b/src/theory/uf/equality_engine.h index d1c0ece95..74af68227 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -845,6 +845,6 @@ private: } // Namespace eq } // Namespace theory -} // Namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/uf/equality_engine_iterator.cpp b/src/theory/uf/equality_engine_iterator.cpp index 48b2552cd..c9a35f6e3 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -132,4 +132,4 @@ bool EqClassIterator::isFinished() const { return d_current == null_id; } } // namespace eq } // Namespace theory -} // Namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/equality_engine_iterator.h b/src/theory/uf/equality_engine_iterator.h index 1d1089090..33562a99e 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -79,6 +79,6 @@ class EqClassIterator } // Namespace eq } // Namespace theory -} // Namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/uf/equality_engine_notify.h b/src/theory/uf/equality_engine_notify.h index 7904d7cf6..bd353375f 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -115,6 +115,6 @@ class EqualityEngineNotifyNone : public EqualityEngineNotify } // Namespace eq } // Namespace theory -} // Namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/theory/uf/equality_engine_types.h b/src/theory/uf/equality_engine_types.h index 5714099f9..092b4bd89 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 CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -359,6 +359,6 @@ struct TriggerInfo { } // namespace eq } // namespace theory -} // namespace CVC4 +} // 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 7984813ac..c159ff3b4 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -455,4 +455,4 @@ bool HoExtension::collectModelInfoHoTerm(Node n, TheoryModel* m) } // namespace uf } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/ho_extension.h b/src/theory/uf/ho_extension.h index 90b0b67c5..3ca647f28 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 CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -198,6 +198,6 @@ class HoExtension } // namespace uf } // namespace theory -} // namespace CVC4 +} // namespace CVC5 #endif /* __CVC4__THEORY__UF__HO_EXTENSION_H */ diff --git a/src/theory/uf/kinds b/src/theory/uf/kinds index 9564899fe..ab2e422ee 100644 --- a/src/theory/uf/kinds +++ b/src/theory/uf/kinds @@ -4,32 +4,32 @@ # src/theory/builtin/kinds. # -theory THEORY_UF ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::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 ::CVC4::theory::uf::CardinalityValueTypeRule +typerule CARDINALITY_VALUE ::CVC5::theory::uf::CardinalityValueTypeRule operator HO_APPLY 2 "higher-order (partial) function application" -typerule HO_APPLY ::CVC4::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 2c102c4ca..2688c0574 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -207,4 +207,4 @@ Node UfProofRuleChecker::checkInternal(PfRule id, } // namespace uf } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/proof_checker.h b/src/theory/uf/proof_checker.h index bb999dc15..502aeaa59 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 CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -44,6 +44,6 @@ class UfProofRuleChecker : public ProofRuleChecker } // namespace uf } // namespace theory -} // namespace CVC4 +} // 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 7db887b56..2837a02aa 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace eq { @@ -549,4 +549,4 @@ void ProofEqEngine::explainWithProof(Node lit, } // namespace eq } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/proof_equality_engine.h b/src/theory/uf/proof_equality_engine.h index adf8d2c18..5129ad1df 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 CVC4 { +namespace CVC5 { class ProofNode; class ProofNodeManager; @@ -296,6 +296,6 @@ class ProofEqEngine : public EagerProofGenerator } // namespace eq } // namespace theory -} // namespace CVC4 +} // 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 ca7254fb6..9b25c8906 100644 --- a/src/theory/uf/symmetry_breaker.cpp +++ b/src/theory/uf/symmetry_breaker.cpp @@ -48,11 +48,11 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace uf { -using namespace ::CVC4::context; +using namespace ::CVC5::context; SymmetryBreaker::Template::Template() : d_template(), @@ -800,8 +800,8 @@ void SymmetryBreaker::insertUsedIn(Term term, const Permutation& p, set<Node>& c } } -}/* CVC4::theory::uf namespace */ -}/* CVC4::theory namespace */ +} // namespace uf +} // namespace theory std::ostream& operator<<(std::ostream& out, const theory::uf::SymmetryBreaker::Permutation& p) { out << "{"; @@ -816,4 +816,4 @@ std::ostream& operator<<(std::ostream& out, const theory::uf::SymmetryBreaker::P return out; } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/theory/uf/symmetry_breaker.h b/src/theory/uf/symmetry_breaker.h index 2a95e5bc7..8ce0c2c44 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 CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -170,11 +170,13 @@ private: };/* class SymmetryBreaker */ -}/* CVC4::theory::uf namespace */ -}/* CVC4::theory namespace */ +} // namespace uf +} // namespace theory -std::ostream& operator<<(std::ostream& out, const ::CVC4::theory::uf::SymmetryBreaker::Permutation& p); +std::ostream& operator<<( + std::ostream& out, + const ::CVC5::theory::uf::SymmetryBreaker::Permutation& p); -}/* CVC4 namespace */ +} // 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 aaa9d60f0..29bb6ba7d 100644 --- a/src/theory/uf/theory_uf.cpp +++ b/src/theory/uf/theory_uf.cpp @@ -35,7 +35,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -691,6 +691,6 @@ bool TheoryUF::isHigherOrderType(TypeNode tn) return ret; } -} /* namespace CVC4::theory::uf */ -} /* namespace CVC4::theory */ -} /* namespace CVC4 */ +} // namespace uf +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/uf/theory_uf.h b/src/theory/uf/theory_uf.h index 8d2edaffe..97cfc1fa5 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 CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -181,8 +181,8 @@ private: std::map<TypeNode, bool> d_isHoType; };/* class TheoryUF */ -}/* CVC4::theory::uf namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace uf +} // namespace theory +} // 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 abb0c2e6c..5727d62cd 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 CVC4::kind; +using namespace CVC5::kind; -namespace CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -243,4 +243,4 @@ Node UfModelTree::getFunctionValue( const char* argPrefix, bool simplify ){ } // namespace uf } // namespace theory -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/theory/uf/theory_uf_model.h b/src/theory/uf/theory_uf_model.h index 62ec8204f..b1e0eea8f 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 CVC4 { +namespace CVC5 { namespace theory { class TheoryModel; @@ -114,6 +114,6 @@ public: } } -} +} // namespace CVC5 #endif diff --git a/src/theory/uf/theory_uf_rewriter.h b/src/theory/uf/theory_uf_rewriter.h index ea4f66d16..ffa0ec22f 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 CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -208,8 +208,8 @@ public: //conversion between HO_APPLY AND APPLY_UF } }; /* class TheoryUfRewriter */ -}/* CVC4::theory::uf namespace */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace uf +} // namespace theory +} // 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 aad1ad63d..c21b36669 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 CVC4 { +namespace CVC5 { namespace theory { namespace uf { @@ -80,7 +80,7 @@ class CardinalityConstraintTypeRule { throw TypeCheckingExceptionPrivate( n, "cardinality constraint must be a constant"); } - CVC4::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"); } - CVC4::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"); @@ -176,8 +176,8 @@ class HoApplyTypeRule { } }; /* class HoApplyTypeRule */ -} /* CVC4::theory::uf namespace */ -} /* CVC4::theory namespace */ -} /* CVC4 namespace */ +} // namespace uf +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__UF__THEORY_UF_TYPE_RULES_H */ diff --git a/src/theory/valuation.cpp b/src/theory/valuation.cpp index e46f38a28..f77dff234 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 CVC4 { +namespace CVC5 { namespace theory { std::ostream& operator<<(std::ostream& os, EqualityStatus s) @@ -221,5 +221,5 @@ context::CDList<Assertion>::const_iterator Valuation::factsEnd(TheoryId tid) return theory->facts_end(); } -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 diff --git a/src/theory/valuation.h b/src/theory/valuation.h index 860517451..c79c3bf9b 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 CVC4 { +namespace CVC5 { class TheoryEngine; @@ -216,7 +216,7 @@ public: context::CDList<Assertion>::const_iterator factsEnd(TheoryId tid); };/* class Valuation */ -}/* CVC4::theory namespace */ -}/* CVC4 namespace */ +} // namespace theory +} // namespace CVC5 #endif /* CVC4__THEORY__VALUATION_H */ |