diff options
Diffstat (limited to 'src/printer')
-rw-r--r-- | src/printer/ast/ast_printer.cpp | 8 | ||||
-rw-r--r-- | src/printer/ast/ast_printer.h | 8 | ||||
-rw-r--r-- | src/printer/cvc/cvc_printer.cpp | 8 | ||||
-rw-r--r-- | src/printer/cvc/cvc_printer.h | 8 | ||||
-rw-r--r-- | src/printer/let_binding.cpp | 4 | ||||
-rw-r--r-- | src/printer/let_binding.h | 4 | ||||
-rw-r--r-- | src/printer/printer.cpp | 6 | ||||
-rw-r--r-- | src/printer/printer.h | 4 | ||||
-rw-r--r-- | src/printer/smt2/smt2_printer.cpp | 30 | ||||
-rw-r--r-- | src/printer/smt2/smt2_printer.h | 8 | ||||
-rw-r--r-- | src/printer/tptp/tptp_printer.cpp | 8 | ||||
-rw-r--r-- | src/printer/tptp/tptp_printer.h | 8 |
12 files changed, 52 insertions, 52 deletions
diff --git a/src/printer/ast/ast_printer.cpp b/src/printer/ast/ast_printer.cpp index 3a9b20566..5d3fb1adc 100644 --- a/src/printer/ast/ast_printer.cpp +++ b/src/printer/ast/ast_printer.cpp @@ -29,7 +29,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace printer { namespace ast { @@ -473,6 +473,6 @@ static bool tryToStream(std::ostream& out, const CommandStatus* s) return false; } -}/* CVC4::printer::ast namespace */ -}/* CVC4::printer namespace */ -}/* CVC4 namespace */ +} // namespace ast +} // namespace printer +} // namespace CVC5 diff --git a/src/printer/ast/ast_printer.h b/src/printer/ast/ast_printer.h index 3564ff592..985cf9872 100644 --- a/src/printer/ast/ast_printer.h +++ b/src/printer/ast/ast_printer.h @@ -23,17 +23,17 @@ #include "printer/printer.h" -namespace CVC4 { +namespace CVC5 { class LetBinding; namespace printer { namespace ast { -class AstPrinter : public CVC4::Printer +class AstPrinter : public CVC5::Printer { public: - using CVC4::Printer::toStream; + using CVC5::Printer::toStream; void toStream(std::ostream& out, TNode n, int toDepth, @@ -196,6 +196,6 @@ class AstPrinter : public CVC4::Printer } // namespace ast } // namespace printer -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__PRINTER__AST_PRINTER_H */ diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp index ab532bc43..867bc204a 100644 --- a/src/printer/cvc/cvc_printer.cpp +++ b/src/printer/cvc/cvc_printer.cpp @@ -42,7 +42,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace printer { namespace cvc { @@ -1612,6 +1612,6 @@ void CvcPrinter::toStreamNodeWithLetify(std::ostream& out, lbind->popScope(); } -}/* CVC4::printer::cvc namespace */ -}/* CVC4::printer namespace */ -}/* CVC4 namespace */ +} // namespace cvc +} // namespace printer +} // namespace CVC5 diff --git a/src/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h index d8501b9ed..2b240568e 100644 --- a/src/printer/cvc/cvc_printer.h +++ b/src/printer/cvc/cvc_printer.h @@ -23,17 +23,17 @@ #include "printer/printer.h" -namespace CVC4 { +namespace CVC5 { class LetBinding; namespace printer { namespace cvc { -class CvcPrinter : public CVC4::Printer +class CvcPrinter : public CVC5::Printer { public: - using CVC4::Printer::toStream; + using CVC5::Printer::toStream; CvcPrinter(bool cvc3Mode = false) : d_cvc3Mode(cvc3Mode) {} void toStream(std::ostream& out, TNode n, @@ -204,6 +204,6 @@ class CvcPrinter : public CVC4::Printer } // namespace cvc } // namespace printer -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__PRINTER__CVC_PRINTER_H */ diff --git a/src/printer/let_binding.cpp b/src/printer/let_binding.cpp index ca3ab40f6..638503c1a 100644 --- a/src/printer/let_binding.cpp +++ b/src/printer/let_binding.cpp @@ -16,7 +16,7 @@ #include <sstream> -namespace CVC4 { +namespace CVC5 { LetBinding::LetBinding(uint32_t thresh) : d_thresh(thresh), @@ -212,4 +212,4 @@ void LetBinding::convertCountToLet() } } -} // namespace CVC4 +} // namespace CVC5 diff --git a/src/printer/let_binding.h b/src/printer/let_binding.h index 83f3183ca..9eaeb039a 100644 --- a/src/printer/let_binding.h +++ b/src/printer/let_binding.h @@ -23,7 +23,7 @@ #include "context/cdlist.h" #include "expr/node.h" -namespace CVC4 { +namespace CVC5 { /** * A flexible let binding class. This class provides functionalities for @@ -157,6 +157,6 @@ class LetBinding NodeIdMap d_letMap; }; -} // namespace CVC4 +} // namespace CVC5 #endif diff --git a/src/printer/printer.cpp b/src/printer/printer.cpp index 40471b9a2..c4236d711 100644 --- a/src/printer/printer.cpp +++ b/src/printer/printer.cpp @@ -30,13 +30,13 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { unique_ptr<Printer> Printer::d_printers[language::output::LANG_MAX]; unique_ptr<Printer> Printer::makePrinter(OutputLanguage lang) { - using namespace CVC4::language::output; + using namespace CVC5::language::output; switch(lang) { case LANG_SMTLIB_V2_6: @@ -459,4 +459,4 @@ void Printer::toStreamCmdDeclarationSequence( printUnknownCommand(out, "sequence"); } -}/* CVC4 namespace */ +} // namespace CVC5 diff --git a/src/printer/printer.h b/src/printer/printer.h index 17fd66848..02ffdc939 100644 --- a/src/printer/printer.h +++ b/src/printer/printer.h @@ -26,7 +26,7 @@ #include "smt/model.h" #include "util/result.h" -namespace CVC4 { +namespace CVC5 { class Command; class CommandStatus; @@ -308,6 +308,6 @@ class Printer }; /* class Printer */ -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__PRINTER__PRINTER_H */ diff --git a/src/printer/smt2/smt2_printer.cpp b/src/printer/smt2/smt2_printer.cpp index af555d298..7e80baebc 100644 --- a/src/printer/smt2/smt2_printer.cpp +++ b/src/printer/smt2/smt2_printer.cpp @@ -46,7 +46,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace printer { namespace smt2 { @@ -292,7 +292,7 @@ void Smt2Printer::toStream(std::ostream& out, } else { - out << CVC4::quoteSymbol(dt.getName()); + out << CVC5::quoteSymbol(dt.getName()); } break; } @@ -437,7 +437,7 @@ void Smt2Printer::toStream(std::ostream& out, out << '('; } if(n.getAttribute(expr::VarNameAttr(), name)) { - out << CVC4::quoteSymbol(name); + out << CVC5::quoteSymbol(name); } if(n.getNumChildren() != 0) { for(unsigned i = 0; i < n.getNumChildren(); ++i) { @@ -509,7 +509,7 @@ void Smt2Printer::toStream(std::ostream& out, string s; if (n.getAttribute(expr::VarNameAttr(), s)) { - out << CVC4::quoteSymbol(s); + out << CVC5::quoteSymbol(s); } else { @@ -1334,7 +1334,7 @@ static bool tryToStream(std::ostream& out, const Command* c, Variant v); static std::string quoteSymbol(TNode n) { std::stringstream ss; ss << n; - return CVC4::quoteSymbol(ss.str()); + return CVC5::quoteSymbol(ss.str()); } template <class T> @@ -1364,7 +1364,7 @@ void Smt2Printer::toStream(std::ostream& out, const UnsatCore& core) const const std::vector<std::string>& cnames = core.getCoreNames(); for (const std::string& cn : cnames) { - out << CVC4::quoteSymbol(cn) << std::endl; + out << CVC5::quoteSymbol(cn) << std::endl; } } else @@ -1582,7 +1582,7 @@ void Smt2Printer::toStreamCmdDeclareFunction(std::ostream& out, const std::string& id, TypeNode type) const { - out << "(declare-fun " << CVC4::quoteSymbol(id) << " ("; + out << "(declare-fun " << CVC5::quoteSymbol(id) << " ("; if (type.isFunction()) { const vector<TypeNode> argTypes = type.getArgTypes(); @@ -1702,7 +1702,7 @@ void Smt2Printer::toStreamCmdDeclareType(std::ostream& out, std::stringstream id; id << type; size_t arity = type.isSortConstructor() ? type.getSortConstructorArity() : 0; - out << "(declare-sort " << CVC4::quoteSymbol(id.str()) << " " << arity << ")" + out << "(declare-sort " << CVC5::quoteSymbol(id.str()) << " " << arity << ")" << std::endl; } @@ -1711,7 +1711,7 @@ void Smt2Printer::toStreamCmdDefineType(std::ostream& out, const std::vector<TypeNode>& params, TypeNode t) const { - out << "(define-sort " << CVC4::quoteSymbol(id) << " ("; + out << "(define-sort " << CVC5::quoteSymbol(id) << " ("; if (params.size() > 0) { copy( @@ -1811,7 +1811,7 @@ void Smt2Printer::toStream(std::ostream& out, const DType& dt) const { out << " "; } - out << "(" << CVC4::quoteSymbol(cons.getName()); + out << "(" << CVC5::quoteSymbol(cons.getName()); for (size_t j = 0, nargs = cons.getNumArgs(); j < nargs; j++) { const DTypeSelector& arg = cons[j]; @@ -1844,7 +1844,7 @@ void Smt2Printer::toStreamCmdDatatypeDeclaration( { Assert(t.isDatatype()); const DType& d = t.getDType(); - out << "(" << CVC4::quoteSymbol(d.getName()); + out << "(" << CVC5::quoteSymbol(d.getName()); out << " " << d.getNumParameters() << ")"; } out << ") ("; @@ -1986,7 +1986,7 @@ void Smt2Printer::toStreamCmdSynthFun(std::ostream& out, std::stringstream sym; sym << f; out << '(' << (isInv ? "synth-inv " : "synth-fun ") - << CVC4::quoteSymbol(sym.str()) << ' '; + << CVC5::quoteSymbol(sym.str()) << ' '; out << '('; if (!vars.empty()) { @@ -2137,6 +2137,6 @@ static bool tryToStream(std::ostream& out, const CommandStatus* s, Variant v) return false; } -}/* CVC4::printer::smt2 namespace */ -}/* CVC4::printer namespace */ -}/* CVC4 namespace */ +} // namespace smt2 +} // namespace printer +} // namespace CVC5 diff --git a/src/printer/smt2/smt2_printer.h b/src/printer/smt2/smt2_printer.h index 26ccf5821..a997f789a 100644 --- a/src/printer/smt2/smt2_printer.h +++ b/src/printer/smt2/smt2_printer.h @@ -21,7 +21,7 @@ #include "printer/printer.h" -namespace CVC4 { +namespace CVC5 { class LetBinding; @@ -35,11 +35,11 @@ enum Variant // support for the string standard }; /* enum Variant */ -class Smt2Printer : public CVC4::Printer +class Smt2Printer : public CVC5::Printer { public: Smt2Printer(Variant variant = no_variant) : d_variant(variant) {} - using CVC4::Printer::toStream; + using CVC5::Printer::toStream; void toStream(std::ostream& out, TNode n, int toDepth, @@ -275,6 +275,6 @@ class Smt2Printer : public CVC4::Printer } // namespace smt2 } // namespace printer -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__PRINTER__SMT2_PRINTER_H */ diff --git a/src/printer/tptp/tptp_printer.cpp b/src/printer/tptp/tptp_printer.cpp index 3ec261360..c740f7b76 100644 --- a/src/printer/tptp/tptp_printer.cpp +++ b/src/printer/tptp/tptp_printer.cpp @@ -30,7 +30,7 @@ using namespace std; -namespace CVC4 { +namespace CVC5 { namespace printer { namespace tptp { @@ -97,6 +97,6 @@ void TptpPrinter::toStream(std::ostream& out, const UnsatCore& core) const out << "% SZS output end UnsatCore " << std::endl; } -}/* CVC4::printer::tptp namespace */ -}/* CVC4::printer namespace */ -}/* CVC4 namespace */ +} // namespace tptp +} // namespace printer +} // namespace CVC5 diff --git a/src/printer/tptp/tptp_printer.h b/src/printer/tptp/tptp_printer.h index c1bd2b1d8..ea538a245 100644 --- a/src/printer/tptp/tptp_printer.h +++ b/src/printer/tptp/tptp_printer.h @@ -23,14 +23,14 @@ #include "printer/printer.h" -namespace CVC4 { +namespace CVC5 { namespace printer { namespace tptp { -class TptpPrinter : public CVC4::Printer +class TptpPrinter : public CVC5::Printer { public: - using CVC4::Printer::toStream; + using CVC5::Printer::toStream; void toStream(std::ostream& out, TNode n, int toDepth, @@ -64,6 +64,6 @@ class TptpPrinter : public CVC4::Printer } // namespace tptp } // namespace printer -} // namespace CVC4 +} // namespace CVC5 #endif /* CVC4__PRINTER__TPTP_PRINTER_H */ |