bigdecimal 3.1.8 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2090d7c93ccb0ee94f4e31b443f01a4a996c7f0a12f0684ac21bcdea56813fda
-  data.tar.gz: de18780d3080b0251e6f9cb8a0b6b31ea77d38d92874b57eb37efb40cec83997
+  metadata.gz: 8737ecb678e63a8a9e0aefe2d0ea606a523915d08b66b69704967749e15e53bf
+  data.tar.gz: 0dec9bb1cf41f347efdc60b918bab5f14264e6fc082011870dbc62391fde1270
 SHA512:
-  metadata.gz: 5a2c8d3e0c57a6bd6e63ffcb5c0a125b9edcb85a4528db302d95bce276e9fadc513727a7a7b9f3bb22a10c305e2b5533c53e60612ed68843456b5d43c4aabd9e
-  data.tar.gz: 3b93bfadda8ce3963d2aa61ce1342be2664ea216d029ec24588869a14b12ffb0171538f088490cf8da25fe836361be2d3ff630d514790a0d152bb988c952431e
+  metadata.gz: ddacbb0df3b6976bc560fab41363de45e4776c6e56d884a2c00a71015b838ff83d2a26b87e4af63d3e60fff27f6e90638f7cd6b363c62d06c78ac4c8250d6d5a
+  data.tar.gz: bc4ee4ace918f04364f882b69acb9c60bca9abc2405f426bbaa5831af21a9508c02c73c1f7302a3f25d387b7518d42095bc7bcbb817151e84ca2b9b0ce6889b5

data/ext/bigdecimal/bigdecimal.c

@@ -31,7 +31,7 @@
 #include "bits.h"
 #include "static_assert.h"
 
-#define BIGDECIMAL_VERSION "3.1.8"
+#define BIGDECIMAL_VERSION "3.2.2"
 
 /* #define ENABLE_NUMERIC_STRING */
 
@@ -513,15 +513,10 @@ BigDecimal_prec(VALUE self)
 }
 
 static void
