Tcl Source Code: Diff

Differences From Artifact [11d9a84b3d]:

File generic/tclStrToD.c — part of check-in [1335f34599] at 2017-07-03 08:30:43 on branch trunk — merge core-8-6-branch (user: jan.nijtmans size: 134058) [more...]

To Artifact [8fcaf29782]:

File generic/tclStrToD.c — part of check-in [900152d715] at 2017-09-13 10:14:31 on branch trunk — Make mp_get_long and mp_set_long available to tommath-enabled Tcl extensions. Deprecate the internal TclBNInitBignumFrom* functions, in favor of the official tommath functions with the same purpose. (user: jan.nijtmans size: 134026) [more...]

︙
707 708 709 710 711 712 713 ~~714~~ 715 716 717 718 719 720 721	707 708 709 710 711 712 713 714 715 716 717 718 719 720 721	- +	if ((octalSignificandWide != 0) && (((size_t)shift >= CHAR_BIT*sizeof(Tcl_WideUInt)) \|\| (octalSignificandWide > (~(Tcl_WideUInt)0 >> shift)))) { octalSignificandOverflow = 1; ~~TclBNInitBignumFromWideUInt(&octalSignificandBig,~~ TclInitBignumFromWideUInt(&octalSignificandBig, octalSignificandWide); } } if (!octalSignificandOverflow) { octalSignificandWide = (octalSignificandWide << shift) + (c - '0'); } else {
︙
824 825 826 827 828 829 830 ~~831~~ 832 833 834 835 836 837 838	824 825 826 827 828 829 830 831 832 833 834 835 836 837 838	- +	* large shifts first. / if (significandWide != 0 && ((size_t)shift >= CHAR_BITsizeof(Tcl_WideUInt) \|\| significandWide > (~(Tcl_WideUInt)0 >> shift))) { significandOverflow = 1; ~~TclBNInitBignumFromWideUInt(&significandBig,~~ TclInitBignumFromWideUInt(&significandBig, significandWide); } } if (!significandOverflow) { significandWide = (significandWide << shift) + d; } else { mp_mul_2d(&significandBig, shift, &significandBig);
︙
865 866 867 868 869 870 871 ~~872~~ 873 874 875 876 877 878 879	865 866 867 868 869 870 871 872 873 874 875 876 877 878 879	- +	* large shifts first. / if (significandWide != 0 && ((size_t)shift >= CHAR_BITsizeof(Tcl_WideUInt) \|\| significandWide > (~(Tcl_WideUInt)0 >> shift))) { significandOverflow = 1; ~~TclBNInitBignumFromWideUInt(&significandBig,~~ TclInitBignumFromWideUInt(&significandBig, significandWide); } } if (!significandOverflow) { significandWide = (significandWide << shift) + 1; } else { mp_mul_2d(&significandBig, shift, &significandBig);
︙
1210 1211 1212 1213 1214 1215 1216 ~~1217~~ 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 ~~1238~~ 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 ~~1259~~ 1260 1261 1262 1263 1264 1265 1266	1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266	- + - + - +	acceptState, bytes); case BINARY: shift = numTrailZeros; if (!significandOverflow && significandWide != 0 && ((size_t)shift >= CHAR_BITsizeof(Tcl_WideUInt) \|\| significandWide > (MOST_BITS + signum) >> shift)) { significandOverflow = 1; ~~TclBNInitBignumFromWideUInt(&significandBig, significandWide);~~ TclInitBignumFromWideUInt(&significandBig, significandWide); } if (shift) { if (!significandOverflow) { significandWide <<= shift; } else { mp_mul_2d(&significandBig, shift, &significandBig); } } goto returnInteger; case HEXADECIMAL: / * Returning a hex integer. Final scaling step. / shift = 4 numTrailZeros; if (!significandOverflow && significandWide !=0 && ((size_t)shift >= CHAR_BITsizeof(Tcl_WideUInt) \|\| significandWide > (MOST_BITS + signum) >> shift)) { significandOverflow = 1; ~~TclBNInitBignumFromWideUInt(&significandBig, significandWide);~~ TclInitBignumFromWideUInt(&significandBig, significandWide); } if (shift) { if (!significandOverflow) { significandWide <<= shift; } else { mp_mul_2d(&significandBig, shift, &significandBig); } } goto returnInteger; case OCTAL: / * Returning an octal integer. Final scaling step. / shift = 3 numTrailZeros; if (!octalSignificandOverflow && octalSignificandWide != 0 && ((size_t)shift >= CHAR_BIT*sizeof(Tcl_WideUInt) \|\| octalSignificandWide > (MOST_BITS + signum) >> shift)) { octalSignificandOverflow = 1; ~~TclBNInitBignumFromWideUInt(&octalSignificandBig,~~ TclInitBignumFromWideUInt(&octalSignificandBig, octalSignificandWide); } if (shift) { if (!octalSignificandOverflow) { octalSignificandWide <<= shift; } else { mp_mul_2d(&octalSignificandBig, shift,
︙
1279 1280 1281 1282 1283 1284 1285 ~~1286~~ 1287 1288 1289 1290 1291 1292 1293	1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293	- +	} else { objPtr->internalRep.wideValue = (Tcl_WideInt) octalSignificandWide; } break; } #endif ~~TclBNInitBignumFromWideUInt(&octalSignificandBig,~~ TclInitBignumFromWideUInt(&octalSignificandBig, octalSignificandWide); octalSignificandOverflow = 1; } else { objPtr->typePtr = &tclIntType; if (signum) { objPtr->internalRep.longValue = - (long) octalSignificandWide;
︙
1307 1308 1309 1310 1311 1312 1313 ~~1314~~ 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 ~~1333~~ 1334 1335 1336 1337 1338 1339 1340	1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340	- + - +	case ZERO: case DECIMAL: significandOverflow = AccumulateDecimalDigit(0, numTrailZeros-1, &significandWide, &significandBig, significandOverflow); if (!significandOverflow && (significandWide > MOST_BITS+signum)){ significandOverflow = 1; ~~TclBNInitBignumFromWideUInt(&significandBig, significandWide);~~ TclInitBignumFromWideUInt(&significandBig, significandWide); } returnInteger: if (!significandOverflow) { if (significandWide > (Tcl_WideUInt)(((~(unsigned long)0) >> 1) + signum)) { #ifndef TCL_WIDE_INT_IS_LONG if (significandWide <= MOST_BITS+signum) { objPtr->typePtr = &tclWideIntType; if (signum) { objPtr->internalRep.wideValue = - (Tcl_WideInt) significandWide; } else { objPtr->internalRep.wideValue = (Tcl_WideInt) significandWide; } break; } #endif ~~TclBNInitBignumFromWideUInt(&significandBig,~~ TclInitBignumFromWideUInt(&significandBig, significandWide); significandOverflow = 1; } else { objPtr->typePtr = &tclIntType; if (signum) { objPtr->internalRep.longValue = - (long) significandWide;
︙
1481 1482 1483 1484 1485 1486 1487 ~~1488~~ 1489 1490 1491 1492 1493 1494 1495	1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495	- +	} else if (numZeros >= maxpow10_wide \|\| w > ((~(Tcl_WideUInt)0)-digit)/pow10_wide[numZeros+1]) { /* * Wide multiplication will overflow. Expand the number to a * bignum and fall through into the bignum case. / ~~TclBNInitBignumFromWideUInt(bignumRepPtr, w);~~ TclInitBignumFromWideUInt(bignumRepPtr, w); } else { / * Wide multiplication. / wideRepPtr = w * pow10_wide[numZeros+1] + digit; return 0;
︙
1624 1625 1626 1627 1628 1629 1630 ~~1631~~ 1632 1633 1634 1635 1636 1637 1638	1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638	- +	} /* * All the easy cases have failed. Promote ths significand to bignum and * call MakeHighPrecisionDouble to do it the hard way. / ~~TclBNInitBignumFromWideUInt(&significandBig, significand);~~ TclInitBignumFromWideUInt(&significandBig, significand); retval = MakeHighPrecisionDouble(0, &significandBig, numSigDigs, exponent); mp_clear(&significandBig); / * Come here to return the computed value. */
︙
3311 3312 3313 3314 3315 3316 3317 ~~3318~~ 3319 3320 3321 3322 3323 3324 3325	3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325	- +	int r1; /* * b = bw * 2*b2 5*b5 mminus = 5*m5 / ~~TclBNInitBignumFromWideUInt(&b, bw);~~ TclInitBignumFromWideUInt(&b, bw); mp_init_set_int(&mminus, 1); MulPow5(&b, b5, &b); mp_mul_2d(&b, b2, &b); /* * Adjust if the logarithm was guessed wrong. */
︙
3498 3499 3500 3501 3502 3503 3504 ~~3505~~ 3506 3507 3508 3509 3510 3511 3512	3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512	- +	int i; /* Index in the output buffer. / mp_int temp; / * b = bw * 2*b2 5*b5 / ~~TclBNInitBignumFromWideUInt(&b, bw);~~ TclInitBignumFromWideUInt(&b, bw); MulPow5(&b, b5, &b); mp_mul_2d(&b, b2, &b); /* * Adjust if the logarithm was guessed wrong. */
︙
3706 3707 3708 3709 3710 3711 3712 ~~3713~~ 3714 3715 3716 3717 3718 3719 3720	3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720	- +	int r1; /* * b = bw * 2*b2 5*b5 S = 2*s2 5s5 / ~~TclBNInitBignumFromWideUInt(&b, bw);~~ TclInitBignumFromWideUInt(&b, bw); mp_mul_2d(&b, b2, &b); mp_init_set_int(&S, 1); MulPow5(&S, s5, &S); mp_mul_2d(&S, s2, &S); /* * Handle the case where we guess the position of the decimal point wrong. */
︙
3919 3920 3921 3922 3923 3924 3925 ~~3926~~ 3927 3928 3929 3930 3931 3932 3933	3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933	- +	/* * b = bw * 2*b2 5*b5 S = 2*s2 5s5 / mp_init_multi(&temp, &dig, NULL); ~~TclBNInitBignumFromWideUInt(&b, bw);~~ TclInitBignumFromWideUInt(&b, bw); mp_mul_2d(&b, b2, &b); mp_init_set_int(&S, 1); MulPow5(&S, s5, &S); mp_mul_2d(&S, s2, &S); /* * Handle the case where we guess the position of the decimal point wrong. */
︙
4575 4576 4577 4578 4579 4580 4581 ~~4582~~ 4583 4584 4585 4586 4587 4588 4589	4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589	- +	if (expt <= 0) { mp_init(b); mp_zero(b); } else { Tcl_WideInt w = (Tcl_WideInt) ldexp(fract, mantBits); int shift = expt - mantBits; ~~TclBNInitBignumFromWideInt(b, w);~~ TclInitBignumFromWideInt(b, w); if (shift < 0) { mp_div_2d(b, -shift, b, NULL); } else if (shift > 0) { mp_mul_2d(b, shift, b); } } return TCL_OK;
︙