diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-03-05 08:26:37 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-03-05 08:26:37 +0000 |
commit | 88b52c971b43248e6ceacf1c8140a06427d0418d (patch) | |
tree | 4ee443c898a858fcdd658f3f043e4180eddd8784 /src/smt/smt_engine.h | |
parent | 29cc307cdf2c42bebf4f5615874a864783f47fd0 (diff) |
* public/private code untangled (smt/smt_engine.h no longer #includes
expr/node.h). This removes the warnings we had during compilation,
and heads off a number of potential linking errors due to improper
inlining of private (library-only) stuff in client (out-of-library)
code.
* "configure" now takes some options as part of a "bare-option" build
type (e.g., "./configure debug-coverage" or "./configure production-muzzle").
* split cdo.h, cdlist.h, cdmap.h, and cdset.h from context.h
* split cdlist_black unit test from context_black
* implement CDMap<>.
* give ExprManagers ownership of the context (and have SmtEngine share
that one)
* fix main driver to properly report file-not-found
* fix MemoryMappedInputBuffer class to report reasons for
"errno"-returned system errors
* src/expr/attribute.h: context-dependent attribute kinds now
supported
* test/unit/expr/node_white.h: context-dependent attribute tests
* src/prop/cnf_conversion.h and associated parts of src/util/options.h
and src/main/getopt.cpp: obsolete command-line option, removed.
* src/util/Assert.h: assertions are now somewhat more useful (in debug
builds, anyway) during stack unwinding.
* test/unit/theory/theory_black.h: test context-dependent behavior of
registerTerm() attribute for theories
* src/expr/node_builder.h: formatting, fixes for arithmetic
convenience node builders, check memory allocations
* test/unit/expr/node_builder_black.h: add tessts for addition,
subtraction, unary minus, and multiplication convenience node
builders
* src/expr/attribute.h: more comments
* (various) code formatting, comment cleanup, added throws specifier
to some destructors
* contrib/code-checker: prototype perl script to test (some) code policy
* contrib/indent-settings: command line for GNU indent to indent using
CVC4 style (sort of; this is a work in progress)
* COPYING: legal stuff
* DESIGN_QUESTIONS: obsolete, removed
Diffstat (limited to 'src/smt/smt_engine.h')
-rw-r--r-- | src/smt/smt_engine.h | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/src/smt/smt_engine.h b/src/smt/smt_engine.h index 7495e4100..36cb8746c 100644 --- a/src/smt/smt_engine.h +++ b/src/smt/smt_engine.h @@ -24,9 +24,6 @@ #include "util/result.h" #include "util/model.h" -// FIXME private header in public code -#include "expr/node.h" - // In terms of abstraction, this is below (and provides services to) // ValidityChecker and above (and requires the services of) // PropEngine. @@ -35,7 +32,7 @@ namespace CVC4 { namespace context { class Context; -} +}/* CVC4::context namespace */ class Command; class Options; @@ -44,7 +41,11 @@ class DecisionEngine; namespace prop { class PropEngine; -} +}/* CVC4::prop namespace */ + +namespace smt { + class SmtEnginePrivate; +}/* CVC4::smt namespace */ // TODO: SAT layer (esp. CNF- versus non-clausal solvers under the // hood): use a type parameter and have check() delegate, or subclass @@ -140,18 +141,9 @@ private: /** The propositional engine */ prop::PropEngine* d_propEngine; - /** - * Pre-process an Node. This is expected to be highly-variable, - * with a lot of "source-level configurability" to add multiple - * passes over the Node. TODO: may need to specify a LEVEL of - * preprocessing (certain contexts need more/less ?). - */ - Node preprocess(TNode node); - - /** - * Adds a formula to the current context. - */ - void addFormula(TNode node); + // preprocess() and addFormula() used to be housed here; they are + // now in an SmtEnginePrivate class. See the comment in + // smt_engine.cpp. /** * Full check of consistency in current context. Returns true iff @@ -166,6 +158,8 @@ private: */ Result quickCheck(); + friend class ::CVC4::smt::SmtEnginePrivate; + };/* class SmtEngine */ }/* CVC4 namespace */ |