fixes for compatibility (i.e., CVC3) Java bindings

diff --git a/src/bindings/compat/java/include/cvc3/JniUtils.h b/src/bindings/compat/java/include/cvc3/JniUtils.h
index 45ce4f4efe4686be0456e55bceb7d865433f5c28..567c691fe82edc23c3e69f73d2bc32d0f55d10c1 100644 (file)
--- a/src/bindings/compat/java/include/cvc3/JniUtils.h
+++ b/src/bindings/compat/java/include/cvc3/JniUtils.h
@@ -10,6 +10,8 @@
 //#include "hash_map.h"
 //#include "exception.h"
 
+#define DebugAssert(cond, str) assert(cond)
+
 namespace Java_cvc3_JniUtils {
 
   /// Embedding of c++ objects in java objects

diff --git a/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp b/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
index 70171c918067fc70dd6d8d518bcb940e6a57d923..af588a4ff23b58e386dc281d631e2f6c764042a5 100644 (file)
--- a/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
+++ b/src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp
@@ -86,11 +86,11 @@ return toJavaVCopy(env, result);
 
 DEFINITION: Java_cvc3_ValidityChecker_jniAnyType
 jobject m ValidityChecker vc
-Unimplemented();
+assert(false);// Unimplemented
 
 DEFINITION: Java_cvc3_ValidityChecker_jniArrayLiteral
 jobject m ValidityChecker vc c Expr indexVar c Expr bodyExpr
-Unimplemented();
+assert(false);// Unimplemented
 
 DEFINITION: Java_cvc3_ValidityChecker_jniArrayType
 jobject m ValidityChecker vc c Type typeIndex c Type typeData

diff --git a/src/util/language.i b/src/util/language.i
index ca8e5012aa9b3b013e1136cee701ee58347cdfd3..9823a92052c082b576c88416d6d8d187b71efb72 100644 (file)
--- a/src/util/language.i
+++ b/src/util/language.i
@@ -19,14 +19,14 @@ namespace CVC4 {
 %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_V1) CVC4::language::input::LANG_SMTLIB_V1;
 %rename(INPUT_LANG_SMTLIB_V2) CVC4::language::input::LANG_SMTLIB_V2;
 %rename(INPUT_LANG_TPTP) CVC4::language::input::LANG_TPTP;
 %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_V1) CVC4::language::output::LANG_SMTLIB_V1;
 %rename(OUTPUT_LANG_SMTLIB_V2) CVC4::language::output::LANG_SMTLIB_V2;
 %rename(OUTPUT_LANG_TPTP) CVC4::language::output::LANG_TPTP;
 %rename(OUTPUT_LANG_CVC4) CVC4::language::output::LANG_CVC4;