-BigDecimal_count_precision_and_scale(VALUE self, ssize_t *out_precision, ssize_t *out_scale)
+VpCountPrecisionAndScale(Real *p, ssize_t *out_precision, ssize_t *out_scale)
 {
-    ENTER(1);
-
     if (out_precision == NULL && out_scale == NULL)
         return;
-
-    Real *p;
-    GUARD_OBJ(p, GetVpValue(self, 1));
     if (VpIsZero(p) || !VpIsDef(p)) {
       zero:
         if (out_precision) *out_precision = 0;
@@ -625,6 +620,15 @@ BigDecimal_count_precision_and_scale(VALUE self, ssize_t *out_precision, ssize_t
     }
 }
 
+static void
+BigDecimal_count_precision_and_scale(VALUE self, ssize_t *out_precision, ssize_t *out_scale)
+{
+    ENTER(1);
+    Real *p;
+    GUARD_OBJ(p, GetVpValue(self, 1));
+    VpCountPrecisionAndScale(p, out_precision, out_scale);
+}
+
 /*
  *  call-seq:
  *    precision -> integer
@@ -1485,7 +1489,8 @@ BigDecimal_add(VALUE self, VALUE r)
     return VpCheckGetValue(c);
 }
 
- /*  call-seq:
+ /*
+  *  call-seq:
   *    self - value -> bigdecimal
   *
   *  Returns the \BigDecimal difference of +self+ and +value+:
@@ -1818,55 +1823,6 @@ BigDecimal_mult(VALUE self, VALUE r)
     return VpCheckGetValue(c);
 }
 
-static VALUE
-BigDecimal_divide(VALUE self, VALUE r, Real **c, Real **res, Real **div)
-/* For c = self.div(r): with round operation */
-{
-    ENTER(5);
-    Real *a, *b;
-    ssize_t a_prec, b_prec;
-    size_t mx;
-
-    TypedData_Get_Struct(self, Real, &BigDecimal_data_type, a);
-    SAVE(a);
-
-    VALUE rr = r;
-    if (is_kind_of_BigDecimal(rr)) {
-        /* do nothing */
-    }
-    else if (RB_INTEGER_TYPE_P(r)) {
-        rr = rb_inum_convert_to_BigDecimal(r, 0, true);
-    }
-    else if (RB_TYPE_P(r, T_FLOAT)) {
-        rr = rb_float_convert_to_BigDecimal(r, 0, true);
-    }
-    else if (RB_TYPE_P(r, T_RATIONAL)) {
-        rr = rb_rational_convert_to_BigDecimal(r, a->Prec*BASE_FIG, true);
-    }
-
-    if (!is_kind_of_BigDecimal(rr)) {
-        return DoSomeOne(self, r, '/');
-    }
-
-    TypedData_Get_Struct(rr, Real, &BigDecimal_data_type, b);
-    SAVE(b);
-    *div = b;
-
-    BigDecimal_count_precision_and_scale(self, &a_prec, NULL);
-    BigDecimal_count_precision_and_scale(rr, &b_prec, NULL);
-    mx = (a_prec > b_prec) ? a_prec : b_prec;
-    mx *= 2;
-
-    if (2*BIGDECIMAL_DOUBLE_FIGURES > mx)
-        mx = 2*BIGDECIMAL_DOUBLE_FIGURES;
-
-    GUARD_OBJ((*c), NewZeroWrapNolimit(1, mx + 2*BASE_FIG));
-    GUARD_OBJ((*res), NewZeroWrapNolimit(1, (mx + 1)*2 + 2*BASE_FIG));
-    VpDivd(*c, *res, a, b);
-
-    return Qnil;
-}
-
 static VALUE BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod);
 
 /* call-seq:
@@ -1884,20 +1840,15 @@ static VALUE
 BigDecimal_div(VALUE self, VALUE r)
 /* For c = self/r: with round operation */
 {
-    ENTER(5);
-    Real *c=NULL, *res=NULL, *div = NULL;
-    r = BigDecimal_divide(self, r, &c, &res, &div);
-    if (!NIL_P(r)) return r; /* coerced by other */
-    SAVE(c); SAVE(res); SAVE(div);
-    /* a/b = c + r/b */
-    /* c xxxxx
-       r 00000yyyyy  ==> (y/b)*BASE >= HALF_BASE
-     */
-    /* Round */
-    if (VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
-        VpInternalRound(c, 0, c->frac[c->Prec-1], (DECDIG)(VpBaseVal() * (DECDIG_DBL)res->frac[0] / div->frac[0]));
+    if (
+        !is_kind_of_BigDecimal(r) &&
+        !RB_INTEGER_TYPE_P(r) &&
+        !RB_TYPE_P(r, T_FLOAT) &&
+        !RB_TYPE_P(r, T_RATIONAL)
+    ) {
+        return DoSomeOne(self, r, '/');
     }
-    return VpCheckGetValue(c);
+    return BigDecimal_div2(self, r, INT2FIX(0));
 }
 
 static VALUE BigDecimal_round(int argc, VALUE *argv, VALUE self);
@@ -2053,8 +2004,8 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
 }
 
 /* call-seq:
- * a % b
- * a.modulo(b)
+ *   a % b
+ *   a.modulo(b)
  *
  * Returns the modulus from dividing by b.
  *
@@ -2127,7 +2078,7 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
 }
 
 /* call-seq:
- * remainder(value)
+ *   remainder(value)
  *
  * Returns the remainder from dividing by the value.
  *
@@ -2144,7 +2095,7 @@ BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
 }
 
 /* call-seq:
- * divmod(value)
+ *   divmod(value)
  *
  * Divides by the specified value, and returns the quotient and modulus
  * as BigDecimal numbers. The quotient is rounded towards negative infinity.
@@ -2187,6 +2138,9 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(5);
     SIGNED_VALUE ix;
+    Real *res = NULL;
+    Real *av = NULL, *bv = NULL, *cv = NULL;
+    size_t mx, pl;
 
     if (NIL_P(n)) { /* div in Float sense */
         Real *div = NULL;
@@ -2199,33 +2153,49 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
 
     /* div in BigDecimal sense */
     ix = check_int_precision(n);
