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/smt/command.cpp | |
| 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/smt/command.cpp')
| -rw-r--r-- | src/smt/command.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/smt/command.cpp b/src/smt/command.cpp index f10191c75..9227c3703 100644 --- a/src/smt/command.cpp +++ b/src/smt/command.cpp @@ -2572,18 +2572,19 @@ void SetBenchmarkLogicCommand::toStream(std::ostream& out, /* class SetInfoCommand */ /* -------------------------------------------------------------------------- */ -SetInfoCommand::SetInfoCommand(std::string flag, const std::string& sexpr) - : d_flag(flag), d_sexpr(sexpr) +SetInfoCommand::SetInfoCommand(const std::string& flag, + const std::string& value) + : d_flag(flag), d_value(value) { } -std::string SetInfoCommand::getFlag() const { return d_flag; } -const std::string& SetInfoCommand::getSExpr() const { return d_sexpr; } +const std::string& SetInfoCommand::getFlag() const { return d_flag; } +const std::string& SetInfoCommand::getValue() const { return d_value; } void SetInfoCommand::invoke(api::Solver* solver, SymbolManager* sm) { try { - solver->setInfo(d_flag, d_sexpr); + solver->setInfo(d_flag, d_value); d_commandStatus = CommandSuccess::instance(); } catch (api::CVC4ApiRecoverableException&) @@ -2599,7 +2600,7 @@ void SetInfoCommand::invoke(api::Solver* solver, SymbolManager* sm) Command* SetInfoCommand::clone() const { - return new SetInfoCommand(d_flag, d_sexpr); + return new SetInfoCommand(d_flag, d_value); } std::string SetInfoCommand::getCommandName() const { return "set-info"; } @@ -2609,7 +2610,7 @@ void SetInfoCommand::toStream(std::ostream& out, size_t dag, OutputLanguage language) const { - Printer::getPrinter(language)->toStreamCmdSetInfo(out, d_flag, d_sexpr); + Printer::getPrinter(language)->toStreamCmdSetInfo(out, d_flag, d_value); } /* -------------------------------------------------------------------------- */ @@ -2672,18 +2673,19 @@ void GetInfoCommand::toStream(std::ostream& out, /* class SetOptionCommand */ /* -------------------------------------------------------------------------- */ -SetOptionCommand::SetOptionCommand(std::string flag, const std::string& sexpr) - : d_flag(flag), d_sexpr(sexpr) +SetOptionCommand::SetOptionCommand(const std::string& flag, + const std::string& value) + : d_flag(flag), d_value(value) { } -std::string SetOptionCommand::getFlag() const { return d_flag; } -const std::string& SetOptionCommand::getSExpr() const { return d_sexpr; } +const std::string& SetOptionCommand::getFlag() const { return d_flag; } +const std::string& SetOptionCommand::getValue() const { return d_value; } void SetOptionCommand::invoke(api::Solver* solver, SymbolManager* sm) { try { - solver->setOption(d_flag, d_sexpr); + solver->setOption(d_flag, d_value); d_commandStatus = CommandSuccess::instance(); } catch (api::CVC4ApiRecoverableException&) @@ -2698,7 +2700,7 @@ void SetOptionCommand::invoke(api::Solver* solver, SymbolManager* sm) Command* SetOptionCommand::clone() const { - return new SetOptionCommand(d_flag, d_sexpr); + return new SetOptionCommand(d_flag, d_value); } std::string SetOptionCommand::getCommandName() const { return "set-option"; } @@ -2708,7 +2710,7 @@ void SetOptionCommand::toStream(std::ostream& out, size_t dag, OutputLanguage language) const { - Printer::getPrinter(language)->toStreamCmdSetOption(out, d_flag, d_sexpr); + Printer::getPrinter(language)->toStreamCmdSetOption(out, d_flag, d_value); } /* -------------------------------------------------------------------------- */ |