Plug solver API object into parser. (#2240)

1 files changed, 6 insertions, 7 deletions

diff --git a/examples/nra-translate/smt2toisat.cpp b/examples/nra-translate/smt2toisat.cpp
index 767da1ffd..c4649dcae 100644
--- a/examples/nra-translate/smt2toisat.cpp
+++ b/examples/nra-translate/smt2toisat.cpp
@@ -2,7 +2,7 @@
 /*! \file smt2toisat.cpp
  ** \verbatim
  ** Top contributors (to current version):
- **   Dejan Jovanovic, Tim King, Andrew Reynolds
+ **   Dejan Jovanovic, Tim King, Aina Niemetz
  ** This file is part of the CVC4 project.
  ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS
  ** in the top-level source directory) and their institutional affiliations.
@@ -22,6 +22,7 @@
 #include <typeinfo>
 #include <vector>
 
+#include "api/cvc4cpp.h"
 #include "expr/expr.h"
 #include "options/options.h"
 #include "parser/parser.h"
@@ -50,15 +51,13 @@ int main(int argc, char* argv[])
   // Create the expression manager
   Options options;
   options.setInputLanguage(language::input::LANG_SMTLIB_V2);
-  ExprManager exprManager(options);
+  std::unique_ptr<api::Solver> solver =
+      std::unique_ptr<api::Solver>(new api::Solver(&options));
 
   // Create the parser
-  ParserBuilder parserBuilder(&exprManager, input, options);
+  ParserBuilder parserBuilder(solver.get(), input, options);
   Parser* parser = parserBuilder.build();
 
-  // Smt manager for simplifications
-  SmtEngine engine(&exprManager);
-
   // Variables and assertions
   std::map<Expr, unsigned> variables;
   vector<string> info_tags;
@@ -88,7 +87,7 @@ int main(int argc, char* argv[])
     
     AssertCommand* assert = dynamic_cast<AssertCommand*>(cmd);
     if (assert) {
-      assertions.push_back(engine.simplify(assert->getExpr()));
+      assertions.push_back(solver->getSmtEngine()->simplify(assert->getExpr()));
       delete cmd;
       continue;
     }