bigdecimal 3.1.3 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 709b449a675da27c73c3f89a806b30042260e11ff5850a4f67ad2742c5b893db
-  data.tar.gz: e1e356c06c6af164010886bbbc58f89217921e73d8b5267587c87c9b4566ca75
+  metadata.gz: 109c70397447eabf22f0e869db4b2c0c902c7d0baaf28865aebfc534e3c14b9f
+  data.tar.gz: 43df8b8d27be2b5cbf29c7396c07eabbca3119067b525f94155f2901f2c058d4
 SHA512:
-  metadata.gz: a745b78d3b9fe6f4e5a904dbe0e92fe8d30ff82e741835186ef528a92e2532d7cf10a3da6722ecc8b46b16c1a4f4bccb22bd18ccf5e5fedee1bae1bf62d17961
-  data.tar.gz: 57e4c571d5b1639206842d0ecbfd67ff2b296c9639fdacd5b655b4bf98714e211b737061e95f79f21c4e735afe7e0550079fb6bac3b9f9eefb1ba2c55e48ffbe
+  metadata.gz: 8b0b82714e555c1ca30e761296f497d2cf914a50d19d553cca37b51af6b85914bbc86772b5bb8d70388020dbff9abc3e0501b3d6bb95ba3d68c30a91d5b197fa
+  data.tar.gz: a4bc1e9d1918fb84f5405c3dc2fce2358a074f0f729084936ec7ee2010dffeeee889fb0054d932f35175c48577888fc74bba7afde492f628d8beef5deeeadc0d

data/bigdecimal.gemspec

@@ -1,28 +1,29 @@
 # coding: utf-8
 
+name = File.basename(__FILE__, '.*')
+source_version = ["", "ext/#{name}/"].find do |dir|
+  begin
+    break File.foreach(File.join(__dir__, "#{dir}#{name}.c")) {|line|
+      break $1.sub("-", ".") if /^#define\s+#{name.upcase}_VERSION\s+"(.+)"/o =~ line
+    }
+  rescue Errno::ENOENT
+  end
+end or raise "can't find #{name.upcase}_VERSION"
+
 Gem::Specification.new do |s|
-  s.name          = "bigdecimal"
-  s.version       = "3.1.3"
+  s.name          = name
+  s.version       = source_version
   s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
   s.email         = ["mrkn@mrkn.jp"]
 
   s.summary       = "Arbitrary-precision decimal floating-point number library."
   s.description   = "This library provides arbitrary-precision decimal floating-point number class."
   s.homepage      = "https://github.com/ruby/bigdecimal"
-  s.licenses       = ["Ruby", "bsd-2-clause"]
+  s.licenses       = ["Ruby", "BSD-2-Clause"]
 
   s.require_paths = %w[lib]
-  s.extensions    = %w[ext/bigdecimal/extconf.rb]
   s.files         = %w[
     bigdecimal.gemspec
-    ext/bigdecimal/bigdecimal.c
-    ext/bigdecimal/bigdecimal.h
-    ext/bigdecimal/bits.h
-    ext/bigdecimal/feature.h
-    ext/bigdecimal/missing.c
-    ext/bigdecimal/missing.h
-    ext/bigdecimal/missing/dtoa.c
-    ext/bigdecimal/static_assert.h
     lib/bigdecimal.rb
     lib/bigdecimal/jacobian.rb
     lib/bigdecimal/ludcmp.rb
@@ -33,6 +34,21 @@ Gem::Specification.new do |s|
     sample/nlsolve.rb
     sample/pi.rb
   ]
+  if Gem::Platform === s.platform and s.platform =~ 'java' or RUBY_ENGINE == 'jruby'
+    s.platform      = 'java'
+  else
+    s.extensions    = %w[ext/bigdecimal/extconf.rb]
+    s.files += %w[
+      ext/bigdecimal/bigdecimal.c
+      ext/bigdecimal/bigdecimal.h
+      ext/bigdecimal/bits.h
+      ext/bigdecimal/feature.h
+      ext/bigdecimal/missing.c
+      ext/bigdecimal/missing.h
+      ext/bigdecimal/missing/dtoa.c
+      ext/bigdecimal/static_assert.h
+    ]
+  end
 
   s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 end

data/ext/bigdecimal/bigdecimal.c

