diff options
| author | Morgan Deters <mdeters@gmail.com> | 2012-11-17 04:05:17 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2012-11-17 04:05:17 +0000 |
| commit | 44498017455cce207bf9cb0a1ebbf67c4a4d77cf (patch) | |
| tree | 18f0bf80ea93cfd1f0e49cf38b7f0baf2d457285 /src/expr | |
| parent | db35c4be8bd37746e1c27e446291c82556df1d05 (diff) | |
* Fix for bug 445 agreed to in meeting 11/13/2012: always dump in ALL_SUPPORTED logic
* Java bindings fixes: fixed access to ostreams, iterators
* Make SmtEngine::setUserAttribute() (and others) take a const string&
* Also a few compliance fixes
(this commit was certified error- and warning-free by the test-and-commit script.)
Diffstat (limited to 'src/expr')
| -rw-r--r-- | src/expr/Makefile.am | 3 | ||||
| -rw-r--r-- | src/expr/command.i | 2 | ||||
| -rw-r--r-- | src/expr/expr_manager.i | 2 | ||||
| -rw-r--r-- | src/expr/variable_type_map.i | 8 |
4 files changed, 14 insertions, 1 deletions
diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index b581e8919..0f3a95cdc 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -66,7 +66,8 @@ EXTRA_DIST = \ command.i \ type.i \ kind.i \ - expr.i + expr.i \ + variable_type_map.i BUILT_SOURCES = \ kind.h \ diff --git a/src/expr/command.i b/src/expr/command.i index a4bf5473e..09e54fec0 100644 --- a/src/expr/command.i +++ b/src/expr/command.i @@ -6,6 +6,8 @@ %ignore CVC4::operator<<(std::ostream&, const Command*) throw(); %ignore CVC4::operator<<(std::ostream&, BenchmarkStatus status) throw(); +%ignore CVC4::GetProofCommand; + %rename(beginConst) CVC4::CommandSequence::begin() const throw(); %rename(endConst) CVC4::CommandSequence::end() const throw(); diff --git a/src/expr/expr_manager.i b/src/expr/expr_manager.i index 0d82c7aa8..a386af5ee 100644 --- a/src/expr/expr_manager.i +++ b/src/expr/expr_manager.i @@ -15,6 +15,8 @@ %ignore CVC4::ExprManager::mkExpr(Expr, const std::vector<Expr>&); #endif /* SWIGOCAML */ +%ignore CVC4::stats::getStatisticsRegistry(ExprManager*); + %include "expr/expr_manager.h" %template(mkConst) CVC4::ExprManager::mkConst<CVC4::TypeConstant>; diff --git a/src/expr/variable_type_map.i b/src/expr/variable_type_map.i new file mode 100644 index 000000000..a5d50361f --- /dev/null +++ b/src/expr/variable_type_map.i @@ -0,0 +1,8 @@ +%{ +#include "expr/variable_type_map.h" +%} + +%rename(get) CVC4::VariableTypeMap::operator[](Expr); +%rename(get) CVC4::VariableTypeMap::operator[](Type); + +%include "expr/variable_type_map.h" |