rjb 1.0.11 → 1.1.0

data/ChangeLog

@@ -1,3 +1,21 @@
+Tue Dec 27 Kuwashima
+ *test/Test.java
+ *test/test.rb
+ *ext/depend
+ *ext/load.c
+ *ext/extconf.rb
+ *ext/rjbexception.c
+ *ext/rjb.c
+ *ext/riconv.c
+ 	change for compatibility with Ruby-1.9.0
+Tue Nov 20 arton
+ *rjb.c
+	mark version 1.10.12 for next relase.
+ *load.c
+	omit useless double-quotations from JAVA_HOME, maybe specifies a longpathname (but useless).
+Wed Nov 14 Kuwashima
+ *rjb.c
+ 	add error check to constructor.
 Fri Nov 9 arton
  *test.rb
  *Test.java

data/ext/depend

@@ -1,7 +1,7 @@
-riconv.o : riconv.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h
-rjb.o : rjb.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
-rjbexception.o : rjbexception.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
-load.o : load.c $(hdrdir)/ruby.h $(hdrdir)/config.h $(hdrdir)/defines.h jp_co_infoseek_hp_arton_rjb_RBridge.h
+riconv.o : riconv.c jp_co_infoseek_hp_arton_rjb_RBridge.h
+rjb.o : rjb.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
+rjbexception.o : rjbexception.c jp_co_infoseek_hp_arton_rjb_RBridge.h riconv.h rjb.h
+load.o : load.c jp_co_infoseek_hp_arton_rjb_RBridge.h
 jp_co_infoseek_hp_arton_rjb_RBridge.h : jniwrap.h ../data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 	javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge
 ../data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class : RBridge.java

data/ext/extconf.h

@@ -1,7 +1,9 @@
 #ifndef EXTCONF_H
 #define EXTCONF_H
 #define HAVE_JNI_H 1
+#define HAVE_DL_H 1
 #define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
+#define RJB_RUBY_VERSION_CODE 186
 #endif

data/ext/extconf.rb

@@ -42,11 +42,12 @@ if !javahome.nil?
 end
 
 def create_rjb_makefile
-  if have_header("jni.h")
+  if have_header("jni.h") && have_header("dl.h") || have_header("ruby/dl.h")
     have_func("locale_charset", "iconv.h")
     have_func("nl_langinfo", "langinfo.h")
     have_func("setlocale", "locale.h")
     have_func("getenv")
+    $defs << "-DRJB_RUBY_VERSION_CODE="+RUBY_VERSION.gsub(/\./, '')
     create_header
     create_makefile("rjbcore")
   end

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,21 +1,21 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
-
-#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
- * Method:    call
- * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
-  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
+
+#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
+ * Method:    call
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
+  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/ext/load.c

@@ -12,15 +12,22 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 9 2006-11-20 19:26:14Z arton $
+ * $Id: load.c 43 2007-12-26 18:55:04Z kuwa1 $
  */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include "ruby.h"
+#include "extconf.h"
+#if RJB_RUBY_VERSION_CODE < 190
 #include "intern.h"
 #include "st.h"
 #include "util.h"
+#else
+#include "ruby/intern.h"
+#include "ruby/st.h"
+#include "ruby/util.h"
+#endif
 #include "jniwrap.h"
 #include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
 #include "rjb.h"
@@ -60,22 +67,24 @@
  #define CLASSPATH_SEP ':'
 #endif
 
-typedef void (*GETDEFAULTJAVAVMINITARGS)(void*);
-typedef int (*CREATEJAVAVM)(JavaVM**, void**, void*);
+typedef int (*GETDEFAULTJAVAVMINITARGS)(void*);
+typedef int (*CREATEJAVAVM)(JavaVM**, JNIEnv**, void*);
+
 
 static VALUE jvmdll = Qnil;
-static VALUE GetDefaultJavaVMInitArgs;
-static VALUE CreateJavaVM;
+static VALUE getdefaultjavavminitargsfunc;
+static VALUE createjavavmfunc;
 
 /*
  * not completed, only valid under some circumstances.
  */
