From d5d504da7c73538642b9be86c73f8407e08ab57a Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Tue, 16 Nov 2010 00:20:30 +0000 Subject: [PATCH] fix function signatures --- src/printer/ast/ast_printer.cpp | 8 +++----- src/printer/ast/ast_printer.h | 2 +- src/printer/cvc/cvc_printer.cpp | 6 +++--- src/printer/cvc/cvc_printer.h | 2 +- src/printer/printer.h | 4 ++-- src/printer/smt/smt_printer.cpp | 6 +++--- src/printer/smt/smt_printer.h | 2 +- src/printer/smt2/smt2_printer.cpp | 12 +++++------- src/printer/smt2/smt2_printer.h | 2 +- 9 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/printer/ast/ast_printer.cpp b/src/printer/ast/ast_printer.cpp index cd9b0cad5..6cdf878a0 100644 --- a/src/printer/ast/ast_printer.cpp +++ b/src/printer/ast/ast_printer.cpp @@ -28,12 +28,12 @@ namespace CVC4 { namespace printer { namespace ast { -std::ostream& AstPrinter::toStream(std::ostream& out, TNode n, +void AstPrinter::toStream(std::ostream& out, TNode n, int toDepth, bool types) const { // null if(n.getKind() == kind::NULL_EXPR) { out << "null"; - return out; + return; } // variable @@ -55,7 +55,7 @@ std::ostream& AstPrinter::toStream(std::ostream& out, TNode n, n.getType().toStream(out, -1, false, language::output::LANG_AST); } - return out; + return; } out << '(' << n.getKind(); @@ -90,8 +90,6 @@ std::ostream& AstPrinter::toStream(std::ostream& out, TNode n, } } out << ')'; - - return out; }/* AstPrinter::toStream() */ }/* CVC4::printer::ast namespace */ diff --git a/src/printer/ast/ast_printer.h b/src/printer/ast/ast_printer.h index 0851aef6c..f3d927cfb 100644 --- a/src/printer/ast/ast_printer.h +++ b/src/printer/ast/ast_printer.h @@ -31,7 +31,7 @@ namespace ast { class AstPrinter : public CVC4::Printer { public: - std::ostream& toStream(std::ostream& out, TNode n, int toDepth, bool types) const; + void toStream(std::ostream& out, TNode n, int toDepth, bool types) const; };/* class AstPrinter */ }/* CVC4::printer::ast namespace */ diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp index ab278e804..d2cf3f8b1 100644 --- a/src/printer/cvc/cvc_printer.cpp +++ b/src/printer/cvc/cvc_printer.cpp @@ -27,9 +27,9 @@ namespace CVC4 { namespace printer { namespace cvc { -std::ostream& CvcPrinter::toStream(std::ostream& out, TNode n, - int toDepth, bool types) const { - return n.toStream(out, toDepth, types, language::output::LANG_AST); +void CvcPrinter::toStream(std::ostream& out, TNode n, + int toDepth, bool types) const { + n.toStream(out, toDepth, types, language::output::LANG_AST); }/* CvcPrinter::toStream() */ }/* CVC4::printer::cvc namespace */ diff --git a/src/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h index 53889a989..410be0571 100644 --- a/src/printer/cvc/cvc_printer.h +++ b/src/printer/cvc/cvc_printer.h @@ -31,7 +31,7 @@ namespace cvc { class CvcPrinter : public CVC4::Printer { public: - std::ostream& toStream(std::ostream& out, TNode n, int toDepth, bool types) const; + void toStream(std::ostream& out, TNode n, int toDepth, bool types) const; };/* class CvcPrinter */ }/* CVC4::printer::cvc namespace */ diff --git a/src/printer/printer.h b/src/printer/printer.h index 2532725ae..adbabe3c5 100644 --- a/src/printer/printer.h +++ b/src/printer/printer.h @@ -43,8 +43,8 @@ public: } /** Write a Node out to a stream with this Printer. */ - virtual std::ostream& toStream(std::ostream& out, TNode n, - int toDepth, bool types) const = 0; + virtual void toStream(std::ostream& out, TNode n, + int toDepth, bool types) const = 0; };/* class Printer */ }/* CVC4 namespace */ diff --git a/src/printer/smt/smt_printer.cpp b/src/printer/smt/smt_printer.cpp index 4d8f4bcd4..d03cfbbe0 100644 --- a/src/printer/smt/smt_printer.cpp +++ b/src/printer/smt/smt_printer.cpp @@ -27,9 +27,9 @@ namespace CVC4 { namespace printer { namespace smt { -std::ostream& SmtPrinter::toStream(std::ostream& out, TNode n, - int toDepth, bool types) const { - return n.toStream(out, toDepth, types, language::output::LANG_SMTLIB_V2); +void SmtPrinter::toStream(std::ostream& out, TNode n, + int toDepth, bool types) const { + n.toStream(out, toDepth, types, language::output::LANG_SMTLIB_V2); }/* SmtPrinter::toStream() */ }/* CVC4::printer::smt namespace */ diff --git a/src/printer/smt/smt_printer.h b/src/printer/smt/smt_printer.h index e503ca8f0..8776b1308 100644 --- a/src/printer/smt/smt_printer.h +++ b/src/printer/smt/smt_printer.h @@ -31,7 +31,7 @@ namespace smt { class SmtPrinter : public CVC4::Printer { public: - std::ostream& toStream(std::ostream& out, TNode n, int toDepth, bool types) const; + void toStream(std::ostream& out, TNode n, int toDepth, bool types) const; };/* class SmtPrinter */ }/* CVC4::printer::smt namespace */ diff --git a/src/printer/smt2/smt2_printer.cpp b/src/printer/smt2/smt2_printer.cpp index c8c4bfc20..5aff8ebba 100644 --- a/src/printer/smt2/smt2_printer.cpp +++ b/src/printer/smt2/smt2_printer.cpp @@ -28,12 +28,12 @@ namespace smt2 { void printBvParameterizedOp(std::ostream& out, TNode n); -std::ostream& Smt2Printer::toStream(std::ostream& out, TNode n, - int toDepth, bool types) const { +void Smt2Printer::toStream(std::ostream& out, TNode n, + int toDepth, bool types) const { // null if(n.getKind() == kind::NULL_EXPR) { out << "null"; - return out; + return; } // variable @@ -55,7 +55,7 @@ std::ostream& Smt2Printer::toStream(std::ostream& out, TNode n, n.getType().toStream(out, -1, false, language::output::LANG_SMTLIB_V2); } - return out; + return; } // constant @@ -80,7 +80,7 @@ std::ostream& Smt2Printer::toStream(std::ostream& out, TNode n, kind::metakind::NodeValueConstPrinter::toStream(out, n); } - return out; + return; } bool stillNeedToPrintParams = true; @@ -191,8 +191,6 @@ std::ostream& Smt2Printer::toStream(std::ostream& out, TNode n, } } out << ')'; - - return out; }/* Smt2Printer::toStream() */ void printBvParameterizedOp(std::ostream& out, TNode n) { diff --git a/src/printer/smt2/smt2_printer.h b/src/printer/smt2/smt2_printer.h index 7cd88f0ff..6fce2dfff 100644 --- a/src/printer/smt2/smt2_printer.h +++ b/src/printer/smt2/smt2_printer.h @@ -31,7 +31,7 @@ namespace smt2 { class Smt2Printer : public CVC4::Printer { public: - std::ostream& toStream(std::ostream& out, TNode n, int toDepth, bool types) const; + void toStream(std::ostream& out, TNode n, int toDepth, bool types) const; };/* class Smt2Printer */ }/* CVC4::printer::smt2 namespace */ -- 2.30.2