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 | |
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')
-rw-r--r-- | src/theory/arrays/kinds | 8 | ||||
-rw-r--r-- | src/theory/arrays/theory_arrays.h | 6 | ||||
-rw-r--r-- | src/theory/arrays/theory_arrays_type_rules.h | 15 |
3 files changed, 22 insertions, 7 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 diff --git a/src/theory/arrays/theory_arrays.h b/src/theory/arrays/theory_arrays.h index 64fdd8303..fbbda9e44 100644 --- a/src/theory/arrays/theory_arrays.h +++ b/src/theory/arrays/theory_arrays.h @@ -34,14 +34,14 @@ public: TheoryArrays(context::Context* c, OutputChannel& out, Valuation valuation); ~TheoryArrays(); void preRegisterTerm(TNode n) { } - void registerTerm(TNode n) { } + //void registerTerm(TNode n) { } - void presolve() { } + //void presolve() { } void addSharedTerm(TNode t); void notifyEq(TNode lhs, TNode rhs); void check(Effort e); - void propagate(Effort e) { } + //void propagate(Effort e) { } void explain(TNode n) { } Node getValue(TNode n); void shutdown() { } diff --git a/src/theory/arrays/theory_arrays_type_rules.h b/src/theory/arrays/theory_arrays_type_rules.h index 11e8a8443..bd3c8ad67 100644 --- a/src/theory/arrays/theory_arrays_type_rules.h +++ b/src/theory/arrays/theory_arrays_type_rules.h @@ -11,9 +11,9 @@ ** See the file COPYING in the top-level source directory for licensing ** information.\endverbatim ** - ** \brief Theory of arrays. + ** \brief Typing and cardinality rules for the theory of arrays ** - ** Theory of arrays. + ** Typing and cardinality rules for the theory of arrays. **/ #include "cvc4_private.h" @@ -65,6 +65,17 @@ struct ArrayStoreTypeRule { } };/* struct ArrayStoreTypeRule */ +struct CardinalityComputer { + inline static Cardinality computeCardinality(TypeNode type) { + Assert(type.getKind() == kind::ARRAY_TYPE); + + Cardinality indexCard = type[0].getCardinality(); + Cardinality valueCard = type[1].getCardinality(); + + return valueCard ^ indexCard; + } +};/* struct CardinalityComputer */ + }/* CVC4::theory::arrays namespace */ }/* CVC4::theory namespace */ }/* CVC4 namespace */ |