diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-02-20 17:59:33 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-02-20 17:59:33 +0000 |
commit | 3d2b33d66998261f9369cccc098140f64bc8b417 (patch) | |
tree | 9176ad2684415f8fb95f75a5655e8b17dcdf9793 /src/parser | |
parent | 92155f5e40ed2cf452dc5e2f618e7be6542293e8 (diff) |
portfolio merge
Diffstat (limited to 'src/parser')
-rw-r--r-- | src/parser/parser_builder.cpp | 34 | ||||
-rw-r--r-- | src/parser/parser_builder.h | 2 |
2 files changed, 17 insertions, 19 deletions
diff --git a/src/parser/parser_builder.cpp b/src/parser/parser_builder.cpp index 5c755b5f6..c17956e62 100644 --- a/src/parser/parser_builder.cpp +++ b/src/parser/parser_builder.cpp @@ -28,26 +28,25 @@ #include "util/options.h" namespace CVC4 { - namespace parser { -ParserBuilder::ParserBuilder(ExprManager* exprManager, - const std::string& filename) : +ParserBuilder::ParserBuilder(ExprManager* exprManager, + const std::string& filename) : d_filename(filename), d_exprManager(exprManager) { - init(exprManager,filename); + init(exprManager, filename); } -ParserBuilder::ParserBuilder(ExprManager* exprManager, - const std::string& filename, +ParserBuilder::ParserBuilder(ExprManager* exprManager, + const std::string& filename, const Options& options) : d_filename(filename), d_exprManager(exprManager) { - init(exprManager,filename); + init(exprManager, filename); withOptions(options); } -void ParserBuilder::init(ExprManager* exprManager, +void ParserBuilder::init(ExprManager* exprManager, const std::string& filename) { d_inputType = FILE_INPUT; d_lang = language::input::LANG_AUTO; @@ -60,26 +59,26 @@ void ParserBuilder::init(ExprManager* exprManager, d_parseOnly = false; } -Parser *ParserBuilder::build() - throw (InputStreamException,AssertionException) { - Input *input = NULL; +Parser* ParserBuilder::build() + throw (InputStreamException, AssertionException) { + Input* input = NULL; switch( d_inputType ) { case FILE_INPUT: - input = Input::newFileInput(d_lang,d_filename,d_mmap); + input = Input::newFileInput(d_lang, d_filename, d_mmap); break; case STREAM_INPUT: AlwaysAssert( d_streamInput != NULL, "Uninitialized stream input in ParserBuilder::build()" ); - input = Input::newStreamInput(d_lang,*d_streamInput,d_filename); + input = Input::newStreamInput(d_lang, *d_streamInput, d_filename); break; case STRING_INPUT: - input = Input::newStringInput(d_lang,d_stringInput,d_filename); + input = Input::newStringInput(d_lang, d_stringInput, d_filename); break; default: Unreachable(); } - Parser *parser = NULL; + Parser* parser = NULL; switch(d_lang) { case language::input::LANG_SMTLIB: parser = new Smt(d_exprManager, input, d_strictMode, d_parseOnly); @@ -162,6 +161,5 @@ ParserBuilder& ParserBuilder::withStringInput(const std::string& input) { return *this; } -} /* namespace parser */ - -} /* namespace CVC4 */ +}/* CVC4::parser namespace */ +}/* CVC4 namespace */ diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h index 0463a079f..ce01d3c53 100644 --- a/src/parser/parser_builder.h +++ b/src/parser/parser_builder.h @@ -61,7 +61,7 @@ class CVC4_PUBLIC ParserBuilder { std::string d_stringInput; /** The stream input, if any. */ - std::istream *d_streamInput; + std::istream* d_streamInput; /** The expression manager */ ExprManager* d_exprManager; |