rjb 1.6.0 → 1.6.9

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7d1fbaad6b7b8881cdf6ca256139b8447590c578430e1775255fbc457e44f4aa
4
- data.tar.gz: 5a3e4e5142eb5db86af1b9419f72e5128bb19975926a70c94e078e8553d6ccec
3
+ metadata.gz: db68bd4fe5b0ad8ab33ded261ddfbddac69c2f1713b3be5ccec7c19bf6d504ef
4
+ data.tar.gz: 05cfef71f471a7e181964971cc9efdbf14a6be594957c8f7f2cc79d66abcb634
5
5
  SHA512:
6
- metadata.gz: b4f7b723db8f2ce2415814e6689d26c4f38b221d75903767a9c0434cb0a1da0ba7c6b53fb58fdf7ba8a8861beea02c7cb80079b787f6702d5f03132b6fc09ea1
7
- data.tar.gz: b1724e95cd003cc140c45f42916340bd90c7ce115933a5e83d1a31d3bf91504e2bea714600f7a430e1939083d8e1dbf29fac273eb26d1c4245ec2407cfb39abb
6
+ metadata.gz: d03e67bbe85d5d21ad9368d9956d48e802d2948260f9df551ebf9c3ea5c98753400dfe0446bd0a6fa5711e1f23ce2ed3144e2529c88a6507d8d5ca01fbb91d79
7
+ data.tar.gz: 1811c379afd0cfae646b3fd055399d706e3ee94270c9585f34b0ddbe4c7225694480fce0b390e9762e54292c1d6e8d9073a7deb71e6561b3923b46f79585109b
data/ChangeLog CHANGED
@@ -1,3 +1,69 @@
1
+ Thu Nov 9 2023 arton
2
+ * ext/rjb.c
3
+ RJB_VERSION -> 1.6.9
4
+ * ext/riconv.c
5
+ fix CESU-8 check
6
+ * test/est.rb
7
+ add test_jav_hangul_syllable for checking CESU-8 bug (char start with 0xed)
8
+ Thu Sep 28 2023 chaddow
9
+ #93 fake allocation framework to remove T_DATA warning
10
+ * ext/rjb.c
11
+ call rb_undef_alloc_fund if HAV_RB_DEFINE_ALLOC_FUNC
12
+ Wed Mar 1 2023 mahendrapk
13
+ Fix typo and broken URI
14
+ * README.md
15
+ * readme.txt
16
+ Wed Feb 15 2023 geekontheway
17
+ Fix aarch64 checking exception
18
+ * ext/load.c
19
+ put defined directive on one line
20
+ * ext/rjb.c
21
+ RJB_VERSION -> 1.6.7 (for Gem)
22
+ Mon Dec 26 2022 chaadow
23
+ ruby 3.2 support
24
+ * ext/extconf.rb
25
+ call File.exist? instead of deprecated File.exists?
26
+ * ext/rjb.c
27
+ RJB_VERSION -> 1.6.6 (for Gem)
28
+ Fri Apr 8 2022 arton
29
+ fix #85
30
+ * data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
31
+ Gem rebuild by original binary (build by javac 1.4.2)
32
+ * ext/rjb.c
33
+ RJB_VERSION -> 1.6.5 (not changed any other codes but for Gem)
34
+ Sun Feb 7 2021 arton
35
+ * ext/extconf.rb
36
+ use javah if `javac -version` didn't return the version number (ex. 1.4.2)
37
+ * ext/rjb.c
38
+ RJB_VERSION -> 1.6.4
39
+ Sun Feb 7 2021 arton
40
+ * ext/extconf.rb
41
+ check javac and javah version
42
+ * ext/rjb.c
43
+ RJB_VERSION -> 1.6.3
44
+ Sat Aug 1 2020 arton
45
+ * ext/rjb.c
46
+ RJB_VERSION -> 1.6.2
47
+ * ext/load.c
48
+ support OpenJDK directory structure (without jre)
49
+ * lib/rjb.rb
50
+ change copyright notice
51
+ Wed Jul 17 2019 arton
52
+ * ext/rjb.c
53
+ RJB_VERSION -> 1.6.1
54
+ * lib/rjb.rb
55
+ java_methods and methods return symbol
56
+ implements respond_to? for Java methods
57
+ * ext/rbjexception.c
58
+ delegate to JavaProxy for respond_to? (except for to_str and exception)
59
+ * test/test.rb
60
+ change java_methods test to adjust above change
61
+ add respond_to? test
62
+ Thu Jul 11 2019 arton
63
+ * ext/rjb.c
64
+ RJB_VERSION -> 1.6.0
65
+ * ext/riconv.c
66
+ encode/decode between utf-8 and cesu-8 if char was greater than \uffff
1
67
  Sun Feb 17 2019 lamby / arton
2
68
  * ext/rjb.c
3
69
  RJB_VERSION -> 1.5.9
data/ext/extconf.h CHANGED
@@ -4,5 +4,5 @@
4
4
  #define HAVE_NL_LANGINFO 1
5
5
  #define HAVE_SETLOCALE 1
6
6
  #define HAVE_GETENV 1
7
- #define RJB_RUBY_VERSION_CODE 270
7
+ #define RJB_RUBY_VERSION_CODE 322
8
8
  #endif
data/ext/extconf.rb CHANGED
@@ -40,7 +40,7 @@ unless javahome.nil?
40
40
  raise "JAVA_HOME is not directory." unless File.directory?(javahome)
41
41
  pt = Path.new
42
42
  inc = pt.include(javahome, 'include')
43
- if !File.exists?(inc) && RUBY_PLATFORM =~ /darwin/
43
+ if !File.exist?(inc) && RUBY_PLATFORM =~ /darwin/
44
44
  inc = pt.include('/System/Library/Frameworks/JavaVM.framework', 'Headers')
45
45
  end
46
46
  Dir.open(inc).each do |d|
@@ -76,10 +76,19 @@ when /cygwin/, /mingw/
76
76
  $defs << '-DNONAMELESSUNION'
77
77
  end
78
78
 
79
+ JAVAH_COMMAND = 'javac -h . -classpath ../data/rjb RBridge.java'.freeze
80
+
79
81
  if find_executable('javah')
80
- javah = 'javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge'
82
+ cversion = (`javac -version` =~ /\d+\.\d+\.\d+/ ) ? $& : nil
83
+ hversion = (`javah -version` =~ /\d+\.\d+\.\d+/ ) ? $& : nil
84
+ if cversion == hversion || cversion.nil?
85
+ javah = 'javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge'
86
+ else
87
+ $stderr.puts "warning: javac and javah version unmatch => javah: #{hversion}, javac: #{cversion}"
88
+ javah = JAVAH_COMMAND
89
+ end
81
90
  else
82
- javah = 'javac -h . -classpath ../data/rjb RBridge.java'
91
+ javah = JAVAH_COMMAND
83
92
  end
84
93
  File.open('depend', 'w') do |fout|
85
94
  fout.write ERB.new(IO::read('depend.erb')).result
