Module: ppl/ppl Branch: master Commit: de88902aff57879b54b8d43957f49d4250f1ba7b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=de88902aff578...

Author: Enea Zaffanella zaffanella@cs.unipr.it Date: Thu Apr 23 19:59:49 2009 +0200

Got rid of (unnecessarily involved) method is_null.

---

...ppl_interface_generator_java_classes_cc_code.m4 | 8 ++++---- interfaces/Java/jni/ppl_java_common.cc | 16 ---------------- interfaces/Java/jni/ppl_java_common.defs.hh | 4 ---- .../Java/parma_polyhedra_library/By_Reference.java | 6 ------ 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 index 1a24c00..7b80eb6 100644 --- a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 +++ b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 @@ -868,7 +868,7 @@ Java_parma_1polyhedra_1library_@1CLASS@_@1WIDEN@_1widening_1assign = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); @CPP_CLASS@* y_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_y)); - if (is_null(env, j_by_ref_int)) + if (j_by_ref_int == NULL) this_ptr->@WIDEN@_widening_assign(*y_ptr); else { jobject j_integer = get_by_reference(env, j_by_ref_int); @@ -892,7 +892,7 @@ Java_parma_1polyhedra_1library_@1CLASS@_widening_1assign = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); @CPP_CLASS@* y_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_y)); - if (is_null(env, j_by_ref_int)) + if (j_by_ref_int == NULL) this_ptr->widening_assign(*y_ptr); else { jobject j_integer = get_by_reference(env, j_by_ref_int); @@ -916,7 +916,7 @@ Java_parma_1polyhedra_1library_@1CLASS@_@1EXTRAPOLATION@_1extrapolation_1assign = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_this)); @CPP_CLASS@* y_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_y)); - if (is_null(env, j_by_ref_int)) + if (j_by_ref_int == NULL) this_ptr->@EXTRAPOLATION@_extrapolation_assign(*y_ptr); else { jobject j_integer = get_by_reference(env, j_by_ref_int); @@ -957,7 +957,7 @@ Java_parma_1polyhedra_1library_@1CLASS@_@1LIMITEDBOUNDED@_1@1WIDENEXPN@_1extrapo @CPP_CLASS@* y_ptr = reinterpret_cast<@CPP_CLASS@*>(get_ptr(env, j_y)); @!CONSTRAINER@_System cs = build_cxx_@CONSTRAINER@_system(env, j_cs); - if (is_null(env, j_by_ref_int)) + if (j_by_ref_int == NULL) this_ptr->@LIMITEDBOUNDED@_@WIDENEXPN@_extrapolation_assign(*y_ptr, cs); else { jobject j_integer = get_by_reference(env, j_by_ref_int); diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc index e36c604..f69ac06 100644 --- a/interfaces/Java/jni/ppl_java_common.cc +++ b/interfaces/Java/jni/ppl_java_common.cc @@ -1173,22 +1173,6 @@ get_pair_element(JNIEnv* env, int arg, jobject j_pair) { } }

-jboolean -is_null(JNIEnv* env, jobject obj) { - jclass by_reference_class - = env->FindClass("parma_polyhedra_library/By_Reference"); - CHECK_RESULT_ASSERT(env, by_reference_class); - jmethodID j_reference_is_null_id - = env->GetStaticMethodID(by_reference_class, - "is_null", - "(Ljava/lang/Object;)Z"); - CHECK_RESULT_ASSERT(env, j_reference_is_null_id); - jboolean ret = env->CallStaticBooleanMethod(by_reference_class, - j_reference_is_null_id, obj); - CHECK_EXCEPTION_ASSERT(env); // CHECK ME: an exception is better here? - return ret; -} - jobject build_java_constraint(JNIEnv* env, const Constraint& c) { jclass j_constraint_class diff --git a/interfaces/Java/jni/ppl_java_common.defs.hh b/interfaces/Java/jni/ppl_java_common.defs.hh index 7969cc6..b0854a8 100644 --- a/interfaces/Java/jni/ppl_java_common.defs.hh +++ b/interfaces/Java/jni/ppl_java_common.defs.hh @@ -444,10 +444,6 @@ set_pair_element(JNIEnv* env, jobject& pair_to_be_set, jobject get_pair_element(JNIEnv* env, int arg, jobject pair);

-//! Returns \c true if and only if \p obj is a null Java reference. -jboolean -is_null(JNIEnv* env, jobject obj); - //! Returns a pointer to the C++ object wrapped by \p ppl_object. void* get_ptr(JNIEnv* env, jobject ppl_object); diff --git a/interfaces/Java/parma_polyhedra_library/By_Reference.java b/interfaces/Java/parma_polyhedra_library/By_Reference.java index dda3f27..17bb4a0 100644 --- a/interfaces/Java/parma_polyhedra_library/By_Reference.java +++ b/interfaces/Java/parma_polyhedra_library/By_Reference.java @@ -43,10 +43,4 @@ public class By_Reference<T> { return obj; }

- // FIXME: this must be moved in another place. - static boolean is_null(java.lang.Object obj) { - if (obj == null) - return true; - return false; - } }