diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-14 06:58:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-14 06:58:43 +0000 |
| commit | 0a8988c132164a3a39508fabb863f82c22f7063a (patch) | |
| tree | 9910fe966f2e0b38cae72862a8b17efa0606d4fa | |
| parent | 88383b058bbe68ecc020c9f5e35f9cb7f63923d9 (diff) | |
| download | ruby-0a8988c132164a3a39508fabb863f82c22f7063a.tar.gz | |
bigdecimal.c: backword compatibility as gem
* ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap
depending on PRIsVALUE for 1.9. [Backport #9406]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/bigdecimal/bigdecimal.c | 23 |
2 files changed, 16 insertions, 15 deletions
@@ -1,11 +1,11 @@ -Tue Jan 14 14:52:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jan 14 15:58:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap + depending on PRIsVALUE for 1.9. [Backport #9406] * ext/bigdecimal/bigdecimal.c (DECIMAL_SIZE_OF_BITS): fallback definition for 2.1 or older. [ruby-core:59750] [Backport #9406] - * ext/bigdecimal/bigdecimal.c (raise_with_class): fallback definition - for 1.9. - Tue Jan 14 11:28:44 2014 Yuki Yugui Sonoda <yugui@google.com> * vm_exec.c (cfp): Fixes a SEGV issue in r44554. diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index e8889b8634..3459300564 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -105,9 +105,10 @@ static ID id_eq; #endif #ifdef PRIsVALUE -# define raise_with_class(e, pre, post, obj) rb_raise((e), pre "%" PRIsVALUE post, rb_obj_class(obj)) +# define CLASS_NAME(obj) rb_obj_class(obj) #else -# define raise_with_class(e, pre, post, obj) rb_raise((e), pre "%s" post, rb_obj_classname(obj)) +# define PRIsVALUE "s" +# define CLASS_NAME(obj) rb_obj_classname(obj) #endif /* @@ -284,9 +285,9 @@ SomeOneMayDoIt: unable_to_coerce_without_prec: if (must) { - raise_with_class(rb_eArgError, - "", " can't be coerced into BigDecimal without a precision", - v); + rb_raise(rb_eArgError, + "%"PRIsVALUE" can't be coerced into BigDecimal without a precision", + CLASS_NAME(v)); } return NULL; } @@ -2271,9 +2272,9 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self) } /* fall through */ default: - raise_with_class(rb_eTypeError, - "wrong argument type ", " (expected scalar Numeric)", - vexp); + rb_raise(rb_eTypeError, + "wrong argument type %"PRIsVALUE" (expected scalar Numeric)", + CLASS_NAME(vexp)); } if (VpIsZero(x)) { @@ -2530,9 +2531,9 @@ BigDecimal_new(int argc, VALUE *argv) /* fall through */ case T_RATIONAL: if (NIL_P(nFig)) { - raise_with_class(rb_eArgError, - "can't omit precision for a ", ".", - iniValue); + rb_raise(rb_eArgError, + "can't omit precision for a %"PRIsVALUE".", + CLASS_NAME(iniValue)); } return GetVpValueWithPrec(iniValue, mf, 1); |