From b1fba1729d736fdc4da52eb63e0ce5eec51de819 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Fri, 28 Sep 2012 20:34:00 +0000 Subject: [PATCH] fixes for compatibility (i.e., CVC3) Java bindings --- src/bindings/compat/java/include/cvc3/JniUtils.h | 2 ++ src/bindings/compat/java/src/cvc3/ValidityChecker_impl.cpp | 4 ++-- src/util/language.i | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bindings/compat/java/include/cvc3/JniUtils.h b/src/bindings/compat/java/include/cvc3/JniUtils.h index 45ce4f4ef..567c691fe 100644 --- 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 70171c918..af588a4ff 100644 --- 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 ca8e5012a..9823a9205 100644 --- 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; -- 2.30.2