diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-20 16:43:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-20 16:43:41 +0000 |
| commit | 3a6227f5ee9358bd8d0d093d0b4a7f3400e17e78 (patch) | |
| tree | beb1650b092b8a90fef0bf9b94288d0b38091117 /include/ruby | |
| parent | b7d7682da879d1fe5b670486298585822f56b9f2 (diff) | |
| download | ruby-3a6227f5ee9358bd8d0d093d0b4a7f3400e17e78.tar.gz ruby-3a6227f5ee9358bd8d0d093d0b4a7f3400e17e78.tar.xz ruby-3a6227f5ee9358bd8d0d093d0b4a7f3400e17e78.zip | |
* include/ruby/ruby.h (rb_long2int, RARRAY_LENINT): check long to
cast to int. [ruby-dev:38508]
* struct.c, vm_eval.c, vm_insnhelper.c: use RARRAY_LENINT.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/ruby.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index a277bb2e9..440bfe2ed 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -663,6 +663,25 @@ struct RArray { RARRAY(a)->as.ary : \ RARRAY(a)->as.heap.ptr) +#if SIZEOF_INT < SIZEOF_VALUE +NORETURN(void rb_out_of_int(SIGNED_VALUE num)); +#endif + +#if SIZEOF_INT < SIZEOF_LONG +#define rb_long2int_internal(n, i) \ + int i = (int)(n); \ + if ((long)i != (n)) rb_out_of_int(n) +#ifdef __GNUC__ +#define rb_long2int(i2l_n) ({rb_long2int_internal(i2l_n, i2l_i); i2l_i;}) +#else +static inline int +rb_long2int(long n) {rb_long2int_internal(n, i); return i;} +#endif +#else +#define rb_long2int(n) ((int)(n)) +#endif +#define RARRAY_LENINT(ary) rb_long2int(RARRAY_LEN(ary)) + struct RRegexp { struct RBasic basic; struct re_pattern_buffer *ptr; |