Remove unused #define macros (#376)

* Remove unused #define macros

* Fix typo in comment

* Change BASE and BASE_FIG detection in test helper

Author: tompng

ext/bigdecimal/bigdecimal.c

@@ -115,8 +115,6 @@ bdvalue_nullable(BDVALUE v)
 #define HALF_BASE (BASE/2)
 #define BASE1 (BASE/10)
 
-#define LOG10_2 0.3010299956639812
-
 #ifndef RRATIONAL_ZERO_P
 # define RRATIONAL_ZERO_P(x) (FIXNUM_P(rb_rational_num(x)) && \
 			      FIX2LONG(rb_rational_num(x)) == 0)
@@ -537,7 +535,7 @@ GetBDValueMust(VALUE v)
 static inline VALUE
 BigDecimal_double_fig(VALUE self)
 {
-    return INT2FIX(VpDblFig());
+    return INT2FIX(BIGDECIMAL_DOUBLE_FIGURES);
 }
 
 /*  call-seq:
@@ -852,7 +850,7 @@ BigDecimal_dump(int argc, VALUE *argv, VALUE self)
     GUARD_OBJ(v, GetBDValueMust(self));
     dump = rb_str_new(0, VpNumOfChars(v.real, "E")+50);
     psz = RSTRING_PTR(dump);
-    snprintf(psz, RSTRING_LEN(dump), "%"PRIuSIZE":", VpPrec(v.real)*VpBaseFig());
+    snprintf(psz, RSTRING_LEN(dump), "%"PRIuSIZE":", v.real->Prec*VpBaseFig());
     len = strlen(psz);
     VpToString(v.real, psz+len, RSTRING_LEN(dump)-len, 0, 0);
     rb_str_resize(dump, strlen(psz));
@@ -2170,7 +2168,7 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
     VpSetPrecLimit(pl);
     if (!VpIsZero(res.real)) {
         // Remainder value affects rounding result.
-        // ROUND_UP cv = 0.1e0 with ix=10 will be:
+        // ROUND_UP cv = 0.1e0 with idx=10 will be:
         // 0.1e0 if remainder == 0
         // 0.1000000001e0 if remainder != 0
         size_t idx = roomof(ix, BASE_FIG);
@@ -4416,7 +4414,7 @@ Init_bigdecimal(void)
      * guarantee that two groups could always be multiplied together without
      * overflow.)
      */
-    rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((SIGNED_VALUE)VpBaseVal()));
+    rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((SIGNED_VALUE)BASE));
 
     /* Exceptions */
 
@@ -4635,10 +4633,6 @@ static Real *VpConstPt5;    /* constant 0.5 */
 #define maxnr 100UL    /* Maximum iterations for calculating sqrt. */
                 /* used in VpSqrt() */
 
-/* ETC */
-#define MemCmp(x,y,z) memcmp(x,y,z)
-#define StrCmp(x,y)   strcmp(x,y)
-
 enum op_sw {
     OP_SW_ADD = 1,  /* + */
     OP_SW_SUB,      /* - */
@@ -4865,15 +4859,6 @@ VpGetDoubleNegZero(void) /* Returns the value of -0 */
     return nzero;
 }
 
-#if 0  /* unused */
-VP_EXPORT int
-VpIsNegDoubleZero(double v)
-{
-    double z = VpGetDoubleNegZero();
-    return MemCmp(&v,&z,sizeof(v))==0;
-}
-#endif
-
 VP_EXPORT int
 VpException(unsigned short f, const char *str,int always)
 {
@@ -6977,64 +6962,6 @@ VpDtoV(Real *m, double d)
     return;
 }
 
-/*
- *  m <- ival
- */
-#if 0  /* unused */
-VP_EXPORT void
-VpItoV(Real *m, SIGNED_VALUE ival)
-{
-    size_t mm, ind_m;
-    size_t val, v1, v2, v;
-    int isign;
-    SIGNED_VALUE ne;
-
-    if (ival == 0) {
-	VpSetZero(m, 1);
-	goto Exit;
-    }
-    isign = 1;
-    val = ival;
-    if (ival < 0) {
-	isign = -1;
-	val  =(size_t)(-ival);
-    }
-    ne = 0;
-    ind_m = 0;
-    mm = m->MaxPrec;
-    while (ind_m < mm) {
-	m->frac[ind_m] = 0;
-	++ind_m;
-    }
-    ind_m = 0;
-    while (val > 0) {
-	if (val) {
-	    v1 = val;
-	    v2 = 1;
-	    while (v1 >= BASE) {
-		v1 /= BASE;
-		v2 *= BASE;
-	    }
-	    val = val - v2 * v1;
-	    v = v1;
-	}
-	else {
-	    v = 0;
-	}
-	m->frac[ind_m] = v;
-	++ind_m;
-	++ne;
-    }
-    m->Prec = ind_m - 1;
-    m->exponent = ne;
-    VpSetSign(m, isign);
-    VpNmlz(m);
-
-Exit:
-    return;
-}
-#endif
-
 /*
  * y = SQRT(x),  y*y - x =>0
  */
