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/expr/node_manager.h | |
| 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/expr/node_manager.h')
| -rw-r--r-- | src/expr/node_manager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h index 0ac215f1e..6adcb62a9 100644 --- a/src/expr/node_manager.h +++ b/src/expr/node_manager.h @@ -11,7 +11,7 @@ ** See the file COPYING in the top-level source directory for licensing ** information.\endverbatim ** - ** \brief A manager for Nodes. + ** \brief A manager for Nodes ** ** A manager for Nodes. ** @@ -48,6 +48,8 @@ class StatisticsRegistry; namespace expr { +class TypeChecker; + // Definition of an attribute for the variable name. // TODO: hide this attribute behind a NodeManager interface. namespace attr { @@ -64,6 +66,7 @@ class NodeManager { template <unsigned nchild_thresh> friend class CVC4::NodeBuilder; friend class NodeManagerScope; friend class expr::NodeValue; + friend class expr::TypeChecker; /** Predicate for use with STL algorithms */ struct NodeValueReferenceCountNonZero { @@ -250,9 +253,6 @@ class NodeManager { // undefined private copy constructor (disallow copy) NodeManager(const NodeManager&) CVC4_UNDEFINED; - TypeNode computeType(TNode n, bool check = false) - throw (TypeCheckingExceptionPrivate, AssertionException); - void init(); public: |