@@ -31,6 +31,8 @@
 #include "bits.h"
 #include "static_assert.h"
 
+#define BIGDECIMAL_VERSION "3.1.5"
+
 /* #define ENABLE_NUMERIC_STRING */
 
 #define SIGNED_VALUE_MAX INTPTR_MAX
@@ -313,7 +315,7 @@ static const rb_data_type_t BigDecimal_data_type = {
     "BigDecimal",
     { 0, BigDecimal_delete, BigDecimal_memsize, },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE | RUBY_TYPED_WB_PROTECTED
 #endif
 };
 
@@ -655,7 +657,7 @@ BigDecimal_precision(VALUE self)
  *  Returns the number of decimal digits following the decimal digits in +self+.
  *
  *    BigDecimal("0").scale         # => 0
- *    BigDecimal("1").scale         # => 1
+ *    BigDecimal("1").scale         # => 0
  *    BigDecimal("1.1").scale       # => 1
  *    BigDecimal("3.1415").scale    # => 4
  *    BigDecimal("-1e20").precision # => 0
@@ -2082,6 +2084,13 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
     if (!b) return DoSomeOne(self, r, rb_intern("remainder"));
     SAVE(b);
 
+    if (VpIsPosInf(b) || VpIsNegInf(b)) {
+       GUARD_OBJ(*dv, NewZeroWrapLimited(1, 1));
+       VpSetZero(*dv, 1);
+       *rv = a;
+       return Qnil;
+    }
+
     mx = (a->MaxPrec + b->MaxPrec) *VpBaseFig();
     GUARD_OBJ(c,   NewZeroWrapLimited(1, mx));
     GUARD_OBJ(res, NewZeroWrapNolimit(1, (mx+1) * 2 + (VpBaseFig() + 1)));
@@ -2680,7 +2689,7 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
  * A space at the start of s returns positive values with a leading space.
  *
  * If s contains a number, a space is inserted after each group of that many
- * fractional digits.
+ * digits, starting from '.' and counting outwards.
  *
  * If s ends with an 'E', engineering notation (0.xxxxEnn) is used.
  *
@@ -2688,14 +2697,14 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
  *
  * Examples:
  *
- *   BigDecimal('-123.45678901234567890').to_s('5F')
- *     #=> '-123.45678 90123 45678 9'
+ *   BigDecimal('-1234567890123.45678901234567890').to_s('5F')
+ *     #=> '-123 45678 90123.45678 90123 45678 9'
  *
- *   BigDecimal('123.45678901234567890').to_s('+8F')
- *     #=> '+123.45678901 23456789'
+ *   BigDecimal('1234567890123.45678901234567890').to_s('+8F')
+ *     #=> '+12345 67890123.45678901 23456789'
  *
- *   BigDecimal('123.45678901234567890').to_s(' F')
- *     #=> ' 123.4567890123456789'
+ *   BigDecimal('1234567890123.45678901234567890').to_s(' F')
+ *     #=> ' 1234567890123.4567890123456789'
  */
 static VALUE
 BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
@@ -3713,7 +3722,7 @@ rb_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception)
  *  - Other type:
  *
  *    - Raises an exception if keyword argument +exception+ is +true+.
- *    - Returns +nil+ if keyword argument +exception+ is +true+.
+ *    - Returns +nil+ if keyword argument +exception+ is +false+.
  *
  *  Raises an exception if +value+ evaluates to a Float
  *  and +digits+ is larger than Float::DIG + 1.
@@ -4133,11 +4142,11 @@ get_vp_value:
     }
     x = VpCheckGetValue(vx);
 
-    RB_GC_GUARD(one) = VpCheckGetValue(NewOneWrapLimited(1, 1));
-    RB_GC_GUARD(two) = VpCheckGetValue(VpCreateRbObject(1, "2", true));
+    one = VpCheckGetValue(NewOneWrapLimited(1, 1));
+    two = VpCheckGetValue(VpCreateRbObject(1, "2", true));
 
     n = prec + BIGDECIMAL_DOUBLE_FIGURES;
