diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-10-12 20:20:24 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-10-12 20:20:24 +0000 |
commit | 2bc4c351bbf89103577fa9f33ebb395f5d61826a (patch) | |
tree | 37345ddbee75fc7405868afd3de8b7c2ffdd0fdc /src/expr/node_value.h | |
parent | ec320b78deaaf31bdae1b8b048f66cfb1b3a4197 (diff) |
Merge from cc-memout branch. Here are the main points
* Add ContextMemoryAllocator<T> allocator type, conforming to
STL allocator requirements.
* Extend the CDList<> template to take an allocator (defaults
to std::allocator<T>).
* Add a specialized version of the CDList<> template (in
src/context/cdlist_context_memory.h) that allocates a list
in segments, in context memory.
* Add "forward" headers -- cdlist_forward.h, cdmap_forward.h,
and cdset_forward.h. Use these in public headers, and other
places where you don't need the full header (just the
forward-declaration). These types justify their own header
(instead of just forward-declaring yourself), because they
are complex templated types, with default template parameters,
specializations, etc.
* theory_engine.h no longer depends on individual theory headers.
(Instead it forward-declares Theory implementations.) This is
especially important now that theory .cpp files depend on
TheoryEngine (to implement Theory::getValue()). Previously,
any modification to any theory header file required *all*
theories, and the engine, to be completely rebuilt.
* Support memory cleanup for nontrivial CONSTANT kinds. This
resolves an issue with arithmetic where memory leaked for
each distinct Rational or Integer that was wrapped in a Node.
Diffstat (limited to 'src/expr/node_value.h')
-rw-r--r-- | src/expr/node_value.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/expr/node_value.h b/src/expr/node_value.h index bc592b4e5..a42f39e15 100644 --- a/src/expr/node_value.h +++ b/src/expr/node_value.h @@ -46,6 +46,10 @@ class PlusNodeBuilder; class MultNodeBuilder; class NodeManager; +namespace expr { + class NodeValue; +} + namespace kind { namespace metakind { template < ::CVC4::Kind k, bool pool > @@ -53,6 +57,8 @@ namespace kind { struct NodeValueCompare; struct NodeValueConstPrinter; + + void deleteNodeValueConstant(::CVC4::expr::NodeValue* nv); }/* CVC4::kind::metakind namespace */ }/* CVC4::kind namespace */ @@ -110,11 +116,13 @@ class NodeValue { friend class ::CVC4::NodeManager; template <Kind k, bool pool> - friend struct ::CVC4::kind::metakind::NodeValueConstCompare; + friend struct ::CVC4::kind::metakind::NodeValueConstCompare; friend struct ::CVC4::kind::metakind::NodeValueCompare; friend struct ::CVC4::kind::metakind::NodeValueConstPrinter; + friend void ::CVC4::kind::metakind::deleteNodeValueConstant(NodeValue* nv); + void inc(); void dec(); |