-    if (ix == 0) {
-        return BigDecimal_div(self, b);
-    }
-    else {
-        Real *res = NULL;
-        Real *av = NULL, *bv = NULL, *cv = NULL;
-        size_t mx = ix + VpBaseFig()*2;
-        size_t b_prec = ix;
-        size_t pl = VpSetPrecLimit(0);
-
-        GUARD_OBJ(cv, NewZeroWrapLimited(1, mx + VpBaseFig()));
-        GUARD_OBJ(av, GetVpValue(self, 1));
+
+    pl = VpSetPrecLimit(0);
+    if (ix == 0) ix = pl;
+
+    GUARD_OBJ(av, GetVpValue(self, 1));
+    if (RB_FLOAT_TYPE_P(b) && ix > BIGDECIMAL_DOUBLE_FIGURES) {
         /* TODO: I want to refactor this precision control for a float value later
          *       by introducing an implicit conversion function instead of
          *       GetVpValueWithPrec.  */
-        if (RB_FLOAT_TYPE_P(b) && b_prec > BIGDECIMAL_DOUBLE_FIGURES) {
-            b_prec = BIGDECIMAL_DOUBLE_FIGURES;
-        }
-        GUARD_OBJ(bv, GetVpValueWithPrec(b, b_prec, 1));
-        mx = av->Prec + bv->Prec + 2;
-        if (mx <= cv->MaxPrec) mx = cv->MaxPrec + 1;
-        GUARD_OBJ(res, NewZeroWrapNolimit(1, (mx * 2  + 2)*VpBaseFig()));
-        VpDivd(cv, res, av, bv);
-        VpSetPrecLimit(pl);
-        VpLeftRound(cv, VpGetRoundMode(), ix);
-        return VpCheckGetValue(cv);
+        GUARD_OBJ(bv, GetVpValueWithPrec(b, BIGDECIMAL_DOUBLE_FIGURES, 1));
+    }
+    else {
+        GUARD_OBJ(bv, GetVpValueWithPrec(b, ix, 1));
     }
+
+    if (ix == 0) {
+        ssize_t a_prec, b_prec;
+        VpCountPrecisionAndScale(av, &a_prec, NULL);
+        VpCountPrecisionAndScale(bv, &b_prec, NULL);
+        ix = ((a_prec > b_prec) ? a_prec : b_prec) + BIGDECIMAL_DOUBLE_FIGURES;
+        if (2 * BIGDECIMAL_DOUBLE_FIGURES > ix)
+            ix = 2 * BIGDECIMAL_DOUBLE_FIGURES;
+    }
+
+    // VpDivd needs 2 extra DECDIGs. One more is needed for rounding.
+    GUARD_OBJ(cv, NewZeroWrapLimited(1, ix + 3 * VpBaseFig()));
+
+    mx = bv->Prec + cv->MaxPrec - 1;
+    if (mx <= av->Prec) mx = av->Prec + 1;
+    GUARD_OBJ(res, NewZeroWrapNolimit(1, mx * VpBaseFig()));
+    VpDivd(cv, res, av, bv);
+    VpSetPrecLimit(pl);
+    if (!VpIsZero(res)) {
+        // Remainder value affects rounding result.
+        // ROUND_UP cv = 0.1e0 with ix=10 will be:
+        // 0.1e0 if remainder == 0
+        // 0.1000000001e0 if remainder != 0
+        size_t idx = roomof(ix, BASE_FIG);
+        while (cv->Prec <= idx) cv->frac[cv->Prec++] = 0;
+        if (cv->frac[idx] == 0 || cv->frac[idx] == HALF_BASE) cv->frac[idx]++;
+    }
+    VpLeftRound(cv, VpGetRoundMode(), ix);
+    return VpCheckGetValue(cv);
 }
 
  /*
@@ -2316,7 +2286,7 @@ BigDecimal_add2(VALUE self, VALUE b, VALUE n)
 }
 
 /* call-seq:
- * sub(value, digits)  -> bigdecimal
+ *   sub(value, digits)  -> bigdecimal
  *
  * Subtract the specified value.
  *
@@ -2415,7 +2385,7 @@ BigDecimal_abs(VALUE self)
 }
 
 /* call-seq:
- * sqrt(n)
+ *   sqrt(n)
  *
  * Returns the square root of the value.
  *
@@ -2456,10 +2426,10 @@ BigDecimal_fix(VALUE self)
 }
 
 /* call-seq:
- * round(n, mode)
+ *   round(n, mode)
  *
  * Round to the nearest integer (by default), returning the result as a
- * BigDecimal if n is specified, or as an Integer if it isn't.
+ * BigDecimal if n is specified and positive, or as an Integer if it isn't.
  *
  *	BigDecimal('3.14159').round #=> 3
  *	BigDecimal('8.7').round #=> 9
@@ -2467,6 +2437,7 @@ BigDecimal_fix(VALUE self)
  *
  *	BigDecimal('3.14159').round(2).class.name #=> "BigDecimal"
  *	BigDecimal('3.14159').round.class.name #=> "Integer"
+ *	BigDecimal('3.14159').round(0).class.name #=> "Integer"
  *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
@@ -2533,7 +2504,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
 }
 
 /* call-seq:
- * truncate(n)
+ *   truncate(n)
  *
  * Truncate to the nearest integer (by default), returning the result as a
  * BigDecimal.
@@ -2595,7 +2566,7 @@ BigDecimal_frac(VALUE self)
 }
 
 /* call-seq:
- * floor(n)
+ *   floor(n)
  *
  * Return the largest integer less than or equal to the value, as a BigDecimal.
  *
@@ -2642,7 +2613,7 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
 }
 
 /* call-seq:
- * ceil(n)
+ *   ceil(n)
  *
  * Return the smallest integer greater than or equal to the value, as a BigDecimal.
  *
@@ -2685,7 +2656,7 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
 }
 
 /* call-seq:
- * to_s(s)
+ *   to_s(s)
  *
  * Converts the value to a string.
  *
@@ -2995,8 +2966,8 @@ bigdecimal_power_by_bigdecimal(Real const* x, Real const* exp, ssize_t const n)
 }
 
 /* call-seq:
- * power(n)
- * power(n, prec)
+ *   power(n)
+ *   power(n, prec)
  *
  * Returns the value raised to the power of n.
  *
@@ -3787,8 +3758,9 @@ BigDecimal_s_interpret_loosely(VALUE klass, VALUE str)
         return VpCheckGetValue(vp);
 }
 
- /* call-seq:
-  * BigDecimal.limit(digits)
+ /*
+  * call-seq:
+  *   BigDecimal.limit(digits)
   *
   * Limit the number of significant digits in newly created BigDecimal
   * numbers to the specified value. Rounding is performed as necessary,
@@ -3922,7 +3894,7 @@ BigDecimal_save_limit(VALUE self)
 }
 
 /* call-seq:
- * BigMath.exp(decimal, numeric)    -> BigDecimal
+ *   BigMath.exp(decimal, numeric)    -> BigDecimal
  *
  * Computes the value of e (the base of natural logarithms) raised to the
  * power of +decimal+, to the specified number of digits of precision.
@@ -4053,7 +4025,7 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 }
 
 /* call-seq:
- * BigMath.log(decimal, numeric)    -> BigDecimal
+ *   BigMath.log(decimal, numeric)    -> BigDecimal
  *
  * Computes the natural logarithm of +decimal+ to the specified number of
  * digits of precision, +numeric+.
@@ -5276,7 +5248,7 @@ VP_EXPORT Real *
 VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
 {
     const char *orig_szVal = szVal;
-    size_t i, j, ni, ipf, nf, ipe, ne, dot_seen, exp_seen, nalloc;
+    size_t i, j, ni, ipf, nf, ipe, ne, exp_seen, nalloc;
     size_t len;
     char v, *psz;
     int  sign=1;
@@ -5362,13 +5334,11 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
     ne  = 0; /* number of digits in the exponential part */
     ipf = 0; /* index of the beginning of the fractional part */
     ipe = 0; /* index of the beginning of the exponential part */