-static VALUE load_jvm(char* jvmtype)
+static int load_jvm(char* jvmtype)
 {
     char* libpath;
     char* java_home;
     char* jh;
     VALUE dl;
+    VALUE importer;
 
 #if defined(__APPLE__) && defined(__MACH__)
     jh = "/System/Library/Frameworks/JavaVM.framework";
@@ -84,8 +93,17 @@ static VALUE load_jvm(char* jvmtype)
 #endif
     if (!jh)
     {
-        return Qnil;
+        return 0;
+    }
+#if defined(_WIN32)
+    if (*jh == '"' && *(jh + strlen(jh) - 1) == '"')
+    {
+        char* p = ALLOCA_N(char, strlen(jh) + 1);
+        strcpy(p, jh + 1);
+        *(p + strlen(p) - 1) = '\0';
+        jh = p;
     }
+#endif    
     java_home = ALLOCA_N(char, strlen(jh) + 1);
     strcpy(java_home, jh);
     if (*(java_home + strlen(jh) - 1) == DIRSEPARATOR)
@@ -104,16 +122,24 @@ static VALUE load_jvm(char* jvmtype)
 		       + strlen(ARCH) + strlen(jvmtype) + 1);
     sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
 #endif
+
     rb_require("dl");
-    dl = rb_eval_string("DL");
-    jvmdll = rb_funcall(dl, rb_intern("dlopen"), 1, rb_str_new2(libpath));
-    GetDefaultJavaVMInitArgs = rb_funcall(jvmdll, rb_intern("sym"),
-			  2, rb_str_new2("JNI_GetDefaultJavaVMInitArgs"),
-			     rb_str_new2("0p"));
-    CreateJavaVM = rb_funcall(jvmdll, rb_intern("sym"),
-			      2, rb_str_new2("JNI_CreateJavaVM"),
-			         rb_str_new2("pppp"));
-    return Qtrue;
+    if (!rb_const_defined_at(rb_cObject, rb_intern("DL")))
+    {
+	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
+	return 0;
+    }
+    
+    jvmdll = rb_funcall(rb_const_get(rb_cObject, rb_intern("DL")), rb_intern("dlopen"), 1, rb_str_new2(libpath));
+
+#if RJB_RUBY_VERSION_CODE < 190
+    getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2("JNI_GetDefaultJavaVMInitArgs"), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
+    createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2("JNI_CreateJavaVM"), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
+#else
+    getdefaultjavavminitargsfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2("JNI_GetDefaultJavaVMInitArgs"));
+    createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2("JNI_CreateJavaVM"));
+#endif
+    return 1;
 }
 
 static int load_bridge(JNIEnv* jenv)
@@ -190,17 +216,24 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     int i;
     VALUE optval;
 
-    if (jvmdll == Qnil)
+    if (!RTEST(jvmdll))
     {
-	if (load_jvm(JVM_TYPE) == Qnil)
+	if (!load_jvm(JVM_TYPE))
 	{
 	    return -1;
 	}
     }
 