-    RB_GC_GUARD(vn) = SSIZET2NUM(n);
+    vn = SSIZET2NUM(n);
     expo = VpExponent10(vx);
     if (expo < 0 || expo >= 3) {
 	char buf[DECIMAL_SIZE_OF_BITS(SIZEOF_VALUE * CHAR_BIT) + 4];
@@ -4149,9 +4158,9 @@ get_vp_value:
     }
     w = BigDecimal_sub(x, one);
     x = BigDecimal_div2(w, BigDecimal_add(x, one), vn);
-    RB_GC_GUARD(x2) = BigDecimal_mult2(x, x, vn);
-    RB_GC_GUARD(y)  = x;
-    RB_GC_GUARD(d)  = y;
+    x2 = BigDecimal_mult2(x, x, vn);
+    y = x;
+    d = y;
     i = 1;
     while (!VpIsZero((Real*)DATA_PTR(d))) {
 	SIGNED_VALUE const ey = VpExponent10(DATA_PTR(y));
@@ -4179,6 +4188,13 @@ get_vp_value:
 	y = BigDecimal_add(y, dy);
     }
 
+    RB_GC_GUARD(one);
+    RB_GC_GUARD(two);
+    RB_GC_GUARD(vn);
+    RB_GC_GUARD(x2);
+    RB_GC_GUARD(y);
+    RB_GC_GUARD(d);
+
     return y;
 }
 
@@ -4347,7 +4363,20 @@ BigDecimal_negative_zero(void)
  *      (2/3r).to_d(3)  # => 0.667e0
  *      "0.5".to_d      # => 0.5e0
  *