@@ -7317,7 +7244,7 @@ VpLeftRound(Real *y, unsigned short f, ssize_t nf)
     DECDIG v;
     if (!VpHasVal(y)) return 0; /* Unable to round */
     v = y->frac[0];
-    nf -= VpExponent(y) * (ssize_t)BASE_FIG;
+    nf -= y->exponent * (ssize_t)BASE_FIG;
     while ((v /= 10) != 0) nf--;
     nf += (ssize_t)BASE_FIG-1;
     return VpMidRound(y, f, nf);

ext/bigdecimal/bigdecimal.h

@@ -196,7 +196,6 @@ typedef struct {
 
 #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);
@@ -214,9 +213,6 @@ VP_EXPORT unsigned short VpGetRoundMode(void);
 VP_EXPORT unsigned short VpSetRoundMode(unsigned short n);
 
 VP_EXPORT int VpException(unsigned short f,const char *str,int always);
-#if 0  /* unused */
-VP_EXPORT int VpIsNegDoubleZero(double v);
-#endif
 VP_EXPORT size_t VpNumOfChars(Real *vp,const char *pszFmt);
 VP_EXPORT size_t VpInit(DECDIG BaseVal);
 VP_EXPORT Real *VpAlloc(size_t mx, const char *szVal, int strict_p, int exc);
@@ -233,9 +229,6 @@ VP_EXPORT void VpToFString(Real *a, char *buf, size_t bufsize, size_t fFmt, int
 VP_EXPORT int VpCtoV(Real *a, const char *int_chr, size_t ni, const char *frac, size_t nf, const char *exp_chr, size_t ne);
 VP_EXPORT int VpVtoD(double *d, SIGNED_VALUE *e, Real *m);
 VP_EXPORT void VpDtoV(Real *m,double d);
-#if 0  /* unused */
-VP_EXPORT void VpItoV(Real *m,S_INT ival);
-#endif
 VP_EXPORT int VpSqrt(Real *y,Real *x);
 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);
@@ -256,10 +249,6 @@ VP_EXPORT Real *VpOne(void);
 #define Max(a, b)  (((a)>(b))?(a):(b))
 #define Min(a, b)  (((a)>(b))?(b):(a))
 
-#define VpMaxPrec(a)   ((a)->MaxPrec)
-#define VpPrec(a)      ((a)->Prec)
-#define VpGetFlag(a)   ((a)->flag)
-
 /* Sign */
 
 /* VpGetSign(a) returns 1,-1 if a>0,a<0 respectively */
@@ -294,7 +283,6 @@ VP_EXPORT Real *VpOne(void);
 #define VpSetInf(a,s)   (void)(((s)>0)?VpSetPosInf(a):VpSetNegInf(a))
 #define VpHasVal(a)     (a->frac[0])
 #define VpIsOne(a)      ((a->Prec==1)&&(a->frac[0]==1)&&(a->exponent==1))
-#define VpExponent(a)   (a->exponent)
 #ifdef BIGDECIMAL_DEBUG
 int VpVarCheck(Real * v);
 #endif /* BIGDECIMAL_DEBUG */

test/bigdecimal/helper.rb

@@ -4,13 +4,13 @@
 require 'rbconfig/sizeof'
 
 module TestBigDecimalBase
-  if BigDecimal(0)._dump.start_with?('9')
+  BASE = BigDecimal::BASE
+  case BASE
+  when 1000000000
     SIZEOF_DECDIG = RbConfig::SIZEOF["int32_t"]
-    BASE = 1_000_000_000
     BASE_FIG = 9
-  else
+  when 10000
     SIZEOF_DECDIG = RbConfig::SIZEOF["int16_t"]
-    BASE = 10000
     BASE_FIG = 4
   end