rjb 1.0.1 → 1.0.2

data/ChangeLog

@@ -1,3 +1,14 @@
+Sun Oct 08 arton (on behalf of richard apodaca)
+ *load.c
+	support AMD64
+	
+Mon Sep 11 arton
+ *test.rb
+	add a test of arguments types are various array.
+ *Test.java
+	add a test of arguments types are various array.
+ *rjb.c
+	accept nil for array parameter.
 Sun Sep 10 arton
  *test.rb
 	add a test of return type is an object wrapped an array

data/ext/jniwrap.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id:$
+ * $Id: jniwrap.h 4 2006-09-11 15:21:38Z arton $
  */
 #ifndef _Included_jniwrap
 #define _Included_jniwrap

data/ext/load.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 14 2006-08-01 13:51:41Z arton $
+ * $Id: load.c 5 2006-10-07 19:51:57Z arton $
  */
 
 #include <stdlib.h>
@@ -45,6 +45,10 @@
    #define ARCH "sparcv9"
  #elif defined(__sparc__)
    #define ARCH "sparc"
+ #elif defined(__amd64__)
+   #define ARCH "amd64"
+   #undef JVM_TYPE
+   #define JVM_TYPE "server"
  #elif defined(i586) || defined(__i386__)
   #define ARCH "i386"
  #endif

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 2 2006-04-11 19:04:40Z arton $
+ * $Id: riconv.c 4 2006-09-11 15:21:38Z arton $
  */
 
 #include "ruby.h"

data/ext/riconv.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: riconv.h 2 2006-04-11 19:04:40Z arton $
+ * $Id: riconv.h 4 2006-09-11 15:21:38Z arton $
  */
 #ifndef _RICONV_H
 #define _RICONV_H

data/ext/rjb.c

@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 15 2006-08-01 13:52:36Z arton $
+ * $Id: rjb.c 4 2006-09-11 15:21:38Z arton $
  */
 
-#define RJB_VERSION "1.0.1"
+#define RJB_VERSION "1.0.2"
 
 #include "ruby.h"
 #include "st.h"
@@ -1033,7 +1033,11 @@ static void rv2jarray(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
     {
         int i;
         jarray ja = NULL;
-        if (*(psig + 1) == '[')
+	if (NIL_P(val))
+	{
+	    // no-op, null for an array
+	}
+        else if (*(psig + 1) == '[')
         {
             if (TYPE(val) != T_ARRAY) {
                 rb_raise(rb_eRuntimeError, "array's rank unmatch");
@@ -1864,7 +1868,7 @@ static int check_rtype(JNIEnv* jenv, VALUE v, char* p)
     case T_OBJECT:
 	// fall down to the next case
     default:
-        if (pcls)
+        if (pcls || *p == '[')
         {
             return 1;
         }

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 2 2006-04-11 19:04:40Z arton $
+ * $Id: rjb.h 4 2006-09-11 15:21:38Z arton $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision

data/ext/rjbexception.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 10 2006-07-16 04:15:47Z arton $
+ * $Id: rjbexception.c 4 2006-09-11 15:21:38Z arton $
  */
 
 #include "ruby.h"

data/test/test.rb

@@ -1,5 +1,5 @@
 #!/usr/local/env ruby
-# $Id:$
+# $Id: test.rb 4 2006-09-11 15:21:38Z arton $
 
 require 'test/unit'
 require 'rjb'
@@ -405,5 +405,11 @@ class TestRjb < Test::Unit::TestCase
     assert_equal(2, a[1][0].intValue)
     assert_equal('Hello World !!', a[1][1].toString)
   end
+
+  def test_CallByNullForArraies()
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    assert_equal(nil, test.callWithArraies(nil, nil, nil, nil, nil, nil,
+                                           nil, nil))
+  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.1
-date: 2006-09-10 00:00:00 +09:00
+  version: 1.0.2
+date: 2006-10-08 00:00:00 +09:00
 summary: Ruby Java bridge
 require_paths: 
 - lib
@@ -30,10 +30,10 @@ authors:
 - arton
 files: 
 - ext/RBridge.java
-- ext/load.c
 - ext/riconv.c
 - ext/rjbexception.c
 - ext/rjb.c
+- ext/load.c
 - ext/jniwrap.h
 - ext/rjb.h
 - ext/riconv.h
@@ -42,13 +42,12 @@ files:
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
-- test/gctest.rb
 - test/test.rb
-- test/jp/co/infoseek/hp/arton/rjb/Base.class
+- test/gctest.rb
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
-- test/jp/co/infoseek/hp/arton/rjb/IBase.class
-- test/jp/co/infoseek/hp/arton/rjb/JTest.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/Base.class
 - COPYING
 - ChangeLog
 - readme.sj