Partial merge from kind-backend branch, including Minisat and CNF work to

support incrementality.

Some clean-up work will likely follow, but the CNF/Minisat stuff should be
left pretty much untouched.

Expected performance change negligible; slightly better on memory:
  http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=3705&reference_id=3697&mode=&category=&p=5
Note that there are crashes, but that these are exhibited in the nightly
regression run too!

1 files changed, 5 insertions, 1 deletions

diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h
index ce01d3c53..095769ab5 100644
--- a/src/parser/parser_builder.h
+++ b/src/parser/parser_builder.h
@@ -44,6 +44,7 @@ class Parser;
 class CVC4_PUBLIC ParserBuilder {
   enum InputType {
     FILE_INPUT,
+    LINE_BUFFERED_STREAM_INPUT,
     STREAM_INPUT,
     STRING_INPUT
   };
@@ -90,7 +91,7 @@ public:
                 const Options& options);
 
   /** Build the parser, using the current settings. */
-  Parser *build() throw (InputStreamException,AssertionException);
+  Parser *build() throw (InputStreamException, AssertionException);
 
   /** Should semantic checks be enabled in the parser? (Default: yes) */
   ParserBuilder& withChecks(bool flag = true);
@@ -150,6 +151,9 @@ public:
   /** Set the parser to use the given stream for its input. */
   ParserBuilder& withStreamInput(std::istream& input);
 
+  /** Set the parser to use the given stream for its input. */
+  ParserBuilder& withLineBufferedStreamInput(std::istream& input);
+
   /** Set the parser to use the given string for its input. */
   ParserBuilder& withStringInput(const std::string& input);
 };/* class ParserBuilder */