diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-04-25 06:56:14 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-04-25 06:56:14 +0000 |
| commit | cb7363eef352200615e1a0d3729cea8b2c74d265 (patch) | |
| tree | d57f6a9cfab879c1027e7282f63d0fae14fc0153 /src/theory/arrays/kinds | |
| parent | e39882bd8a308711135a1ff644293fd9c46e6433 (diff) | |
Weekend work. The main points:
* Type::getCardinality() returns the cardinality for for all types.
Theories give a cardinality in the their kinds file. For
cardinalities that depend on a type argument, a "cardinality
computer" function is named in the kinds file, which takes a
TypeNode and returns its cardinality.
* There's a bitmap for the set of "active theories" in the
TheoryEngine. Theories become "active" when a term that is owned by
them, or whose type is owned by them, is pre-registered (run CVC4
with --verbose to see theory activation). Non-active theories don't
get any calls for check() or propagate() or anything, and if we're
running in single-theory mode, the shared term manager doesn't have
to get involved. This is really important for get() performance
(which can only skimp on walking the entire sub-DAG only if the
theory doesn't require it AND the shared term manager doesn't
require it).
* TheoryEngine now does not call presolve(), registerTerm(),
notifyRestart(), etc., on a Theory if that theory doesn't declare
that property in its kinds file. To avoid coding errors,
mktheorytraits greps the theory header and gives warnings if:
+ the theory appears to declare one of the functions (check,
propagate, etc.) that isn't listed among its kinds file properties
(but probably should be)
+ the theory appears NOT to declare one of the functions listed in
its kinds file properties
* some bounded token stream work
Diffstat (limited to 'src/theory/arrays/kinds')
| -rw-r--r-- | src/theory/arrays/kinds | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/theory/arrays/kinds b/src/theory/arrays/kinds index 7738f50ca..533145dc2 100644 --- a/src/theory/arrays/kinds +++ b/src/theory/arrays/kinds @@ -6,11 +6,15 @@ theory THEORY_ARRAY ::CVC4::theory::arrays::TheoryArrays "theory/arrays/theory_arrays.h" -properties polite stable-infinite +properties polite stable-infinite +properties check rewriter ::CVC4::theory::arrays::TheoryArraysRewriter "theory/arrays/theory_arrays_rewriter.h" operator ARRAY_TYPE 2 "array type" +cardinality ARRAY_TYPE \ + "::CVC4::theory::arrays::CardinalityComputer::computeCardinality(%TYPE%)" \ + "theory/arrays/theory_arrays_type_rules.h" # select a i is a[i] operator SELECT 2 "array select" @@ -18,4 +22,4 @@ operator SELECT 2 "array select" # store a i e is a[i] <= e operator STORE 3 "array store" -endtheory
\ No newline at end of file +endtheory |