-    dot_seen = 0;
     exp_seen = 0;
 
     if (v != '\0') {
         /* Scanning fractional part */
         if ((psz[i] = szVal[j]) == '.') {
-            dot_seen = 1;
             ++i;
             ++j;
             ipf = i;
@@ -5384,9 +5354,6 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
                     }
                     if (!strict_p) {
                         v = psz[i] = '\0';
-                        if (nf == 0) {
-                            dot_seen = 0;
-                        }
                         break;
                     }
                     goto invalid_value;
@@ -5457,7 +5424,7 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
 
     psz[i] = '\0';
 
-    if (strict_p && (((ni == 0 || dot_seen) && nf == 0) || (exp_seen && ne == 0))) {
+    if (strict_p && ((ni == 0 && nf == 0) || (exp_seen && ne == 0))) {
         VALUE str;
       invalid_value:
         if (!strict_p) {
@@ -6168,7 +6135,7 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
     word_c = c->MaxPrec;
     word_r = r->MaxPrec;
 
-    if (word_a >= word_r) goto space_error;
+    if (word_a >= word_r || word_b + word_c - 2 >= word_r) goto space_error;
 
     ind_r = 1;
     r->frac[0] = 0;

data/ext/bigdecimal/extconf.rb

@@ -24,15 +24,17 @@ have_header("math.h")
 have_header("stdbool.h")
 have_header("stdlib.h")
 
-have_header("x86intrin.h")
-have_func("_lzcnt_u32", "x86intrin.h")
-have_func("_lzcnt_u64", "x86intrin.h")
-
-have_header("intrin.h")
-have_func("__lzcnt", "intrin.h")
-have_func("__lzcnt64", "intrin.h")
-have_func("_BitScanReverse", "intrin.h")
-have_func("_BitScanReverse64", "intrin.h")
+if have_header("x86intrin.h")
+  have_func("_lzcnt_u32", "x86intrin.h")
+  have_func("_lzcnt_u64", "x86intrin.h")
+end
+
+if have_header("intrin.h")
+  have_func("__lzcnt", "intrin.h")
+  have_func("__lzcnt64", "intrin.h")
+  have_func("_BitScanReverse", "intrin.h")
+  have_func("_BitScanReverse64", "intrin.h")
+end
 
 have_func("labs", "stdlib.h")
 have_func("llabs", "stdlib.h")

data/ext/bigdecimal/missing.c

@@ -15,7 +15,8 @@
     _Pragma("GCC diagnostic push") \
     _Pragma("GCC diagnostic ignored \"-Wattributes\"") \
     __attribute__((__no_sanitize__(x))) y; \
-    _Pragma("GCC diagnostic pop")
+    _Pragma("GCC diagnostic pop") \
+    y
 #endif
 
 #undef strtod

data/lib/bigdecimal/math.rb

@@ -7,13 +7,12 @@ require 'bigdecimal'
 #   sqrt(x, prec)
 #   sin (x, prec)
 #   cos (x, prec)
-#   atan(x, prec)  Note: |x|<1, x=0.9999 may not converge.
+#   atan(x, prec)
 #   PI  (prec)
 #   E   (prec) == exp(1.0,prec)
 #
 # where:
 #   x    ... BigDecimal number to be computed.
-#            |x| must be small enough to get convergence.
 #   prec ... Number of digits to be obtained.
 #++
 #

data/lib/bigdecimal/util.rb

@@ -155,7 +155,7 @@ class Complex < Numeric
   # See also Kernel.BigDecimal.
   #
   def to_d(*args)
-    BigDecimal(self) unless self.imag.zero? # to raise eerror
+    BigDecimal(self) unless self.imag.zero? # to raise error
 
     if args.length == 0
       case self.real

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bigdecimal
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.2.2
 platform: ruby
 authors:
 - Kenta Murata
 - Zachary Scott
 - Shigeo Kobayashi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: This library provides arbitrary-precision decimal floating-point number
   class.
@@ -47,7 +46,6 @@ licenses:
 - BSD-2-Clause
 metadata:
   changelog_uri: https://github.com/ruby/bigdecimal/blob/master/CHANGES.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Arbitrary-precision decimal floating-point number library.
 test_files: []