diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/bigdecimal/bigdecimal.c | 29 |
2 files changed, 28 insertions, 9 deletions
@@ -1,3 +1,11 @@ +Tue Jan 14 14:52:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 c7d9945a15..e8889b8634 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -99,6 +99,17 @@ static ID id_eq; # define RRATIONAL_NEGATIVE_P(x) RTEST(rb_funcall((x), '<', 1, INT2FIX(0))) #endif +#ifndef DECIMAL_SIZE_OF_BITS +#define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999) +/* an approximation of ceil(n * log10(2)), upto 65536 at least */ +#endif + +#ifdef PRIsVALUE +# define raise_with_class(e, pre, post, obj) rb_raise((e), pre "%" PRIsVALUE post, rb_obj_class(obj)) +#else +# define raise_with_class(e, pre, post, obj) rb_raise((e), pre "%s" post, rb_obj_classname(obj)) +#endif + /* * ================== Ruby Interface part ========================== */ @@ -273,9 +284,9 @@ SomeOneMayDoIt: unable_to_coerce_without_prec: if (must) { - rb_raise(rb_eArgError, - "%s can't be coerced into BigDecimal without a precision", - rb_obj_classname(v)); + raise_with_class(rb_eArgError, + "", " can't be coerced into BigDecimal without a precision", + v); } return NULL; } @@ -2260,9 +2271,9 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self) } /* fall through */ default: - rb_raise(rb_eTypeError, - "wrong argument type %s (expected scalar Numeric)", - rb_obj_classname(vexp)); + raise_with_class(rb_eTypeError, + "wrong argument type ", " (expected scalar Numeric)", + vexp); } if (VpIsZero(x)) { @@ -2519,9 +2530,9 @@ BigDecimal_new(int argc, VALUE *argv) /* fall through */ case T_RATIONAL: if (NIL_P(nFig)) { - rb_raise(rb_eArgError, - "can't omit precision for a %"PRIsVALUE".", - rb_obj_class(iniValue)); + raise_with_class(rb_eArgError, + "can't omit precision for a ", ".", + iniValue); } return GetVpValueWithPrec(iniValue, mf, 1); |