diff options
| author | Gereon Kremer <nafur42@gmail.com> | 2021-08-04 17:29:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-05 00:29:11 +0000 |
| commit | 183808b608071890b4d8a05d51233fe37a133873 (patch) | |
| tree | 0d6863aac009de12e3b0055a40cec15244be6455 /test/unit | |
| parent | a796c4d8461f22aa523edd3031290e0ba03edd60 (diff) | |
No longer call solver constructor with an options object. (#6985)
This PR removes calls to the Solver constructor with an Options object, and instead uses the setOption() method.
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/parser/parser_black.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/test/unit/parser/parser_black.cpp b/test/unit/parser/parser_black.cpp index 10bba5e64..8c8ef15d7 100644 --- a/test/unit/parser/parser_black.cpp +++ b/test/unit/parser/parser_black.cpp @@ -44,9 +44,9 @@ class TestParserBlackParser : public TestInternal void SetUp() override { TestInternal::SetUp(); - d_options.base.parseOnly = true; d_symman.reset(nullptr); - d_solver.reset(new cvc5::api::Solver(&d_options)); + d_solver.reset(new cvc5::api::Solver()); + d_solver->setOption("parse-only", "true"); } void TearDown() override @@ -55,13 +55,6 @@ class TestParserBlackParser : public TestInternal d_solver.reset(nullptr); } - void setUp() - { - /* ensure the old symbol manager is deleted */ - d_symman.reset(nullptr); - d_solver.reset(new api::Solver(&d_options)); - } - /* Set up declaration context for expr inputs */ void setupContext(Parser& parser) { @@ -87,7 +80,7 @@ class TestParserBlackParser : public TestInternal { d_symman.reset(new SymbolManager(d_solver.get())); std::unique_ptr<Parser> parser(ParserBuilder(d_solver.get(), d_symman.get()) - .withOptions(d_options) + .withOptions(d_solver->getOptions()) .withInputLanguage(d_lang) .build()); parser->setInput(Input::newStringInput(d_lang, goodInput, "test")); @@ -106,7 +99,7 @@ class TestParserBlackParser : public TestInternal { d_symman.reset(new SymbolManager(d_solver.get())); std::unique_ptr<Parser> parser(ParserBuilder(d_solver.get(), d_symman.get()) - .withOptions(d_options) + .withOptions(d_solver->getOptions()) .withInputLanguage(d_lang) .withStrictMode(strictMode) .build()); @@ -128,7 +121,7 @@ class TestParserBlackParser : public TestInternal { d_symman.reset(new SymbolManager(d_solver.get())); std::unique_ptr<Parser> parser(ParserBuilder(d_solver.get(), d_symman.get()) - .withOptions(d_options) + .withOptions(d_solver->getOptions()) .withInputLanguage(d_lang) .build()); parser->setInput(Input::newStringInput(d_lang, goodExpr, "test")); @@ -162,7 +155,7 @@ class TestParserBlackParser : public TestInternal { d_symman.reset(new SymbolManager(d_solver.get())); std::unique_ptr<Parser> parser(ParserBuilder(d_solver.get(), d_symman.get()) - .withOptions(d_options) + .withOptions(d_solver->getOptions()) .withInputLanguage(d_lang) .withStrictMode(strictMode) .build()); @@ -177,7 +170,6 @@ class TestParserBlackParser : public TestInternal , ParserException); } - Options d_options; InputLanguage d_lang; std::unique_ptr<cvc5::api::Solver> d_solver; std::unique_ptr<SymbolManager> d_symman; |