- * == License
+ * == Methods for Working with \JSON
+ *
+ * - {::json_create}[https://docs.ruby-lang.org/en/master/BigDecimal.html#method-c-json_create]:
+ *   Returns a new \BigDecimal object constructed from the given object.
+ * - {#as_json}[https://docs.ruby-lang.org/en/master/BigDecimal.html#method-i-as_json]:
+ *   Returns a 2-element hash representing +self+.
+ * - {#to_json}[https://docs.ruby-lang.org/en/master/BigDecimal.html#method-i-to_json]:
+ *   Returns a \JSON string representing +self+.
+ *
+ * These methods are provided by the {JSON gem}[https://github.com/flori/json]. To make these methods available:
+ *
+ *   require 'json/add/bigdecimal'
+ *
+ * * == License
  *
  * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
  *
@@ -4395,13 +4424,10 @@ Init_bigdecimal(void)
 
     /* Constants definition */
 
-#ifndef RUBY_BIGDECIMAL_VERSION
-# error RUBY_BIGDECIMAL_VERSION is not defined
-#endif
     /*
      * The version of bigdecimal library
      */
-    rb_define_const(rb_cBigDecimal, "VERSION", rb_str_new2(RUBY_BIGDECIMAL_VERSION));
+    rb_define_const(rb_cBigDecimal, "VERSION", rb_str_new2(BIGDECIMAL_VERSION));
 
     /*
      * Base value used in internal calculations.  On a 32 bit system, BASE
@@ -6453,7 +6479,7 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
                     }
                 }
                 nc += fprintf(fp, "E%"PRIdSIZE, VpExponent10(a));
-                nc += fprintf(fp, " (%"PRIdVALUE", %lu, %lu)", a->exponent, a->Prec, a->MaxPrec);
+                nc += fprintf(fp, " (%"PRIdVALUE", %"PRIuSIZE", %"PRIuSIZE")", a->exponent, a->Prec, a->MaxPrec);
             }
             else {
                 nc += fprintf(fp, "0.0");
@@ -6693,95 +6719,90 @@ VpToFString(Real *a, char *buf, size_t buflen, size_t fFmt, int fPlus)
 /* fPlus = 0: default, 1: set ' ' before digits, 2: set '+' before digits. */
 {
     size_t i, n;
-    DECDIG m, e, nn;
+    DECDIG m, e;
     char *p = buf;
-    size_t plen = buflen;
+    size_t plen = buflen, delim = fFmt;
     ssize_t ex;
 
     if (VpToSpecialString(a, buf, buflen, fPlus)) return;
 
-#define ADVANCE(n) do { \
-    if (plen < n) goto overflow; \
-    p += n; \
-    plen -= n; \
+#define APPEND(c, group) do { \
+    if (plen < 1) goto overflow; \
+    if (group && delim == 0) { \
+        *p = ' '; \
+        p += 1; \
+        plen -= 1; \
+    } \
+    if (plen < 1) goto overflow; \
+    *p = c; \
+    p += 1; \
+    plen -= 1; \
+    if (group) delim = (delim + 1) % fFmt; \
 } while (0)
 
 
     if (BIGDECIMAL_NEGATIVE_P(a)) {
-        *p = '-';
-        ADVANCE(1);
+        APPEND('-', false);
     }
     else if (fPlus == 1) {
-        *p = ' ';
-        ADVANCE(1);
+        APPEND(' ', false);
     }
     else if (fPlus == 2) {
-        *p = '+';
-        ADVANCE(1);
+        APPEND('+', false);
     }
 
     n  = a->Prec;
     ex = a->exponent;
     if (ex <= 0) {
-        *p = '0'; ADVANCE(1);
-        *p = '.'; ADVANCE(1);
-        while (ex < 0) {
-            for (i=0; i < BASE_FIG; ++i) {
-                *p = '0'; ADVANCE(1);
-            }
-            ++ex;
+        APPEND('0', false);
+        APPEND('.', false);
+    }
+    while (ex < 0) {
+        for (i=0; i < BASE_FIG; ++i) {
+            APPEND('0', fFmt > 0);
         }
-        ex = -1;
+        ++ex;
     }
 
     for (i = 0; i < n; ++i) {
-        --ex;
-        if (i == 0 && ex >= 0) {
-            size_t n = snprintf(p, plen, "%lu", (unsigned long)a->frac[i]);
-            if (n > plen) goto overflow;
-            ADVANCE(n);
-        }
-        else {
-            m = BASE1;
-            e = a->frac[i];
-            while (m) {
-                nn = e / m;
-                *p = (char)(nn + '0');
-                ADVANCE(1);
-                e = e - nn * m;
+        m = BASE1;
+        e = a->frac[i];
+        if (i == 0 && ex > 0) {
+            for (delim = 0; e / m == 0; delim++) {
                 m /= 10;
             }
+            if (fFmt > 0) {
+              delim = 2*fFmt - (ex * BASE_FIG - delim) % fFmt;
+            }
+        }
+        while (m && (e || (i < n - 1) || ex > 0)) {
+            APPEND((char)(e / m + '0'), fFmt > 0);
+            e %= m;
+            m /= 10;
         }
-        if (ex == 0) {
-            *p = '.';
-            ADVANCE(1);
+        if (--ex == 0) {
+            APPEND('.', false);
+            delim = fFmt;
         }
     }
-    while (--ex>=0) {
-        m = BASE;
-        while (m /= 10) {
-            *p = '0';
-            ADVANCE(1);
+
+    while (ex > 0) {
+        for (i=0; i < BASE_FIG; ++i) {
+            APPEND('0', fFmt > 0);
         }
-        if (ex == 0) {
-            *p = '.';
-            ADVANCE(1);
+        if (--ex == 0) {
+            APPEND('.', false);
         }
     }
 
     *p = '\0';
-    while (p - 1 > buf && p[-1] == '0') {
-        *(--p) = '\0';
-        ++plen;
-    }
     if (p - 1 > buf && p[-1] == '.') {
         snprintf(p, plen, "0");
     }
-    if (fFmt) VpFormatSt(buf, fFmt);
 
   overflow:
     return;
-#undef ADVANCE
+#undef APPEND
 }
 
 /*
@@ -7158,7 +7179,6 @@ VpSqrt(Real *y, Real *x)
     Real *r = NULL;
     size_t y_prec;
     SIGNED_VALUE n, e;
-    SIGNED_VALUE prec;
     ssize_t nr;
     double val;
 
@@ -7197,12 +7217,6 @@ VpSqrt(Real *y, Real *x)
     nr = 0;
     y_prec = y->MaxPrec;
 
-    prec = x->exponent - (ssize_t)y_prec;
-    if (x->exponent > 0)
-	++prec;
-    else
-	--prec;
-
     VpVtoD(&val, &e, x);    /* val <- x  */
     e /= (SIGNED_VALUE)BASE_FIG;
     n = e / 2;

data/ext/bigdecimal/extconf.rb

@@ -1,18 +1,6 @@
 # frozen_string_literal: false
 require 'mkmf'
 
-def check_bigdecimal_version(gemspec_path)
-  message "checking RUBY_BIGDECIMAL_VERSION... "
-  bigdecimal_version = File.read(gemspec_path).match(/^\s*s\.version\s+=\s+['"]([^'"]+)['"]\s*$/)[1]
-
-  version_components = bigdecimal_version.split('.')
-  bigdecimal_version = version_components[0, 3].join('.')
-  bigdecimal_version << "-#{version_components[3]}" if version_components[3]
-  $defs << %Q[-DRUBY_BIGDECIMAL_VERSION=\\"#{bigdecimal_version}\\"]
-
-  message "#{bigdecimal_version}\n"
-end
-
 def have_builtin_func(name, check_expr, opt = "", &b)
   checking_for checking_message(name.funcall_style, nil, opt) do
     if try_compile(<<SRC, opt, &b)
@@ -27,18 +15,6 @@ SRC
   end
 end
 
-gemspec_name = gemspec_path = nil
-unless ['', '../../'].any? {|dir|
-         gemspec_name = "#{dir}bigdecimal.gemspec"
-         gemspec_path = File.expand_path("../#{gemspec_name}", __FILE__)
-         File.file?(gemspec_path)
-       }
-  $stderr.puts "Unable to find bigdecimal.gemspec"
-  abort
-end
-
-check_bigdecimal_version(gemspec_path)
-
 have_builtin_func("__builtin_clz", "__builtin_clz(0)")
 have_builtin_func("__builtin_clzl", "__builtin_clzl(0)")
 have_builtin_func("__builtin_clzll", "__builtin_clzll(0)")
@@ -82,6 +58,5 @@ else
 end
 
 create_makefile('bigdecimal') {|mf|
-  mf << "GEMSPEC = #{gemspec_name}\n"
   mf << "BIGDECIMAL_RB = #{bigdecimal_rb}\n"
 }

data/lib/bigdecimal/util.rb

@@ -18,7 +18,7 @@ class Integer < Numeric
   #
   #     42.to_d   # => 0.42e2
   #
-  # See also BigDecimal::new.
+  # See also Kernel.BigDecimal.
   #
   def to_d
     BigDecimal(self)
@@ -45,7 +45,7 @@ class Float < Numeric
   #     1.234.to_d       # => 0.1234e1
   #     1.234.to_d(2)    # => 0.12e1
   #
-  # See also BigDecimal::new.
+  # See also Kernel.BigDecimal.
   #
   def to_d(precision=0)
     BigDecimal(self, precision)
@@ -67,7 +67,7 @@ class String
   #     "123.45e1".to_d        # => 0.12345e4
   #     "45.67 degrees".to_d   # => 0.4567e2
   #
-  # See also BigDecimal::new.
+  # See also Kernel.BigDecimal.
   #
   def to_d
     BigDecimal.interpret_loosely(self)
@@ -127,7 +127,7 @@ class Rational < Numeric
   #
   #     Rational(22, 7).to_d(3)   # => 0.314e1
   #
-  # See also BigDecimal::new.
+  # See also Kernel.BigDecimal.
   #
   def to_d(precision)
     BigDecimal(self, precision)
@@ -152,7 +152,7 @@ class Complex < Numeric
   #     Complex(0.1234567, 0).to_d(4)   # => 0.1235e0
   #     Complex(Rational(22, 7), 0).to_d(3)   # => 0.314e1
   #
-  # See also BigDecimal::new.
+  # See also Kernel.BigDecimal.
   #
   def to_d(*args)
     BigDecimal(self) unless self.imag.zero? # to raise eerror

data/lib/bigdecimal.rb

@@ -1 +1,5 @@
-require 'bigdecimal.so'
+if RUBY_ENGINE == 'jruby'
+  JRuby::Util.load_ext("org.jruby.ext.bigdecimal.BigDecimalLibrary")
+else
+  require 'bigdecimal.so'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigdecimal
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.5
 platform: ruby
 authors:
 - Kenta Murata
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies: []
 description: This library provides arbitrary-precision decimal floating-point number
   class.
@@ -43,7 +43,7 @@ files:
 homepage: https://github.com/ruby/bigdecimal
 licenses:
 - Ruby
-- bsd-2-clause
+- BSD-2-Clause
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: Arbitrary-precision decimal floating-point number library.