Using Options in ParserBuilder and InteractiveShell

1 files changed, 12 insertions, 2 deletions

diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h
index 2e0af677e..4e8c06f78 100644
--- a/src/parser/parser_builder.h
+++ b/src/parser/parser_builder.h
@@ -23,8 +23,10 @@
 
 #include <string>
 
-#include "parser/input.h"
-#include "parser/parser_options.h"
+#include "input.h"
+#include "parser_options.h"
+
+#include "util/options.h"
 
 namespace CVC4 {
 
@@ -87,11 +89,16 @@ class CVC4_PUBLIC ParserBuilder {
   /** Should we memory-map a file input? */
   bool d_mmap;
 
+  void init(ExprManager& exprManager, const std::string& filename);
+
 public:
 
   /** Create a parser builder using the given ExprManager and filename. */
   ParserBuilder(ExprManager& exprManager, const std::string& filename);
 
+  ParserBuilder(ExprManager& exprManager, const std::string& filename,
+                const Options& options);
+
   /** Build the parser, using the current settings. */
   Parser *build() throw (InputStreamException,AssertionException);
 
@@ -118,6 +125,9 @@ public:
    * the parser will have a file input. (Default: no) */
   ParserBuilder& withMmap(bool flag = true);
 
+  /** Derive settings from the given options. */
+  ParserBuilder& withOptions(const Options& options);
+
   /** Should the parser use strict mode? (Default: no) */
   ParserBuilder& withStrictMode(bool flag = true);