diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-17 21:24:26 -0400 |
---|---|---|
committer | lianah <lianahady@gmail.com> | 2014-06-19 18:24:40 -0400 |
commit | 51726016b8733d2cd50a1834e841253e69a0b27a (patch) | |
tree | 75cb6df35bed7f713ea9c23688b970f80dd93027 /src/util | |
parent | 17be4f1e005b233e75c37acad3aadba45fd780dd (diff) |
Java bindings fixes.
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/Makefile.am | 1 | ||||
-rw-r--r-- | src/util/emptyset.i | 17 | ||||
-rw-r--r-- | src/util/predicate.h | 2 | ||||
-rw-r--r-- | src/util/predicate.i | 2 |
4 files changed, 20 insertions, 2 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 9122f9ddb..5cf5da1e0 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -148,6 +148,7 @@ EXTRA_DIST = \ language.i \ array.i \ array_store_all.i \ + emptyset.i \ ascription_type.i \ rational.i \ hash.i \ diff --git a/src/util/emptyset.i b/src/util/emptyset.i new file mode 100644 index 000000000..ce4f3a4b7 --- /dev/null +++ b/src/util/emptyset.i @@ -0,0 +1,17 @@ +%{ +#include "util/emptyset.h" +%} + +%rename(equals) CVC4::EmptySet::operator==(const EmptySet&) const; +%ignore CVC4::EmptySet::operator!=(const EmptySet&) const; + +%rename(less) CVC4::EmptySet::operator<(const EmptySet&) const; +%rename(lessEqual) CVC4::EmptySet::operator<=(const EmptySet&) const; +%rename(greater) CVC4::EmptySet::operator>(const EmptySet&) const; +%rename(greaterEqual) CVC4::EmptySet::operator>=(const EmptySet&) const; + +%rename(apply) CVC4::EmptySetHashFunction::operator()(const EmptySet&) const; + +%ignore CVC4::operator<<(std::ostream& out, const EmptySet& es); + +%include "util/emptyset.h" diff --git a/src/util/predicate.h b/src/util/predicate.h index 686e92dc8..5fb3f806a 100644 --- a/src/util/predicate.h +++ b/src/util/predicate.h @@ -52,7 +52,7 @@ public: bool operator==(const Predicate& p) const; - friend std::ostream& operator<<(std::ostream& out, const Predicate& p); + friend std::ostream& CVC4::operator<<(std::ostream& out, const Predicate& p); friend size_t PredicateHashFunction::operator()(const Predicate& p) const; };/* class Predicate */ diff --git a/src/util/predicate.i b/src/util/predicate.i index f29cd16d5..eedbb2e83 100644 --- a/src/util/predicate.i +++ b/src/util/predicate.i @@ -7,6 +7,6 @@ %rename(apply) CVC4::PredicateHashFunction::operator()(const Predicate&) const; -%ignore CVC4::operator<<(std::ostream& out, const Predicate& p); +%ignore CVC4::operator<<(std::ostream&, const Predicate&); %include "util/predicate.h" |