diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-09-02 20:41:08 +0000 |
| commit | 1d18e5ebed9a5b20ed6a8fe21d11842acf6fa7ea (patch) | |
| tree | 7074f04453914bc377ff6aeb307dd17b82b76ff3 /src/main/interactive_shell.cpp | |
| parent | 74770f1071e6102795393cf65dd0c651038db6b4 (diff) | |
Merge from my post-smtcomp branch. Includes:
Dumping infrastructure. Can dump preprocessed queries and clauses. Can
also dump queries (for testing with another solver) to see if any conflicts
are missed, T-propagations are missed, all lemmas are T-valid, etc. For a
full list of options see --dump=help.
CUDD building much cleaner.
Documentation and assertion fixes.
Printer improvements, printing of commands in language-defined way, etc.
Typechecker stuff in expr package now autogenerated, no need to manually
edit the expr package when adding a new theory.
CVC3 compatibility layer (builds as libcompat).
SWIG detection and language binding support (infrastructure).
Support for some Z3 extended commands (like datatypes) in SMT-LIBv2 mode
(when not in compliance mode).
Copyright and file headers regenerated.
Diffstat (limited to 'src/main/interactive_shell.cpp')
| -rw-r--r-- | src/main/interactive_shell.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/main/interactive_shell.cpp b/src/main/interactive_shell.cpp index 707fc0ef3..8f1d54a3a 100644 --- a/src/main/interactive_shell.cpp +++ b/src/main/interactive_shell.cpp @@ -2,8 +2,8 @@ /*! \file interactive_shell.cpp ** \verbatim ** Original author: cconway - ** Major contributors: none - ** Minor contributors (to current version): mdeters + ** Major contributors: mdeters + ** Minor contributors (to current version): none ** This file is part of the CVC4 prototype. ** Copyright (c) 2009, 2010, 2011 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences @@ -237,11 +237,14 @@ Command* InteractiveShell::readCommand() { break; } else { #if HAVE_LIBREADLINE - DeclarationCommand* dcmd = - dynamic_cast<DeclarationCommand*>(cmd); - if(dcmd != NULL) { - const vector<string>& ids = dcmd->getDeclaredSymbols(); - s_declarations.insert(ids.begin(), ids.end()); + if(dynamic_cast<DeclareFunctionCommand*>(cmd) != NULL) { + s_declarations.insert(dynamic_cast<DeclareFunctionCommand*>(cmd)->getSymbol()); + } else if(dynamic_cast<DefineFunctionCommand*>(cmd) != NULL) { + s_declarations.insert(dynamic_cast<DeclareFunctionCommand*>(cmd)->getSymbol()); + } else if(dynamic_cast<DeclareTypeCommand*>(cmd) != NULL) { + s_declarations.insert(dynamic_cast<DeclareFunctionCommand*>(cmd)->getSymbol()); + } else if(dynamic_cast<DefineTypeCommand*>(cmd) != NULL) { + s_declarations.insert(dynamic_cast<DeclareFunctionCommand*>(cmd)->getSymbol()); } #endif /* HAVE_LIBREADLINE */ } |