rjb 1.0.4 → 1.0.6

data/ChangeLog

@@ -1,4 +1,6 @@
 Tue Nov 21 arton
+ *rjb.c
+       Skip the constant registering process, if the constant was already defined. 
  *load.c
  *rjb.c
  *rjbexception.c

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006 arton
+ * Copyright(c) 2004,2005,2006,2007 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 8 2006-11-20 19:17:22Z arton $
+ * $Id: rjb.c 15 2007-06-16 18:00:13Z arton $
  */
 
-#define RJB_VERSION "1.0.4"
+#define RJB_VERSION "1.0.6"
 
 #include "ruby.h"
 #include "st.h"
@@ -1241,7 +1241,47 @@ static void setup_methodbase(JNIEnv* jenv, struct cls_constructor* pm,
 	fill_convert(jenv, pm, parama, pcount);
     }
 }
- 
+
+static void register_methodinfo(struct cls_method* newpm, st_table* tbl)
+{
+    struct cls_method* pm;
+    
+    if (st_lookup(tbl, newpm->name, (st_data_t*)&pm))
+    {
+	newpm->next = pm->next;
+	pm->next = newpm;
+    }
+    else
+    {
+	newpm->next = NULL;
+	st_insert(tbl, newpm->name, (VALUE)newpm);
+    }
+}
+
+static struct cls_method* clone_methodinfo(struct cls_method* pm)
+{
+    struct cls_method* result = ALLOC(struct cls_method);
+    memcpy(result, pm, sizeof(struct cls_method));
+    return result;
+}
+
+static void make_alias(const char* jname, char* rname)
+{
+    while (*jname)
+    {
+        if (isupper(*jname))
+        {
+            *rname++ = '_';
+            *rname++ = tolower(*jname++);
+        }
+        else
+        {
+            *rname++ = *jname++;
+        }
+    }
+    *rname = '\0';
+}
+
 static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static_method)
 {
     struct cls_method* result;
@@ -1252,6 +1292,7 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
     jobjectArray parama;
     jobject cls;
     jsize param_count;
+    char* rname;
 
     result = ALLOC(struct cls_method);
     parama = (*jenv)->CallObjectMethod(jenv, m, getParameterTypes);
@@ -1259,12 +1300,13 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
     param_count = (*jenv)->GetArrayLength(jenv, parama);
     rjb_check_exception(jenv, 0);
     setup_methodbase(jenv, &result->basic, parama, param_count);
-
     nm = (*jenv)->CallObjectMethod(jenv, m, method_getName);
     rjb_check_exception(jenv, 0);	    
     jname = (*jenv)->GetStringUTFChars(jenv, nm, NULL);
+    rname = ALLOCA_N(char, strlen(jname) * 2 + 8);
+    make_alias(jname, rname);
     result->name = rb_intern(jname);
-    rjb_release_string(jenv, nm, jname);
+    rjb_release_string(jenv, nm, jname);    
     result->basic.id = (*jenv)->FromReflectedMethod(jenv, m);
     rjb_check_exception(jenv, 0);
     cls = (*jenv)->CallObjectMethod(jenv, m, getReturnType);
@@ -1272,15 +1314,43 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
     setup_j2r(jenv, cls, result, static_method);
     (*jenv)->DeleteLocalRef(jenv, cls);
     result->static_method = static_method;
-    if (st_lookup(tbl, result->name, (st_data_t*)&pm))
+    register_methodinfo(result, tbl);
+    // create method alias
+    pm = NULL;
+    if (strlen(rname) > 3
+        && (*rname == 'g' || *rname == 's') && *(rname + 1) == 'e' && *(rname + 2) == 't')
+    {
+        pm = clone_methodinfo(result);
+        if (*rname == 's') 
+        {
+            if (result->basic.arg_count == 1)
+            {
+                rname += 3;
+                strcat(rname, "=");
+            }
+        }
+        else
+        {
+            rname += 3;
+        }
+        if (*rname == '_') rname++;
+    }
+    else if (strlen(rname) > 2 && result->basic.result_signature == 'Z'
+             && *rname == 'i' && *(rname + 1) == 's')
     {
-	result->next = pm->next;
-	pm->next = result;
+        pm = clone_methodinfo(result);
+        rname += 2;
+        if (*rname == '_') rname++;
+        strcat(rname, "?");
     }
     else
     {
-	result->next = NULL;
-	st_insert(tbl, result->name, (VALUE)result);
+        pm = clone_methodinfo(result);
+    }
+    if (pm)
+    {
+        pm->name = rb_intern(rname);
+        register_methodinfo(pm, tbl);
     }
 }
 
