diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-06-30 11:12:14 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-06-30 11:12:14 +0000 |
| commit | 4375b60d5df794b2c6193f3892185ea181a0748d (patch) | |
| tree | d346f9dc6bde42c3def6e0aac3b2711418e3d491 /test/unit/expr/attribute_white.h | |
| parent | 4206a75e7a1635d04bb69084404a75670e164b62 (diff) | |
* theory "tree" rewriting implemented and works
* added TheoryArith::preRewrite() to test and demonstrate
the use of pre-rewriting.
* array types and type checking now supported
* array type checking now supported
* theoryOf() dispatching properly to arrays now
* theories now required to implement a (simple) identify()
function that returns a string identifying them for
debugging/user output purposes
* added "builtin" theory to hold all built-in kinds and their
type rules and rewriting (currently only exploding distinct)
* fixed production build failure (regarding NodeSetDepth)
* removed an errant "using namespace std" in util/bitvector.h
(and made associated trivial fixes elsewhere)
* fixes to make unexpected exceptions more verbose in debug builds
* fixes to make multiple, cascading assertion fails simpler
* minor other fixes to comments etc.
Diffstat (limited to 'test/unit/expr/attribute_white.h')
| -rw-r--r-- | test/unit/expr/attribute_white.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/test/unit/expr/attribute_white.h b/test/unit/expr/attribute_white.h index 8afc012ff..c07fb1b09 100644 --- a/test/unit/expr/attribute_white.h +++ b/test/unit/expr/attribute_white.h @@ -26,7 +26,7 @@ #include "expr/node_manager.h" #include "expr/attribute.h" #include "expr/node.h" -#include "theory/theory.h" +#include "theory/theory_engine.h" #include "theory/uf/theory_uf.h" #include "util/Assert.h" @@ -138,8 +138,17 @@ public: TS_ASSERT_DIFFERS(theory::Theory::RegisteredAttr::s_id, TestFlag2cd::s_id); TS_ASSERT_DIFFERS(TestFlag1cd::s_id, TestFlag2cd::s_id); - lastId = attr::LastAttributeId<TNode, false>::s_id; - TS_ASSERT_LESS_THAN(theory::RewriteCache::s_id, lastId); + lastId = attr::LastAttributeId<Node, false>::s_id; + TS_ASSERT_LESS_THAN(theory::PreRewriteCache::s_id, lastId); + TS_ASSERT_LESS_THAN(theory::PostRewriteCache::s_id, lastId); + TS_ASSERT_LESS_THAN(theory::PreRewriteCacheTop::s_id, lastId); + TS_ASSERT_LESS_THAN(theory::PostRewriteCacheTop::s_id, lastId); + TS_ASSERT_DIFFERS(theory::PreRewriteCache::s_id, theory::PostRewriteCache::s_id); + TS_ASSERT_DIFFERS(theory::PreRewriteCache::s_id, theory::PreRewriteCacheTop::s_id); + TS_ASSERT_DIFFERS(theory::PreRewriteCache::s_id, theory::PostRewriteCacheTop::s_id); + TS_ASSERT_DIFFERS(theory::PostRewriteCache::s_id, theory::PreRewriteCacheTop::s_id); + TS_ASSERT_DIFFERS(theory::PostRewriteCache::s_id, theory::PostRewriteCacheTop::s_id); + TS_ASSERT_DIFFERS(theory::PreRewriteCacheTop::s_id, theory::PostRewriteCacheTop::s_id); lastId = attr::LastAttributeId<TypeNode, false>::s_id; TS_ASSERT_LESS_THAN(NodeManager::TypeAttr::s_id, lastId); |