diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-03-01 14:48:04 +0000 |
| commit | 45a138c326da72890bf889a3670aad503ef4aa1e (patch) | |
| tree | fa0c9a8497d0b33f78a9f19212152a61392825cc /src/theory/arith/kinds | |
| parent | 8c0b2d6db32103268f84d89c0d0545c7eb504069 (diff) | |
Partial merge from kind-backend branch, including Minisat and CNF work to
support incrementality.
Some clean-up work will likely follow, but the CNF/Minisat stuff should be
left pretty much untouched.
Expected performance change negligible; slightly better on memory:
http://church.cims.nyu.edu/regress-results/compare_jobs.php?job_id=3705&reference_id=3697&mode=&category=&p=5
Note that there are crashes, but that these are exhibited in the nightly
regression run too!
Diffstat (limited to 'src/theory/arith/kinds')
| -rw-r--r-- | src/theory/arith/kinds | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/theory/arith/kinds b/src/theory/arith/kinds index bf5ea24c1..95d7d6ed1 100644 --- a/src/theory/arith/kinds +++ b/src/theory/arith/kinds @@ -17,7 +17,9 @@ operator PLUS 2: "arithmetic addition" operator MULT 2: "arithmetic multiplication" operator MINUS 2 "arithmetic binary subtraction operator" operator UMINUS 1 "arithmetic unary negation" -operator DIVISION 2 "arithmetic division" +operator DIVISION 2 "real division" +operator INTS_DIVISION 2 "ints division" +operator INTS_MODULUS 2 "ints modulus" operator POW 2 "arithmetic power" sort REAL_TYPE \ @@ -39,6 +41,19 @@ sort PSEUDOBOOLEAN_TYPE \ "expr/node_manager.h" \ "Pseudoboolean type" +constant SUBRANGE_TYPE \ + ::CVC4::SubrangeBounds \ + ::CVC4::SubrangeBoundsHashStrategy \ + "util/subrange_bound.h" \ + "the type of an integer subrange" +cardinality SUBRANGE_TYPE \ + "::CVC4::theory::arith::SubrangeProperties::computeCardinality(%TYPE%)" \ + "theory/arith/theory_arith_type_rules.h" +well-founded SUBRANGE_TYPE \ + true \ + "::CVC4::theory::arith::SubrangeProperties::mkGroundTerm(%TYPE%)" \ + "theory/arith/theory_arith_type_rules.h" + constant CONST_RATIONAL \ ::CVC4::Rational \ ::CVC4::RationalHashStrategy \ @@ -75,4 +90,7 @@ typerule LEQ ::CVC4::theory::arith::ArithPredicateTypeRule typerule GT ::CVC4::theory::arith::ArithPredicateTypeRule typerule GEQ ::CVC4::theory::arith::ArithPredicateTypeRule +typerule INTS_DIVISION ::CVC4::theory::arith::ArithOperatorTypeRule +typerule INTS_MODULUS ::CVC4::theory::arith::ArithOperatorTypeRule + endtheory |