bigdecimal 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba59492c4c5d6d57a15b9a02b25d8587257d66a083a80eba82ad65d2209a77c5
-  data.tar.gz: d25d0be615ff46b7f38a64ddedda4964c965ef9f9a20fc1a7a79acfa3a297151
+  metadata.gz: 4fe17cbc3e4c4013708f79a93c975f84b3b55c53028671ef217dde778438a909
+  data.tar.gz: 5ec9c5839c1ff24a1d08bca8087fff348ec5eaf5aeac910ebb4c972dc00b7b20
 SHA512:
-  metadata.gz: 5e3de510a188c4658be5d4e6e163a81622aecd60d99d7ff605f18c180fff04fbb2bd327d18b2975e688fbc12c2ed9a02e25f3d94956872156f3b66c0256e4911
-  data.tar.gz: c2db42684202a56b218164603222e6f511c53d9b91545c0a1b142e0570c421b0e16f6ec3d883267c92d6924fa1192fd73fea2eca0390afed5c5c1dcd7b986f21
+  metadata.gz: 653b43d52285c5b25dbef5a4ced242d289b966699e099ae37f122a120e924cabd484a534df3d62c1c2e03ae76fefdb874564631bcdd617f041b664b42c34d981
+  data.tar.gz: 0cc5144ca6df649f27338327021bc7644cd55f7834ff035e473b9abb68d821ea28f9a89f3e6210224547cce0be0c0a56bc9c72d89e63b8446407f2f3ef4ff602

data/bigdecimal.gemspec

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-bigdecimal_version = '1.4.1'
+bigdecimal_version = '2.0.0'
 
 Gem::Specification.new do |s|
   s.name          = "bigdecimal"
@@ -14,16 +14,11 @@ Gem::Specification.new do |s|
   s.license       = "ruby"
 
   s.require_paths = %w[lib]
-  s.extensions    = %w[ext/bigdecimal/extconf.rb ext/bigdecimal/util/extconf.rb]
+  s.extensions    = %w[ext/bigdecimal/extconf.rb]
   s.files         = %w[
     bigdecimal.gemspec
     ext/bigdecimal/bigdecimal.c
-    ext/bigdecimal/bigdecimal.def
     ext/bigdecimal/bigdecimal.h
-    ext/bigdecimal/depend
-    ext/bigdecimal/extconf.rb
-    ext/bigdecimal/util/extconf.rb
-    ext/bigdecimal/util/util.c
     lib/bigdecimal.rb
     lib/bigdecimal/jacobian.rb
     lib/bigdecimal/ludcmp.rb
@@ -35,11 +30,10 @@ Gem::Specification.new do |s|
     sample/pi.rb
   ]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0".freeze)
+  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rake-compiler", ">= 0.9"
-  s.add_development_dependency "rake-compiler-dock", ">= 0.6.1"
   s.add_development_dependency "minitest", "< 5.0.0"
   s.add_development_dependency "pry"
 end

data/ext/bigdecimal/bigdecimal.c

@@ -127,6 +127,30 @@ rb_rational_den(VALUE rat)
 }
 #endif
 
+#ifndef HAVE_RB_COMPLEX_REAL
+static inline VALUE
+rb_complex_real(VALUE cmp)
+{
+#ifdef HAVE_TYPE_STRUCT_RCOMPLEX
+  return RCOMPLEX(cmp)->real;
+#else
+  return rb_funcall(cmp, rb_intern("real"), 0);
+#endif
+}
+#endif
+
+#ifndef HAVE_RB_COMPLEX_IMAG
+static inline VALUE
+rb_complex_imag(VALUE cmp)
+{
+#ifdef HAVE_TYPE_STRUCT_RCOMPLEX
+  return RCOMPLEX(cmp)->imag;
+#else
+  return rb_funcall(cmp, rb_intern("imag"), 0);
+#endif
+}
+#endif
+
 #define BIGDECIMAL_POSITIVE_P(bd) ((bd)->sign > 0)
 #define BIGDECIMAL_NEGATIVE_P(bd) ((bd)->sign < 0)
 
