diff options
| author | Abdalrhman Mohamed <32971963+abdoo8080@users.noreply.github.com> | 2021-03-03 04:28:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 10:28:45 +0000 |
| commit | 6db84f6e373f9651af48df7b654e3992f68472ac (patch) | |
| tree | 3c146a185ce575431ea7a63cf97a8e0bb1031c0b /src/printer/cvc | |
| parent | c4709cb01356dd73fdd767d19af85b36ffd566c4 (diff) | |
Remove uses of SExpr class. (#6035)
This PR is a step towards removing SExpr class. It replaces SExpr with std::string for set-info and set-option commands.
Diffstat (limited to 'src/printer/cvc')
| -rw-r--r-- | src/printer/cvc/cvc_printer.cpp | 14 | ||||
| -rw-r--r-- | src/printer/cvc/cvc_printer.h | 4 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp index 82798d074..7ac2da40b 100644 --- a/src/printer/cvc/cvc_printer.cpp +++ b/src/printer/cvc/cvc_printer.cpp @@ -1420,13 +1420,9 @@ void CvcPrinter::toStreamCmdSetBenchmarkLogic(std::ostream& out, void CvcPrinter::toStreamCmdSetInfo(std::ostream& out, const std::string& flag, - SExpr sexpr) const + const std::string& value) const { - out << "% (set-info " << flag << ' '; - OutputLanguage language = - d_cvc3Mode ? language::output::LANG_CVC3 : language::output::LANG_CVC4; - SExpr::toStream(out, sexpr, language); - out << ')' << std::endl; + out << "% (set-info " << flag << ' ' << value << ')' << std::endl; } void CvcPrinter::toStreamCmdGetInfo(std::ostream& out, @@ -1437,11 +1433,9 @@ void CvcPrinter::toStreamCmdGetInfo(std::ostream& out, void CvcPrinter::toStreamCmdSetOption(std::ostream& out, const std::string& flag, - SExpr sexpr) const + const std::string& value) const { - out << "OPTION \"" << flag << "\" "; - SExpr::toStream(out, sexpr, language::output::LANG_CVC4); - out << ';' << std::endl; + out << "OPTION \"" << flag << "\" " << value << ';' << std::endl; } void CvcPrinter::toStreamCmdGetOption(std::ostream& out, diff --git a/src/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h index 58e47dbac..ab18d62de 100644 --- a/src/printer/cvc/cvc_printer.h +++ b/src/printer/cvc/cvc_printer.h @@ -125,7 +125,7 @@ class CvcPrinter : public CVC4::Printer /** Print set-info command */ void toStreamCmdSetInfo(std::ostream& out, const std::string& flag, - SExpr sexpr) const override; + const std::string& value) const override; /** Print get-info command */ void toStreamCmdGetInfo(std::ostream& out, @@ -134,7 +134,7 @@ class CvcPrinter : public CVC4::Printer /** Print set-option command */ void toStreamCmdSetOption(std::ostream& out, const std::string& flag, - SExpr sexpr) const override; + const std::string& value) const override; /** Print get-option command */ void toStreamCmdGetOption(std::ostream& out, |