diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
commit | 45a138c326da72890bf889a3670aad503ef4aa1e (patch) | |
tree | fa0c9a8497d0b33f78a9f19212152a61392825cc /src/parser/input.cpp | |
parent | 8c0b2d6db32103268f84d89c0d0545c7eb504069 (diff) |
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!
Diffstat (limited to 'src/parser/input.cpp')
-rw-r--r-- | src/parser/input.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/parser/input.cpp b/src/parser/input.cpp index 70c887371..76aa47812 100644 --- a/src/parser/input.cpp +++ b/src/parser/input.cpp @@ -59,25 +59,26 @@ Input* Input::newFileInput(InputLanguage lang, bool useMmap) throw (InputStreamException, AssertionException) { AntlrInputStream *inputStream = - AntlrInputStream::newFileInputStream(filename,useMmap); - return AntlrInput::newInput(lang,*inputStream); + AntlrInputStream::newFileInputStream(filename, useMmap); + return AntlrInput::newInput(lang, *inputStream); } Input* Input::newStreamInput(InputLanguage lang, std::istream& input, - const std::string& name) + const std::string& name, + bool lineBuffered) throw (InputStreamException, AssertionException) { AntlrInputStream *inputStream = - AntlrInputStream::newStreamInputStream(input,name); - return AntlrInput::newInput(lang,*inputStream); + AntlrInputStream::newStreamInputStream(input, name, lineBuffered); + return AntlrInput::newInput(lang, *inputStream); } Input* Input::newStringInput(InputLanguage lang, const std::string& str, const std::string& name) throw (InputStreamException, AssertionException) { - AntlrInputStream *inputStream = AntlrInputStream::newStringInputStream(str,name); - return AntlrInput::newInput(lang,*inputStream); + AntlrInputStream *inputStream = AntlrInputStream::newStringInputStream(str, name); + return AntlrInput::newInput(lang, *inputStream); } }/* CVC4::parser namespace */ |