diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-04-20 05:37:38 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-04-20 05:37:38 +0000 |
commit | 12c1e41862e4b12c3953272416a1edc103d299ee (patch) | |
tree | 9c7d3a044c33ffc3be177e6ca692eb4149add27c /src/expr/declaration_scope.h | |
parent | 08df44e6b61999a14dd24a7a134146694dcb3596 (diff) |
Tuesday end-of-day commit.
Expected performance impact outside of datatypes/CVC parser is
negligible.
* CVC language LAMBDA, functional LET, type LET, precedence fixes,
bitvectors, and arrays, with partial parsing support also for
quantifiers, tuples, subranges, subtypes, and records
* support for complex recursive DATATYPE selectors, e.g.
tree = node(children:ARRAY INT OF tree) | leaf(data:INT)
these are complicated because they have to be left unresolved
at parse time and dealt with in a second pass.
* bugfix for Exprs/Types that occurred when setting them to null
(not Nodes/TypeNodes, just Exprs/Types).
* Cleanup/code review items
Diffstat (limited to 'src/expr/declaration_scope.h')
-rw-r--r-- | src/expr/declaration_scope.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/expr/declaration_scope.h b/src/expr/declaration_scope.h index 17140c850..6d89f5f4e 100644 --- a/src/expr/declaration_scope.h +++ b/src/expr/declaration_scope.h @@ -2,10 +2,10 @@ /*! \file declaration_scope.h ** \verbatim ** Original author: cconway - ** Major contributors: none - ** Minor contributors (to current version): dejan, mdeters + ** Major contributors: mdeters + ** Minor contributors (to current version): none ** This file is part of the CVC4 prototype. - ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) + ** Copyright (c) 2009, 2010, 2011 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing @@ -49,7 +49,7 @@ class CVC4_PUBLIC ScopeException : public Exception { */ class CVC4_PUBLIC DeclarationScope { /** The context manager for the scope maps. */ - context::Context *d_context; + context::Context* d_context; /** A map for expressions. */ context::CDMap<std::string, Expr, StringHashFunction> *d_exprMap; @@ -180,6 +180,9 @@ public: /** Push a scope level. */ void pushScope() throw(); + /** Get the current level of this declaration scope. */ + size_t getLevel() const throw(); + };/* class DeclarationScope */ }/* CVC4 namespace */ |