data/ext/load.c CHANGED
@@ -1,6 +1,6 @@
1
1
  /*
2
2
  * Rjb - Ruby <-> Java Bridge
3
- * Copyright(c) 2004,2005,2006,2009,2010,2011 arton
3
+ * Copyright(c) 2004,2005,2006,2009,2010,2011,2020 arton
4
4
  *
5
5
  * This library is free software; you can redistribute it and/or
6
6
  * modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,11 @@
38
38
  #if defined(_WIN32) || defined(__CYGWIN__)
39
39
  #if defined(__CYGWIN__)
40
40
  #define JVMDLL "%s/jre/bin/%s/jvm.dll"
41
+ #define OPENJDK_JVMDLL "%s/bin/%s/jvm.dll"
41
42
  #define DIRSEPARATOR '/'
42
43
  #else
43
44
  #define JVMDLL "%s\\jre\\bin\\%s\\jvm.dll"
45
+ #define OPENJDK_JVMDLL "%s\\bin\\%s\\jvm.dll"
44
46
  #define DIRSEPARATOR '\\'
45
47
  #if defined(_WIN64)
46
48
  #undef JVM_TYPE
@@ -61,6 +63,7 @@
61
63
  #define JVM_TYPE "j9vm"
62
64
  #elif defined(__hpux)
63
65
  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.sl"
66
+ #define OPENJDK_JVMDLL "%s/lib/%s/libjvm.sl"
64
67
  #define ARCH "PA_RISC"
65
68
  #undef JVM_TYPE
66
69
  #define JVM_TYPE "server"
@@ -79,7 +82,7 @@
79
82
  #define ARCH "i386"
80
83
  #elif defined(__arm__)
81
84
  #define ARCH "arm"
82
- #elif defined(__aarch64__)
85
+ #elif defined(__ARM64_ARCH_8__) || defined(__aarch64__) || defined(__ARMv8__) || defined(__ARMv8_A__)
83
86
  #define ARCH "aarch64"
84
87
  #undef JVM_TYPE
85
88
  #define JVM_TYPE "server"
@@ -88,6 +91,7 @@
88
91
  #include <sys/systeminfo.h>
89
92
  #endif
90
93
  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.so"
94
+ #define OPENJDK_JVMDLL "%s/lib/%s/libjvm.so"
91
95
  #define DIRSEPARATOR '/'
92
96
  #define CLASSPATH_SEP ':'
93
97
  #endif
@@ -123,12 +127,20 @@ static int open_jvm(char* libpath)
123
127
  size_t i;
124
128
  int state;
125
129
 
130
+ if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, rb_str_new2(libpath)) == RUBY_Qfalse)
131
+ {
132
+ if (RTEST(ruby_verbose))
133
+ {
134
+ fprintf(stderr, "Rjb::load try to find but not exist %s\n", libpath);
135
+ }
136
+ return 0;
137
+ }
126
138
  #if defined(RUBINIUS)
127
139
  i = 1;
128
140
  #else
129
141
  i = 0;
130
142
  #endif
131
- for (; i < COUNTOF(DLLibs); i++)
143
+ for (; i < COUNTOF(DLLibs); i++)
132
144
  {
133
145
  state = 0;
134
146
  rb_protect(safe_require, rb_str_new2(DLLibs[i]), &state);
@@ -137,7 +149,7 @@ static int open_jvm(char* libpath)
137
149
  {
138
150
  if (i > 0)
139
151
  {
140
- rb_raise(rb_eRuntimeError, "Constants DL and Fiddle is not defined.");
152
+ rb_raise(rb_eRuntimeError, "Constants DL or Fiddle is not defined.");
141
153
  return 0;
142
154
  }
143
155
  }
@@ -163,8 +175,8 @@ static int open_jvm(char* libpath)
163
175
  }
164
176
  /* get function pointers of JNI */
165
177
  #if RJB_RUBY_VERSION_CODE < 190
166
- getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
167
- createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
178
+ getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
179
+ createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
168
180
  #else
169
181
  getdefaultjavavminitargsfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(GETDEFAULTJVMINITARGS));
170
182
  createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(CREATEJVM));
@@ -184,6 +196,7 @@ static int file_exist(const char* dir, const char* file)
184
196
 
185
197
  /*
186
198
  * not completed, only valid under some circumstances.
199
+ * load priority: OpenJDK -> SunJDK
187
200
  */
188
201
  static int load_jvm(const char* jvmtype)
189
202
  {
@@ -236,26 +249,37 @@ static int load_jvm(const char* jvmtype)
236
249
  *(p + strlen(p) - 1) = '\0';
237
250
  jh = p;
238
251
  }
239
- #endif
252
+ #endif
240
253
  java_home = ALLOCA_N(char, strlen(jh) + 1);
241
254
  strcpy(java_home, jh);
242
255
  if (*(java_home + strlen(jh) - 1) == DIRSEPARATOR)
243
256
  {
244
257
  *(java_home + strlen(jh) - 1) = '\0';
245
258
  }
259
+ #if defined(__APPLE__) && defined(__MACH__)
260
+ libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home) + 1);
261
+ sprintf(libpath, JVMDLL, java_home);
262
+ return open_jvm(libpath);
263
+ #else
246
264
  #if defined(_WIN32) || defined(__CYGWIN__)
247
265
  libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
248
266
  + strlen(jvmtype) + 1);
249
- sprintf(libpath, JVMDLL, java_home, jvmtype);
250
- #elif defined(__APPLE__) && defined(__MACH__)
251
- libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home) + 1);
252
- sprintf(libpath, JVMDLL, java_home);
253
267
  #else /* not Windows / MAC OS-X */
254
268
  libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
255
- + strlen(ARCH) + strlen(jvmtype) + 1);
269
+ + strlen(ARCH) + strlen(jvmtype) + 1);
270
+ #endif
271
+ sprintf(libpath, OPENJDK_JVMDLL, java_home, jvmtype);
272
+ if (open_jvm(libpath))
273
+ {
274
+ return 1;
275
+ }
276
+ #if defined(_WIN32) || defined(__CYGWIN__)
277
+ return 0;
278
+ #else /* not Windows / MAC OS-X */
256
279
  sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
257
280
  #endif
258
281
  return open_jvm(libpath);
282
+ #endif /* __APPLE__ and __MACH */
259
283
  }
260
284
 
261
285
  static int load_bridge(JNIEnv* jenv)
@@ -269,7 +293,7 @@ static int load_bridge(JNIEnv* jenv)
269
293
  VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
270
294
  v = rb_const_get(v, rb_intern("BRIDGE_FILE"));
271
295
  #else
272
- VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")),
296
+ VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")),
273
297
  rb_intern("BRIDGE_FILE"));
274
298
  #endif
275
299
  bridge = StringValuePtr(v);
@@ -352,7 +376,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
352
376
  *(p + strlen(p) - 1) = '\0';
353
377
  libjvm = p;
354
378
  }
355
- #endif
379
+ #endif
356
380
  if (libjvm == NULL || !open_jvm(libjvm))
357
381
  {
358
382
  #if defined(__APPLE__) && defined(__MACH__)
@@ -370,7 +394,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
370
394
  }
371
395
  #endif
372
396
  }
373
-
397
+
374
398
  #if RJB_RUBY_VERSION_CODE < 190 && !defined(RUBINIUS)
375
399
  ruby_errinfo = Qnil;
376
400
  #else
data/ext/riconv.c CHANGED
@@ -14,7 +14,6 @@
14
14
  *
15
15
  * $Id: riconv.c 117 2010-06-04 12:16:25Z arton $
16
16
  */
17
-
18
17
  #include "ruby.h"
19
18
  #include "extconf.h"
20
19
 
