Some fixes for swig warnings.

diff --git a/src/expr/command.i b/src/expr/command.i
index 76c8fa674bb1a5fb39c7371fda2bcf3ed2fbba16..d6cbfe27213d0a9789577bab20156b87e66bbbe0 100644 (file)
--- a/src/expr/command.i
+++ b/src/expr/command.i
@@ -11,7 +11,10 @@
 
 %ignore CVC4::operator<<(std::ostream&, const Command&) throw();
 %ignore CVC4::operator<<(std::ostream&, const Command*) throw();
+%ignore CVC4::operator<<(std::ostream&, const CommandStatus&) throw();
+%ignore CVC4::operator<<(std::ostream&, const CommandStatus*) throw();
 %ignore CVC4::operator<<(std::ostream&, BenchmarkStatus status) throw();
+%ignore CVC4::operator<<(std::ostream&, CommandPrintSuccess) throw();
 
 %ignore CVC4::GetProofCommand;
 %ignore CVC4::CommandPrintSuccess::Scope;

diff --git a/src/theory/logic_info.i b/src/theory/logic_info.i
index 67eea4e04f20291a7a04f24bbdeb2791028ba0ef..ee3652a1e2f57747e7a021b7b622d02759fc5825 100644 (file)
--- a/src/theory/logic_info.i
+++ b/src/theory/logic_info.i
@@ -12,4 +12,6 @@
 %rename(equals) CVC4::LogicInfo::operator==(const LogicInfo&) const;
 %ignore CVC4::LogicInfo::operator!=(const LogicInfo&) const;
 
+%ignore CVC4::operator<<(std::ostream&, const LogicInfo&);
+
 %include "theory/logic_info.h"

diff --git a/src/util/array_store_all.i b/src/util/array_store_all.i
index 5e8fd71408d1562d17249cccf2a82c4b105f2ddd..aee550314e91e4ef0c09d7cf4567509244fe3c9c 100644 (file)
--- a/src/util/array_store_all.i
+++ b/src/util/array_store_all.i
@@ -9,5 +9,9 @@
 %rename(greater) CVC4::ArrayStoreAll::operator>(const ArrayStoreAll&) const;
 %rename(greaterEqual) CVC4::ArrayStoreAll::operator>=(const ArrayStoreAll&) const;
 
+%rename(apply) CVC4::ArrayStoreAllHashFunction::operator()(const ArrayStoreAll&) const;
+
+%ignore CVC4::operator<<(std::ostream&, const ArrayStoreAll&);
+
 %include "expr/type.i"
 %include "util/array_store_all.h"

diff --git a/src/util/ascription_type.i b/src/util/ascription_type.i
index d0b435a4dbd65aa53c2e02a35c1073c78d16bdba..fe8856bcca55f18386c3fb397fcdb93cdaecec42 100644 (file)
--- a/src/util/ascription_type.i
+++ b/src/util/ascription_type.i
@@ -5,6 +5,8 @@
 %rename(equals) CVC4::AscriptionType::operator==(const AscriptionType&) const;
 %ignore CVC4::AscriptionType::operator!=(const AscriptionType&) const;
 
+%rename(apply) CVC4::AscriptionTypeHashFunction::operator()(const AscriptionType&) const;
+
 %ignore CVC4::operator<<(std::ostream&, AscriptionType);
 
 %include "util/ascription_type.h"

diff --git a/src/util/bitvector.i b/src/util/bitvector.i
index 220e284b3335e7be5a27037bbac1fc914fc381a4..8eb6158aed680ebd0712222277ee8969b67b1670 100644 (file)
--- a/src/util/bitvector.i
+++ b/src/util/bitvector.i
@@ -29,8 +29,15 @@
 %rename(toUnsigned) CVC4::BitVectorSignExtend::operator unsigned() const;
 %rename(toUnsigned) CVC4::BitVectorRotateLeft::operator unsigned() const;
 %rename(toUnsigned) CVC4::BitVectorRotateRight::operator unsigned() const;
+%rename(toUnsigned) CVC4::IntToBitVector::operator unsigned() const;
+
+%rename(apply) CVC4::BitVectorHashFunction::operator()(const BitVector&) const;
+%rename(apply) CVC4::BitVectorExtractHashFunction::operator()(const BitVectorExtract&) const;
+%rename(apply) CVC4::BitVectorBitOfHashFunction::operator()(const BitVectorBitOf&) const;
 
 %ignore CVC4::operator<<(std::ostream&, const BitVector&);
 %ignore CVC4::operator<<(std::ostream&, const BitVectorExtract&);
+%ignore CVC4::operator<<(std::ostream&, const BitVectorBitOf&);
+%ignore CVC4::operator<<(std::ostream&, const IntToBitVector&);
 
 %include "util/bitvector.h"

