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/main/getopt.cpp | |
parent | 8c87c05ac56a5f29b2ae1e658f2d7d3b7b588163 (diff) |
Merging from branches/antlr3 (r246:354)
Diffstat (limited to 'src/main/getopt.cpp')
-rw-r--r-- | src/main/getopt.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/getopt.cpp b/src/main/getopt.cpp index df94ef9ab..ad59e0039 100644 --- a/src/main/getopt.cpp +++ b/src/main/getopt.cpp @@ -30,11 +30,10 @@ #include "util/configuration.h" #include "util/output.h" #include "util/options.h" -#include "parser/parser.h" +#include "parser/parser_options.h" using namespace std; using namespace CVC4; -using namespace CVC4::parser; namespace CVC4 { namespace main { @@ -153,13 +152,13 @@ throw(OptionException) { case 'L': if(!strcmp(optarg, "cvc4") || !strcmp(optarg, "pl")) { - opts->lang = Parser::LANG_CVC4; + opts->lang = parser::LANG_CVC4; break; } else if(!strcmp(optarg, "smtlib") || !strcmp(optarg, "smt")) { - opts->lang = Parser::LANG_SMTLIB; + opts->lang = parser::LANG_SMTLIB; break; } else if(!strcmp(optarg, "auto")) { - opts->lang = Parser::LANG_AUTO; + opts->lang = parser::LANG_AUTO; break; } @@ -187,7 +186,7 @@ throw(OptionException) { // silences CVC4 (except "sat" or "unsat" or "unknown", forces smtlib input) opts->smtcomp_mode = true; opts->verbosity = -1; - opts->lang = Parser::LANG_SMTLIB; + opts->lang = parser::LANG_SMTLIB; break; case PARSE_ONLY: |