Convert parser input interface to api::Term (#3809)

3 files changed, 6 insertions, 6 deletions

diff --git a/test/system/ouroborous.cpp b/test/system/ouroborous.cpp
index 3075e358d..a9f205236 100644
--- a/test/system/ouroborous.cpp
+++ b/test/system/ouroborous.cpp
@@ -70,7 +70,7 @@ string translate(string in, InputLanguage inlang, OutputLanguage outlang) {
        << "translating from " << inlang << " to " << outlang << " this string:" << endl
        << in << endl;
   psr->setInput(Input::newStringInput(inlang, in, "internal-buffer"));
-  Expr e = psr->nextExpression();
+  Expr e = psr->nextExpression().getExpr();
   stringstream ss;
   ss << language::SetLanguage(outlang) << expr::ExprSetDepth(-1) << e;
   assert(psr->nextExpression().isNull());// next expr should be null
@@ -81,7 +81,7 @@ string translate(string in, InputLanguage inlang, OutputLanguage outlang) {
        << "reparsing as " << outlang << endl;
 
   psr->setInput(Input::newStringInput(toInputLanguage(outlang), s, "internal-buffer"));
-  Expr f = psr->nextExpression();
+  Expr f = psr->nextExpression().getExpr();
   assert(e == f);
   cout << "got same expressions " << e.getId() << " and " << f.getId() << endl
        << "==============================================" << endl;
diff --git a/test/unit/parser/parser_black.h b/test/unit/parser/parser_black.h
index bfaf8bda0..e00016f45 100644
--- a/test/unit/parser/parser_black.h
+++ b/test/unit/parser/parser_black.h
@@ -148,7 +148,7 @@ class ParserBlack
       TS_ASSERT(!parser->done());
       setupContext(*parser);
       TS_ASSERT(!parser->done());
-      Expr e = parser->nextExpression();
+      api::Term e = parser->nextExpression();
       TS_ASSERT(!e.isNull());
       e = parser->nextExpression();
       TS_ASSERT(parser->done());
@@ -187,7 +187,7 @@ class ParserBlack
                          .build();
     setupContext(*parser);
     TS_ASSERT(!parser->done());
-    TS_ASSERT_THROWS(Expr e = parser->nextExpression();
+    TS_ASSERT_THROWS(api::Term e = parser->nextExpression();
                      cout << endl
                           << "Bad expr succeeded." << endl
                           << "Input: <<" << badExpr << ">>" << endl
diff --git a/test/unit/parser/parser_builder_black.h b/test/unit/parser/parser_builder_black.h
index 78e1be748..44bb9293b 100644
--- a/test/unit/parser/parser_builder_black.h
+++ b/test/unit/parser/parser_builder_black.h
@@ -99,7 +99,7 @@ class ParserBuilderBlack : public CxxTest::TestSuite
     Parser *parser = builder.build();
     TS_ASSERT(parser != NULL);
 
-    Expr e = parser->nextExpression();
+    api::Term e = parser->nextExpression();
     TS_ASSERT(e.isNull());
 
     delete parser;
@@ -110,7 +110,7 @@ class ParserBuilderBlack : public CxxTest::TestSuite
     Parser *parser = builder.build();
     TS_ASSERT(parser != NULL);
 
-    Expr e = parser->nextExpression();
+    api::Term e = parser->nextExpression();
     TS_ASSERT_EQUALS(e, d_solver->getExprManager()->mkConst(true));
 
     e = parser->nextExpression();