-    ptr = rb_funcall(GetDefaultJavaVMInitArgs, rb_intern("to_i"), 0);
-    initargs = *(GETDEFAULTJAVAVMINITARGS*)FIX2INT(ptr);
-    initargs(vm_args);
+    if (NIL_P(getdefaultjavavminitargsfunc))
+    {
+	return -1;
+    }
+    initargs = (GETDEFAULTJAVAVMINITARGS)NUM2ULONG(getdefaultjavavminitargsfunc);
+    result = initargs(vm_args);
+    if (0 > result)
+    {
+        return result;
+    }
     len = strlen(userpath);
     if (getenv("CLASSPATH"))
     {
@@ -239,9 +272,12 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     vm_args->nOptions = optlen;
     vm_args->options = options;
     vm_args->ignoreUnrecognized = JNI_TRUE;
-    ptr = rb_funcall(CreateJavaVM, rb_intern("to_i"), 0);
-    createjavavm = *(CREATEJAVAVM*)FIX2INT(ptr);
-    result = createjavavm(&rjb_jvm, (void**)pjenv, vm_args);
+    if (NIL_P(createjavavmfunc))
+    {
+	return -1;
+    }
+    createjavavm = (CREATEJAVAVM)NUM2ULONG(createjavavmfunc);
+    result = createjavavm(&rjb_jvm, pjenv, vm_args);
     if (!result)
     {
 	result = load_bridge(*pjenv);

data/ext/riconv.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.c 37 2007-11-08 17:25:36Z arton $
+ * $Id: riconv.c 45 2007-12-26 20:03:21Z kuwa1 $
  */
 
 #include "ruby.h"
@@ -165,6 +165,7 @@ static void check_kcode()
 
 VALUE exticonv_local_to_utf8(VALUE local_string)
 {
+#if RJB_RUBY_VERSION_CODE < 190
     check_kcode();
     if(RTEST(objIconvR2J))
     {
@@ -174,10 +175,28 @@ VALUE exticonv_local_to_utf8(VALUE local_string)
     {
         return local_string;
     }
+#else
+    VALUE rb_cEncoding, default_external, encoding, ascii8bit;
+    rb_cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
+    default_external = rb_funcall(rb_cEncoding, rb_intern("default_external"), 0);
+    ascii8bit = rb_const_get(rb_cEncoding, rb_intern("ASCII_8BIT"));
+    encoding = rb_funcall(local_string, rb_intern("encoding"), 0);
+
+    if (ascii8bit == encoding && ascii8bit == default_external)
+    {
+	return local_string; //don't know default encoding
+    }
+    else if (encoding == ascii8bit)
+    {
+	local_string = rb_funcall(local_string, rb_intern("force_encoding"), 1, default_external);
+    }
+    return rb_funcall(local_string, rb_intern("encode"), 1, rb_str_new2("utf-8"));
+#endif
 }
 
 VALUE exticonv_utf8_to_local(VALUE utf8_string)
 {
+#if RJB_RUBY_VERSION_CODE < 190
     check_kcode();
     if(RTEST(objIconvR2J))
     {
@@ -187,4 +206,20 @@ VALUE exticonv_utf8_to_local(VALUE utf8_string)
     {
         return utf8_string;
     }
+#else
+    VALUE rb_cEncoding, encoding, ascii8bit;
+    rb_cEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
+    encoding = rb_funcall(rb_cEncoding, rb_intern("default_external"), 0);
+    ascii8bit = rb_const_get(rb_cEncoding, rb_intern("ASCII_8BIT"));
+
+    utf8_string = rb_funcall(utf8_string, rb_intern("force_encoding"), 1, rb_str_new2("utf-8"));
+    if (ascii8bit == encoding)
+    {
+	return utf8_string; //don't know default encoding
+    }
+    else
+    {
+        return rb_funcall(utf8_string, rb_intern("encode"), 1, encoding);
+    }
+#endif
 }

data/ext/riconv.h

@@ -12,12 +12,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.h 29 2007-10-22 08:29:05Z kuwa1 $
+ * $Id: riconv.h 43 2007-12-26 18:55:04Z kuwa1 $
  */
 #ifndef _RICONV_H
 #define _RICONV_H
 
-extern VALUE exticonv_local_to_utf8(VALUE);
-extern VALUE exticonv_utf8_to_local(VALUE);
+
+VALUE exticonv_local_to_utf8(VALUE);
+VALUE exticonv_utf8_to_local(VALUE);
 
 #endif /* _RICONV_H */

data/ext/rjb.c

@@ -12,13 +12,18 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 39 2007-11-08 17:33:57Z arton $
+ * $Id: rjb.c 50 2007-12-28 07:31:33Z arton $
  */
 
-#define RJB_VERSION "1.0.11"
+#define RJB_VERSION "1.1.0"
 
 #include "ruby.h"
+#include "extconf.h"
+#if RJB_RUBY_VERSION_CODE < 190
 #include "st.h"
+#else
+#include "ruby/st.h"
+#endif
 #include "jniwrap.h"
 #include "jp_co_infoseek_hp_arton_rjb_RBridge.h"
 #include "riconv.h"
@@ -273,11 +278,11 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
 
 static VALUE jv2rv(JNIEnv* jenv, jvalue val)
 {
-    if (primitive_conversion == Qfalse)
+    if (RTEST(primitive_conversion))
     {
-        return jv2rv_r(jenv, val);
+        return jv2rv_withprim(jenv, val.l);
     }
-    return jv2rv_withprim(jenv, val.l);
+    return jv2rv_r(jenv, val);
 }
 
 static VALUE jvoid2rv(JNIEnv* jenv, jvalue val)
@@ -426,8 +431,8 @@ static VALUE call_conv(JNIEnv* jenv, jvalue val, size_t sz, void* p, CONV conv,
     char* cp = (char*)p;
     jsize len = (*jenv)->GetArrayLength(jenv, val.l);
     VALUE v = rb_ary_new2(len);
-    VALUE* pv = RARRAY(v)->ptr;
-    RARRAY(v)->len = len;
+    VALUE* pv = RARRAY_PTR(v);
+    RARRAY_LEN(v) = len;
     for (i = 0; i < len; i++)
     {
         *pv++ =conv(jenv, cp);
@@ -526,8 +531,11 @@ static VALUE jv2rv_withprim(JNIEnv* jenv, jobject o)
 {
     jvalue jv;
     int i;
-    jclass klass = (*jenv)->GetObjectClass(jenv, o);
+    jclass klass;
     jv.j = 0;
+    if (!o)
+	rb_raise(rb_eRuntimeError, "Object is NULL");
+    klass = (*jenv)->GetObjectClass(jenv, o);
     for (i = PRM_INT; i < PRM_LAST; i++)
     {
         if ((*jenv)->IsSameObject(jenv, jpcvt[i].klass, klass))
@@ -645,7 +653,7 @@ static void rv2jshort(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
 static void rv2jboolean(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
 {
     if (!release)
-	jv->z = (val == Qnil || val == Qfalse) ? JNI_FALSE : JNI_TRUE;
+	jv->z = (RTEST(val)) ? JNI_TRUE : JNI_FALSE;
 }
 static void rv2jstring(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
 {
@@ -803,8 +811,8 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
 static void check_fixnumarray(VALUE v)
 {
     int i;
-    int len = RARRAY(v)->len;
-    VALUE* p = RARRAY(v)->ptr;
+    int len = RARRAY_LEN(v);
+    VALUE* p = RARRAY_PTR(v);
     // check all fixnum (overflow is permit)
     for (i = 0; i < len; i++)
     {
@@ -820,20 +828,20 @@ static jarray r2barray(JNIEnv* jenv, VALUE v, const char* cls)
     jarray ary = NULL;
     if (TYPE(v) == T_STRING)
     {
-	ary = (*jenv)->NewByteArray(jenv, RSTRING(v)->len);
-	(*jenv)->SetByteArrayRegion(jenv, ary, 0, RSTRING(v)->len,
-				    RSTRING(v)->ptr);
+	ary = (*jenv)->NewByteArray(jenv, RSTRING_LEN(v));
+	(*jenv)->SetByteArrayRegion(jenv, ary, 0, RSTRING_LEN(v),
+				    RSTRING_PTR(v));
     }
     else if (TYPE(v) == T_ARRAY)
     {
 	int i;
 	jbyte* pb;
 	check_fixnumarray(v);
-	ary = (*jenv)->NewByteArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewByteArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetByteArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
-	    *(pb + i) = (jbyte)FIX2ULONG(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jbyte)FIX2ULONG(RARRAY_PTR(v)[i]);
 	}
 	(*jenv)->ReleaseByteArrayElements(jenv, ary, pb, 0);
     }
@@ -852,11 +860,11 @@ static jarray r2carray(JNIEnv* jenv, VALUE v, const char* cls)
 	int i;
 	jchar* pb;
 	check_fixnumarray(v);
-	ary = (*jenv)->NewCharArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewCharArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetCharArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
-	    *(pb + i) = (jchar)FIX2ULONG(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jchar)FIX2ULONG(RARRAY_PTR(v)[i]);
 	}
 	(*jenv)->ReleaseCharArrayElements(jenv, ary, pb, 0);
 	return ary;
@@ -871,11 +879,11 @@ static jarray r2darray(JNIEnv* jenv, VALUE v, const char* cls)
     {
 	int i;
 	jdouble* pb;
-	ary = (*jenv)->NewDoubleArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewDoubleArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetDoubleArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
-	    *(pb + i) = (jdouble)rb_num2dbl(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jdouble)rb_num2dbl(RARRAY_PTR(v)[i]);
 	}
 	(*jenv)->ReleaseDoubleArrayElements(jenv, ary, pb, 0);
 	return ary;
@@ -890,11 +898,11 @@ static jarray r2farray(JNIEnv* jenv, VALUE v, const char* cls)
     {
 	int i;
 	jfloat* pb;
-	ary = (*jenv)->NewFloatArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewFloatArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetFloatArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
-	    *(pb + i) = (jfloat)rb_num2dbl(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jfloat)rb_num2dbl(RARRAY_PTR(v)[i]);
 	}
 	(*jenv)->ReleaseFloatArrayElements(jenv, ary, pb, 0);
 	return ary;
@@ -910,11 +918,11 @@ static jarray r2iarray(JNIEnv* jenv, VALUE v, const char* cls)
 	int i;
 	jint* pb;
 	check_fixnumarray(v);
-	ary = (*jenv)->NewIntArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewIntArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetIntArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
-	    *(pb + i) = (jint)FIX2LONG(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jint)FIX2LONG(RARRAY_PTR(v)[i]);
 	}
 	(*jenv)->ReleaseIntArrayElements(jenv, ary, pb, 0);
 	return ary;
@@ -929,14 +937,14 @@ static jarray r2larray(JNIEnv* jenv, VALUE v, const char* cls)
     {
 	int i;
 	jlong* pb;
-	ary = (*jenv)->NewLongArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewLongArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetLongArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
 #if HAVE_LONG_LONG
-	    *(pb + i) = (jlong)rb_num2ll(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jlong)rb_num2ll(RARRAY_PTR(v)[i]);
 #else
-	    *(pb + i) = (jlong)FIX2LONG(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jlong)FIX2LONG(RARRAY_PTR(v)[i]);
 #endif
 	}
 	(*jenv)->ReleaseLongArrayElements(jenv, ary, pb, 0);
@@ -953,11 +961,11 @@ static jarray r2sarray(JNIEnv* jenv, VALUE v, const char* cls)
 	int i;
 	jshort* pb;
 	check_fixnumarray(v);
-	ary = (*jenv)->NewShortArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewShortArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetShortArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
-	    *(pb + i) = (jshort)FIX2LONG(RARRAY(v)->ptr[i]);
+	    *(pb + i) = (jshort)FIX2LONG(RARRAY_PTR(v)[i]);
 	}
 	(*jenv)->ReleaseShortArrayElements(jenv, ary, pb, 0);
 	return ary;
@@ -972,12 +980,12 @@ static jarray r2boolarray(JNIEnv* jenv, VALUE v, const char* cls)
     {
 	int i;
 	jboolean* pb;
-	ary = (*jenv)->NewBooleanArray(jenv, RARRAY(v)->len);
+	ary = (*jenv)->NewBooleanArray(jenv, RARRAY_LEN(v));
 	pb = (*jenv)->GetBooleanArrayElements(jenv, ary, NULL);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
 	    *(pb + i)
-		= (NIL_P(RARRAY(v)->ptr[i]) || RARRAY(v)->ptr[i] == Qfalse)
+		= (!RTEST(RARRAY_PTR(v)[i]))
 			? JNI_FALSE : JNI_TRUE;
 	}
 	(*jenv)->ReleaseBooleanArrayElements(jenv, ary, pb, 0);
@@ -997,12 +1005,12 @@ static jarray r2objarray(JNIEnv* jenv, VALUE v, const char* cls)
     if (TYPE(v) == T_ARRAY)
     {
 	int i;
-	ary = (*jenv)->NewObjectArray(jenv, RARRAY(v)->len, j_object, NULL);
+	ary = (*jenv)->NewObjectArray(jenv, RARRAY_LEN(v), j_object, NULL);
 	rjb_check_exception(jenv, 0);
-	for (i = 0; i < RARRAY(v)->len; i++)
+	for (i = 0; i < RARRAY_LEN(v); i++)
 	{
 	    jvalue jv;
-	    rv2jobject(jenv, RARRAY(v)->ptr[i], &jv, NULL, 0);
+	    rv2jobject(jenv, RARRAY_PTR(v)[i], &jv, NULL, 0);
 	    (*jenv)->SetObjectArrayElement(jenv, ary, i, jv.l);
 	}
 	return ary;
@@ -1079,12 +1087,12 @@ static void rv2jarray(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
             if (TYPE(val) != T_ARRAY) {
                 rb_raise(rb_eRuntimeError, "array's rank unmatch");
             }
-            ja = (*jenv)->NewObjectArray(jenv, RARRAY(val)->len, j_object, NULL);
+            ja = (*jenv)->NewObjectArray(jenv, RARRAY_LEN(val), j_object, NULL);
             rjb_check_exception(jenv, 0);
-            for (i = 0; i < RARRAY(val)->len; i++)
+            for (i = 0; i < RARRAY_LEN(val); i++)
             {
                 jvalue jv;
-                rv2jarray(jenv, RARRAY(val)->ptr[i], &jv, psig + 1, 0);
+                rv2jarray(jenv, RARRAY_PTR(val)[i], &jv, psig + 1, 0);
                 (*jenv)->SetObjectArrayElement(jenv, ja, i, jv.l);
             }
         }
@@ -1171,7 +1179,7 @@ static J2R get_arrayconv(const char* cname, char* pdepth)
             return jcvt[i].ja2r;
         }
     }
-    return &jarray2rv;
+    return jarray2rv;
 }
 
 static J2R get_j2r(JNIEnv* jenv, jobject cls, char* psig, char* pdepth, char* ppsig, off_t* piv, int static_method)
@@ -1751,7 +1759,7 @@ static int clear_classes(VALUE key, VALUE val, VALUE dummy)
 }
 static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
 {
-    st_foreach(RHASH(rjb_loaded_classes)->tbl, clear_classes, 0);
+    st_foreach(RHASH_TBL(rjb_loaded_classes), clear_classes, 0);
     if (rjb_jvm)
     {
 	(*rjb_jvm)->DestroyJavaVM(rjb_jvm);
@@ -1775,7 +1783,7 @@ static VALUE rjb_s_classes(VALUE self)
  */
 static VALUE rjb_s_set_pconversion(VALUE self, VALUE val)
 {
-    primitive_conversion = (val == Qnil || val == Qfalse) ? Qfalse : Qtrue;
+    primitive_conversion = (RTEST(val)) ? Qtrue : Qfalse;
     return val;
 }
 
@@ -1883,6 +1891,7 @@ static VALUE createinstance(JNIEnv* jenv, int argc, VALUE* argv,
 	R2J pr2j = *(pc->arg_convert + i);
 	pr2j(jenv, argv[i], args + i, psig, 0);
 	psig = next_sig(psig);
+	rjb_check_exception(jenv, 1);
     }
     obj = (*jenv)->NewObjectA(jenv, org->obj, pc->id, args);
     if (!obj)
@@ -1965,9 +1974,9 @@ static int check_rtype(JNIEnv* jenv, VALUE v, char* p)
     switch (TYPE(v))
     {
     case T_FIXNUM:
-        return (int)strchr("BCDFIJS", *p);
+        return strchr("BCDFIJS", *p) != NULL;
     case T_FLOAT:
-	return (int)strchr("DF", *p);
+	return strchr("DF", *p) != NULL;
     case T_STRING:
       return pcls && !strcmp("java.lang.String", pcls);
     case T_TRUE:
@@ -2164,7 +2173,7 @@ static void register_class(VALUE self, VALUE clsname)
     /*
      * the hash was frozen, so it need to call st_ func directly.
      */
-    st_insert(RHASH(rjb_loaded_classes)->tbl, clsname, self);
+    st_insert(RHASH_TBL(rjb_loaded_classes), clsname, self);
 }
 
 /*
@@ -2754,10 +2763,10 @@ JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
     jvalue j;
     memset(&j, 0, sizeof(j));
 
-    for (i = 0; i < RARRAY(proxies)->len; i++)
+    for (i = 0; i < RARRAY_LEN(proxies); i++)
     {
 	struct rj_bridge* ptr;
-	VALUE val = RARRAY(proxies)->ptr[i];
+	VALUE val = RARRAY_PTR(proxies)[i];
 	Data_Get_Struct(val, struct rj_bridge, ptr);
 	if ((*jenv)->IsSameObject(jenv, proxy, ptr->proxy))
 	{

data/ext/rjb.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.h 8 2006-11-20 19:17:22Z arton $
+ * $Id: rjb.h 47 2007-12-28 06:39:43Z arton $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision
@@ -23,6 +23,12 @@
 #ifndef RJB_H
 #define RJB_H
 
+#if RJB_RUBY_VERSION_CODE < 190
+#if !defined(RHASH_TBL)
+#define RHASH_TBL(x) RHASH((x))->tbl
+#endif
+#endif
+
 #if !defined(COUNTOF)
 #define COUNTOF(x) (sizeof(x)/sizeof(x[0]))
 #endif
@@ -34,6 +40,7 @@
 #define _I64_MAX      9223372036854775807i64
 #endif
 
+
 /* in load.c */
 extern int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs*, char*, VALUE);
 

data/ext/rjbexception.c

@@ -12,11 +12,16 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 8 2006-11-20 19:17:22Z arton $
+ * $Id: rjbexception.c 47 2007-12-28 06:39:43Z arton $
  */
 
 #include "ruby.h"
+#include "extconf.h"
+#if RJB_RUBY_VERSION_CODE < 190
 #include "st.h"
+#else
+#include "ruby/st.h"
+#endif
 #include "jniwrap.h"
 #include "riconv.h"
 #include "rjb.h"
@@ -49,7 +54,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
     if (rexp == Qnil)
     {
 	rexp = rb_define_class(pcls, rb_eStandardError);
-	st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
+	st_insert(RHASH_TBL(rjb_loaded_classes), cname, rexp);
     }
     return rexp;
 }

data/test/test.rb

@@ -1,5 +1,5 @@
 #!/usr/local/env ruby
-# $Id: test.rb 34 2007-11-08 16:52:07Z arton $
+# $Id: test.rb 45 2007-12-26 20:03:21Z kuwa1 $
 
 require 'test/unit'
 require 'rjb'
@@ -47,7 +47,7 @@ class TestRjb < Test::Unit::TestCase
     assert_equal('abcde', str.toString)
     # argument test
     # char
-    assert_equal('abxde', str.replace(?c, ?x))
+    assert_equal('abxde', str.replace("c".sum, "x".sum))
     # string
     assert_equal('abdxe', str.replaceAll('cd', 'dx'))
     # int
@@ -84,12 +84,12 @@ class TestRjb < Test::Unit::TestCase
     # short
     s = @jShort.new_with_sig('S', 1532)
     assert_equal(1532, s.shortValue)
-    c = @jChar.new_with_sig('C', ?A)
-    assert_equal(?A, c.charValue)
+    c = @jChar.new_with_sig('C', "A".sum)
+    assert_equal("A".sum, c.charValue)
   end
 
   def test_array
-    str = @jString.new_with_sig('[C', [?a, ?b, ?c, ?d, ?e, ?c, ?f, ?c, ?g])
+    str = @jString.new_with_sig('[C', ["a".sum, "b".sum, "c".sum, "d".sum, "e".sum, "c".sum, "f".sum, "c".sum, "g".sum])
     assert_equal('abcdecfcg', str.toString)
     # conv string array
     splt = str.split('c')
@@ -102,7 +102,7 @@ class TestRjb < Test::Unit::TestCase
     assert_equal('abcdecfcg', ba)
     # conv char array to array(int)
     ca = str.toCharArray
-    assert_equal([?a, ?b, ?c, ?d, ?e, ?c, ?f, ?c, ?g], ca)
+    assert_equal(["a".sum, "b".sum, "c".sum, "d".sum, "e".sum, "c".sum, "f".sum, "c".sum, "g".sum], ca)
   end
 
   def test_importobj()
@@ -134,40 +134,64 @@ class TestRjb < Test::Unit::TestCase
   end
 
   def test_kjconv()
-    $KCODE = 'euc'
-    euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-    s = @jString.new(euc_kj)
-    assert_equal(s.toString(), euc_kj)
-    $KCODE = 'sjis'
-    sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-    s = @jString.new(sjis_kj)
-    assert_equal(s.toString(), sjis_kj)
-    $KCODE = 'utf8'
-    utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-    s = @jString.new(utf8_kj)
-    assert_equal(s.toString(), utf8_kj)
-    $KCODE = 'none'
-    if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
-      #expecting shift_jis on windows
-      none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+    if Object::const_defined?(:Encoding)
+      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8".force_encoding "euc-jp"
+      s = @jString.new(euc_kj)
+      assert_equal(s.toString().encoding, Encoding::UTF_8)
+      assert_equal(s.toString().encode("euc-jp"), euc_kj)
+      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67".force_encoding "shift_jis"
+      s = @jString.new(sjis_kj)
+      assert_equal(s.toString().encode("shift_jis"), sjis_kj)
+      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding "utf-8"
+      s = @jString.new(utf8_kj.encode("utf-8"))
+      assert_equal(s.toString(), utf8_kj)
+      if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
+	#expecting shift_jis on windows
+	none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67" #.force_encoding "shift_jis"
+        s = @jString.new(none_kj)
+        assert_equal(s.toString().encode("shift_jis"), none_kj)
+      else
+	#expecting utf-8 unless windows
+	none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88".force_encoding "utf-8"
+        s = @jString.new(none_kj)
+        assert_equal(s.toString(), none_kj)
+      end
     else
-      #expecting utf-8 unless windows
-      none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+      $KCODE = 'euc'
+      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+      s = @jString.new(euc_kj)
+      assert_equal(s.toString(), euc_kj)
+      $KCODE = 'sjis'
+      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+      s = @jString.new(sjis_kj)
+      assert_equal(s.toString(), sjis_kj)
+      $KCODE = 'utf8'
+      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+      s = @jString.new(utf8_kj)
+      assert_equal(s.toString(), utf8_kj)
+      $KCODE = 'none'
+      if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
+	#expecting shift_jis on windows
+	none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+      else
+	#expecting utf-8 unless windows
+	none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+      end
+      s = @jString.new(none_kj)
+      assert_equal(s.toString(), none_kj)
+      $KCODE = 'utf8'
+      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+      s = @jString.new(utf8_kj)
+      assert_equal(s.toString(), utf8_kj)
+      $KCODE = 'sjis'
+      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+      s = @jString.new(sjis_kj)
+      assert_equal(s.toString(), sjis_kj)
+      $KCODE = 'euc'
+      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+      s = @jString.new(euc_kj)
+      assert_equal(s.toString(), euc_kj)
     end
-    s = @jString.new(none_kj)
-    assert_equal(s.toString(), none_kj)
-    $KCODE = 'utf8'
-    utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-    s = @jString.new(utf8_kj)
-    assert_equal(s.toString(), utf8_kj)
-    $KCODE = 'sjis'
-    sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-    s = @jString.new(sjis_kj)
-    assert_equal(s.toString(), sjis_kj)
-    $KCODE = 'euc'
-    euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-    s = @jString.new(euc_kj)
-    assert_equal(s.toString(), euc_kj)
   end
 
   def test_constants()
@@ -451,7 +475,7 @@ class TestRjb < Test::Unit::TestCase
     stringbuffer = Rjb::import('java.lang.StringBuffer')
     sb = stringbuffer.new('abc')
     assert_equal(1, sb.index_of('bc'))
-    sb.set_char_at(1, ?B)
+    sb.set_char_at(1, "B".sum)
     assert_equal('aBc', sb.to_string)
     sb.length = 2
     assert_equal('aB', sb.to_string)
@@ -472,7 +496,7 @@ class TestRjb < Test::Unit::TestCase
     assert_equal(-6, @jByte.valueOf('-6'))
     assert_equal(0x7000000000000000, @jLong.valueOf('8070450532247928832'))
     assert_equal(-9223372036854775807, @jLong.valueOf('-9223372036854775807'))
-    assert_equal(?A, @jChar.valueOf(?A))
+    assert_equal("A".sum, @jChar.valueOf("A".sum))
   end
 
   def test_obj_to_primitive
@@ -486,7 +510,7 @@ class TestRjb < Test::Unit::TestCase
     a.add @jBoolean.TRUE
     a.add @jByte.valueOf('5')
     a.add @jLong.valueOf('8070450532247928832')
-    a.add @jChar.valueOf(?A)
+    a.add @jChar.valueOf("A".sum)
 
     Rjb::primitive_conversion = true
 
@@ -498,7 +522,7 @@ class TestRjb < Test::Unit::TestCase
     assert a.get(5)
     assert_equal 5, a.get(6)
     assert_equal 8070450532247928832, a.get(7)
-    assert_equal ?A, a.get(8)
+    assert_equal "A".sum, a.get(8)
   end
 
   def test_primitive_to_obj
@@ -514,7 +538,7 @@ class TestRjb < Test::Unit::TestCase
     a.add @jBoolean.TRUE
     a.add @jByte.valueOf('5')
     a.add @jLong.valueOf('8070450532247928832')
-    a.add @jChar.valueOf(?A)
+    a.add @jChar.valueOf("A".sum)
     assert_equal 'abcdef', a.get(0)
     assert_equal 1, a.get(1)
     assert_equal 2, a.get(2)
@@ -523,7 +547,7 @@ class TestRjb < Test::Unit::TestCase
     assert a.get(5)
     assert_equal 5, a.get(6)
     assert_equal 8070450532247928832, a.get(7)
-    assert_equal ?A, a.get(8)
+    assert_equal "A".sum, a.get(8)
   end
 
   def test_enum

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.0.11
-date: 2007-11-09 00:00:00 +09:00
+  version: 1.1.0
+date: 2007-12-28 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -31,8 +31,8 @@ authors:
 files: 
 - ext/RBridge.java
 - ext/load.c
-- ext/riconv.c
 - ext/rjbexception.c
+- ext/riconv.c
 - ext/rjb.c
 - ext/jniwrap.h
 - ext/rjb.h
@@ -43,13 +43,13 @@ files:
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
-- test/test.rb
 - test/gctest.rb
+- test/test.rb
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - test/jp/co/infoseek/hp/arton/rjb/Base.class
+- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
 - COPYING
 - ChangeLog
 - readme.sj