diff options
| author | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-03-30 20:22:33 +0000 |
|---|---|---|
| committer | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-03-30 20:22:33 +0000 |
| commit | 8730e9320a833a9eb0e65074f9988950b7424c0c (patch) | |
| tree | 1cb09404256743e208fece079ba473595e05edcd /src/util | |
| parent | 8c87c05ac56a5f29b2ae1e658f2d7d3b7b588163 (diff) | |
Merging from branches/antlr3 (r246:354)
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/.gitignore | 2 | ||||
| -rw-r--r-- | src/util/options.h | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/util/.gitignore b/src/util/.gitignore new file mode 100644 index 000000000..f39e98071 --- /dev/null +++ b/src/util/.gitignore @@ -0,0 +1,2 @@ +/.deps +/Makefile.in diff --git a/src/util/options.h b/src/util/options.h index b71acd982..8e2d46e99 100644 --- a/src/util/options.h +++ b/src/util/options.h @@ -17,7 +17,9 @@ #define __CVC4__OPTIONS_H #include <iostream> -#include "parser/parser.h" +#include <string> +#include "cvc4_config.h" +#include "parser/parser_options.h" namespace CVC4 { @@ -39,7 +41,7 @@ struct CVC4_PUBLIC Options { int verbosity; /** The input language */ - parser::Parser::InputLanguage lang; + parser::InputLanguage lang; /** Should we exit after parsing? */ bool parseOnly; @@ -56,7 +58,7 @@ struct CVC4_PUBLIC Options { out(0), err(0), verbosity(0), - lang(parser::Parser::LANG_AUTO), + lang(parser::LANG_AUTO), parseOnly(false), semanticChecks(true), memoryMap(false) |