considerable bindings interface work, some improvements to build

7 files changed, 40 insertions, 7 deletions

diff --git a/src/util/Assert.i b/src/util/Assert.i
index 11881982b..b43c36520 100644
--- a/src/util/Assert.i
+++ b/src/util/Assert.i
@@ -2,4 +2,7 @@
 #include "util/Assert.h"
 %}
 
+%rename(CVC4IllegalArgumentException) CVC4::IllegalArgumentException;
+%ignore CVC4::InternalErrorException::InternalErrorException(const char*, const char*, unsigned, const char*, ...);
+
 %include "util/Assert.h"
diff --git a/src/util/exception.i b/src/util/exception.i
index d3ff896d2..52ff28922 100644
--- a/src/util/exception.i
+++ b/src/util/exception.i
@@ -3,5 +3,6 @@
 %}
 
 %ignore CVC4::operator<<(std::ostream&, const Exception&);
+%ignore CVC4::Exception::Exception(const char*);
 
 %include "util/exception.h"
diff --git a/src/util/hash.i b/src/util/hash.i
index f2f1e6652..470447fc3 100644
--- a/src/util/hash.i
+++ b/src/util/hash.i
@@ -2,4 +2,6 @@
 #include "util/hash.h"
 %}
 
+%rename(apply) CVC4::StringHashFunction::operator()(const std::string&) const;
+
 %include "util/hash.h"
diff --git a/src/util/language.i b/src/util/language.i
index cd261a73c..28e0eb5ac 100644
--- a/src/util/language.i
+++ b/src/util/language.i
@@ -2,9 +2,33 @@
 #include "util/language.h"
 %}
 
-%import "util/language.h"
+namespace CVC4 {
+  namespace language {
+    namespace input {
+      %ignore operator<<(std::ostream&, Language);
+    }/* CVC4::language::input namespace */
 
-%ignore CVC4::operator<<(std::ostream&, CVC4::language::input::Language);
-%ignore CVC4::operator<<(std::ostream&, CVC4::language::output::Language);
+    namespace output {
+      %ignore operator<<(std::ostream&, Language);
+    }/* CVC4::language::output namespace */
+  }/* CVC4::language namespace */
+}/* CVC4 namespace */
+
+// These clash in the monolithic Java namespace, so we rename them.
+%rename(InputLanguage) CVC4::language::input::Language;
+%rename(OutputLanguage) CVC4::language::output::Language;
+
+%rename(INPUT_LANG_AUTO) CVC4::language::input::LANG_AUTO;
+%rename(INPUT_LANG_SMTLIB) CVC4::language::input::LANG_SMTLIB;
+%rename(INPUT_LANG_SMTLIB_V2) CVC4::language::input::LANG_SMTLIB_V2;
+%rename(INPUT_LANG_CVC4) CVC4::language::input::LANG_CVC4;
+%rename(INPUT_LANG_MAX) CVC4::language::input::LANG_MAX;
+
+%rename(OUTPUT_LANG_AUTO) CVC4::language::output::LANG_AUTO;
+%rename(OUTPUT_LANG_SMTLIB) CVC4::language::output::LANG_SMTLIB;
+%rename(OUTPUT_LANG_SMTLIB_V2) CVC4::language::output::LANG_SMTLIB_V2;
+%rename(OUTPUT_LANG_CVC4) CVC4::language::output::LANG_CVC4;
+%rename(OUTPUT_LANG_AST) CVC4::language::output::LANG_AST;
+%rename(OUTPUT_LANG_MAX) CVC4::language::output::LANG_MAX;
 
 %include "util/language.h"
diff --git a/src/util/options.i b/src/util/options.i
index ad4815a33..9e0caccd6 100644
--- a/src/util/options.i
+++ b/src/util/options.i
@@ -5,5 +5,4 @@
 %ignore CVC4::operator<<(std::ostream&, Options::SimplificationMode);
 %ignore CVC4::operator<<(std::ostream&, Options::ArithPivotRule);
 
-%import "util/exception.h"
 %include "util/options.h"
diff --git a/src/util/output.i b/src/util/output.i
index c2729203a..10653c2f8 100644
--- a/src/util/output.i
+++ b/src/util/output.i
@@ -2,9 +2,13 @@
 #include "util/output.h"
 %}
 
-%import "util/output.h"
-
 %feature("valuewrapper") CVC4::null_streambuf;
 %feature("valuewrapper") std::ostream;
 
+// There are issues with SWIG's attempted wrapping of these variables when
+// it tries to generate the getters and setters.  For now, just ignore them.
+%ignore CVC4::null_sb;
+%ignore CVC4::null_os;
+%ignore CVC4::DumpC::dump_cout;
+
 %include "util/output.h"
diff --git a/src/util/stats.h b/src/util/stats.h
index 7d3e33a6f..42cd73c3d 100644
--- a/src/util/stats.h
+++ b/src/util/stats.h
@@ -212,7 +212,7 @@ public:
     return ss.str();
   }
 
-};/* class DataStat<T> */
+};/* class ReadOnlyDataStat<T> */
 
 
 /**