cpython-lru_cache-weakref: Python/pystrtod.c annotate

annotate Python/pystrtod.c @ 39496:352ffe77b71d legacy-trunk

Patch #1535500: fix segfault in BZ2File.writelines and make sure it raises the correct exceptions.

author	Georg Brandl <georg@python.org>
date	Mon, 14 Aug 2006 21:42:55 +0000
parents	0e8a94ba2106
children	3fcaf6cc306d

rev	line source
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	1 /* -- Mode: C; c-file-style: "python" -- */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	2
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	3 #include <Python.h>
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	4 #include <locale.h>
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	5
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	6 /* ascii character tests (as opposed to locale tests) */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	7 #define ISSPACE(c) ((c) == ' ' \|\| (c) == '\f' \|\| (c) == '\n' \|\| \
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	8 (c) == '\r' \|\| (c) == '\t' \|\| (c) == '\v')
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	9 #define ISDIGIT(c) ((c) >= '0' && (c) <= '9')
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	10 #define ISXDIGIT(c) (ISDIGIT(c) \|\| ((c) >= 'a' && (c) <= 'f') \|\| ((c) >= 'A' && (c) <= 'F'))
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	11
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	12
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	13 /**
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	14 * PyOS_ascii_strtod:
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	15 * @nptr: the string to convert to a numeric value.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	16 * @endptr: if non-%NULL, it returns the character after
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	17 * the last character used in the conversion.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	18 *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	19 * Converts a string to a #gdouble value.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	20 * This function behaves like the standard strtod() function
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	21 * does in the C locale. It does this without actually
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	22 * changing the current locale, since that would not be
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	23 * thread-safe.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	24 *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	25 * This function is typically used when reading configuration
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	26 * files or other non-user input that should be locale independent.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	27 * To handle input from the user you should normally use the
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	28 * locale-sensitive system strtod() function.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	29 *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	30 * If the correct value would cause overflow, plus or minus %HUGE_VAL
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	31 * is returned (according to the sign of the value), and %ERANGE is
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	32 * stored in %errno. If the correct value would cause underflow,
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	33 * zero is returned and %ERANGE is stored in %errno.
38480 9b001ebeaa5e Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. Georg Brandl <georg@python.org> parents: 38320 diff changeset	34 * If memory allocation fails, %ENOMEM is stored in %errno.
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	35 *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	36 * This function resets %errno before calling strtod() so that
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	37 * you can reliably detect overflow and underflow.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	38 *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	39 * Return value: the #gdouble value.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	40 **/
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	41 double
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	42 PyOS_ascii_strtod(const char nptr, char *endptr)
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	43 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	44 char *fail_pos;
36080 10440bcfa061 Fix compiler warnings Neal Norwitz <nnorwitz@gmail.com> parents: 36077 diff changeset	45 double val = -1.0;
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	46 struct lconv *locale_data;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	47 const char *decimal_point;
36230 ded4a497eb76 Fix icc warnings: strlen() returns size_t Neal Norwitz <nnorwitz@gmail.com> parents: 36080 diff changeset	48 size_t decimal_point_len;
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	49 const char p, decimal_point_pos;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	50 const char end = NULL; / Silence gcc */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	51
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	52 assert(nptr != NULL);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	53
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	54 fail_pos = NULL;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	55
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	56 locale_data = localeconv();
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	57 decimal_point = locale_data->decimal_point;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	58 decimal_point_len = strlen(decimal_point);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	59
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	60 assert(decimal_point_len != 0);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	61
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	62 decimal_point_pos = NULL;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	63 if (decimal_point[0] != '.' \|\|
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	64 decimal_point[1] != 0)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	65 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	66 p = nptr;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	67 /* Skip leading space */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	68 while (ISSPACE(*p))
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	69 p++;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	70
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	71 /* Skip leading optional sign */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	72 if (p == '+' \|\| p == '-')
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	73 p++;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	74
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	75 while (ISDIGIT(*p))
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	76 p++;
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	77
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	78 if (*p == '.')
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	79 {
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	80 decimal_point_pos = p++;
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	81
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	82 while (ISDIGIT(*p))
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	83 p++;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	84
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	85 if (p == 'e' \|\| p == 'E')
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	86 p++;
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	87 if (p == '+' \|\| p == '-')
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	88 p++;
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	89 while (ISDIGIT(*p))
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	90 p++;
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	91 end = p;
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	92 }
38989 0e8a94ba2106 Bug #1417699: Reject locale-specific decimal point in float() Martin v. Löwis <martin@v.loewis.de> parents: 38481 diff changeset	93 else if (strncmp(p, decimal_point, decimal_point_len) == 0)
0e8a94ba2106 Bug #1417699: Reject locale-specific decimal point in float() Martin v. Löwis <martin@v.loewis.de> parents: 38481 diff changeset	94 {
0e8a94ba2106 Bug #1417699: Reject locale-specific decimal point in float() Martin v. Löwis <martin@v.loewis.de> parents: 38481 diff changeset	95 /* Python bug #1417699 */
0e8a94ba2106 Bug #1417699: Reject locale-specific decimal point in float() Martin v. Löwis <martin@v.loewis.de> parents: 38481 diff changeset	96 endptr = (char)nptr;
0e8a94ba2106 Bug #1417699: Reject locale-specific decimal point in float() Martin v. Löwis <martin@v.loewis.de> parents: 38481 diff changeset	97 errno = EINVAL;
0e8a94ba2106 Bug #1417699: Reject locale-specific decimal point in float() Martin v. Löwis <martin@v.loewis.de> parents: 38481 diff changeset	98 return val;
0e8a94ba2106 Bug #1417699: Reject locale-specific decimal point in float() Martin v. Löwis <martin@v.loewis.de> parents: 38481 diff changeset	99 }
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	100 /* For the other cases, we need not convert the decimal point */
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	101 }
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	102
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	103 /* Set errno to zero, so that we can distinguish zero results
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	104 and underflows */
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	105 errno = 0;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	106
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	107 if (decimal_point_pos)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	108 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	109 char copy, c;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	110
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	111 /* We need to convert the '.' to the locale specific decimal point */
38320 3d477d158401 Swap out bare malloc()/free() use for PyMem_MALLOC()/PyMem_FREE() . Brett Cannon <bcannon@gmail.com> parents: 37607 diff changeset	112 copy = (char *)PyMem_MALLOC(end - nptr + 1 + decimal_point_len);
38480 9b001ebeaa5e Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. Georg Brandl <georg@python.org> parents: 38320 diff changeset	113 if (copy == NULL) {
9b001ebeaa5e Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. Georg Brandl <georg@python.org> parents: 38320 diff changeset	114 if (endptr)
38481 3d1a99b39fca Fix compiler warning. Georg Brandl <georg@python.org> parents: 38480 diff changeset	115 endptr = (char )nptr;
38480 9b001ebeaa5e Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. Georg Brandl <georg@python.org> parents: 38320 diff changeset	116 errno = ENOMEM;
9b001ebeaa5e Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. Georg Brandl <georg@python.org> parents: 38320 diff changeset	117 return val;
9b001ebeaa5e Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. Georg Brandl <georg@python.org> parents: 38320 diff changeset	118 }
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	119
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	120 c = copy;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	121 memcpy(c, nptr, decimal_point_pos - nptr);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	122 c += decimal_point_pos - nptr;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	123 memcpy(c, decimal_point, decimal_point_len);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	124 c += decimal_point_len;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	125 memcpy(c, decimal_point_pos + 1, end - (decimal_point_pos + 1));
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	126 c += end - (decimal_point_pos + 1);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	127 *c = 0;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	128
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	129 val = strtod(copy, &fail_pos);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	130
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	131 if (fail_pos)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	132 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	133 if (fail_pos > decimal_point_pos)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	134 fail_pos = (char *)nptr + (fail_pos - copy) - (decimal_point_len - 1);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	135 else
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	136 fail_pos = (char *)nptr + (fail_pos - copy);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	137 }
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	138
38320 3d477d158401 Swap out bare malloc()/free() use for PyMem_MALLOC()/PyMem_FREE() . Brett Cannon <bcannon@gmail.com> parents: 37607 diff changeset	139 PyMem_FREE(copy);
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	140
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	141 }
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	142 else {
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	143 unsigned i = 0;
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	144 if (nptr[i] == '-')
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	145 i++;
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	146 if (nptr[i] == '0' && (nptr[i+1] == 'x' \|\| nptr[i+1] == 'X'))
36080 10440bcfa061 Fix compiler warnings Neal Norwitz <nnorwitz@gmail.com> parents: 36077 diff changeset	147 fail_pos = (char*)nptr;
36077 3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	148 else
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	149 val = strtod(nptr, &fail_pos);
3b90258fec9f Get float() to be more portable across platforms. Disable hex strings. Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	150 }
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	151
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	152 if (endptr)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	153 *endptr = fail_pos;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	154
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	155 return val;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	156 }
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	157
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	158
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	159 /**
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	160 * PyOS_ascii_formatd:
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	161 * @buffer: A buffer to place the resulting string in
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	162 * @buf_len: The length of the buffer.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	163 * @format: The printf()-style format to use for the
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	164 * code to use for converting.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	165 * @d: The #gdouble to convert
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	166 *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	167 * Converts a #gdouble to a string, using the '.' as
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	168 * decimal point. To format the number you pass in
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	169 * a printf()-style format string. Allowed conversion
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	170 * specifiers are 'e', 'E', 'f', 'F', 'g' and 'G'.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	171 *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	172 * Return value: The pointer to the buffer with the converted string.
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	173 **/
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	174 char *
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	175 PyOS_ascii_formatd(char *buffer,
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36230 diff changeset	176 size_t buf_len,
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	177 const char *format,
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	178 double d)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	179 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	180 struct lconv *locale_data;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	181 const char *decimal_point;
36230 ded4a497eb76 Fix icc warnings: strlen() returns size_t Neal Norwitz <nnorwitz@gmail.com> parents: 36080 diff changeset	182 size_t decimal_point_len, rest_len;
32305 13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	183 char *p;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	184 char format_char;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	185
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	186 /* g_return_val_if_fail (buffer != NULL, NULL); */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	187 /* g_return_val_if_fail (format[0] == '%', NULL); */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	188 /* g_return_val_if_fail (strpbrk (format + 1, "'l%") == NULL, NULL); */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	189
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	190 format_char = format[strlen(format) - 1];
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	191
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	192 /* g_return_val_if_fail (format_char == 'e' \|\| format_char == 'E' \|\| */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	193 /* format_char == 'f' \|\| format_char == 'F' \|\| */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	194 /* format_char == 'g' \|\| format_char == 'G', */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	195 /* NULL); */
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	196
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	197 if (format[0] != '%')
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	198 return NULL;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	199
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	200 if (strpbrk(format + 1, "'l%"))
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	201 return NULL;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	202
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	203 if (!(format_char == 'e' \|\| format_char == 'E' \|\|
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	204 format_char == 'f' \|\| format_char == 'F' \|\|
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	205 format_char == 'g' \|\| format_char == 'G'))
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	206 return NULL;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	207
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	208
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	209 PyOS_snprintf(buffer, buf_len, format, d);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	210
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	211 locale_data = localeconv();
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	212 decimal_point = locale_data->decimal_point;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	213 decimal_point_len = strlen(decimal_point);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	214
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	215 assert(decimal_point_len != 0);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	216
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	217 if (decimal_point[0] != '.' \|\|
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	218 decimal_point[1] != 0)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	219 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	220 p = buffer;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	221
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	222 if (p == '+' \|\| p == '-')
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	223 p++;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	224
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	225 while (isdigit((unsigned char)*p))
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	226 p++;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	227
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	228 if (strncmp(p, decimal_point, decimal_point_len) == 0)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	229 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	230 *p = '.';
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	231 p++;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	232 if (decimal_point_len > 1) {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	233 rest_len = strlen(p + (decimal_point_len - 1));
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	234 memmove(p, p + (decimal_point_len - 1),
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	235 rest_len);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	236 p[rest_len] = 0;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	237 }
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	238 }
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	239 }
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	240
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	241 return buffer;
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	242 }
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	243
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	244 double
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	245 PyOS_ascii_atof(const char *nptr)
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	246 {
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	247 return PyOS_ascii_strtod(nptr, NULL);
13656d58d450 Patch #774665: Make Python LC_NUMERIC agnostic. Martin v. Löwis <martin@v.loewis.de> parents: diff changeset	248 }

Mercurial > cpython-lru_cache-weakref

annotate Python/pystrtod.c @ 39496:352ffe77b71d legacy-trunk