mirror of
https://github.com/python/cpython.git
synced 2024-11-29 21:05:33 +08:00
77c02ebf38
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60618 | walter.doerwald | 2008-02-06 15:31:55 +0100 (Wed, 06 Feb 2008) | 6 lines Remove month parameter from Calendar.yeardatescalendar(), Calendar.yeardays2calendar() and Calendar.yeardayscalendar() as the methods don't have such a parameter. Fixes issue #2017. Rewrap content to 80 chars. ........ r60622 | facundo.batista | 2008-02-06 20:28:49 +0100 (Wed, 06 Feb 2008) | 4 lines Fixes issue 1959. Converted tests to unittest. Thanks Giampaolo Rodola. ........ r60626 | thomas.heller | 2008-02-06 21:29:17 +0100 (Wed, 06 Feb 2008) | 3 lines Fixed refcounts and error handling. Should not be merged to py3k branch. ........ r60630 | mark.dickinson | 2008-02-06 23:10:50 +0100 (Wed, 06 Feb 2008) | 4 lines Issue 1979: Make Decimal comparisons (other than !=, ==) involving NaN raise InvalidOperation (and return False if InvalidOperation is trapped). ........ r60632 | mark.dickinson | 2008-02-06 23:25:16 +0100 (Wed, 06 Feb 2008) | 2 lines Remove incorrect usage of :const: in documentation. ........ r60634 | georg.brandl | 2008-02-07 00:45:51 +0100 (Thu, 07 Feb 2008) | 2 lines Revert accidental changes to test_queue in r60605. ........ r60636 | raymond.hettinger | 2008-02-07 01:54:20 +0100 (Thu, 07 Feb 2008) | 1 line Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. ........ r60637 | mark.dickinson | 2008-02-07 02:14:23 +0100 (Thu, 07 Feb 2008) | 2 lines Fix broken link in decimal documentation. ........ r60638 | mark.dickinson | 2008-02-07 02:42:06 +0100 (Thu, 07 Feb 2008) | 3 lines IEEE 754 should be IEEE 854; give precise reference for comparisons involving NaNs. ........ r60639 | raymond.hettinger | 2008-02-07 03:12:52 +0100 (Thu, 07 Feb 2008) | 1 line Return ints instead of longs for tuple.count() and tuple.index(). ........ r60640 | raymond.hettinger | 2008-02-07 04:10:33 +0100 (Thu, 07 Feb 2008) | 1 line Merge 60627. ........ r60641 | raymond.hettinger | 2008-02-07 04:25:46 +0100 (Thu, 07 Feb 2008) | 1 line Merge r60628, r60631, and r60633. Register UserList and UserString will the appropriate ABCs. ........ r60642 | brett.cannon | 2008-02-07 08:47:31 +0100 (Thu, 07 Feb 2008) | 3 lines Cast a struct to a void pointer so as to do a type-safe pointer comparison (mistmatch found by clang). ........ r60643 | brett.cannon | 2008-02-07 09:04:07 +0100 (Thu, 07 Feb 2008) | 2 lines Remove unnecessary curly braces around an int literal. ........ r60644 | andrew.kuchling | 2008-02-07 12:43:47 +0100 (Thu, 07 Feb 2008) | 1 line Update URL ........ r60645 | facundo.batista | 2008-02-07 17:16:29 +0100 (Thu, 07 Feb 2008) | 4 lines Fixes issue 2026. Tests converted to unittest. Thanks Giampaolo Rodola. ........ r60646 | christian.heimes | 2008-02-07 18:15:30 +0100 (Thu, 07 Feb 2008) | 1 line Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. ........ r60648 | facundo.batista | 2008-02-07 20:06:52 +0100 (Thu, 07 Feb 2008) | 6 lines Fixes Issue 1401. When redirected, a possible POST get converted to GET, so it loses its payload. So, it also must lose the headers related to the payload (if it has no content any more, it shouldn't indicate content length and type). ........ r60649 | walter.doerwald | 2008-02-07 20:30:22 +0100 (Thu, 07 Feb 2008) | 3 lines Clarify that the output of TextCalendar.formatmonth() and TextCalendar.formatyear() for custom instances won't be influenced by calls to the module global setfirstweekday() function. Fixes #2018. ........ r60651 | walter.doerwald | 2008-02-07 20:48:34 +0100 (Thu, 07 Feb 2008) | 3 lines Fix documentation for Calendar.iterweekdays(): firstweekday is a property. Fixes second part of #2018. ........ r60653 | walter.doerwald | 2008-02-07 20:57:32 +0100 (Thu, 07 Feb 2008) | 2 lines Fix typo in docstring for Calendar.itermonthdays(). ........ r60655 | raymond.hettinger | 2008-02-07 21:04:37 +0100 (Thu, 07 Feb 2008) | 1 line The float conversion recipe is simpler in Py2.6 ........ r60657 | raymond.hettinger | 2008-02-07 21:10:49 +0100 (Thu, 07 Feb 2008) | 1 line Fix typo ........ r60660 | brett.cannon | 2008-02-07 23:27:10 +0100 (Thu, 07 Feb 2008) | 3 lines Make sure a switch statement does not have repetitive case statements. Error found through LLVM post-2.1 svn. ........ r60661 | christian.heimes | 2008-02-08 01:11:31 +0100 (Fri, 08 Feb 2008) | 1 line Deallocate content of the dict free list on interpreter shutdown ........ r60662 | christian.heimes | 2008-02-08 01:14:34 +0100 (Fri, 08 Feb 2008) | 1 line Use prefix decrement ........ r60663 | amaury.forgeotdarc | 2008-02-08 01:56:02 +0100 (Fri, 08 Feb 2008) | 5 lines issue 2045: Infinite recursion when printing a subclass of defaultdict, if default_factory is set to a bound method. Will backport. ........ r60667 | jeffrey.yasskin | 2008-02-08 07:45:40 +0100 (Fri, 08 Feb 2008) | 2 lines Oops! 2.6's Rational.__ne__ didn't work. ........ r60671 | hyeshik.chang | 2008-02-08 18:10:20 +0100 (Fri, 08 Feb 2008) | 2 lines Update big5hkscs codec to conform to the HKSCS:2004 revision. ........ r60673 | raymond.hettinger | 2008-02-08 23:30:04 +0100 (Fri, 08 Feb 2008) | 4 lines Remove unnecessary modulo division. The preceding test guarantees that 0 <= i < len. ........ r60674 | raymond.hettinger | 2008-02-09 00:02:27 +0100 (Sat, 09 Feb 2008) | 1 line Speed-up __iter__() mixin method. ........ r60675 | raymond.hettinger | 2008-02-09 00:34:21 +0100 (Sat, 09 Feb 2008) | 1 line Fill-in missing Set comparisons ........ r60677 | raymond.hettinger | 2008-02-09 00:57:06 +0100 (Sat, 09 Feb 2008) | 1 line Add advice on choosing between DictMixin and MutableMapping ........
157 lines
5.1 KiB
C
157 lines
5.1 KiB
C
#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;
|
|
}
|