svn+ssh://pythondev@svn.python.org/python/trunk ........ r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line Added PEP 3101. ........ r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines Fixes contributed by Ori Avtalion. ........ r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description). ........ r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. ........ r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines Close manifest file. This change doesn't make any difference to CPython, but is a necessary fix for Jython. ........ r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines Remove news about float repr() -- issue 1580 is still in limbo. ........ r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines Removed uses of dict.has_key() from distutils, and uses of callable() from copy_reg.py, so the interpreter now starts up without warnings when '-3' is given. More work like this needs to be done in the rest of the stdlib. ........ r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines configure.ac: Remove the configure check for _Bool, it is already done in the top-level Python configure script. configure, fficonfig.h.in: regenerated. ........ r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines Replace 'has_key()' with 'in'. Replace 'raise Error, stuff' with 'raise Error(stuff)'. ........ r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line Update more instances of has_key(). ........ r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines Fix a few typos and layout glitches (more work is needed). Move 2.5 news to Misc/HISTORY. ........ r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines #2079: typo in userdict docs. ........ r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines Part of #2154: minimal syntax fixes in doc example snippets. ........ r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line First draft for itertools.product(). Docs and other updates forthcoming. ........ r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery) ........ r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines A lot more typo fixes by Ori Avtalion. ........ r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines Don't reference pyshell. ........ r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines Another fix. ........
379 lines
10 KiB
C
379 lines
10 KiB
C
/* -*- Mode: C; c-file-style: "python" -*- */
|
|
|
|
#include <Python.h>
|
|
#include <locale.h>
|
|
|
|
/* ascii character tests (as opposed to locale tests) */
|
|
#define ISSPACE(c) ((c) == ' ' || (c) == '\f' || (c) == '\n' || \
|
|
(c) == '\r' || (c) == '\t' || (c) == '\v')
|
|
#define ISDIGIT(c) ((c) >= '0' && (c) <= '9')
|
|
#define ISXDIGIT(c) (ISDIGIT(c) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
|
|
|
|
|
|
/**
|
|
* PyOS_ascii_strtod:
|
|
* @nptr: the string to convert to a numeric value.
|
|
* @endptr: if non-%NULL, it returns the character after
|
|
* the last character used in the conversion.
|
|
*
|
|
* Converts a string to a #gdouble value.
|
|
* This function behaves like the standard strtod() function
|
|
* does in the C locale. It does this without actually
|
|
* changing the current locale, since that would not be
|
|
* thread-safe.
|
|
*
|
|
* This function is typically used when reading configuration
|
|
* files or other non-user input that should be locale independent.
|
|
* To handle input from the user you should normally use the
|
|
* locale-sensitive system strtod() function.
|
|
*
|
|
* If the correct value would cause overflow, plus or minus %HUGE_VAL
|
|
* is returned (according to the sign of the value), and %ERANGE is
|
|
* stored in %errno. If the correct value would cause underflow,
|
|
* zero is returned and %ERANGE is stored in %errno.
|
|
* If memory allocation fails, %ENOMEM is stored in %errno.
|
|
*
|
|
* This function resets %errno before calling strtod() so that
|
|
* you can reliably detect overflow and underflow.
|
|
*
|
|
* Return value: the #gdouble value.
|
|
**/
|
|
double
|
|
PyOS_ascii_strtod(const char *nptr, char **endptr)
|
|
{
|
|
char *fail_pos;
|
|
double val = -1.0;
|
|
struct lconv *locale_data;
|
|
const char *decimal_point;
|
|
size_t decimal_point_len;
|
|
const char *p, *decimal_point_pos;
|
|
const char *end = NULL; /* Silence gcc */
|
|
const char *digits_pos = NULL;
|
|
int negate = 0;
|
|
|
|
assert(nptr != NULL);
|
|
|
|
fail_pos = NULL;
|
|
|
|
locale_data = localeconv();
|
|
decimal_point = locale_data->decimal_point;
|
|
decimal_point_len = strlen(decimal_point);
|
|
|
|
assert(decimal_point_len != 0);
|
|
|
|
decimal_point_pos = NULL;
|
|
|
|
/* We process any leading whitespace and the optional sign manually,
|
|
then pass the remainder to the system strtod. This ensures that
|
|
the result of an underflow has the correct sign. (bug #1725) */
|
|
|
|
p = nptr;
|
|
/* Skip leading space */
|
|
while (ISSPACE(*p))
|
|
p++;
|
|
|
|
/* Process leading sign, if present */
|
|
if (*p == '-') {
|
|
negate = 1;
|
|
p++;
|
|
} else if (*p == '+') {
|
|
p++;
|
|
}
|
|
|
|
/* What's left should begin with a digit, a decimal point, or one of
|
|
the letters i, I, n, N. It should not begin with 0x or 0X */
|
|
if ((!ISDIGIT(*p) &&
|
|
*p != '.' && *p != 'i' && *p != 'I' && *p != 'n' && *p != 'N')
|
|
||
|
|
(*p == '0' && (p[1] == 'x' || p[1] == 'X')))
|
|
{
|
|
if (endptr)
|
|
*endptr = (char*)nptr;
|
|
errno = EINVAL;
|
|
return val;
|
|
}
|
|
digits_pos = p;
|
|
|
|
if (decimal_point[0] != '.' ||
|
|
decimal_point[1] != 0)
|
|
{
|
|
while (ISDIGIT(*p))
|
|
p++;
|
|
|
|
if (*p == '.')
|
|
{
|
|
decimal_point_pos = p++;
|
|
|
|
while (ISDIGIT(*p))
|
|
p++;
|
|
|
|
if (*p == 'e' || *p == 'E')
|
|
p++;
|
|
if (*p == '+' || *p == '-')
|
|
p++;
|
|
while (ISDIGIT(*p))
|
|
p++;
|
|
end = p;
|
|
}
|
|
else if (strncmp(p, decimal_point, decimal_point_len) == 0)
|
|
{
|
|
/* Python bug #1417699 */
|
|
if (endptr)
|
|
*endptr = (char*)nptr;
|
|
errno = EINVAL;
|
|
return val;
|
|
}
|
|
/* For the other cases, we need not convert the decimal point */
|
|
}
|
|
|
|
/* Set errno to zero, so that we can distinguish zero results
|
|
and underflows */
|
|
errno = 0;
|
|
|
|
if (decimal_point_pos)
|
|
{
|
|
char *copy, *c;
|
|
|
|
/* We need to convert the '.' to the locale specific decimal point */
|
|
copy = (char *)PyMem_MALLOC(end - digits_pos +
|
|
1 + decimal_point_len);
|
|
if (copy == NULL) {
|
|
if (endptr)
|
|
*endptr = (char *)nptr;
|
|
errno = ENOMEM;
|
|
return val;
|
|
}
|
|
|
|
c = copy;
|
|
memcpy(c, digits_pos, decimal_point_pos - digits_pos);
|
|
c += decimal_point_pos - digits_pos;
|
|
memcpy(c, decimal_point, decimal_point_len);
|
|
c += decimal_point_len;
|
|
memcpy(c, decimal_point_pos + 1, end - (decimal_point_pos + 1));
|
|
c += end - (decimal_point_pos + 1);
|
|
*c = 0;
|
|
|
|
val = strtod(copy, &fail_pos);
|
|
|
|
if (fail_pos)
|
|
{
|
|
if (fail_pos > decimal_point_pos)
|
|
fail_pos = (char *)digits_pos +
|
|
(fail_pos - copy) -
|
|
(decimal_point_len - 1);
|
|
else
|
|
fail_pos = (char *)digits_pos +
|
|
(fail_pos - copy);
|
|
}
|
|
|
|
PyMem_FREE(copy);
|
|
|
|
}
|
|
else {
|
|
val = strtod(digits_pos, &fail_pos);
|
|
}
|
|
|
|
if (fail_pos == digits_pos)
|
|
fail_pos = (char *)nptr;
|
|
|
|
if (negate && fail_pos != nptr)
|
|
val = -val;
|
|
|
|
if (endptr)
|
|
*endptr = fail_pos;
|
|
|
|
return val;
|
|
}
|
|
|
|
|
|
/* From the C99 standard, section 7.19.6:
|
|
The exponent always contains at least two digits, and only as many more digits
|
|
as necessary to represent the exponent.
|
|
*/
|
|
#define MIN_EXPONENT_DIGITS 2
|
|
|
|
/* see FORMATBUFLEN in unicodeobject.c */
|
|
#define FLOAT_FORMATBUFLEN 120
|
|
|
|
/**
|
|
* PyOS_ascii_formatd:
|
|
* @buffer: A buffer to place the resulting string in
|
|
* @buf_len: The length of the buffer.
|
|
* @format: The printf()-style format to use for the
|
|
* code to use for converting.
|
|
* @d: The #gdouble to convert
|
|
*
|
|
* Converts a #gdouble to a string, using the '.' as
|
|
* decimal point. To format the number you pass in
|
|
* a printf()-style format string. Allowed conversion
|
|
* specifiers are 'e', 'E', 'f', 'F', 'g', 'G', and 'n'.
|
|
*
|
|
* 'n' is the same as 'g', except it uses the current locale.
|
|
*
|
|
* Return value: The pointer to the buffer with the converted string.
|
|
**/
|
|
char *
|
|
PyOS_ascii_formatd(char *buffer,
|
|
size_t buf_len,
|
|
const char *format,
|
|
double d)
|
|
{
|
|
char *p;
|
|
char format_char;
|
|
size_t format_len = strlen(format);
|
|
|
|
/* For type 'n', we need to make a copy of the format string, because
|
|
we're going to modify 'n' -> 'g', and format is const char*, so we
|
|
can't modify it directly. FLOAT_FORMATBUFLEN should be longer than
|
|
we ever need this to be. There's an upcoming check to ensure it's
|
|
big enough. */
|
|
char tmp_format[FLOAT_FORMATBUFLEN];
|
|
|
|
/* g_return_val_if_fail (buffer != NULL, NULL); */
|
|
/* g_return_val_if_fail (format[0] == '%', NULL); */
|
|
/* g_return_val_if_fail (strpbrk (format + 1, "'l%") == NULL, NULL); */
|
|
|
|
/* The last character in the format string must be the format char */
|
|
format_char = format[format_len - 1];
|
|
|
|
/* g_return_val_if_fail (format_char == 'e' || format_char == 'E' || */
|
|
/* format_char == 'f' || format_char == 'F' || */
|
|
/* format_char == 'g' || format_char == 'G', */
|
|
/* NULL); */
|
|
|
|
if (format[0] != '%')
|
|
return NULL;
|
|
|
|
/* I'm not sure why this test is here. It's ensuring that the format
|
|
string after the first character doesn't have a single quote, a
|
|
lowercase l, or a percent. This is the reverse of the commented-out
|
|
test about 10 lines ago. */
|
|
if (strpbrk(format + 1, "'l%"))
|
|
return NULL;
|
|
|
|
if (!(format_char == 'e' || format_char == 'E' ||
|
|
format_char == 'f' || format_char == 'F' ||
|
|
format_char == 'g' || format_char == 'G' ||
|
|
format_char == 'n'))
|
|
return NULL;
|
|
|
|
/* Map 'n' format_char to 'g', by copying the format string and
|
|
replacing the final 'n' with a 'g' */
|
|
if (format_char == 'n') {
|
|
if (format_len + 1 >= sizeof(tmp_format)) {
|
|
/* The format won't fit in our copy. Error out. In
|
|
practice, this will never happen and will be detected
|
|
by returning NULL */
|
|
return NULL;
|
|
}
|
|
strcpy(tmp_format, format);
|
|
tmp_format[format_len - 1] = 'g';
|
|
format = tmp_format;
|
|
}
|
|
|
|
/* Have PyOS_snprintf do the hard work */
|
|
PyOS_snprintf(buffer, buf_len, format, d);
|
|
|
|
/* Get the current local, and find the decimal point character (or
|
|
string?). Convert that string back to a dot. Do not do this if
|
|
using the 'n' (number) format code. */
|
|
if (format_char != 'n') {
|
|
struct lconv *locale_data = localeconv();
|
|
const char *decimal_point = locale_data->decimal_point;
|
|
size_t decimal_point_len = strlen(decimal_point);
|
|
size_t rest_len;
|
|
|
|
assert(decimal_point_len != 0);
|
|
|
|
if (decimal_point[0] != '.' || decimal_point[1] != 0) {
|
|
p = buffer;
|
|
|
|
if (*p == '+' || *p == '-')
|
|
p++;
|
|
|
|
while (isdigit(Py_CHARMASK(*p)))
|
|
p++;
|
|
|
|
if (strncmp(p, decimal_point, decimal_point_len) == 0) {
|
|
*p = '.';
|
|
p++;
|
|
if (decimal_point_len > 1) {
|
|
rest_len = strlen(p +
|
|
(decimal_point_len - 1));
|
|
memmove(p, p + (decimal_point_len - 1),
|
|
rest_len);
|
|
p[rest_len] = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* If an exponent exists, ensure that the exponent is at least
|
|
MIN_EXPONENT_DIGITS digits, providing the buffer is large enough
|
|
for the extra zeros. Also, if there are more than
|
|
MIN_EXPONENT_DIGITS, remove as many zeros as possible until we get
|
|
back to MIN_EXPONENT_DIGITS */
|
|
p = strpbrk(buffer, "eE");
|
|
if (p && (*(p + 1) == '-' || *(p + 1) == '+')) {
|
|
char *start = p + 2;
|
|
int exponent_digit_cnt = 0;
|
|
int leading_zero_cnt = 0;
|
|
int in_leading_zeros = 1;
|
|
int significant_digit_cnt;
|
|
|
|
p += 2;
|
|
while (*p && isdigit(Py_CHARMASK(*p))) {
|
|
if (in_leading_zeros && *p == '0')
|
|
++leading_zero_cnt;
|
|
if (*p != '0')
|
|
in_leading_zeros = 0;
|
|
++p;
|
|
++exponent_digit_cnt;
|
|
}
|
|
|
|
significant_digit_cnt = exponent_digit_cnt - leading_zero_cnt;
|
|
if (exponent_digit_cnt == MIN_EXPONENT_DIGITS) {
|
|
/* If there are 2 exactly digits, we're done,
|
|
regardless of what they contain */
|
|
}
|
|
else if (exponent_digit_cnt > MIN_EXPONENT_DIGITS) {
|
|
int extra_zeros_cnt;
|
|
|
|
/* There are more than 2 digits in the exponent. See
|
|
if we can delete some of the leading zeros */
|
|
if (significant_digit_cnt < MIN_EXPONENT_DIGITS)
|
|
significant_digit_cnt = MIN_EXPONENT_DIGITS;
|
|
extra_zeros_cnt = exponent_digit_cnt - significant_digit_cnt;
|
|
|
|
/* Delete extra_zeros_cnt worth of characters from the
|
|
front of the exponent */
|
|
assert(extra_zeros_cnt >= 0);
|
|
|
|
/* Add one to significant_digit_cnt to copy the
|
|
trailing 0 byte, thus setting the length */
|
|
memmove(start,
|
|
start + extra_zeros_cnt,
|
|
significant_digit_cnt + 1);
|
|
}
|
|
else {
|
|
/* If there are fewer than 2 digits, add zeros
|
|
until there are 2, if there's enough room */
|
|
int zeros = MIN_EXPONENT_DIGITS - exponent_digit_cnt;
|
|
if (start + zeros + exponent_digit_cnt + 1
|
|
< buffer + buf_len) {
|
|
memmove(start + zeros, start,
|
|
exponent_digit_cnt + 1);
|
|
memset(start, '0', zeros);
|
|
}
|
|
}
|
|
}
|
|
|
|
return buffer;
|
|
}
|
|
|
|
double
|
|
PyOS_ascii_atof(const char *nptr)
|
|
{
|
|
return PyOS_ascii_strtod(nptr, NULL);
|
|
}
|