Bindings work (ocaml bindings are now sort of working); also minor cleanup

1 files changed, 16 insertions, 4 deletions

diff --git a/src/util/datatype.i b/src/util/datatype.i
index 23782aa28..34e890214 100644
--- a/src/util/datatype.i
+++ b/src/util/datatype.i
@@ -8,14 +8,26 @@ namespace CVC4 {
 }
 
 %extend std::vector< CVC4::Datatype > {
-  %ignore vector(size_type);
-  %ignore resize(size_type);
+  /* These member functions have slightly different signatures in
+   * different swig language packages.  The underlying issue is that
+   * Datatype::Constructor doesn't have a default constructor */
+  %ignore vector(unsigned int size = 0);// ocaml
+  %ignore set( int i, const CVC4::Datatype &x );// ocaml
+  %ignore to_array();// ocaml
+  %ignore vector(size_type);// java/python
+  %ignore resize(size_type);// java/python
 };
 %template(vectorDatatype) std::vector< CVC4::Datatype >;
 
 %extend std::vector< CVC4::Datatype::Constructor > {
-  %ignore vector(size_type);
-  %ignore resize(size_type);
+  /* These member functions have slightly different signatures in
+   * different swig language packages.  The underlying issue is that
+   * Datatype::Constructor doesn't have a default constructor */
+  %ignore vector(unsigned int size = 0);// ocaml
+  %ignore set( int i, const CVC4::Datatype::Constructor &x );// ocaml
+  %ignore to_array();// ocaml
+  %ignore vector(size_type);// java/python
+  %ignore resize(size_type);// java/python
 };
 %template(vectorDatatypeConstructor) std::vector< CVC4::Datatype::Constructor >;