Mercurial > cpython-lru_cache-weakref
view Python/strtod.c @ 45852:30c4e1ca8421
Merged revisions 61431,61433-61436,61439,61444,61449-61450,61453,61458,61465,61468,61471-61474,61480,61483-61484,61488,61495-61496,61498,61503-61504,61507,61509-61510,61515-61518 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r61431 | vinay.sajip | 2008-03-16 22:35:58 +0100 (So, 16 Mär 2008) | 1 line
Clarified documentation on use of shutdown().
........
r61433 | mark.summerfield | 2008-03-17 09:28:15 +0100 (Mo, 17 Mär 2008) | 5 lines
Added a footnote to each pointing out that for XML output if an encoding
string is given it should conform to the appropriate XML standards---for
example, "UTF-8" is okay, but "UTF8" is not.
........
r61434 | eric.smith | 2008-03-17 12:01:01 +0100 (Mo, 17 Mär 2008) | 7 lines
Issue 2264: empty float presentation type needs to have at least one digit past the decimal point.
Added "Z" format_char to PyOS_ascii_formatd to support empty float presentation type.
Renamed buf_size in PyOS_ascii_formatd to more accurately reflect it's meaning.
Modified format.__float__ to use the new "Z" format as the default.
Added test cases.
........
r61435 | eric.smith | 2008-03-17 13:14:29 +0100 (Mo, 17 Mär 2008) | 2 lines
Reformated lines > 79 chars.
Deleted unused macro ISXDIGIT.
........
r61436 | jeffrey.yasskin | 2008-03-17 15:40:53 +0100 (Mo, 17 Mär 2008) | 13 lines
Allow Gnu gcc's to build python on OSX by removing -Wno-long-double,
-no-cpp-precomp, and -mno-fused-madd from configure.
* r22183 added -no-cpp-precomp, which
http://gcc.gnu.org/ml/gcc/2005-12/msg00368.html claims hasn't been
needed since gcc-3.1.
* r25607 added -Wno-long-double to avoid a warning in
Include/objimpl.h (issue 525481). The long double is still there,
but OSX 10.4's gcc no longer warns about it.
* r33666 fixed issue 775892 on OSX 10.3 by adding -mno-fused-madd,
which changed the sign of some float 0s. Tim Peters said it wasn't
a real issue anyway, and it no longer causes test failures.
Fixes issue #1779871.
........
r61439 | martin.v.loewis | 2008-03-17 17:31:57 +0100 (Mo, 17 Mär 2008) | 2 lines
Add Trent Nelson.
........
r61444 | travis.oliphant | 2008-03-17 18:36:12 +0100 (Mo, 17 Mär 2008) | 1 line
Add necessary headers to back-port new buffer protocol to Python 2.6
........
r61449 | gregory.p.smith | 2008-03-17 19:48:05 +0100 (Mo, 17 Mär 2008) | 8 lines
Force zlib.crc32 and zlib.adler32 to return a signed integer on all platforms
regardless of the native sizeof(long) used in the integer object.
This somewhat odd behavior of returning a signed is maintained in 2.x for
compatibility reasons of always returning an integer rather than a long object.
Fixes Issue1202 for Python 2.6
........
r61450 | neal.norwitz | 2008-03-17 20:02:45 +0100 (Mo, 17 Mär 2008) | 3 lines
Use a buffer large enough to ensure we don't overrun, even if the value
is outside the range we expect.
........
r61453 | steven.bethard | 2008-03-17 20:33:11 +0100 (Mo, 17 Mär 2008) | 1 line
Document unicode.isnumeric() and unicode.isdecimal() (issue2326)
........
r61458 | neal.norwitz | 2008-03-17 21:22:43 +0100 (Mo, 17 Mär 2008) | 5 lines
Issue 2321: reduce memory usage (increase the memory that is returned
to the system) by using pymalloc for the data of unicode objects.
Will backport.
........
r61465 | martin.v.loewis | 2008-03-17 22:55:30 +0100 (Mo, 17 Mär 2008) | 2 lines
Add David Wolever.
........
r61468 | gregory.p.smith | 2008-03-18 01:20:01 +0100 (Di, 18 Mär 2008) | 3 lines
Fix the IOError message text when opening a file with an invalid filename.
Error reported by Ilan Schnell.
........
r61471 | brett.cannon | 2008-03-18 02:00:07 +0100 (Di, 18 Mär 2008) | 2 lines
Convert test_strftime, test_getargs, and test_pep247 to use unittest.
........
r61472 | jeffrey.yasskin | 2008-03-18 02:09:59 +0100 (Di, 18 Mär 2008) | 2 lines
Fix build on platforms that don't have intptr_t. Patch by Joseph Armbruster.
........
r61473 | brett.cannon | 2008-03-18 02:50:25 +0100 (Di, 18 Mär 2008) | 2 lines
Convert test_dummy_threading and test_dbm to unittest.
........
r61474 | brett.cannon | 2008-03-18 02:58:56 +0100 (Di, 18 Mär 2008) | 2 lines
Move test_extcall to doctest.
........
r61480 | brett.cannon | 2008-03-18 04:46:22 +0100 (Di, 18 Mär 2008) | 2 lines
test_errno was a no-op test; now it actually tests things and uses unittest.
........
r61483 | brett.cannon | 2008-03-18 05:09:00 +0100 (Di, 18 Mär 2008) | 3 lines
Remove our implementation of memmove() and strerror(); both are in the C89
standard library.
........
r61484 | brett.cannon | 2008-03-18 05:16:06 +0100 (Di, 18 Mär 2008) | 2 lines
The output directory for tests that compare against stdout is now gone!
........
r61488 | jeffrey.yasskin | 2008-03-18 05:29:35 +0100 (Di, 18 Mär 2008) | 2 lines
Block the "socket.ssl() is deprecated" warning from test_socket_ssl.
........
r61495 | jeffrey.yasskin | 2008-03-18 05:56:06 +0100 (Di, 18 Mär 2008) | 4 lines
Speed test_thread up from 51.328s to 0.081s by reducing its sleep times. We
still sleep at all to make it likely that all threads are active at the same
time.
........
r61496 | jeffrey.yasskin | 2008-03-18 06:12:41 +0100 (Di, 18 Mär 2008) | 4 lines
Speed up test_dict by about 10x by only checking selected dict literal sizes,
instead of every integer from 0 to 400. Exhaustive testing wastes time without
providing enough more assurance that the code is correct.
........
r61498 | neal.norwitz | 2008-03-18 06:20:29 +0100 (Di, 18 Mär 2008) | 1 line
Try increasing the timeout to reduce the flakiness of this test.
........
r61503 | brett.cannon | 2008-03-18 06:43:04 +0100 (Di, 18 Mär 2008) | 2 lines
Improve the error message for a test that failed on the S-390 Debian buildbot.
........
r61504 | jeffrey.yasskin | 2008-03-18 06:45:40 +0100 (Di, 18 Mär 2008) | 3 lines
Add a -S/--slow flag to regrtest to have it print the 10 slowest tests with
their times.
........
r61507 | neal.norwitz | 2008-03-18 07:03:46 +0100 (Di, 18 Mär 2008) | 1 line
Add some info to the failure messages
........
r61509 | trent.nelson | 2008-03-18 08:02:12 +0100 (Di, 18 Mär 2008) | 1 line
Issue 2286: bump up the stack size of the 64-bit debug python_d.exe to 2100000. The default value of 200000 causes a stack overflow at 1965 iterations of r_object() in marshal.c, 35 iterations before the 2000 limit enforced by MAX_MARSHAL_STACK_DEPTH.
........
r61510 | trent.nelson | 2008-03-18 08:32:47 +0100 (Di, 18 Mär 2008) | 5 lines
The behaviour of winsound.Beep() seems to differ between different versions of Windows when there's either:
a) no sound card entirely
b) legacy beep driver has been disabled
c) the legacy beep driver has been uninstalled
Sometimes RuntimeErrors are raised, sometimes they're not. If _have_soundcard() returns False, don't expect winsound.Beep() to raise a RuntimeError, as this clearly isn't the case, as demonstrated by the various Win32 XP buildbots.
........
r61515 | martin.v.loewis | 2008-03-18 13:20:15 +0100 (Di, 18 Mär 2008) | 2 lines
norwitz-amd64 (gentoo) has EREMOTEIO.
........
r61516 | martin.v.loewis | 2008-03-18 13:45:37 +0100 (Di, 18 Mär 2008) | 2 lines
Add more Linux error codes.
........
r61517 | martin.v.loewis | 2008-03-18 14:05:03 +0100 (Di, 18 Mär 2008) | 2 lines
Add WSA errors.
........
r61518 | martin.v.loewis | 2008-03-18 14:16:05 +0100 (Di, 18 Mär 2008) | 2 lines
Note that the stderr output of the test is intentional.
........
| author | Christian Heimes <christian@cheimes.de> |
|---|---|
| date | Tue, 18 Mar 2008 15:15:01 +0000 |
| parents | 2a821e001a2b |
| children | e38335d4df91 0d14827bcc0d |
line wrap: on
line source
#include "pyconfig.h" /* comp.sources.misc strtod(), as posted in comp.lang.tcl, with bugfix for "123000.0" and acceptance of space after 'e' sign nuked. ************************************************************ * YOU MUST EDIT THE MACHINE-DEPENDENT DEFINITIONS BELOW!!! * ************************************************************ */ /* File : stdtod.c (Modified version of str2dbl.c) Author : Richard A. O'Keefe @ Quintus Computer Systems, Inc. Updated: Tuesday August 2nd, 1988 Defines: double strtod (char *str, char**ptr) */ /* This is an implementation of the strtod() function described in the System V manuals, with a different name to avoid linker problems. All that str2dbl() does itself is check that the argument is well-formed and is in range. It leaves the work of conversion to atof(), which is assumed to exist and deliver correct results (if they can be represented). There are two reasons why this should be provided to the net: (a) some UNIX systems do not yet have strtod(), or do not have it available in the BSD "universe" (but they do have atof()). (b) some of the UNIX systems that *do* have it get it wrong. (some crash with large arguments, some assign the wrong *ptr value). There is a reason why *we* are providing it: we need a correct version of strtod(), and if we give this one away maybe someone will look for mistakes in it and fix them for us (:-). */ /* The following constants are machine-specific. MD{MIN,MAX}EXPT are integers and MD{MIN,MAX}FRAC are strings such that 0.${MDMAXFRAC}e${MDMAXEXPT} is the largest representable double, 0.${MDMINFRAC}e${MDMINEXPT} is the smallest representable +ve double MD{MIN,MAX}FRAC must not have any trailing zeros. The values here are for IEEE-754 64-bit floats. It is not perfectly clear to me whether an IEEE infinity should be returned for overflow, nor what a portable way of writing one is, so HUGE is just 0.MAXFRAC*10**MAXEXPT (this seems still to be the UNIX convention). I do know about <values.h>, but the whole point of this file is that we can't always trust that stuff to be there or to be correct. */ static int MDMINEXPT = -323; static char MDMINFRAC[] = "494065645841246544"; static double ZERO = 0.0; static int MDMAXEXPT = 309; static char MDMAXFRAC[] = "17976931348623157"; static double HUGE = 1.7976931348623157e308; extern double atof(const char *); /* Only called when result known to be ok */ #ifdef HAVE_ERRNO_H #include <errno.h> #endif extern int errno; double strtod(char *str, char **ptr) { int sign, scale, dotseen; int esign, expt; char *save; register char *sp, *dp; register int c; char *buforg, *buflim; char buffer[64]; /* 45-digit significant + */ /* 13-digit exponent */ sp = str; while (*sp == ' ') sp++; sign = 1; if (*sp == '-') sign -= 2, sp++; dotseen = 0, scale = 0; dp = buffer; *dp++ = '0'; *dp++ = '.'; buforg = dp, buflim = buffer+48; for (save = sp; c = *sp; sp++) if (c == '.') { if (dotseen) break; dotseen++; } else if ((unsigned)(c-'0') > (unsigned)('9'-'0')) { break; } else if (c == '0') { if (dp != buforg) { /* This is not the first digit, so we want to keep it */ if (dp < buflim) *dp++ = c; if (!dotseen) scale++; } else { /* No non-zero digits seen yet */ /* If a . has been seen, scale must be adjusted */ if (dotseen) scale--; } } else { /* This is a nonzero digit, so we want to keep it */ if (dp < buflim) *dp++ = c; /* If it precedes a ., scale must be adjusted */ if (!dotseen) scale++; } if (sp == save) { if (ptr) *ptr = str; errno = EDOM; /* what should this be? */ return ZERO; } while (dp > buforg && dp[-1] == '0') --dp; if (dp == buforg) *dp++ = '0'; *dp = '\0'; /* Now the contents of buffer are +--+--------+-+--------+ |0.|fraction|\|leftover| +--+--------+-+--------+ ^dp points here where fraction begins with 0 iff it is "0", and has at most 45 digits in it, and leftover is at least 16 characters. */ save = sp, expt = 0, esign = 1; do { c = *sp++; if (c != 'e' && c != 'E') break; c = *sp++; if (c == '-') esign -= 2, c = *sp++; else if (c == '+' /* || c == ' ' */ ) c = *sp++; if ((unsigned)(c-'0') > (unsigned)('9'-'0')) break; while (c == '0') c = *sp++; for (; (unsigned)(c-'0') <= (unsigned)('9'-'0'); c = *sp++) expt = expt*10 + c-'0'; if (esign < 0) expt = -expt; save = sp-1; } while (0); if (ptr) *ptr = save; expt += scale; /* Now the number is sign*0.fraction*10**expt */ errno = ERANGE; if (expt > MDMAXEXPT) { return HUGE*sign; } else if (expt == MDMAXEXPT) { if (strcmp(buforg, MDMAXFRAC) > 0) return HUGE*sign; } else if (expt < MDMINEXPT) { return ZERO*sign; } else if (expt == MDMINEXPT) { if (strcmp(buforg, MDMINFRAC) < 0) return ZERO*sign; } /* We have now established that the number can be */ /* represented without overflow or underflow */ (void) sprintf(dp, "E%d", expt); errno = 0; return atof(buffer)*sign; }
