More Java bindings fixes

diff --git a/src/cvc4.i b/src/cvc4.i
index 52c4f4ea7c4009c276a863b851b1786c33a111e2..ec3aa43cb4d9ffc03cdbd8daa23469f314134d31 100644 (file)
--- a/src/cvc4.i
+++ b/src/cvc4.i
@@ -64,6 +64,7 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
 %template(vectorCommandPtr) std::vector< CVC4::Command* >;
 %template(vectorType) std::vector< CVC4::Type >;
 %template(vectorExpr) std::vector< CVC4::Expr >;
+%template(vectorUnsignedInt) std::vector< unsigned int >;
 %template(vectorVectorExpr) std::vector< std::vector< CVC4::Expr > >;
 %template(vectorDatatypeType) std::vector< CVC4::DatatypeType >;
 %template(vectorSExpr) std::vector< CVC4::SExpr >;
@@ -247,10 +248,10 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
 %include "util/rational.i"
 %include "util/exception.i"
 %include "util/language.i"
-%include "options/options.i"
 %include "util/cardinality.i"
 %include "util/bool.i"
 %include "util/sexpr.i"
+%include "options/options.i"
 %include "util/statistics.i"
 %include "util/result.i"
 %include "util/configuration.i"

diff --git a/src/util/regexp.i b/src/util/regexp.i
index 60765391d6c17f16f4346cdbe7771e62cd14aff9..9f9826663d6db32cd23205d647df9b52b4895d84 100644 (file)
--- a/src/util/regexp.i
+++ b/src/util/regexp.i
@@ -30,4 +30,6 @@
 %ignore CVC4::operator<<(std::ostream&, const String&);
 %ignore CVC4::operator<<(std::ostream&, const RegExp&);
 
+%apply int &OUTPUT { int &c };
 %include "util/regexp.h"
+%clear int &c;