@@ -196,12 +195,15 @@ static int contains_auxchar(const unsigned char* p)
196
195
  {
197
196
  while (*p)
198
197
  {
199
- if (*p == 0xed)
198
+ if (*p == 0xed && *(p + 1) && *(p + 1))
200
199
  {
201
200
  #if defined(DEBUG)
202
- printf("find %02x %02x %02x %02x %02x %02x\n", *p, *(p + 1), *(p + 2), *(p + 3), *(p + 4), *(p + 5));
201
+ printf("find %02x %02x %02x %02x %02x %02x\n", *p, *(p + 1), *(p + 2), *(p + 3), *(p + 4), *(p + 5));
203
202
  #endif
204
- return 1;
203
+ if ((*(p + 1) & 0xa0) == 0xa0 && (*(p + 2) & 0xb0) == 0xb0)
204
+ {
205
+ return 1;
206
+ }
205
207
  }
206
208
  switch (*p & 0xe0)
207
209
  {
data/ext/rjb.c CHANGED
@@ -14,7 +14,7 @@
14
14
  *
15
15
  */
16
16
 
17
- #define RJB_VERSION "1.6.0"
17
+ #define RJB_VERSION "1.6.9"
18
18
 
19
19
  #include "ruby.h"
20
20
  #include "extconf.h"
@@ -64,6 +64,10 @@
64
64
  #define IS_RJB_OBJECT(v) (CLASS_INHERITED(rjbi, rb_obj_class(v)) || rb_obj_class(v) == rjb || CLASS_INHERITED(rjbb, rb_obj_class(v)))
65
65
  #define USER_INITIALIZE "@user_initialize"
66
66
 
67
+ #if !defined(HAVE_RB_DEFINE_ALLOC_FUNC)
68
+ static void rb_undef_alloc_func(v) {}
69
+ #endif
70
+
67
71
  static void register_class(VALUE, VALUE);
68
72
  static VALUE import_class(JNIEnv* jenv, jclass, VALUE);
69
73
  static VALUE register_instance(JNIEnv* jenv, VALUE klass, struct jv_data*, jobject);
@@ -102,7 +106,7 @@ static VALUE primitive_conversion = Qfalse;
102
106
  /*
103
107
  * Object cache, never destroyed
104
108
  */
105
- /* method */
109
+ /* method */
106
110
  static jmethodID method_getModifiers;
107
111
  static jmethodID method_getName;
108
112
  static jmethodID getParameterTypes;
@@ -229,7 +233,7 @@ static VALUE jstring2val(JNIEnv* jenv, jstring s)
229
233
  const char* p;
230
234
  VALUE v;
231
235
 
232
- if (s == NULL)
236
+ if (s == NULL)
233
237
  {
234
238
  return Qnil;
235
239
  }
@@ -317,7 +321,7 @@ static VALUE jv2rv_r(JNIEnv* jenv, jvalue val)
317
321
  Data_Get_Struct(v, struct jv_data, ptr);
318
322
  v = register_instance(jenv, v, (struct jv_data*)ptr, val.l);
319
323
  (*jenv)->DeleteLocalRef(jenv, klass);
320
- (*jenv)->DeleteLocalRef(jenv, val.l);
324
+ (*jenv)->DeleteLocalRef(jenv, val.l);
321
325
  return v;
322
326
  }
323
327
 
@@ -357,7 +361,7 @@ static VALUE jfloat2rv(JNIEnv* jenv, jvalue val)
357
361
 
358
362
  static VALUE jint2rv(JNIEnv* jenv, jvalue val)
359
363
  {
360
- return INT2NUM(val.i);
364
+ return INT2NUM(val.i);
361
365
  }
362
366
 
363
367
  static VALUE jlong2rv(JNIEnv* jenv, jvalue val)
@@ -393,13 +397,13 @@ static VALUE ja2r(J2R conv, JNIEnv* jenv, jvalue val, int depth)
393
397
  VALUE v;
394
398
  int i;
395
399
  if (!val.l) return Qnil;
396
- if (depth == 1)
400
+ if (depth == 1)
397
401
  {
398
402
  return conv(jenv, val);
399
403
  }
400
404
  len = (*jenv)->GetArrayLength(jenv, val.l);
401
405
  v = rb_ary_new2(len);
402
- for (i = 0; i < len; i++)
406
+ for (i = 0; i < len; i++)
403
407
  {
404
408
  jvalue wrap;
405
409
  wrap.l = (*jenv)->GetObjectArrayElement(jenv, val.l, i);
@@ -454,7 +458,7 @@ static VALUE la2rv(JNIEnv* jenv, void* p)
454
458
  return LL2NUM(*(jlong*)p);
455
459
  #else
456
460
  return LONG2NUM(*(jlong*)p);
457
- #endif
461
+ #endif
458
462
  }
459
463
 
460
464
  static VALUE sa2rv(JNIEnv* jenv, void* p)
@@ -498,7 +502,7 @@ static VALUE jbytearray2rv(JNIEnv* jenv, jvalue val)
498
502
  static VALUE jchararray2rv(JNIEnv* jenv, jvalue val)
499
503
  {
500
504
  jchar* p = (*jenv)->GetCharArrayElements(jenv, val.l, NULL);
501
- return call_conv(jenv, val, sizeof(jchar), p, ca2rv,
505
+ return call_conv(jenv, val, sizeof(jchar), p, ca2rv,
502
506
  offsetof(struct JNINativeInterface_, ReleaseCharArrayElements));
503
507
  }
504
508
  static VALUE jdoublearray2rv(JNIEnv* jenv, jvalue val)
@@ -557,14 +561,14 @@ static VALUE jbooleanarray2rv(JNIEnv* jenv, jvalue val)
557
561
  */
558
562
  static jprimitive_table jpcvt[] = {
559
563
  { "java/lang/Integer", "intValue", "()I", "(I)V", NULL, 0, 0, jint2rv, },
560
- { "java/lang/Long", "longValue", "()J", "(J)V", NULL, 0, 0, jlong2rv, },
564
+ { "java/lang/Long", "longValue", "()J", "(J)V", NULL, 0, 0, jlong2rv, },
561
565
  { "java/lang/Double", "doubleValue", "()D", "(D)V", NULL, 0, 0, jdouble2rv, },
562
566
  { "java/lang/Boolean", "booleanValue", "()Z", "(Z)Ljava/lang/Boolean;",
563
567
  NULL, 0, 0, jboolean2rv, },
564
568
  { "java/lang/Character", "charValue", "()C", NULL, NULL, 0, 0, jchar2rv, },
565
569
  { "java/lang/Short", "intValue", "()I", NULL, NULL, 0, 0, jint2rv, },
566
570
  { "java/lang/Byte", "intValue", "()I", NULL, NULL, 0, 0, jint2rv, },
567
- { "java/lang/Float", "doubleValue", "()D", NULL, NULL, 0, 0, jdouble2rv, },
571
+ { "java/lang/Float", "doubleValue", "()D", NULL, NULL, 0, 0, jdouble2rv, },
568
572
  };
569
573
 
570
574
  /*
@@ -669,7 +673,7 @@ static void rv2jfloat(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
669
673
  static void rv2jint(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
670
674
  {
671
675
  if (!release)
672
- jv->i = NUM2INT(val);
676
+ jv->i = NUM2INT(val);
673
677
  }
674
678
  static void rv2jlong(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int release)
675
679
  {
@@ -693,7 +697,7 @@ static void rv2jshort(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, int
693
697
  if (release) return;
694
698
  if (TYPE(val) == T_FIXNUM)
695
699
  {
696
- int n = FIX2INT(val);
700
+ int n = FIX2INT(val);
697
701
  if (abs(n) < 0x7fff)
698
702
  {
699
703
  jv->s = (short)n;
@@ -814,7 +818,7 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
814
818
  Data_Get_Struct(val, struct rj_bridge, ptr);
815
819
  jv->l = ptr->proxy;
816
820
  }
817
- else if (CLASS_INHERITED(rjbc, rb_obj_class(val)))
821
+ else if (CLASS_INHERITED(rjbc, rb_obj_class(val)))
818
822
  {
819
823
  struct jv_data* ptr;
820
824
  Data_Get_Struct(val, struct jv_data, ptr);
@@ -836,13 +840,13 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
836
840
  case T_ARRAY:
837
841
  jv->l = r2objarray(jenv, val, "Ljava/lang/Object;");
838
842
  break;
839
- #if HAVE_LONG_LONG
843
+ #if HAVE_LONG_LONG
840
844
  case T_BIGNUM:
841
845
  arg.j = rb_big2ll(val);
842
846
  jv->l = (*jenv)->NewObject(jenv, jpcvt[PRM_LONG].klass,
843
847
  jpcvt[PRM_LONG].ctr_id, arg);
844
848
  break;
845
- #endif
849
+ #endif
846
850
  case T_OBJECT:
847
851
  default:
848
852
  #if defined(DEBUG)
@@ -860,7 +864,7 @@ static void rv2jobject(JNIEnv* jenv, VALUE val, jvalue* jv, const char* psig, in
860
864
  }
861
865
  else
862
866
  {
863
- switch (TYPE(val))
867
+ switch (TYPE(val))
864
868
  {
865
869
  case T_STRING:
866
870
  case T_FLOAT:
@@ -1287,7 +1291,7 @@ static J2R get_j2r(JNIEnv* jenv, jobject cls, char* psig, char* pdepth, char* pp
1287
1291
  const char* cname;
1288
1292
  const char* jname = NULL;
1289
1293
  jstring nm = (*jenv)->CallObjectMethod(jenv, cls, rjb_class_getName);
1290
- rjb_check_exception(jenv, 0);
1294
+ rjb_check_exception(jenv, 0);
1291
1295
  cname = (*jenv)->GetStringUTFChars(jenv, nm, NULL);
1292
1296
 
1293
1297
  if (*cname == '[')
@@ -1391,7 +1395,7 @@ static void setup_methodbase(JNIEnv* jenv, struct cls_constructor* pm,
1391
1395
  static void register_methodinfo(struct cls_method* newpm, st_table* tbl)
1392
1396
  {
1393
1397
  struct cls_method* pm;
1394
-
1398
+
1395
1399
  if (st_lookup(tbl, newpm->name, (st_data_t*)&pm))
1396
1400
  {
1397
1401
  newpm->next = pm->next;
@@ -1434,7 +1438,7 @@ static int make_alias(const char* jname, char* rname)
1434
1438
  static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static_method)
1435
1439
  {
1436
1440
  struct cls_method* result;
1437
- struct cls_method* pm;
1441
+ struct cls_method* pm;
1438
1442
  const char* jname;
1439
1443
  int alias;
1440
1444
  jstring nm;
@@ -1450,12 +1454,12 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
1450
1454
  rjb_check_exception(jenv, 0);
1451
1455
  setup_methodbase(jenv, &result->basic, parama, param_count);
1452
1456
  nm = (*jenv)->CallObjectMethod(jenv, m, method_getName);
1453
- rjb_check_exception(jenv, 0);
1457
+ rjb_check_exception(jenv, 0);
1454
1458
  jname = (*jenv)->GetStringUTFChars(jenv, nm, NULL);
1455
1459
  rname = ALLOCA_N(char, strlen(jname) * 2 + 8);
1456
1460
  alias = make_alias(jname, rname);
1457
1461
  result->name = rb_intern(jname);
1458
- rjb_release_string(jenv, nm, jname);
1462
+ rjb_release_string(jenv, nm, jname);
1459
1463
  result->basic.id = (*jenv)->FromReflectedMethod(jenv, m);
1460
1464
  rjb_check_exception(jenv, 0);
1461
1465
  cls = (*jenv)->CallObjectMethod(jenv, m, getReturnType);
@@ -1470,7 +1474,7 @@ static void create_methodinfo(JNIEnv* jenv, st_table* tbl, jobject m, int static
1470
1474
  && (*rname == 'g' || *rname == 's') && *(rname + 1) == 'e' && *(rname + 2) == 't')
1471
1475
  {
1472
1476
  pm = clone_methodinfo(result);
1473
- if (*rname == 's')
1477
+ if (*rname == 's')
1474
1478
  {
1475
1479
  if (result->basic.arg_count == 1)
1476
1480
  {
@@ -1515,7 +1519,7 @@ static void create_fieldinfo(JNIEnv* jenv, st_table* tbl, jobject f, int readonl
1515
1519
  result = ALLOC(struct cls_field);
1516
1520
  memset(result, 0, sizeof(struct cls_field));
1517
1521
  nm = (*jenv)->CallObjectMethod(jenv, f, field_getName);
1518
- rjb_check_exception(jenv, 0);
1522
+ rjb_check_exception(jenv, 0);
1519
1523
  jname = (*jenv)->GetStringUTFChars(jenv, nm, NULL);
1520
1524
  result->name = rb_intern(jname);
1521
1525
  rjb_release_string(jenv, nm, jname);
@@ -1537,7 +1541,7 @@ static void create_fieldinfo(JNIEnv* jenv, st_table* tbl, jobject f, int readonl
1537
1541
  static void setup_constructors(JNIEnv* jenv, struct cls_constructor*** pptr, jobjectArray methods)
1538
1542
  {
1539
1543
  int i;
1540
- struct cls_constructor* pc;
1544
+ struct cls_constructor* pc;
1541
1545
  jsize mcount = (*jenv)->GetArrayLength(jenv, methods);
1542
1546
  struct cls_constructor** tbl = ALLOC_N(struct cls_constructor*, mcount + 1);
1543
1547
  *pptr = tbl;
@@ -1557,21 +1561,21 @@ static void setup_constructors(JNIEnv* jenv, struct cls_constructor*** pptr, job
1557
1561
  pc->id = (*jenv)->FromReflectedMethod(jenv, c);
1558
1562
  (*jenv)->DeleteLocalRef(jenv, c);
1559
1563
  }
1560
- tbl[mcount] = NULL;
1564
+ tbl[mcount] = NULL;
1561
1565
  }
1562
-
1566
+
1563
1567
  static void setup_methods(JNIEnv* jenv, st_table** tbl, st_table** static_tbl,
1564
1568
  jobjectArray methods)
1565
1569
  {
1566
1570
  int i;
1567
- jint modifier;
1571
+ jint modifier;
1568
1572
  jsize mcount = (*jenv)->GetArrayLength(jenv, methods);
1569
1573
  *tbl = st_init_numtable_with_size(mcount);
1570
1574
  *static_tbl = st_init_numtable();
1571
1575
  for (i = 0; i < mcount; i++)
1572
1576
  {
1573
1577
  jobject m = (*jenv)->GetObjectArrayElement(jenv, methods, i);
1574
- rjb_check_exception(jenv, 0);
1578
+ rjb_check_exception(jenv, 0);
1575
1579
  modifier = (*jenv)->CallIntMethod(jenv, m, method_getModifiers);
1576
1580
  if (!(modifier & ACC_STATIC))
1577
1581
  {
@@ -1588,13 +1592,13 @@ static void setup_methods(JNIEnv* jenv, st_table** tbl, st_table** static_tbl,
1588
1592
  static void setup_fields(JNIEnv* jenv, st_table** tbl, jobjectArray flds)
1589
1593
  {
1590
1594
  int i;
1591
- jint modifier;
1595
+ jint modifier;
1592
1596
  jsize fcount = (*jenv)->GetArrayLength(jenv, flds);
1593
1597
  *tbl = st_init_numtable_with_size(fcount);
1594
1598
  for (i = 0; i < fcount; i++)
1595
1599
  {
1596
1600
  jobject f = (*jenv)->GetObjectArrayElement(jenv, flds, i);
1597
- rjb_check_exception(jenv, 0);
1601
+ rjb_check_exception(jenv, 0);
1598
1602
  modifier = (*jenv)->CallIntMethod(jenv, f, field_getModifiers);
1599
1603
  create_fieldinfo(jenv, *tbl, f, modifier & ACC_FINAL, modifier & ACC_STATIC);
1600
1604
  (*jenv)->DeleteLocalRef(jenv, f);
@@ -1640,7 +1644,7 @@ static void load_constants(JNIEnv* jenv, jclass klass, VALUE self, jobjectArray
1640
1644
  rjb_check_exception(jenv, 0);
1641
1645
  jfid = (*jenv)->GetStaticFieldID(jenv, klass, cname, sigs);
1642
1646
  rjb_check_exception(jenv, 0);
1643
- switch (sig)
1647
+ switch (sig)
1644
1648
  {
1645
1649
  case 'D':
1646
1650
  jv.d = (*jenv)->GetStaticDoubleField(jenv, klass, jfid);
@@ -1670,14 +1674,14 @@ static void load_constants(JNIEnv* jenv, jclass klass, VALUE self, jobjectArray
1670
1674
  jv.l = (*jenv)->GetStaticObjectField(jenv, klass, jfid);
1671
1675
  break;
1672
1676
  }
1673
- pname = (char*)cname;
1677
+ pname = (char*)cname;
1674
1678
  if (!isupper(*cname))
1675
1679
  {
1676
1680
  pname = ALLOCA_N(char, strlen(cname) + 1);
1677
1681
  strcpy(pname, cname);
1678
1682
  *pname = toupper(*pname);
1679
- if (!isupper(*pname)
1680
- || rb_const_defined(rb_obj_class(self), rb_intern(pname)))
1683
+ if (!isupper(*pname)
1684
+ || rb_const_defined(rb_obj_class(self), rb_intern(pname)))
1681
1685
  {
1682
1686
  pname = NULL;
1683
1687
  }
@@ -1697,7 +1701,7 @@ static void setup_metadata(JNIEnv* jenv, VALUE self, struct jv_data* ptr, VALUE
1697
1701
  jmethodID mid;
1698
1702
  jobjectArray methods;
1699
1703
  jobjectArray flds;
1700
-
1704
+
1701
1705
  jclass klass = (*jenv)->GetObjectClass(jenv, ptr->idata.obj);
1702
1706
  ptr->idata.klass = (*jenv)->NewGlobalRef(jenv, klass);
1703
1707
  rjb_check_exception(jenv, 0);
@@ -1726,7 +1730,7 @@ static void setup_metadata(JNIEnv* jenv, VALUE self, struct jv_data* ptr, VALUE
1726
1730
  * def load(class_path = '', vmargs = [])
1727
1731
  * class_path: passes for the class dir and jar name
1728
1732
  * vmargs: strng array of vmarg (such as -Xrs)
1729
- *
1733
+ *
1730
1734
  * change in rjb 0.1.7, omit first argument for JNI version.
1731
1735
  * because I misunderstood the number means (JVM but JNI).
1732
1736
  */
@@ -1769,7 +1773,7 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
1769
1773
  rb_funcall(user_path, stradd, 1, rb_ary_entry(classpath, 0));
1770
1774
  }
1771
1775
  userpath = StringValueCStr(user_path);
1772
-
1776
+
1773
1777
  if (!NIL_P(vm_argv))
1774
1778
  {
1775
1779
  Check_Type(vm_argv, T_ARRAY);
@@ -1792,31 +1796,31 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
1792
1796
  RJB_LOAD_METHOD(getParameterTypes, jmethod, "getParameterTypes", "()[Ljava/lang/Class;");
1793
1797
  RJB_LOAD_METHOD(getReturnType, jmethod, "getReturnType", "()Ljava/lang/Class;");
1794
1798
  rjb_check_exception(jenv, 1);
1795
-
1799
+
1796
1800
  RJB_FIND_CLASS(jfield, "java/lang/reflect/Field");
1797
1801
  RJB_LOAD_METHOD(field_getModifiers, jfield, "getModifiers", "()I");
1798
1802
  RJB_LOAD_METHOD(field_getName, jfield, "getName", "()Ljava/lang/String;");
1799
1803
  RJB_LOAD_METHOD(field_getType, jfield, "getType", "()Ljava/lang/Class;");
1800
1804
  rjb_check_exception(jenv, 1);
1801
-
1805
+
1802
1806
  RJB_HOLD_CLASS(j_class, "java/lang/Class");
1803
1807
  RJB_LOAD_METHOD(rjb_class_getName, j_class, "getName", "()Ljava/lang/String;");
1804
1808
  rjb_check_exception(jenv, 1);
1805
-
1809
+
1806
1810
  RJB_HOLD_CLASS(rjb_j_throwable, "java/lang/Throwable");
1807
1811
  RJB_LOAD_METHOD(rjb_throwable_getMessage, rjb_j_throwable, "getMessage", "()Ljava/lang/String;");
1808
- rjb_check_exception(jenv, 1);
1812
+ rjb_check_exception(jenv, 1);
1809
1813
 
1810
1814
  RJB_HOLD_CLASS(j_string, "java/lang/String");
1811
1815
  RJB_LOAD_METHOD(str_tostring, j_string, "toString", "()Ljava/lang/String;");
1812
- rjb_check_exception(jenv, 1);
1816
+ rjb_check_exception(jenv, 1);
1813
1817
 
1814
1818
  RJB_HOLD_CLASS(j_object, "java/lang/Object");
1815
- rjb_check_exception(jenv, 1);
1819
+ rjb_check_exception(jenv, 1);
1816
1820
 
1817
1821
  RJB_HOLD_CLASS(j_url, "java/net/URL");
1818
1822
  RJB_LOAD_METHOD(url_new, j_url, "<init>", "(Ljava/lang/String;)V");
1819
- rjb_check_exception(jenv, 1);
1823
+ rjb_check_exception(jenv, 1);
1820
1824
 
1821
1825
  for (i = PRM_INT; i < PRM_LAST; i++)
1822
1826
  {
@@ -1840,7 +1844,7 @@ static VALUE rjb_s_load(int argc, VALUE* argv, VALUE self)
1840
1844
  rb_define_method(rb_singleton_class(jklass), "forName", rjb_class_forname, -1);
1841
1845
  rb_define_alias(rb_singleton_class(jklass), "for_name", "forName");
1842
1846
  rb_gc_register_address(&jklass);
1843
-
1847
+
1844
1848
  return Qnil;
1845
1849
  }
1846
1850
 
@@ -1874,7 +1878,7 @@ jobject get_systemloader(JNIEnv* jenv)
1874
1878
  RJB_HOLD_CLASS(j_classloader, "java/lang/ClassLoader");
1875
1879
  RJB_LOAD_STATIC_METHOD(get_system_classloader, j_classloader,
1876
1880
  "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
1877
- rjb_check_exception(jenv, 1);
1881
+ rjb_check_exception(jenv, 1);
1878
1882
  }
1879
1883
  return (*jenv)->CallStaticObjectMethod(jenv, j_classloader, get_system_classloader);
1880
1884
  }
@@ -1908,7 +1912,7 @@ static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
1908
1912
  st_foreach(RHASH(rjb_loaded_classes)->tbl, clear_classes, 0);
1909
1913
  #endif
1910
1914
  #endif
1911
-
1915
+
1912
1916
  if (rjb_jvm)
1913
1917
  {
1914
1918
  JNIEnv* jenv = rjb_attach_current_thread();
@@ -1990,10 +1994,10 @@ static VALUE rjb_delete_ref(struct jvi_data* ptr)
1990
1994
  */
1991
1995
  static VALUE rj_bridge_free(struct rj_bridge* ptr)
1992
1996
  {
1993
- JNIEnv* jenv = rjb_attach_current_thread();
1997
+ JNIEnv* jenv = rjb_attach_current_thread();
1994
1998
  if (jenv)
1995
1999
  {
1996
- (*jenv)->DeleteLocalRef(jenv, ptr->proxy);
2000
+ (*jenv)->DeleteLocalRef(jenv, ptr->proxy);
1997
2001
  (*jenv)->DeleteLocalRef(jenv, ptr->bridge);
1998
2002
  }
1999
2003
  return Qnil;
@@ -2015,7 +2019,7 @@ static VALUE rjb_s_free(struct jv_data* ptr)
2015
2019
  /* class never delete
2016
2020
  JNIEnv* jenv = rjb_attach_current_thread();
2017
2021
  struct cls_constructor** c;
2018
-
2022
+
2019
2023
  rjb_delete_ref(&ptr->idata);
2020
2024
  if (ptr->constructors)
2021
2025
  {
@@ -2030,7 +2034,7 @@ static VALUE rjb_s_free(struct jv_data* ptr)
2030
2034
  st_foreach(ptr->idata.methods, (int(*)())free_method_item, 0);
2031
2035
  st_free_table(ptr->idata.methods);
2032
2036
  }
2033
- (*jenv)->DeleteGlobalRef(jenv, ptr->idata.klass);
2037
+ (*jenv)->DeleteGlobalRef(jenv, ptr->idata.klass);
2034
2038
  st_delete(RHASH(rjb_loaded_classes)->tbl, clsname, NULL);
2035
2039
  */
2036
2040
  return Qnil;
@@ -2049,7 +2053,7 @@ static VALUE createinstance(JNIEnv* jenv, int argc, VALUE* argv,
2049
2053
  struct jv_data* jklass;
2050
2054
  struct jvi_data* org;
2051
2055
  jvalue* args = (argc) ? ALLOCA_N(jvalue, argc) : NULL;
2052
-
2056
+
2053
2057
  Data_Get_Struct(self, struct jv_data, jklass);
2054
2058
  org = &jklass->idata;
2055
2059
 
@@ -2087,7 +2091,7 @@ static VALUE import_class(JNIEnv* jenv, jclass jcls, VALUE clsname)
2087
2091
  char* nm = ALLOCA_N(char, strlen(pclsname) + 1);
2088
2092
  strcpy(nm, pclsname);
2089
2093
  *nm = toupper(*nm);
2090
- for (pclsname = nm; *pclsname; pclsname++)
2094
+ for (pclsname = nm; *pclsname; pclsname++)
2091
2095
  {
2092
2096
  if (*pclsname == '.')
2093
2097
  {
@@ -2095,6 +2099,7 @@ static VALUE import_class(JNIEnv* jenv, jclass jcls, VALUE clsname)
2095
2099
  }
2096
2100
  }
2097
2101
  rexp = rb_define_class_under(rjb, nm, rjbc);
2102
+ rb_undef_alloc_func(rexp);
2098
2103
  ptr = ALLOC(struct jv_data);
2099
2104
  memset(ptr, 0, sizeof(struct jv_data));
2100
2105
  v = Data_Wrap_Struct(rexp, NULL, rjb_s_free, ptr);
@@ -2116,7 +2121,7 @@ static VALUE rjb_a_missing(int argc, VALUE* argv, VALUE self)
2116
2121
 
2117
2122
  static VALUE rjb_i_prepare_proxy(VALUE self)
2118
2123
  {
2119
- return rb_funcall(self, rb_intern("instance_eval"), 1,
2124
+ return rb_funcall(self, rb_intern("instance_eval"), 1,
2120
2125
  rb_str_new2("instance_eval(&" USER_INITIALIZE ")"));
2121
2126
  }
2122
2127
 
@@ -2175,7 +2180,7 @@ static int check_rtype(JNIEnv* jenv, VALUE* pv, char* p)
2175
2180
  if (strchr("IJ", *p)) return SOSO;
2176
2181
  return strchr("BCDFS", *p) != NULL;
2177
2182
  case T_BIGNUM:
2178
- return strchr("BCDFIJS", *p) != NULL;
2183
+ return strchr("BCDFIJS", *p) != NULL;
2179
2184
  case T_FLOAT:
2180
2185
  if (*p == 'D') return SOSO;
2181
2186
  if (*p == 'F') return SATISFIED;
@@ -2298,7 +2303,7 @@ static VALUE rjb_newinstance(int argc, VALUE* argv, VALUE self)
2298
2303
  int weight = 0;
2299
2304
  int cweight;
2300
2305
  JNIEnv* jenv = rjb_prelude();
2301
-
2306
+
2302
2307
  Data_Get_Struct(self, struct jv_data, ptr);
2303
2308
 
2304
2309
  if (ptr->constructors)
@@ -2378,7 +2383,7 @@ jclass rjb_find_class(JNIEnv* jenv, VALUE name)
2378
2383
  {
2379
2384
  char* cname;
2380
2385
  char* jnicls;
2381
-
2386
+
2382
2387
  Check_Type(name, T_STRING);
2383
2388
  cname = StringValueCStr(name);
2384
2389
  jnicls = ALLOCA_N(char, strlen(cname) + 1);
@@ -2455,8 +2460,8 @@ static VALUE rjb_s_bind(VALUE self, VALUE rbobj, VALUE itfname)
2455
2460
  VALUE result = Qnil;
2456
2461
  jclass itf;
2457
2462
  JNIEnv* jenv = rjb_prelude();
2458
-
2459
- itf = rjb_find_class(jenv, itfname);
2463
+
2464
+ itf = rjb_find_class(jenv, itfname);
2460
2465
  rjb_check_exception(jenv, 1);
2461
2466
  if (itf)
2462
2467
  {
@@ -2582,7 +2587,7 @@ static jobject conv_jarname_to_url(JNIEnv* jenv, VALUE jarname)
2582
2587
  #if defined(DOSISH)
2583
2588
  if (strlen(jarp) > 1 && jarp[1] == ':')
2584
2589
  {
2585
- sprintf(urlp, "file:///%s", jarp);
2590
+ sprintf(urlp, "file:///%s", jarp);
2586
2591
  }
2587
2592
  else
2588
2593
  #endif
@@ -2604,7 +2609,7 @@ static jobject conv_jarname_to_url(JNIEnv* jenv, VALUE jarname)
2604
2609
  }
2605
2610
  #endif
2606
2611
  arg.l = (*jenv)->NewStringUTF(jenv, urlp);
2607
- rjb_check_exception(jenv, 0);
2612
+ rjb_check_exception(jenv, 0);
2608
2613
  url = (*jenv)->NewObject(jenv, j_url, url_new, arg);
2609
2614
  rjb_check_exception(jenv, 0);
2610
2615
  return url;
@@ -2657,7 +2662,7 @@ static VALUE rjb_s_add_jar(VALUE self, VALUE jarname)
2657
2662
  if (!url_loader)
2658
2663
  {
2659
2664
  args[0].l = (*jenv)->NewObjectArray(jenv, (jsize)((count == 0) ? 1 : count), j_url, NULL);
2660
- rjb_check_exception(jenv, 0);
2665
+ rjb_check_exception(jenv, 0);
2661
2666
  if (!count)
2662
2667
  {
2663
2668
  (*jenv)->SetObjectArrayElement(jenv, args[0].l, 0,
@@ -2732,7 +2737,7 @@ static VALUE rjb_i_class(VALUE self)
2732
2737
  static VALUE getter(JNIEnv* jenv, struct cls_field* pf, struct jvi_data* ptr)
2733
2738
  {
2734
2739
  jvalue jv;
2735
- switch (pf->result_signature)
2740
+ switch (pf->result_signature)
2736
2741
  {
2737
2742
  case 'D':
2738
2743
  if (pf->static_field)
@@ -2839,7 +2844,7 @@ static void setter(JNIEnv* jenv, struct cls_field* pf, struct jvi_data* ptr, VA
2839
2844
  {
2840
2845
  jvalue jv;
2841
2846
  pf->arg_convert(jenv, val, &jv, pf->field_signature, 0);
2842
- switch (*pf->field_signature)
2847
+ switch (*pf->field_signature)
2843
2848
  {
2844
2849
  case 'D':
2845
2850
  if (pf->static_field)
@@ -2960,7 +2965,7 @@ static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
2960
2965
  found = 0;
2961
2966
  if (argc == pm->basic.arg_count)
2962
2967
  {
2963
- if (sig && pm->basic.method_signature)
2968
+ if (sig && pm->basic.method_signature)
2964
2969
  {
2965
2970
  if (!strcmp(sig, pm->basic.method_signature))
2966
2971
  {
@@ -2999,7 +3004,7 @@ static VALUE invoke(JNIEnv* jenv, struct cls_method* pm, struct jvi_data* ptr,
2999
3004
  if (!prefer_pm)
3000
3005
  {
3001
3006
  const char* tname = rb_id2name(orgpm->name);
3002
- if (sig)
3007
+ if (sig)
3003
3008
  {
3004
3009
  rb_raise(rb_eRuntimeError, "Fail: unknown method name `%s(\'%s\')'", tname, sig);
3005
3010
  }
@@ -3092,7 +3097,7 @@ static VALUE invoke_by_instance(ID rmid, int argc, VALUE* argv,
3092
3097
  {
3093
3098
  ret = getter(jenv, pf, ptr);
3094
3099
  }
3095
- else
3100
+ else
3096
3101
  {
3097
3102
  if (argc == 1 && *(tname + strlen(tname) - 1) == '=')
3098
3103
  {
@@ -3154,7 +3159,7 @@ static VALUE rjb_i_missing(int argc, VALUE* argv, VALUE self)
3154
3159
  ID rmid = rb_to_id(argv[0]);
3155
3160
 
3156
3161
  Data_Get_Struct(self, struct jvi_data, ptr);
3157
-
3162
+
3158
3163
  return invoke_by_instance(rmid, argc -1, argv + 1, ptr, NULL);
3159
3164
  }
3160
3165
 
@@ -3217,7 +3222,7 @@ static VALUE invoke_by_class(ID rmid, int argc, VALUE* argv,
3217
3222
  rb_raise(rb_eRuntimeError, "Fail: unknown method name `%s'", tname);
3218
3223
  }
3219
3224
  }
3220
-
3225
+
3221
3226
  return ret;
3222
3227
  }
3223
3228
 
@@ -3259,7 +3264,7 @@ static VALUE rjb_missing(int argc, VALUE* argv, VALUE self)
3259
3264
  return r;
3260
3265
  }
3261
3266
  }
3262
-
3267
+
3263
3268
  Data_Get_Struct(self, struct jv_data, ptr);
3264
3269
  return invoke_by_class(rmid, argc - 1, argv + 1, ptr, NULL);
3265
3270
  }
@@ -3293,7 +3298,7 @@ void Init_rjbcore()
3293
3298
  #else
3294
3299
  rb_protect((VALUE(*)(VALUE))rb_require, (VALUE)"iconv", NULL);
3295
3300
  #endif
3296
- #endif
3301
+ #endif
3297
3302
  rjb_loaded_classes = rb_hash_new();
3298
3303
  #ifndef RUBINIUS
3299
3304
  OBJ_FREEZE(rjb_loaded_classes);
@@ -3323,7 +3328,7 @@ void Init_rjbcore()
3323
3328
  rb_define_class_variable(rjb, "@@classpath", rb_ary_new());
3324
3329
  cvar_classpath = rb_intern("@@classpath");
3325
3330
 
3326
- /* Java class object */
3331
+ /* Java class object */
3327
3332
  rjbc = CLASS_NEW(rb_cObject, "Rjb_JavaClass");
3328
3333
  rb_gc_register_address(&rjbc);
3329
3334
  rb_define_method(rjbc, "method_missing", rjb_missing, -1);
@@ -3333,8 +3338,9 @@ void Init_rjbcore()
3333
3338
 
3334
3339
  /* Java instance object */
3335
3340
  rjbi = CLASS_NEW(rb_cObject, "Rjb_JavaProxy");
3341
+ rb_undef_alloc_func(rjbi);
3336
3342
  rb_gc_register_address(&rjbi);
3337
- rb_define_method(rjbi, "method_missing", rjb_i_missing, -1);
3343
+ rb_define_method(rjbi, "method_missing", rjb_i_missing, -1);
3338
3344
  rb_define_method(rjbi, "_invoke", rjb_i_invoke, -1);
3339
3345
  rb_define_method(rjbi, "_classname", rjb_i_class, 0);
3340
3346
  rb_define_method(rjbi, "_prepare_proxy", rjb_i_prepare_proxy, 0);
@@ -3342,6 +3348,7 @@ void Init_rjbcore()
3342
3348
 
3343
3349
  /* Ruby-Java Bridge object */
3344
3350
  rjbb = CLASS_NEW(rb_cObject, "Rjb_JavaBridge");
3351
+ rb_undef_alloc_func(rjbb);
3345
3352
  rb_gc_register_address(&rjbb);
3346
3353
 
3347
3354
  /* anonymous interface object */
data/ext/rjbexception.c CHANGED
@@ -29,7 +29,7 @@
29
29
  static VALUE missing_delegate(int argc, VALUE* argv, VALUE self)
30
30
  {
31
31
  ID rmid = rb_to_id(argv[0]);
32
- return rb_funcall(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
32
+ return rb_funcallv(rb_ivar_get(self, rb_intern("@cause")), rmid, argc - 1, argv + 1);
33
33
  }
34
34
 
35
35
  static VALUE get_cause(VALUE self)
@@ -43,7 +43,18 @@ static VALUE ex_respond_to(int argc, VALUE* argv, VALUE self)
43
43
  {
44
44
  rb_raise(rb_eArgError, "respond_to? require 1 or 2 arguments");
45
45
  }
46
- return rb_to_id(argv[0]) == rb_intern("to_str") ? Qfalse : Qtrue;
46
+ if (rb_to_id(argv[0]) == rb_intern("to_str"))
47
+ {
48
+ return Qfalse;
49
+ }
50
+ else if (rb_to_id(argv[0]) == rb_intern("exception"))
51
+ {
52
+ return Qtrue;
53
+ }
54
+ else
55
+ {
56
+ return rb_funcallv(rb_ivar_get(self, rb_intern("@cause")), rb_intern("respond_to?"), argc, argv);
57
+ }
47
58
  }
48
59
 
49
60
  /*
@@ -86,7 +97,7 @@ VALUE rjb_get_exception_class(JNIEnv* jenv, jstring str)
86
97
  st_insert(RHASH(rjb_loaded_classes)->tbl, cname, rexp);
87
98
  #endif
88
99
  #endif
89
-
100
+
90
101
  }
91
102
  return rexp;
92
103
  }
@@ -98,7 +109,7 @@ VALUE rjb_s_throw(int argc, VALUE* argv, VALUE self)
98
109
  {
99
110
  VALUE klass;
100
111
  VALUE message;
101
- JNIEnv* jenv = NULL;
112
+ JNIEnv* jenv = NULL;
102
113
 
103
114
  rjb_load_vm_default();
104
115
 
data/lib/rjb.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  =begin
2
- Copyright(c) 2006-2010,2012 arton
2
+ Copyright(c) 2006-2010,2012,2020 arton
3
3
  =end
4
4
 
5
5
  require 'rbconfig'
@@ -86,7 +86,7 @@ module Rjb
86
86
  (org + klass.getMethods.select do |m|
87
87
  blk.call(m)
88
88
  end.map do |m|
89
- m.name
89
+ m.name.to_sym
90
90
  end).uniq
91
91
  end
92
92
  def format_sigs(s)
@@ -98,6 +98,19 @@ module Rjb
98
98
  "[#{s.map{|m|m.nil? ? 'void' : m}.join(', ')}]"
99
99
  end
100
100
  end
101
+ def make_snake(nm)
102
+ nm.gsub(/(.)([A-Z])/) { "#{$1}_#{$2.downcase}" }
103
+ end
104
+ alias :rjb_org_respond_to? :respond_to?
105
+ def rjb_respond_to?(sym, klass, priv)
106
+ return true if (klass ? self : getClass).getMethods.select do |m|
107
+ (klass && !instance_method?(m) && (priv || public_method?(m))) ||
108
+ (!klass && instance_method?(m) && (priv || public_method?(m)))
109
+ end.map do |m|
110
+ [m.name.to_sym, make_snake(m.name).to_sym]
111
+ end.flatten.include?(sym.to_sym)
112
+ rjb_org_respond_to?(sym, priv)
113
+ end
101
114
  end
102
115
 
103
116
  class Rjb_JavaClass
@@ -119,6 +132,9 @@ module Rjb
119
132
  "#{m}(#{format_sigs(self.static_sigs(m))})"
120
133
  end
121
134
  end
135
+ def respond_to?(sym, priv = false)
136
+ rjb_respond_to?(sym, true, priv)
137
+ end
122
138
  end
123
139
  class Rjb_JavaProxy
124
140
  include JMethod
@@ -141,6 +157,9 @@ module Rjb
141
157
  "#{m}(#{format_sigs(getClass.sigs(m))})"
142
158
  end
143
159
  end
160
+ def respond_to?(sym, priv = false)
161
+ rjb_respond_to?(sym, false, priv)
162
+ end
144
163
  end
145
164
  class Rjb_JavaBridge
146
165
  def method_missing(name, *args)
data/readme.txt CHANGED
@@ -28,10 +28,10 @@ see test/readme.unix
28
28
  you must set LD_LIBRARY_PATH environmental variable to run rjb.
29
29
 
30
30
  -- Notice for opening non-ASCII 7bit filename
31
- If you'll plan to open the non-ascii character named file by Java class through Rjb, it may require to set LC_ALL environment variable in you sciprt.
31
+ If you'll plan to open the non-ascii character named file by Java class through Rjb, it may require to set LC_ALL environment variable in your script.
32
32
  For example in Rails, set above line in production.rb as your environment.
33
33
  ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
34
- cf: http://bugs.sun.com/view_bug.do?bug_id=4733494
34
+ cf: https://bugs.java.com/bugdatabase/view_bug.do?bug_id=4733494
35
35
  (Thanks Paul for this information).
36
36
 
37
37
  artonx@yahoo.co.jp
data/test/test.rb CHANGED
@@ -726,19 +726,19 @@ class TestRjb < Test::Unit::TestCase
726
726
  end
727
727
  def test_methods_extension
728
728
  m = @jString.new('').methods
729
- assert m.include?('indexOf')
729
+ assert m.include?(:indexOf)
730
730
  end
731
731
  def test_class_methods_extension
732
732
  m = @jString.methods
733
- assert m.include?('format')
733
+ assert m.include?(:format)
734
734
  end
735
735
  def test_pmethods_extension
736
736
  m = @jString.new('').public_methods
737
- assert m.include?('indexOf')
737
+ assert m.include?(:indexOf)
738
738
  end
739
739
  def test_class_pmethods_extension
740
740
  m = @jString.public_methods
741
- assert m.include?('format')
741
+ assert m.include?(:format)
742
742
  end
743
743
  def test_java_methods
744
744
  indexof = @jString.new('').java_methods.find do |m|
@@ -960,8 +960,30 @@ class TestRjb < Test::Unit::TestCase
960
960
  end
961
961
 
962
962
  def test_java_utf8
963
- y = @jString.new('𠮷野家')
963
+ y = @jString.new('𠮷野家') # with surrogate pair
964
964
  assert_equal '𠮷野家', y.toString
965
965
  end
966
- end
967
966
 
967
+ def test_java_hangul_syllable
968
+ # 토 \uD1A => ED 86 A0 (utf-8)
969
+ test_string = "토" # simple unicode char (not surrogate pair)
970
+ y = @jString.new_with_sig('Ljava.lang.String;', test_string)
971
+ assert_equal(test_string, y.toString)
972
+ test_string = "토토" # simple unicode char (not surrogate pair)
973
+ y = @jString.new_with_sig('Ljava.lang.String;', test_string)
974
+ assert_equal(test_string, y.toString)
975
+ end
976
+
977
+ def test_respond_to
978
+ str = @jString.new('blabla')
979
+ assert str.respond_to? :substring
980
+ assert_false str.respond_to? :unknown_method
981
+ begin
982
+ @jInteger.parseInt('blabla')
983
+ rescue => e
984
+ assert e.respond_to? :print_stack_trace
985
+ assert e.respond_to? :printStackTrace
986
+ assert_false e.respond_to? :unknown_method
987
+ end
988
+ end
989
+ end
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rjb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.6.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - arton
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-10 00:00:00.000000000 Z
11
+ date: 2023-11-09 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: 'RJB is a bridge program that connect between Ruby and Java with Java
14
14
  Native Interface.
15
15
 
16
- '
16
+ '
17
17
  email: artonx@gmail.com
18
18
  executables: []
19
19
  extensions:
@@ -44,10 +44,7 @@ files:
44
44
  - readme.txt
45
45
  - samples/filechooser.rb
46
46
  - samples/unzip.rb
47
- - test/anon-test-50.rb
48
47
  - test/anon-test-60.rb
49
- - test/anon.rb
50
- - test/b.rb
51
48
  - test/exttest.rb
52
49
  - test/gctest.rb
53
50
  - test/jartest.jar
@@ -71,10 +68,9 @@ files:
71
68
  - test/test_osxjvm.rb
72
69
  - test/test_osxload.rb
73
70
  - test/test_unload.rb
74
- - test/x.rb
75
71
  homepage: https://www.artonx.org/collabo/backyard/?RubyJavaBridge
76
72
  licenses:
77
- - LGPL
73
+ - LGPL-2.1-or-later
78
74
  metadata: {}
79
75
  post_install_message:
80
76
  rdoc_options: []
@@ -93,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
93
89
  requirements:
94
90
  - none
95
91
  - JDK 5.0
96
- rubygems_version: 3.0.1
92
+ rubygems_version: 3.4.10
97
93
  signing_key:
98
94
  specification_version: 4
99
95
  summary: Ruby Java bridge
data/test/anon-test-50.rb DELETED
@@ -1,13 +0,0 @@
1
- require 'rjb'
2
- Rjb::load
3
- begin
4
- Rjb::throw('java.lang.NumberFormatException', 'test')
5
- Rjb::throw(Rjb::import('java.lang.NumberFormatException').new('test'))
6
- rescue NumberFormatException => e
7
- puts "I expect a NumberFormatException to be thrown"
8
- rescue Exception => e
9
- puts "I at least expect *some* excetpion to be thrown"
10
- else
11
- puts "Unexpectedly no exception is thrown"
12
- end
13
-
data/test/anon.rb DELETED
@@ -1,23 +0,0 @@
1
- require 'rjb'
2
- Rjb::load
3
- begin
4
- Rjb::import('java.lang.Integer').parseInt('x')
5
- rescue NumberFormatException => e
6
- puts e.class
7
- puts e.message
8
- begin
9
- puts (StandardError === e).to_s
10
- raise e
11
- rescue => f
12
- puts f.class
13
- puts f.message
14
- puts f.cause.inspect
15
- puts f.exception.inspect
16
- if e.class == f.class
17
- puts "I expect the equality to be true"
18
- else
19
- puts "Unexpectedly the re-raised Java exception has changed " +
20
- "from a #{e.class} into a #{f.class}"
21
- end
22
- end
23
- end
data/test/b.rb DELETED
@@ -1,13 +0,0 @@
1
- class TestError < StandardError
2
- end
3
-
4
- begin
5
- raise TestError.new
6
- rescue => e
7
- puts e.class
8
- begin
9
- raise e, 'abc'
10
- rescue => f
11
- puts f.class
12
- end
13
- end
data/test/x.rb DELETED
@@ -1,10 +0,0 @@
1
- begin
2
- i.foo
3
- rescue => e
4
- puts e.class
5
- begin
6
- raise e
7
- rescue => f
8
- puts f.class
9
- end
10
- end