summaryrefslogtreecommitdiff
path: root/ext/bigdecimal
diff options
context:
space:
mode:
authorKenta Murata <mrkn@mrkn.jp>2021-01-30 12:05:15 +0900
committerKenta Murata <mrkn@mrkn.jp>2021-02-04 13:18:52 +0900
commit868d66e0b513ae038648fffbe826d9580099a6f4 (patch)
tree329c1f30d02b2c45a3b297cd0c2c09a296069927 /ext/bigdecimal
parentb0d6563f131d98f72c508199e5e3bc8da80b90ab (diff)
[ruby/bigdecimal] Stop using rmpd and RMPD prefixes and DBLE_FIG
https://github.com/ruby/bigdecimal/commit/7479923fdb
Diffstat (limited to 'ext/bigdecimal')
-rw-r--r--ext/bigdecimal/bigdecimal.c90
-rw-r--r--ext/bigdecimal/bigdecimal.h55
2 files changed, 64 insertions, 81 deletions
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index e0832b8..b9ba0ea 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -67,16 +67,12 @@ static ID id_half;
#define SAVE(p) PUSH((p)->obj)
#define GUARD_OBJ(p,y) ((p)=(y), SAVE(p))
-#define BASE_FIG RMPD_COMPONENT_FIGURES
-#define BASE RMPD_BASE
+#define BASE_FIG BIGDECIMAL_COMPONENT_FIGURES
+#define BASE BIGDECIMAL_BASE
#define HALF_BASE (BASE/2)
#define BASE1 (BASE/10)
-#ifndef DBLE_FIG
-#define DBLE_FIG RMPD_DOUBLE_FIGURES /* figure of double */
-#endif
-
#define LOG10_2 0.3010299956639812
#ifndef RRATIONAL_ZERO_P
@@ -2371,7 +2367,7 @@ is_even(VALUE x)
}
static VALUE
-rmpd_power_by_big_decimal(Real const* x, Real const* exp, ssize_t const n)
+bigdecimal_power_by_bigdecimal(Real const* x, Real const* exp, ssize_t const n)
{
VALUE log_x, multiplied, y;
volatile VALUE obj = exp->obj;
@@ -2441,7 +2437,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
goto retry;
}
if (NIL_P(prec)) {
- n += DBLE_FIG;
+ n += BIGDECIMAL_DOUBLE_FIGURES;
}
exp = GetVpValueWithPrec(vexp, 0, 1);
break;
@@ -2573,7 +2569,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
}
if (exp != NULL) {
- return rmpd_power_by_big_decimal(x, exp, n);
+ return bigdecimal_power_by_bigdecimal(x, exp, n);
}
else if (RB_TYPE_P(vexp, T_BIGNUM)) {
VALUE abs_value = BigDecimal_abs(self);
@@ -2630,7 +2626,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
else {
GUARD_OBJ(y, VpCreateRbObject(1, "0", true));
}
- VpPower(y, x, int_exp);
+ VpPowerByInt(y, x, int_exp);
if (!NIL_P(prec) && VpIsDef(y)) {
VpMidRound(y, VpGetRoundMode(), n);
}
@@ -2849,22 +2845,22 @@ rb_float_convert_to_BigDecimal(VALUE val, size_t digs, int raise_exception)
"can't omit precision for a %"PRIsVALUE".",
CLASS_OF(val));
}
- else if (digs > DBLE_FIG) {
+ else if (digs > BIGDECIMAL_DOUBLE_FIGURES) {
if (!raise_exception)
return Qnil;
rb_raise(rb_eArgError, "precision too large.");
}
/* Use the same logic in flo_to_s to convert a float to a decimal string */
- char buf[DBLE_FIG + BASE_FIG + 2 + 1]; /* sizeof(buf) == 28 in the typical case */
+ char buf[BIGDECIMAL_DOUBLE_FIGURES + BASE_FIG + 2 + 1]; /* sizeof(buf) == 28 in the typical case */
int decpt, negative_p;
char *e;
const int mode = digs == 0 ? 0 : 2;
char *p = BigDecimal_dtoa(d, mode, (int)digs, &decpt, &negative_p, &e);
int len10 = (int)(e - p);
- if (len10 > DBLE_FIG) {
+ if (len10 > BIGDECIMAL_DOUBLE_FIGURES) {
/* TODO: Presumably, rounding should be done here. */
- len10 = DBLE_FIG;
+ len10 = BIGDECIMAL_DOUBLE_FIGURES;
}
memcpy(buf, p, len10);
xfree(p);
@@ -3381,7 +3377,7 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
}
x = vx->obj;
- n = prec + rmpd_double_figures();
+ n = prec + BIGDECIMAL_DOUBLE_FIGURES;
negative = BIGDECIMAL_NEGATIVE_P(vx);
if (negative) {
VALUE x_zero = INT2NUM(1);
@@ -3406,8 +3402,8 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
if (m <= 0) {
break;
}
- else if ((size_t)m < rmpd_double_figures()) {
- m = rmpd_double_figures();
+ else if ((size_t)m < BIGDECIMAL_DOUBLE_FIGURES) {
+ m = BIGDECIMAL_DOUBLE_FIGURES;
}
d = BigDecimal_mult(d, x); /* d <- d * x */
@@ -3543,7 +3539,7 @@ get_vp_value:
RB_GC_GUARD(one) = VpCheckGetValue(VpCreateRbObject(1, "1", true));
RB_GC_GUARD(two) = VpCheckGetValue(VpCreateRbObject(1, "2", true));
- n = prec + rmpd_double_figures();
+ n = prec + BIGDECIMAL_DOUBLE_FIGURES;
RB_GC_GUARD(vn) = SSIZET2NUM(n);
expo = VpExponent10(vx);
if (expo < 0 || expo >= 3) {
@@ -3567,8 +3563,8 @@ get_vp_value:
if (m <= 0) {
break;
}
- else if ((size_t)m < rmpd_double_figures()) {
- m = rmpd_double_figures();
+ else if ((size_t)m < BIGDECIMAL_DOUBLE_FIGURES) {
+ m = BIGDECIMAL_DOUBLE_FIGURES;
}
x = BigDecimal_mult2(x2, x, vn);
@@ -4095,7 +4091,7 @@ VpFree(Real *pv)
* EXCEPTION Handling.
*/
-#define rmpd_set_thread_local_exception_mode(mode) \
+#define bigdecimal_set_thread_local_exception_mode(mode) \
rb_thread_local_aset( \
rb_thread_current(), \
id_BigDecimal_exception_mode, \
@@ -4111,8 +4107,8 @@ VpGetException (void)
);
if (NIL_P(vmode)) {
- rmpd_set_thread_local_exception_mode(RMPD_EXCEPTION_MODE_DEFAULT);
- return RMPD_EXCEPTION_MODE_DEFAULT;
+ bigdecimal_set_thread_local_exception_mode(BIGDECIMAL_EXCEPTION_MODE_DEFAULT);
+ return BIGDECIMAL_EXCEPTION_MODE_DEFAULT;
}
return NUM2USHORT(vmode);
@@ -4121,20 +4117,20 @@ VpGetException (void)
static void
VpSetException(unsigned short f)
{
- rmpd_set_thread_local_exception_mode(f);
+ bigdecimal_set_thread_local_exception_mode(f);
}
/*
* Precision limit.
*/
-#define rmpd_set_thread_local_precision_limit(limit) \
+#define bigdecimal_set_thread_local_precision_limit(limit) \
rb_thread_local_aset( \
rb_thread_current(), \
id_BigDecimal_precision_limit, \
SIZET2NUM(limit) \
)
-#define RMPD_PRECISION_LIMIT_DEFAULT ((size_t)0)
+#define BIGDECIMAL_PRECISION_LIMIT_DEFAULT ((size_t)0)
/* These 2 functions added at v1.1.7 */
VP_EXPORT size_t
@@ -4146,8 +4142,8 @@ VpGetPrecLimit(void)
);
if (NIL_P(vlimit)) {
- rmpd_set_thread_local_precision_limit(RMPD_PRECISION_LIMIT_DEFAULT);
- return RMPD_PRECISION_LIMIT_DEFAULT;
+ bigdecimal_set_thread_local_precision_limit(BIGDECIMAL_PRECISION_LIMIT_DEFAULT);
+ return BIGDECIMAL_PRECISION_LIMIT_DEFAULT;
}
return NUM2SIZET(vlimit);
@@ -4157,7 +4153,7 @@ VP_EXPORT size_t
VpSetPrecLimit(size_t n)
{
size_t const s = VpGetPrecLimit();
- rmpd_set_thread_local_precision_limit(n);
+ bigdecimal_set_thread_local_precision_limit(n);
return s;
}
@@ -4165,7 +4161,7 @@ VpSetPrecLimit(size_t n)
* Rounding mode.
*/
-#define rmpd_set_thread_local_rounding_mode(mode) \
+#define bigdecimal_set_thread_local_rounding_mode(mode) \
rb_thread_local_aset( \
rb_thread_current(), \
id_BigDecimal_rounding_mode, \
@@ -4181,8 +4177,8 @@ VpGetRoundMode(void)
);
if (NIL_P(vmode)) {
- rmpd_set_thread_local_rounding_mode(RMPD_ROUNDING_MODE_DEFAULT);
- return RMPD_ROUNDING_MODE_DEFAULT;
+ bigdecimal_set_thread_local_rounding_mode(BIGDECIMAL_ROUNDING_MODE_DEFAULT);
+ return BIGDECIMAL_ROUNDING_MODE_DEFAULT;
}
return NUM2USHORT(vmode);
@@ -4210,7 +4206,7 @@ VP_EXPORT unsigned short
VpSetRoundMode(unsigned short n)
{
if (VpIsRoundMode(n)) {
- rmpd_set_thread_local_rounding_mode(n);
+ bigdecimal_set_thread_local_rounding_mode(n);
return n;
}
@@ -4450,7 +4446,7 @@ VpNumOfChars(Real *vp,const char *pszFmt)
* by one DECDIG word in the computer used.
*
* [Returns]
- * DBLE_FIG ... OK
+ * BIGDECIMAL_DOUBLE_FIGURES ... OK
*/
VP_EXPORT size_t
VpInit(DECDIG BaseVal)
@@ -4468,16 +4464,16 @@ VpInit(DECDIG BaseVal)
#ifdef BIGDECIMAL_DEBUG
if (gfDebug) {
- printf("VpInit: BaseVal = %"PRIuDECDIG"\n", BaseVal);
+ printf("VpInit: BaseVal = %"PRIuDECDIG"\n", BaseVal);
printf("\tBASE = %"PRIuDECDIG"\n", BASE);
printf("\tHALF_BASE = %"PRIuDECDIG"\n", HALF_BASE);
printf("\tBASE1 = %"PRIuDECDIG"\n", BASE1);
printf("\tBASE_FIG = %u\n", BASE_FIG);
- printf("\tDBLE_FIG = %d\n", DBLE_FIG);
+ printf("\tBIGDECIMAL_DOUBLE_FIGURES = %d\n", BIGDECIMAL_DOUBLE_FIGURES);
}
#endif /* BIGDECIMAL_DEBUG */
- return rmpd_double_figures();
+ return BIGDECIMAL_DOUBLE_FIGURES;
}
VP_EXPORT Real *
@@ -4525,7 +4521,7 @@ overflow:
}
Real *
-rmpd_parse_special_string(const char *str)
+bigdecimal_parse_special_string(const char *str)
{
static const struct {
const char *str;
@@ -4626,7 +4622,7 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
}
/* Check on Inf & NaN */
- if ((vp = rmpd_parse_special_string(szVal)) != NULL) {
+ if ((vp = bigdecimal_parse_special_string(szVal)) != NULL) {
return vp;
}
@@ -5832,7 +5828,7 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
case '0': case 'z':
ZeroSup = 0;
++j;
- sep = cntl_chr[j] == 'z' ? RMPD_COMPONENT_FIGURES : 10;
+ sep = cntl_chr[j] == 'z' ? BIGDECIMAL_COMPONENT_FIGURES : 10;
break;
}
for (i = 0; i < a->Prec; ++i) {
@@ -6284,7 +6280,7 @@ Final:
* [Output]
* *d ... fraction part of m(d = 0.xxxxxxx). where # of 'x's is fig.
* *e ... exponent of m.
- * DBLE_FIG ... Number of digits in a double variable.
+ * BIGDECIMAL_DOUBLE_FIGURES ... Number of digits in a double variable.
*
* m -> d*10**e, 0<d<BASE
* [Returns]
@@ -6331,7 +6327,7 @@ VpVtoD(double *d, SIGNED_VALUE *e, Real *m)
goto Exit;
}
/* Normal number */
- fig = (DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
+ fig = roomof(BIGDECIMAL_DOUBLE_FIGURES, BASE_FIG);
ind_m = 0;
mm = Min(fig, m->Prec);
*d = 0.0;
@@ -6348,7 +6344,7 @@ Exit:
if (gfDebug) {
VPrint(stdout, " VpVtoD: m=%\n", m);
printf(" d=%e * 10 **%ld\n", *d, *e);
- printf(" DBLE_FIG = %d\n", DBLE_FIG);
+ printf(" BIGDECIMAL_DOUBLE_FIGURES = %d\n", BIGDECIMAL_DOUBLE_FIGURES);
}
#endif /*BIGDECIMAL_DEBUG */
return f;
@@ -6549,7 +6545,7 @@ VpSqrt(Real *y, Real *x)
}
VpDtoV(y, sqrt(val)); /* y <- sqrt(val) */
y->exponent += n;
- n = (SIGNED_VALUE)((DBLE_FIG + BASE_FIG - 1) / BASE_FIG);
+ n = (SIGNED_VALUE)roomof(BIGDECIMAL_DOUBLE_FIGURES, BASE_FIG);
y->MaxPrec = Min((size_t)n , y_prec);
f->MaxPrec = y->MaxPrec + 1;
n = (SIGNED_VALUE)(y_prec * BASE_FIG);
@@ -6919,7 +6915,7 @@ Exit:
* y = x ** n
*/
VP_EXPORT int
-VpPower(Real *y, Real *x, SIGNED_VALUE n)
+VpPowerByInt(Real *y, Real *x, SIGNED_VALUE n)
{
size_t s, ss;
ssize_t sign;
@@ -7006,8 +7002,8 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
Exit:
#ifdef BIGDECIMAL_DEBUG
if (gfDebug) {
- VPrint(stdout, "VpPower y=%\n", y);
- VPrint(stdout, "VpPower x=%\n", x);
+ VPrint(stdout, "VpPowerByInt y=%\n", y);
+ VPrint(stdout, "VpPowerByInt x=%\n", x);
printf(" n=%"PRIdVALUE"\n", n);
}
#endif /* BIGDECIMAL_DEBUG */
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index 5f343db..acc00b8 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -24,9 +24,9 @@
# define SIZEOF_DECDIG 4
# define PRI_DECDIG_PREFIX ""
# ifdef PRI_LL_PREFIX
-# define PRI_DECDIG_DBL_PREFIX PRI_LL_PREFIX
+# define PRI_DECDIG_DBL_PREFIX PRI_LL_PREFIX
# else
-# define PRI_DECDIG_DBL_PREFIX "l"
+# define PRI_DECDIG_DBL_PREFIX "l"
# endif
#else
# define DECDIG uint16_t
@@ -51,6 +51,18 @@
#define PRIxDECDIG_DBL PRI_DECDIG_DBL_PREFIX"x"
#define PRIXDECDIG_DBL PRI_DECDIG_DBL_PREFIX"X"
+#if SIZEOF_DECDIG == 4
+# define BIGDECIMAL_BASE ((DECDIG)1000000000U)
+# define BIGDECIMAL_COMPONENT_FIGURES 9
+#elif SIZEOF_DECDIG == 2
+# define BIGDECIMAL_BASE ((DECDIG)10000U)
+# define BIGDECIMAL_COMPONENT_FIGURES 4
+#else
+# error Unknown size of DECDIG
+#endif
+
+#define BIGDECIMAL_DOUBLE_FIGURES (1+DBL_DIG)
+
#if defined(__cplusplus)
extern "C" {
#if 0
@@ -60,25 +72,6 @@ extern "C" {
extern VALUE rb_cBigDecimal;
-#if 0 || SIZEOF_DECDIG >= 16
-# define RMPD_COMPONENT_FIGURES 38
-# define RMPD_BASE ((DECDIG)100000000000000000000000000000000000000U)
-#elif SIZEOF_DECDIG >= 8
-# define RMPD_COMPONENT_FIGURES 19
-# define RMPD_BASE ((DECDIG)10000000000000000000U)
-#elif SIZEOF_DECDIG >= 4
-# define RMPD_COMPONENT_FIGURES 9
-# define RMPD_BASE ((DECDIG)1000000000U)
-#elif SIZEOF_DECDIG >= 2
-# define RMPD_COMPONENT_FIGURES 4
-# define RMPD_BASE ((DECDIG)10000U)
-#else
-# define RMPD_COMPONENT_FIGURES 2
-# define RMPD_BASE ((DECDIG)100U)
-#endif
-
-#define RMPD_DOUBLE_FIGURES (1+DBL_DIG)
-
/*
* NaN & Infinity
*/
@@ -104,7 +97,7 @@ extern VALUE rb_cBigDecimal;
/* Following 2 exceptions can't controlled by user */
#define VP_EXCEPTION_OP ((unsigned short)0x0020)
-#define RMPD_EXCEPTION_MODE_DEFAULT 0U
+#define BIGDECIMAL_EXCEPTION_MODE_DEFAULT 0U
/* Computation mode */
#define VP_ROUND_MODE ((unsigned short)0x0100)
@@ -116,7 +109,7 @@ extern VALUE rb_cBigDecimal;
#define VP_ROUND_FLOOR 6
#define VP_ROUND_HALF_EVEN 7
-#define RMPD_ROUNDING_MODE_DEFAULT VP_ROUND_HALF_UP
+#define BIGDECIMAL_ROUNDING_MODE_DEFAULT VP_ROUND_HALF_UP
#define VP_SIGN_NaN 0 /* NaN */
#define VP_SIGN_POSITIVE_ZERO 1 /* Positive zero */
@@ -171,16 +164,9 @@ VP_EXPORT Real *VpNewRbClass(size_t mx, char const *str, VALUE klass, bool stric
VP_EXPORT Real *VpCreateRbObject(size_t mx, const char *str, bool raise_exception);
-static inline DECDIG
-rmpd_base_value(void) { return RMPD_BASE; }
-static inline size_t
-rmpd_component_figures(void) { return RMPD_COMPONENT_FIGURES; }
-static inline size_t
-rmpd_double_figures(void) { return RMPD_DOUBLE_FIGURES; }
-
-#define VpBaseFig() rmpd_component_figures()
-#define VpDblFig() rmpd_double_figures()
-#define VpBaseVal() rmpd_base_value()
+#define VpBaseFig() BIGDECIMAL_COMPONENT_FIGURES
+#define VpDblFig() BIGDECIMAL_DOUBLE_FIGURES
+#define VpBaseVal() BIGDECIMAL_BASE
/* Zero,Inf,NaN (isinf(),isnan() used to check) */
VP_EXPORT double VpGetDoubleNaN(void);
@@ -228,7 +214,8 @@ VP_EXPORT int VpActiveRound(Real *y, Real *x, unsigned short f, ssize_t il);
VP_EXPORT int VpMidRound(Real *y, unsigned short f, ssize_t nf);
VP_EXPORT int VpLeftRound(Real *y, unsigned short f, ssize_t nf);
VP_EXPORT void VpFrac(Real *y, Real *x);
-VP_EXPORT int VpPower(Real *y, Real *x, SIGNED_VALUE n);
+VP_EXPORT int VpPowerByInt(Real *y, Real *x, SIGNED_VALUE n);
+#define VpPower VpPowerByInt
/* VP constants */
VP_EXPORT Real *VpOne(void);