diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-08-16 01:58:41 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-08-16 01:58:41 +0000 |
| commit | 3e07620deae66ac9efaad3566186462356436011 (patch) | |
| tree | 75d1ff72e44653e1faa0ffdde2d573ab7ccca554 | |
| parent | 8406fd17c82dd3caa5d769d07e2c122e937df688 (diff) | |
fix exceptions and mkConst() in java binding
| -rw-r--r-- | src/expr/expr_manager.i | 22 | ||||
| -rw-r--r-- | src/util/exception.i | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/src/expr/expr_manager.i b/src/expr/expr_manager.i index 960ba8f84..178f00ccd 100644 --- a/src/expr/expr_manager.i +++ b/src/expr/expr_manager.i @@ -19,4 +19,26 @@ %template(mkConst) CVC4::ExprManager::mkConst< CVC4::Rational >; + +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::TypeConstant>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::ArrayStoreAll>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorSize>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::AscriptionType>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorBitOf>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::SubrangeBounds>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorRepeat>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorExtract>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorRotateLeft>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorSignExtend>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorZeroExtend>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVectorRotateRight>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::UninterpretedConstant>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::kind::Kind_t>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::Datatype>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::Rational>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::BitVector>; +%template(mkConst) CVC4::ExprManager::mkConst<CVC4::Predicate>; +%template(mkConst) CVC4::ExprManager::mkConst<std::string>; +%template(mkConst) CVC4::ExprManager::mkConst<bool>; + %include "expr/expr_manager.h" diff --git a/src/util/exception.i b/src/util/exception.i index ab6284633..c5daadec0 100644 --- a/src/util/exception.i +++ b/src/util/exception.i @@ -4,5 +4,6 @@ %ignore CVC4::operator<<(std::ostream&, const Exception&) throw(); %ignore CVC4::Exception::Exception(const char*) throw(); +%typemap(javabase) CVC4::Exception "java.lang.RuntimeException"; %include "util/exception.h" |