Remove public option wrappers (#6716)

This PR gets rid of almost all remaining public option wrappers. It does so by
- making base, main and parser options public such that they can directly be used from the driver and the parser
- moving incremental and the resource limiting options to base
- moving dumping options to main

After this PR, the only option wrapper left is becoming obsolete as well after (the follow-up of) #6697.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
index d96e94d43..eab982013 100644
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -26,8 +26,8 @@
 #include "base/check.h"
 #include "base/output.h"
 #include "expr/kind.h"
+#include "options/base_options.h"
 #include "options/options.h"
-#include "options/options_public.h"
 #include "parser/input.h"
 #include "parser/parser_exception.h"
 #include "smt/command.h"
@@ -900,7 +900,7 @@ std::wstring Parser::processAdHocStringEsc(const std::string& s)
 api::Term Parser::mkStringConstant(const std::string& s)
 {
   if (language::isInputLang_smt2_6(
-          options::getInputLanguage(d_solver->getOptions())))
+          d_solver->getOptions().base.inputLanguage))
   {
     return d_solver->mkString(s, true);
   }