From ce3b3b2c4aebff1cde3e7979c1a0eabb1c8dd695 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Tue, 3 Dec 2013 20:49:39 -0500 Subject: [PATCH] Some fixes for swig warnings. --- src/expr/command.i | 3 +++ src/theory/logic_info.i | 2 ++ src/util/array_store_all.i | 4 ++++ src/util/ascription_type.i | 2 ++ src/util/bitvector.i | 7 +++++++ src/util/predicate.i | 4 ++++ src/util/record.i | 8 ++++++++ src/util/subrange_bound.i | 3 +++ src/util/tuple.i | 6 ++++++ src/util/uninterpreted_constant.i | 4 ++++ 10 files changed, 43 insertions(+) diff --git a/src/expr/command.i b/src/expr/command.i index 76c8fa674..d6cbfe272 100644 --- 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 67eea4e04..ee3652a1e 100644 --- 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 5e8fd7140..aee550314 100644 --- 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 d0b435a4d..fe8856bcc 100644 --- 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 220e284b3..8eb6158ae 100644 --- 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 233da01f9..f29cd16d5 100644 --- 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 368519f5b..0cc1bc579 100644 --- 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 c619b5e31..c12bd11e4 100644 --- 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 f3de7b51b..1498f9289 100644 --- 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 c0bdc5390..9a49f0642 100644 --- 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" -- 2.30.2