@@ -1406,6 +1476,7 @@ static void load_constants(JNIEnv* jenv, jclass klass, VALUE self, jobjectArray
 	    jvalue jv;
 	    jfieldID jfid;
 	    char sigs[256];
+            char* pname;
 
 	    // constants make define directly in the ruby object
 	    cls = (*jenv)->CallObjectMethod(jenv, f, field_getType);
@@ -1451,21 +1522,22 @@ static void load_constants(JNIEnv* jenv, jclass klass, VALUE self, jobjectArray
 		jv.l = (*jenv)->GetStaticObjectField(jenv, klass, jfid);
 		break;
 	    }
+            pname = (char*)cname; 
 	    if (!isupper(*cname))
 	    {
- 	        char* p = ALLOCA_N(char, strlen(cname) + 1);
-		strcpy(p, cname);
-		*p = toupper(*p);
-		if (isupper(*p)) 
+ 	        pname = ALLOCA_N(char, strlen(cname) + 1);
+		strcpy(pname, cname);
+		*pname = toupper(*pname);
+		if (!isupper(*pname) 
+                    || rb_const_defined(RBASIC(self)->klass, rb_intern(pname))) 
 		{
-	            rb_define_const(RBASIC(self)->klass, p, j2r(jenv, jv));
+	            pname = NULL;
 		}
 	    }
-	    else
+	    if (pname)
 	    {
-	        rb_define_const(RBASIC(self)->klass, cname, j2r(jenv, jv));
+	        rb_define_const(RBASIC(self)->klass, pname, j2r(jenv, jv));
 	    }
-
 	    rjb_release_string(jenv, nm, cname);
 	}
 	(*jenv)->DeleteLocalRef(jenv, f);
@@ -1498,7 +1570,6 @@ static void setup_metadata(JNIEnv* jenv, VALUE self, struct jv_data* ptr, VALUE
     setup_fields(jenv, &ptr->idata.fields, flds);
 
     register_class(self, classname);
-
     load_constants(jenv, ptr->idata.obj, self, flds);
 }
 
@@ -2404,13 +2475,11 @@ static VALUE invoke_by_instance(ID rmid, int argc, VALUE* argv,
 	if (st_lookup(ptr->fields, rb_intern(fname), (st_data_t*)&pf))
 	{
 	    setter(jenv, pf, ptr, *argv);
+            return ret;
         }
-	else
-	{
-	    rb_raise(rb_eRuntimeError, "Fail: unknown field name `%s'", fname);
-	}
+        // fall through for the setter alias name
     }
-    else if (st_lookup(ptr->methods, rmid, (st_data_t*)&pm))
+    if (st_lookup(ptr->methods, rmid, (st_data_t*)&pm))
     {
 	ret = invoke(jenv, pm, ptr, argc, argv, sig);
     }

data/test/test.rb

@@ -1,5 +1,5 @@
 #!/usr/local/env ruby
-# $Id: test.rb 4 2006-09-11 15:21:38Z arton $
+# $Id: test.rb 16 2007-06-16 18:00:49Z arton $
 
 require 'test/unit'
 require 'rjb'
@@ -421,5 +421,19 @@ class TestRjb < Test::Unit::TestCase
       assert(e)
     end
   end
+
+  def test_rubyize
+    loader = Rjb::import('java.lang.ClassLoader')
+    cls = import('java.lang.Class')
+    b = cls.for_name('jp.co.infoseek.hp.arton.rjb.IBase', true, loader.system_class_loader)
+    assert(b.interface?)
+    stringbuffer = Rjb::import('java.lang.StringBuffer')
+    sb = stringbuffer.new('abc')
+    assert_equal(1, sb.index_of('bc'))
+    sb.set_char_at(1, ?B)
+    assert_equal('aBc', sb.to_string)
+    sb.length = 2
+    assert_equal('aB', sb.to_string)
+  end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2007-05-06 00:00:00 +09:00
+  version: 1.0.6
+date: 2007-06-17 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -42,8 +42,8 @@ files:
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
-- test/gctest.rb
 - test/test.rb
+- test/gctest.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