diff --git a/src/util/predicate.i b/src/util/predicate.i
index 233da01f93af6db5ad6f5cfbccc78147182ee526..f29cd16d528d6b89ebaa58700b302559feaf14fc 100644 (file)
--- a/src/util/predicate.i
+++ b/src/util/predicate.i
@@ -5,4 +5,8 @@
 %rename(equals) CVC4::Predicate::operator==(const Predicate&) const;
 %rename(toExpr) CVC4::Predicate::operator Expr() const;
 
+%rename(apply) CVC4::PredicateHashFunction::operator()(const Predicate&) const;
+
+%ignore CVC4::operator<<(std::ostream& out, const Predicate& p);
+
 %include "util/predicate.h"

diff --git a/src/util/record.i b/src/util/record.i
index 368519f5b2f85d99f4c4b43e2a3f15728ff8fbb8..0cc1bc579d622e045bb378fac1e4e7db3d3338f0 100644 (file)
--- a/src/util/record.i
+++ b/src/util/record.i
@@ -19,6 +19,14 @@
 %ignore CVC4::Record::operator!=(const Record&) const;
 %rename(getField) CVC4::Record::operator[](size_t) const;
 
+%rename(apply) CVC4::RecordHashFunction::operator()(const Record&) const;
+%rename(apply) CVC4::RecordSelectHashFunction::operator()(const RecordSelect&) const;
+%rename(apply) CVC4::RecordUpdateHashFunction::operator()(const RecordUpdate&) const;
+
+%ignore CVC4::operator<<(std::ostream&, const Record&);
+%ignore CVC4::operator<<(std::ostream&, const RecordSelect&);
+%ignore CVC4::operator<<(std::ostream&, const RecordUpdate&);
+
 #ifdef SWIGJAVA
 
 // These Object arrays are always of two elements, the first is a String and the second a

diff --git a/src/util/subrange_bound.i b/src/util/subrange_bound.i
index c619b5e3106b673af420403052e1ca2ab7ed0cde..c12bd11e4b0476630393667aaf2b8e0d6e8dce6c 100644 (file)
--- a/src/util/subrange_bound.i
+++ b/src/util/subrange_bound.i
@@ -16,6 +16,9 @@
 %rename(greater) CVC4::SubrangeBounds::operator>(const SubrangeBounds&) const;
 %rename(greaterEqual) CVC4::SubrangeBounds::operator>=(const SubrangeBounds&) const;
 
+%rename(apply) CVC4::SubrangeBoundsHashFunction::operator()(const SubrangeBounds&) const;
+
 %ignore CVC4::operator<<(std::ostream&, const SubrangeBound&);
+%ignore CVC4::operator<<(std::ostream&, const SubrangeBounds&);
 
 %include "util/subrange_bound.h"

diff --git a/src/util/tuple.i b/src/util/tuple.i
index f3de7b51b55e7827a7468eab8b751a3429cba11c..1498f92891ac24c4ff0ffda03b1ae68c15eea04d 100644 (file)
--- a/src/util/tuple.i
+++ b/src/util/tuple.i
@@ -8,4 +8,10 @@
 %rename(equals) CVC4::TupleUpdate::operator==(const TupleUpdate&) const;
 %ignore CVC4::TupleUpdate::operator!=(const TupleUpdate&) const;
 
+%rename(apply) CVC4::TupleSelectHashFunction::operator()(const TupleSelect&) const;
+%rename(apply) CVC4::TupleUpdateHashFunction::operator()(const TupleUpdate&) const;
+
+%ignore CVC4::operator<<(std::ostream&, const TupleSelect&);
+%ignore CVC4::operator<<(std::ostream&, const TupleUpdate&);
+
 %include "util/tuple.h"

diff --git a/src/util/uninterpreted_constant.i b/src/util/uninterpreted_constant.i
index c0bdc5390e7f2b7ae810f86622e95e377f3f7d22..9a49f0642a72108b5c52a6b5840116e323da696a 100644 (file)
--- a/src/util/uninterpreted_constant.i
+++ b/src/util/uninterpreted_constant.i
@@ -10,4 +10,8 @@
 %rename(equals) CVC4::UninterpretedConstant::operator==(const UninterpretedConstant&) const;
 %ignore CVC4::UninterpretedConstant::operator!=(const UninterpretedConstant&) const;
 
+%rename(apply) CVC4::UninterpretedConstantHashFunction::operator()(const UninterpretedConstant&) const;
+
+%ignore CVC4::operator<<(std::ostream&, const UninterpretedConstant&);
+
 %include "util/uninterpreted_constant.h"