diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-02-19 20:29:58 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-02-19 20:29:58 +0000 |
| commit | ce0e796ad92f040fb75435bd7880bc28a60b0374 (patch) | |
| tree | 00a390f0347a30978b482cbbb6e074c6dc5a99d2 /src/expr/node_builder.h | |
| parent | 34b455b1d74fdc06dd2f874fa2bc8d73127fbedf (diff) | |
* Attribute infrastructure -- static design. Documentation is coming.
See test/unit/expr/node_white.h for use examples, including how to
define new attribute kinds.
Also:
* fixes to test infrastructure
* minor changes to code formatting throughout
* attribute tests in test/unit/expr/node_white.h
* fixes to NodeManagerScope ordering
* use NodeValue::getKind() to properly deal with UNDEFINED_KIND
(removing compiler warning)
* ExprManager: add proper NodeManagerScope to public-facing member
functions
* store variable names and types in attributes
* SoftNode is a placeholder, not a real implementation
Diffstat (limited to 'src/expr/node_builder.h')
| -rw-r--r-- | src/expr/node_builder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h index 08a879600..093f09a79 100644 --- a/src/expr/node_builder.h +++ b/src/expr/node_builder.h @@ -171,7 +171,7 @@ public: NodeBuilder& operator<<(const Kind& k) { Assert(!d_used, "NodeBuilder is one-shot only; tried to access it after conversion"); - Assert(d_ev->d_kind == UNDEFINED_KIND); + Assert(d_ev->getKind() == UNDEFINED_KIND); d_ev->d_kind = k; return *this; } @@ -563,7 +563,7 @@ inline void NodeBuilder<nchild_thresh>::dealloc() { template <unsigned nchild_thresh> NodeBuilder<nchild_thresh>::operator Node() {// not const Assert(!d_used, "NodeBuilder is one-shot only; tried to access it after conversion"); - Assert(d_ev->d_kind != UNDEFINED_KIND, + Assert(d_ev->getKind() != UNDEFINED_KIND, "Can't make an expression of an undefined kind!"); if(d_ev->d_kind == VARIABLE) { |