@@ -276,7 +300,6 @@ again:
 #ifdef ENABLE_NUMERIC_STRING
       case T_STRING:
 	StringValueCStr(v);
-	rb_check_safe_obj(v);
 	return VpCreateRbObject(RSTRING_LEN(v) + VpBaseFig() + 1,
 				RSTRING_PTR(v));
 #endif /* ENABLE_NUMERIC_STRING */
@@ -418,7 +441,6 @@ BigDecimal_load(VALUE self, VALUE str)
     unsigned long m=0;
 
     pch = (unsigned char *)StringValueCStr(str);
-    rb_check_safe_obj(str);
     /* First get max prec */
     while((*pch) != (unsigned char)'\0' && (ch = *pch++) != (unsigned char)':') {
         if(!ISDIGIT(ch)) {
@@ -1756,12 +1778,15 @@ BigDecimal_fix(VALUE self)
  * round(n, mode)
  *
  * Round to the nearest integer (by default), returning the result as a
- * BigDecimal.
+ * BigDecimal if n is specified, or as an Integer if it isn't.
  *
  *	BigDecimal('3.14159').round #=> 3
  *	BigDecimal('8.7').round #=> 9
  *	BigDecimal('-9.9').round #=> -10
  *
+ *	BigDecimal('3.14159').round(2).class.name #=> "BigDecimal"
+ *	BigDecimal('3.14159').round.class.name #=> "Integer"
+ *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
  *
@@ -2027,7 +2052,6 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
     if (rb_scan_args(argc, argv, "01", &f) == 1) {
 	if (RB_TYPE_P(f, T_STRING)) {
 	    psz = StringValueCStr(f);
-	    rb_check_safe_obj(f);
 	    if (*psz == ' ') {
 		fPlus = 1;
 		psz++;
@@ -2560,6 +2584,10 @@ BigDecimal_clone(VALUE self)
   return self;
 }
 
+#ifdef HAVE_RB_OPTS_EXCEPTION_P
+int rb_opts_exception_p(VALUE opts, int default_value);
+#define opts_exception_p(opts) rb_opts_exception_p((opts), 1)
+#else
 static int
 opts_exception_p(VALUE opts)
 {
@@ -2568,12 +2596,20 @@ opts_exception_p(VALUE opts)
     if (!kwds[0]) {
         kwds[0] = rb_intern_const("exception");
     }
-    rb_get_kwargs(opts, kwds, 0, 1, &exception);
+    if (!rb_get_kwargs(opts, kwds, 0, 1, &exception)) return 1;
+    switch (exception) {
+      case Qtrue: case Qfalse:
+        break;
+      default:
+        rb_raise(rb_eArgError, "true or false is expected as exception: %+"PRIsVALUE,
+                 exception);
+    }
     return exception != Qfalse;
 }
+#endif
 
 static Real *
-BigDecimal_new(int argc, VALUE *argv)
+VpNewVarArg(int argc, VALUE *argv)
 {
     size_t mf;
     VALUE  opts = Qnil;
@@ -2616,6 +2652,7 @@ BigDecimal_new(int argc, VALUE *argv)
         }
     }
 
+  retry:
     switch (TYPE(iniValue)) {
       case T_DATA:
 	if (is_kind_of_BigDecimal(iniValue)) {
@@ -2653,6 +2690,18 @@ BigDecimal_new(int argc, VALUE *argv)
 	}
 	return GetVpValueWithPrec(iniValue, mf, 1);
 
+      case T_COMPLEX:
+        {
+            VALUE im;
+            im = rb_complex_imag(iniValue);
+            if (!is_zero(im)) {
+                rb_raise(rb_eArgError,
+                         "Unable to make a BigDecimal from non-zero imaginary number");
+            }
+            iniValue = rb_complex_real(iniValue);
+            goto retry;
+        }
+
       case T_STRING:
 	/* fall through */
       default:
@@ -2710,8 +2759,11 @@ f_BigDecimal(int argc, VALUE *argv, VALUE self)
     Real *pv;
     VALUE obj;
 
+    if (argc > 0 && CLASS_OF(argv[0]) == rb_cBigDecimal) {
+        if (argc == 1 || (argc == 2 && RB_TYPE_P(argv[1], T_HASH))) return argv[0];
+    }
     obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, 0);
-    pv = BigDecimal_new(argc, argv);
+    pv = VpNewVarArg(argc, argv);
     if (pv == NULL) return Qnil;
     SAVE(pv);
     if (ToValue(pv)) pv = VpCopy(NULL, pv);
@@ -2720,6 +2772,20 @@ f_BigDecimal(int argc, VALUE *argv, VALUE self)
     return pv->obj = obj;
 }
 
+static VALUE
+BigDecimal_s_interpret_loosely(VALUE klass, VALUE str)
+{
+    ENTER(1);
+    char const *c_str;
+    Real *pv;
+
+    c_str = StringValueCStr(str);
+    GUARD_OBJ(pv, VpAlloc(0, c_str, 0, 1));
+    pv->obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, pv);
+    RB_OBJ_FREEZE(pv->obj);
+    return pv->obj;
+}
+
  /* call-seq:
   * BigDecimal.limit(digits)
   *
@@ -2939,6 +3005,10 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
     n = prec + rmpd_double_figures();
     negative = BIGDECIMAL_NEGATIVE_P(vx);
     if (negative) {
+        VALUE x_zero = INT2NUM(1);
+        VALUE x_copy = f_BigDecimal(1, &x_zero, klass);
+        x = BigDecimal_initialize_copy(x_copy, x);
+        vx = DATA_PTR(x);
 	VpSetSign(vx, 1);
     }
 
@@ -3140,20 +3210,6 @@ get_vp_value:
     return y;
 }
 
-VALUE
-rmpd_util_str_to_d(VALUE str)
-{
-  ENTER(1);
-  char const *c_str;
-  Real *pv;
-
-  c_str = StringValueCStr(str);
-  GUARD_OBJ(pv, VpAlloc(0, c_str, 0, 1));
-  pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
-  RB_OBJ_FREEZE(pv->obj);
-  return pv->obj;
-}
-
 /* Document-class: BigDecimal
  * BigDecimal provides arbitrary-precision floating point decimal arithmetic.
  *
@@ -3300,6 +3356,7 @@ Init_bigdecimal(void)
     /* Class methods */
     rb_undef_method(CLASS_OF(rb_cBigDecimal), "allocate");
     rb_undef_method(CLASS_OF(rb_cBigDecimal), "new");
+    rb_define_singleton_method(rb_cBigDecimal, "interpret_loosely", BigDecimal_s_interpret_loosely, 1);
     rb_define_singleton_method(rb_cBigDecimal, "mode", BigDecimal_mode, -1);
     rb_define_singleton_method(rb_cBigDecimal, "limit", BigDecimal_limit, -1);
     rb_define_singleton_method(rb_cBigDecimal, "double_fig", BigDecimal_double_fig, 0);
@@ -3430,7 +3487,6 @@ Init_bigdecimal(void)
 
 
     /* instance methods */
-    rb_define_method(rb_cBigDecimal, "initialize_copy", BigDecimal_initialize_copy, 1);
     rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
 
     rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
@@ -4281,7 +4337,7 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
 
     psz[i] = '\0';
 
-    if (((ni == 0 || dot_seen) && nf == 0) || (exp_seen && ne == 0)) {
+    if (strict_p && (((ni == 0 || dot_seen) && nf == 0) || (exp_seen && ne == 0))) {
         VALUE str;
       invalid_value:
         if (!strict_p) {

data/ext/bigdecimal/extconf.rb

@@ -1,6 +1,21 @@
 # frozen_string_literal: false
 require 'mkmf'
 
+def check_bigdecimal_version(gemspec_path)
+  message "checking RUBY_BIGDECIMAL_VERSION... "
+
+  bigdecimal_version =
+    IO.readlines(gemspec_path)
+      .grep(/\Abigdecimal_version\s+=\s+/)[0][/\'([^\']+)\'/, 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
+
 gemspec_name = gemspec_path = nil
 unless ['', '../../'].any? {|dir|
          gemspec_name = "#{dir}bigdecimal.gemspec"
@@ -11,11 +26,7 @@ unless ['', '../../'].any? {|dir|
   abort
 end
 
-bigdecimal_version =
-  IO.readlines(gemspec_path)
-    .grep(/\Abigdecimal_version\s+=\s+/)[0][/\'([\d\.]+)\'/, 1]
-
-$defs << %Q[-DRUBY_BIGDECIMAL_VERSION=\\"#{bigdecimal_version}\\"]
+check_bigdecimal_version(gemspec_path)
 
 have_func("labs", "stdlib.h")
 have_func("llabs", "stdlib.h")
@@ -25,8 +36,12 @@ have_func("isfinite", "math.h")
 have_type("struct RRational", "ruby.h")
 have_func("rb_rational_num", "ruby.h")
 have_func("rb_rational_den", "ruby.h")
+have_type("struct RComplex", "ruby.h")
+have_func("rb_complex_real", "ruby.h")
+have_func("rb_complex_imag", "ruby.h")
 have_func("rb_array_const_ptr", "ruby.h")
 have_func("rb_sym2str", "ruby.h")
+have_func("rb_opts_exception_p", "ruby.h")
 
 if File.file?(File.expand_path('../lib/bigdecimal.rb', __FILE__))
   bigdecimal_rb = "$(srcdir)/lib/bigdecimal.rb"

data/lib/bigdecimal/jacobian.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: false
-#
+
+require 'bigdecimal'
+
 # require 'bigdecimal/jacobian'
 #
 # Provides methods to compute the Jacobian matrix of a set of equations at a
@@ -21,9 +23,6 @@
 #
 # fx is f.values(x).
 #
-
-require 'bigdecimal'
-
 module Jacobian
   module_function
 

data/lib/bigdecimal/util.rb

@@ -6,7 +6,6 @@
 #++
 
 require 'bigdecimal'
-require 'bigdecimal/util.so'
 
 class Integer < Numeric
   # call-seq:
@@ -66,6 +65,9 @@ class String
   #
   # See also BigDecimal::new.
   #
+  def to_d
+    BigDecimal.interpret_loosely(self)
+  end
 end
 
 
@@ -129,6 +131,39 @@ class Rational < Numeric
 end
 
 
+class Complex < Numeric
+  # call-seq:
+  #     cmp.to_d             -> bigdecimal
+  #     cmp.to_d(precision)  -> bigdecimal
+  #
+  # Returns the value as a BigDecimal.
+  #
+  # The +precision+ parameter is required for a rational complex number.
+  # This parameter is used to determine the number of significant digits
+  # for the result.
+  #
+  #     require 'bigdecimal'
+  #     require 'bigdecimal/util'
+  #
+  #     Complex(0.1234567, 0).to_d(4)   # => 0.1235e0
+  #     Complex(Rational(22, 7), 0).to_d(3)   # => 0.314e1
+  #
+  # See also BigDecimal::new.
+  #
+  def to_d(*args)
+    BigDecimal(self) unless self.imag.zero? # to raise eerror
+
+    if args.length == 0
+      case self.real
+      when Rational
+        BigDecimal(self.real) # to raise error
+      end
+    end
+    self.real.to_d(*args)
+  end
+end
+
+
 class NilClass
   # call-seq:
   #     nil.to_d -> bigdecimal

data/lib/bigdecimal.rb

@@ -1,10 +1 @@
-begin
-  require "#{RUBY_VERSION[/\d+\.\d+/]}/bigdecimal.so"
-rescue LoadError
-  require 'bigdecimal.so'
-end
-
-def BigDecimal.new(*args, **kwargs)
-  warn "BigDecimal.new is deprecated; use BigDecimal() method instead.", uplevel: 1
-  BigDecimal(*args, **kwargs)
-end
+require 'bigdecimal.so'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigdecimal
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Kenta Murata
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,20 +40,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -89,17 +75,12 @@ email:
 executables: []
 extensions:
 - ext/bigdecimal/extconf.rb
-- ext/bigdecimal/util/extconf.rb
 extra_rdoc_files: []
 files:
 - bigdecimal.gemspec
 - ext/bigdecimal/bigdecimal.c
-- ext/bigdecimal/bigdecimal.def
 - ext/bigdecimal/bigdecimal.h
-- ext/bigdecimal/depend
 - ext/bigdecimal/extconf.rb
-- ext/bigdecimal/util/extconf.rb
-- ext/bigdecimal/util/util.c
 - lib/bigdecimal.rb
 - lib/bigdecimal/jacobian.rb
 - lib/bigdecimal/ludcmp.rb
@@ -121,14 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Arbitrary-precision decimal floating-point number library.

data/ext/bigdecimal/bigdecimal.def

@@ -1,3 +0,0 @@
-EXPORTS
-rmpd_util_str_to_d
-Init_bigdecimal

data/ext/bigdecimal/depend

@@ -1,16 +0,0 @@
-extconf.h: $(srcdir)/$(GEMSPEC)
-Makefile: $(BIGDECIMAL_RB)
-
-# AUTOGENERATED DEPENDENCIES START
-bigdecimal.o: $(RUBY_EXTCONF_H)
-bigdecimal.o: $(arch_hdrdir)/ruby/config.h
-bigdecimal.o: $(hdrdir)/ruby/defines.h
-bigdecimal.o: $(hdrdir)/ruby/intern.h
-bigdecimal.o: $(hdrdir)/ruby/missing.h
-bigdecimal.o: $(hdrdir)/ruby/ruby.h
-bigdecimal.o: $(hdrdir)/ruby/st.h
-bigdecimal.o: $(hdrdir)/ruby/subst.h
-bigdecimal.o: $(hdrdir)/ruby/util.h
-bigdecimal.o: bigdecimal.c
-bigdecimal.o: bigdecimal.h
-# AUTOGENERATED DEPENDENCIES END

data/ext/bigdecimal/util/extconf.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: false
-require 'mkmf'
-
-checking_for(checking_message("Windows")) do
-  case RUBY_PLATFORM
-  when /cygwin|mingw/
-    if defined?($extlist)
-      build_dir = "$(TARGET_SO_DIR)../"
-    else
-      base_dir = File.expand_path('../../../..', __FILE__)
-      build_dir = File.join(base_dir, "tmp", RUBY_PLATFORM, "bigdecimal", RUBY_VERSION, "")
-    end
-    $libs << " #{build_dir}bigdecimal.so"
-    true
-  when /mswin/
-    $DLDFLAGS << " -libpath:.."
-    $libs << " bigdecimal-$(arch).lib"
-    true
-  else
-    false
-  end
-end
-
-create_makefile('bigdecimal/util')

data/ext/bigdecimal/util/util.c

@@ -1,9 +0,0 @@
-#include "ruby.h"
-
-RUBY_EXTERN VALUE rmpd_util_str_to_d(VALUE str);
-
-void
-Init_util(void)
-{
-  rb_define_method(rb_cString, "to_d", rmpd_util_str_to_d, 0);
-}