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/kind_template.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/kind_template.h')
-rw-r--r-- | src/expr/kind_template.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/expr/kind_template.h b/src/expr/kind_template.h index 932ec31c8..6b9787f6c 100644 --- a/src/expr/kind_template.h +++ b/src/expr/kind_template.h @@ -2,10 +2,10 @@ /*! \file kind_template.h ** \verbatim ** Original author: mdeters - ** Major contributors: none + ** Major contributors: dejan ** 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 @@ -95,7 +95,7 @@ struct KindHashStrategy { * The enumeration for the built-in atomic types. */ enum TypeConstant { - ${type_constant_list} +${type_constant_list} LAST_TYPE };/* enum TypeConstant */ @@ -110,7 +110,7 @@ struct TypeConstantHashStrategy { inline std::ostream& operator<<(std::ostream& out, TypeConstant typeConstant) { switch(typeConstant) { - ${type_constant_descriptions} +${type_constant_descriptions} default: out << "UNKNOWN_TYPE_CONSTANT"; break; @@ -121,13 +121,13 @@ inline std::ostream& operator<<(std::ostream& out, TypeConstant typeConstant) { namespace theory { enum TheoryId { - ${theory_enum} +${theory_enum} THEORY_LAST }; inline std::ostream& operator<<(std::ostream& out, TheoryId theoryId) { switch(theoryId) { - ${theory_descriptions} +${theory_descriptions} default: out << "UNKNOWN_THEORY"; break; @@ -136,18 +136,18 @@ inline std::ostream& operator<<(std::ostream& out, TheoryId theoryId) { } inline TheoryId kindToTheoryId(::CVC4::Kind k) { - switch (k) { - ${kind_to_theory_id} + switch(k) { +${kind_to_theory_id} default: - Unreachable(); + Unhandled(k); } } inline TheoryId typeConstantToTheoryId(::CVC4::TypeConstant typeConstant) { - switch (typeConstant) { - ${type_constant_to_theory_id} + switch(typeConstant) { +${type_constant_to_theory_id} default: - Unreachable(); + Unhandled(typeConstant); } } |