generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-03-19 13:02:13 +01:00
Code Issues Projects Releases Wiki Activity

ruby: improves compatibility with JRuby

Browse Source
This commit is contained in:
FURUHASHI Sadayuki 2011-05-09 21:59:55 +09:00
parent 96bb4cf49d
commit f50694cc96
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ruby/compat.h
View File

@ -28,46 +28,68 @@ extern int s_enc_usascii;
extern VALUE s_enc_utf8_value; extern VALUE s_enc_utf8_value;
#endif #endif
#ifdef RUBY_VM /* MRI 1.9 */
#if defined(RUBY_VM)
#define COMPAT_RERAISE rb_exc_raise(rb_errinfo()) #define COMPAT_RERAISE rb_exc_raise(rb_errinfo())
/* JRuby */
#elif defined(JRUBY)
#define COMPAT_RERAISE rb_exc_raise(rb_gv_get("$!"))
/* MRI 1.8 and Rubinius */
#else #else
#define COMPAT_RERAISE rb_exc_raise(ruby_errinfo) #define COMPAT_RERAISE rb_exc_raise(ruby_errinfo)
#endif #endif
/* ruby 1.8 and Rubinius */
#ifndef RBIGNUM_POSITIVE_P #ifndef RBIGNUM_POSITIVE_P
# ifdef RUBINIUS
# define RBIGNUM_POSITIVE_P(b) (rb_funcall(b, rb_intern(">="), 1, INT2FIX(0)) == Qtrue) /* Rubinius */
# else #if defined(RUBINIUS)
# define RBIGNUM_POSITIVE_P(b) (RBIGNUM(b)->sign) #define RBIGNUM_POSITIVE_P(b) (rb_funcall(b, rb_intern(">="), 1, INT2FIX(0)) == Qtrue)
# endif
/* JRuby */
#elif defined(JRUBY)
#define RBIGNUM_POSITIVE_P(b) (rb_funcall(b, rb_intern(">="), 1, INT2FIX(0)) == Qtrue)
#define rb_big2ull(b) rb_num2ull(b)
/*#define rb_big2ll(b) rb_num2ll(b)*/
/* MRI 1.8 */
#else
#define RBIGNUM_POSITIVE_P(b) (RBIGNUM(b)->sign)
#endif
#endif #endif
/* Rubinius */ /* Rubinius */
#ifdef RUBINIUS #if defined(RUBINIUS)
static inline void rb_gc_enable() { return; }
static inline void rb_gc_disable() { return; }
/* JRuby */
#elif defined(JRUBY)
static inline void rb_gc_enable() { return; } static inline void rb_gc_enable() { return; }
static inline void rb_gc_disable() { return; } static inline void rb_gc_disable() { return; }
#endif #endif
/* ruby 1.8.5 */ /* MRI 1.8.5 */
#ifndef RSTRING_PTR #ifndef RSTRING_PTR
#define RSTRING_PTR(s) (RSTRING(s)->ptr) #define RSTRING_PTR(s) (RSTRING(s)->ptr)
#endif #endif
/* ruby 1.8.5 */ /* MRI 1.8.5 */
#ifndef RSTRING_LEN #ifndef RSTRING_LEN
#define RSTRING_LEN(s) (RSTRING(s)->len) #define RSTRING_LEN(s) (RSTRING(s)->len)
#endif #endif
/* ruby 1.8.5 */ /* MRI 1.8.5 */
#ifndef RARRAY_PTR #ifndef RARRAY_PTR
#define RARRAY_PTR(s) (RARRAY(s)->ptr) #define RARRAY_PTR(s) (RARRAY(s)->ptr)
#endif #endif
/* ruby 1.8.5 */ /* MRI 1.8.5 */
#ifndef RARRAY_LEN #ifndef RARRAY_LEN
#define RARRAY_LEN(s) (RARRAY(s)->len) #define RARRAY_LEN(s) (RARRAY(s)->len)
#endif #endif

4
ruby/pack.c
View File

@ -113,7 +113,11 @@ static VALUE MessagePack_FalseClass_to_msgpack(int argc, VALUE *argv, VALUE self
static VALUE MessagePack_Fixnum_to_msgpack(int argc, VALUE *argv, VALUE self) static VALUE MessagePack_Fixnum_to_msgpack(int argc, VALUE *argv, VALUE self)
{ {
ARG_BUFFER(out, argc, argv); ARG_BUFFER(out, argc, argv);
#ifdef JRUBY
msgpack_pack_long(out, rb_num2long(self));
#else
msgpack_pack_long(out, FIX2LONG(self)); msgpack_pack_long(out, FIX2LONG(self));
#endif
return out; return out;
} }