1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/bigdecimal] Tweak VpAlloc

Browse Source 
* Stop reusing mx and mf
* Check szVal == NULL first
* Treat special values before checking the leading `#`

https://github.com/ruby/bigdecimal/commit/14f3d965f8
This commit is contained in:
Kenta Murata 2022-11-13 13:26:50 +09:00 committed by git
parent bbb9f72353
commit d1f55dea86
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ext/bigdecimal/bigdecimal.c
View File

@ -5054,11 +5054,11 @@ bigdecimal_parse_special_string(const char *str)
/* /*
* Allocates variable. * Allocates variable.
* [Input] * [Input]
* mx ... allocation unit, if zero then mx is determined by szVal. * mx ... The number of decimal digits to be allocated, if zero then mx is determined by szVal.
* The mx is the number of effective digits can to be stored. * The mx will be the number of significant digits can to be stored.
* szVal ... value assigned(char). If szVal==NULL,then zero is assumed. * szVal ... The value assigned(char). If szVal==NULL, then zero is assumed.
* If szVal[0]=='#' then Max. Prec. will not be considered(1.1.7), * If szVal[0]=='#' then MaxPrec is not affected by the precision limit
* full precision specified by szVal is allocated. * so that the full precision specified by szVal is allocated.
* *
* [Returns] * [Returns]
* Pointer to the newly allocated variable, or * Pointer to the newly allocated variable, or
@ -5069,48 +5069,48 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
{ {
const char *orig_szVal = szVal; 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, dot_seen, exp_seen, nalloc;
size_t len;
char v, *psz; char v, *psz;
int sign=1; int sign=1;
Real *vp = NULL; Real *vp = NULL;
size_t mf = VpGetPrecLimit(); size_t prec_limit = VpGetPrecLimit();
VALUE buf; VALUE buf;
mx = (mx + BASE_FIG - 1) / BASE_FIG; /* Determine allocation unit. */ len = (mx + BASE_FIG - 1) / BASE_FIG; /* Determine allocation unit. */
if (mx == 0) ++mx; if (len == 0) ++len;
if (szVal) { if (szVal == NULL) {
/* Skipping leading spaces */
while (ISSPACE(*szVal)) szVal++;
/* Processing the leading one `#` */
if (*szVal != '#') {
if (mf) {
mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
if (mx > mf) {
mx = mf;
}
}
}
else {
++szVal;
}
}
else {
return_zero: return_zero:
/* necessary to be able to store */ /* necessary to be able to store */
/* at least mx digits. */ /* at least mx digits. */
/* szVal==NULL ==> allocate zero value. */ /* szVal==NULL ==> allocate zero value. */
vp = rbd_allocate_struct(mx); vp = rbd_allocate_struct(mx);
vp->MaxPrec = mx; /* set max precision */ vp->MaxPrec = len; /* set max precision */
VpSetZero(vp, 1); /* initialize vp to zero. */ VpSetZero(vp, 1); /* initialize vp to zero. */
return vp; return vp;
} }
/* Skipping leading spaces */
while (ISSPACE(*szVal)) szVal++;
/* Check on Inf & NaN */ /* Check on Inf & NaN */
if ((vp = bigdecimal_parse_special_string(szVal)) != NULL) { if ((vp = bigdecimal_parse_special_string(szVal)) != NULL) {
return vp; return vp;
} }
/* Processing the leading one `#` */
if (*szVal != '#') {
if (prec_limit) {
size_t const max_len = (prec_limit + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
if (len > max_len) {
len = max_len;
}
}
}
else {
++szVal;
}
/* Scanning digits */ /* Scanning digits */
/* A buffer for keeping scanned digits */ /* A buffer for keeping scanned digits */
@ -5272,11 +5272,11 @@ VpAlloc(size_t mx, const char *szVal, int strict_p, int exc)
nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1; /* set effective allocation */ nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1; /* set effective allocation */
/* units for szVal[] */ /* units for szVal[] */
if (mx == 0) mx = 1; if (len == 0) len = 1;
nalloc = Max(nalloc, mx); nalloc = Max(nalloc, len);
mx = nalloc; len = nalloc;
vp = rbd_allocate_struct(mx); vp = rbd_allocate_struct(len);
vp->MaxPrec = mx; /* set max precision */ vp->MaxPrec = len; /* set max precision */
VpSetZero(vp, sign); VpSetZero(vp, sign);
VpCtoV(vp, psz, ni, psz + ipf, nf, psz + ipe, ne); VpCtoV(vp, psz, ni, psz + ipf, nf, psz + ipe, ne);
rb_str_resize(buf, 0); rb_str_resize(buf, 0);