fix function signatures

diff --git a/src/printer/ast/ast_printer.cpp b/src/printer/ast/ast_printer.cpp
index cd9b0cad5b70ce9cd6ce5650c47908bcaaeaf22e..6cdf878a0571943ea0f5f821eb9e3f3c0f1c5aeb 100644 (file)
--- 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 0851aef6c53bba1067986871e46a0f10afeca565..f3d927cfba2eaf7a771690c74a9c2d66d5750227 100644 (file)
--- 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 ab278e8040b0eb71a65a2e82b8b19db5b1828af4..d2cf3f8b1d9ab1cabb015e1d07a5f698beb17518 100644 (file)
--- 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 53889a989911be1a83dc6070b0cb2433c33a1b80..410be0571d41f79167628ba11de7ac8f89ddfc03 100644 (file)
--- 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 2532725ae846f98af5078e1b50dea31a6a7a2793..adbabe3c5aa6df54a0e11ac75f0f6e2df0e0f7cf 100644 (file)
--- 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 4d8f4bcd461c3067971b0e3332e1c4d04eaeecbf..d03cfbbe03dae8b8a150d99965138ae06f0412fa 100644 (file)
--- 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 e503ca8f0cdbb2b2159fd8d7abf659df8435f6ae..8776b1308d85796dd4c1b0d4f13c0a32967123e9 100644 (file)
--- 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 c8c4bfc20f63c51384d45c6b35e7c61a26754c1f..5aff8ebba7b71d88bdf1aa6c5f88b7fb844b9a7c 100644 (file)
--- 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 7cd88f0ffe28ad52f226953038095876a52cccf8..6fce2dfff18e948c370ddf35c9f312a47eb8d9b3 100644 (file)
--- 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 */