7 files changed, 22 insertions, 15 deletions
diff --git a/examples/nra-translate/normalize.cpp b/examples/nra-translate/normalize.cpp
index 598055ea3..ac5780439 100644
--- a/examples/nra-translate/normalize.cpp
+++ b/examples/nra-translate/normalize.cpp
@@ -6,7 +6,7 @@
 #include <map>
 
 
-#include "util/options.h"
+#include "options/options.h"
 #include "expr/expr.h"
 #include "expr/command.h"
 #include "parser/parser.h"
@@ -16,6 +16,7 @@
 using namespace std;
 using namespace CVC4;
 using namespace CVC4::parser;
+using namespace CVC4::options;
 using namespace CVC4::theory;
 
 int main(int argc, char* argv[]) 
@@ -26,7 +27,7 @@ int main(int argc, char* argv[])
 
   // Create the expression manager
   Options options;
-  options.inputLanguage = language::input::LANG_SMTLIB_V2;
+  options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
   ExprManager exprManager(options);
   
   cout << Expr::setlanguage(language::output::LANG_SMTLIB_V2) << Expr::setdepth(-1);
diff --git a/examples/nra-translate/smt2info.cpp b/examples/nra-translate/smt2info.cpp
index a789bb8d9..b14f8fa8f 100644
--- a/examples/nra-translate/smt2info.cpp
+++ b/examples/nra-translate/smt2info.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 
 
-#include "util/options.h"
+#include "options/options.h"
 #include "expr/expr.h"
 #include "expr/command.h"
 #include "parser/parser.h"
@@ -14,6 +14,7 @@
 using namespace std;
 using namespace CVC4;
 using namespace CVC4::parser;
+using namespace CVC4::options;
 
 unsigned compute_degree(ExprManager& exprManager, const Expr& term) {
   unsigned n = term.getNumChildren();    
@@ -60,7 +61,7 @@ int main(int argc, char* argv[])
 
     // Create the expression manager
     Options options;
-    options.inputLanguage = language::input::LANG_SMTLIB_V2;
+    options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
     ExprManager exprManager(options);
   
     // Create the parser
diff --git a/examples/nra-translate/smt2todreal.cpp b/examples/nra-translate/smt2todreal.cpp
index 34e28bb75..8bdb27181 100644
--- a/examples/nra-translate/smt2todreal.cpp
+++ b/examples/nra-translate/smt2todreal.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <map>
 
-#include "util/options.h"
+#include "options/options.h"
 #include "expr/expr.h"
 #include "expr/command.h"
 #include "parser/parser.h"
@@ -15,6 +15,7 @@
 using namespace std;
 using namespace CVC4;
 using namespace CVC4::parser;
+using namespace CVC4::options;
 
 int main(int argc, char* argv[]) 
 {
@@ -24,8 +25,8 @@ int main(int argc, char* argv[])
 
   // Create the expression manager
   Options options;
-  options.inputLanguage = language::input::LANG_SMTLIB_V2;
-  options.outputLanguage = language::output::LANG_SMTLIB_V2;
+  options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
+  options.set(outputLanguage, language::output::LANG_SMTLIB_V2);
   ExprManager exprManager(options);
 
   cout << Expr::dag(0) << Expr::setdepth(-1);
diff --git a/examples/nra-translate/smt2toisat.cpp b/examples/nra-translate/smt2toisat.cpp
index 1ad56805b..e2b55b4b9 100644
--- a/examples/nra-translate/smt2toisat.cpp
+++ b/examples/nra-translate/smt2toisat.cpp
@@ -6,7 +6,7 @@
 #include <map>
 
 
-#include "util/options.h"
+#include "options/options.h"
 #include "expr/expr.h"
 #include "expr/command.h"
 #include "parser/parser.h"
@@ -16,6 +16,7 @@
 using namespace std;
 using namespace CVC4;
 using namespace CVC4::parser;
+using namespace CVC4::options;
 
 void translate_to_isat(
         string input,
@@ -32,7 +33,7 @@ int main(int argc, char* argv[])
 
   // Create the expression manager
   Options options;
-  options.inputLanguage = language::input::LANG_SMTLIB_V2;
+  options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
   ExprManager exprManager(options);
   
   // Create the parser
diff --git a/examples/nra-translate/smt2tomathematica.cpp b/examples/nra-translate/smt2tomathematica.cpp
index 25bc850ae..9da21b69b 100644
--- a/examples/nra-translate/smt2tomathematica.cpp
+++ b/examples/nra-translate/smt2tomathematica.cpp
@@ -6,7 +6,7 @@
 #include <map>
 
 
-#include "util/options.h"
+#include "options/options.h"
 #include "expr/expr.h"
 #include "expr/command.h"
 #include "parser/parser.h"
@@ -15,6 +15,7 @@
 using namespace std;
 using namespace CVC4;
 using namespace CVC4::parser;
+using namespace CVC4::options;
 
 void translate_to_mathematica(
         string input,
@@ -31,7 +32,7 @@ int main(int argc, char* argv[])
 
   // Create the expression manager
   Options options;
-  options.inputLanguage = language::input::LANG_SMTLIB_V2;
+  options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
   ExprManager exprManager(options);
   
   // Create the parser
diff --git a/examples/nra-translate/smt2toqepcad.cpp b/examples/nra-translate/smt2toqepcad.cpp
index fe3730382..bed9b42ea 100644
--- a/examples/nra-translate/smt2toqepcad.cpp
+++ b/examples/nra-translate/smt2toqepcad.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 #include <map>
 
-#include "util/options.h"
+#include "options/options.h"
 #include "expr/expr.h"
 #include "expr/command.h"
 #include "parser/parser.h"
@@ -14,6 +14,7 @@
 using namespace std;
 using namespace CVC4;
 using namespace CVC4::parser;
+using namespace CVC4::options;
 
 
 void translate_to_qepcad(
@@ -32,7 +33,7 @@ int main(int argc, char* argv[])
 
   // Create the expression manager
   Options options;
-  options.inputLanguage = language::input::LANG_SMTLIB_V2;
+  options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
   ExprManager exprManager(options);
   
   // Create the parser
diff --git a/examples/nra-translate/smt2toredlog.cpp b/examples/nra-translate/smt2toredlog.cpp
index a7111e595..da34ca4da 100644
--- a/examples/nra-translate/smt2toredlog.cpp
+++ b/examples/nra-translate/smt2toredlog.cpp
@@ -6,7 +6,7 @@
 #include <map>
 
 
-#include "util/options.h"
+#include "options/options.h"
 #include "expr/expr.h"
 #include "expr/command.h"
 #include "parser/parser.h"
@@ -16,6 +16,7 @@
 using namespace std;
 using namespace CVC4;
 using namespace CVC4::parser;
+using namespace CVC4::options;
 
 void translate_to_redlog(
         string input,
@@ -35,7 +36,7 @@ int main(int argc, char* argv[])
 
   // Create the expression manager
   Options options;
-  options.inputLanguage = language::input::LANG_SMTLIB_V2;
+  options.set(inputLanguage, language::input::LANG_SMTLIB_V2);
   ExprManager exprManager(options);
   
   // Create the parser