| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | /* -*- 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')
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /**
 | 
					
						
							|  |  |  |  * 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. | 
					
						
							| 
									
										
										
										
											2006-05-29 14:28:05 +00:00
										 |  |  |  * If memory allocation fails, %ENOMEM is stored in %errno. | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  |  *  | 
					
						
							|  |  |  |  * This function resets %errno before calling strtod() so that | 
					
						
							|  |  |  |  * you can reliably detect overflow and underflow. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Return value: the #gdouble value. | 
					
						
							|  |  |  |  **/ | 
					
						
							|  |  |  | double | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | PyOS_ascii_strtod(const char *nptr, char **endptr) | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	char *fail_pos; | 
					
						
							| 
									
										
										
										
											2005-12-18 05:37:36 +00:00
										 |  |  | 	double val = -1.0; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	struct lconv *locale_data; | 
					
						
							|  |  |  | 	const char *decimal_point; | 
					
						
							| 
									
										
										
										
											2006-01-08 01:03:36 +00:00
										 |  |  | 	size_t decimal_point_len; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	const char *p, *decimal_point_pos; | 
					
						
							|  |  |  | 	const char *end = NULL; /* Silence gcc */ | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 	const char *digits_pos = NULL; | 
					
						
							|  |  |  | 	int negate = 0; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	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; | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	/* 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; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	if (decimal_point[0] != '.' ||  | 
					
						
							|  |  |  | 	    decimal_point[1] != 0) | 
					
						
							|  |  |  | 	{ | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 		while (ISDIGIT(*p)) | 
					
						
							|  |  |  | 			p++; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (*p == '.') | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 		{ | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 			decimal_point_pos = p++; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 			while (ISDIGIT(*p)) | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 				p++; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 			if (*p == 'e' || *p == 'E') | 
					
						
							|  |  |  | 				p++; | 
					
						
							|  |  |  | 			if (*p == '+' || *p == '-') | 
					
						
							|  |  |  | 				p++; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 			while (ISDIGIT(*p)) | 
					
						
							|  |  |  | 				p++; | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 			end = p; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 		} | 
					
						
							| 
									
										
										
										
											2006-07-03 12:19:50 +00:00
										 |  |  | 		else if (strncmp(p, decimal_point, decimal_point_len) == 0) | 
					
						
							|  |  |  | 		{ | 
					
						
							|  |  |  | 			/* Python bug #1417699 */ | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 			if (endptr) | 
					
						
							|  |  |  | 				*endptr = (char*)nptr; | 
					
						
							| 
									
										
										
										
											2006-07-03 12:19:50 +00:00
										 |  |  | 			errno = EINVAL; | 
					
						
							|  |  |  | 			return val; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2008-03-17 12:14:29 +00:00
										 |  |  | 		/* For the other cases, we need not convert the decimal
 | 
					
						
							|  |  |  | 		   point */ | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 	/* Set errno to zero, so that we can distinguish zero results
 | 
					
						
							|  |  |  | 	   and underflows */ | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	errno = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (decimal_point_pos) | 
					
						
							|  |  |  | 	{ | 
					
						
							|  |  |  | 		char *copy, *c; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-17 12:14:29 +00:00
										 |  |  | 		/* We need to convert the '.' to the locale specific decimal
 | 
					
						
							|  |  |  | 		   point */ | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 		copy = (char *)PyMem_MALLOC(end - digits_pos + | 
					
						
							|  |  |  | 					    1 + decimal_point_len); | 
					
						
							| 
									
										
										
										
											2006-05-29 14:28:05 +00:00
										 |  |  | 		if (copy == NULL) { | 
					
						
							|  |  |  | 			if (endptr) | 
					
						
							| 
									
										
										
										
											2006-05-29 14:33:55 +00:00
										 |  |  | 				*endptr = (char *)nptr; | 
					
						
							| 
									
										
										
										
											2006-05-29 14:28:05 +00:00
										 |  |  | 			errno = ENOMEM; | 
					
						
							|  |  |  | 			return val; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 		c = copy; | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 		memcpy(c, digits_pos, decimal_point_pos - digits_pos); | 
					
						
							|  |  |  | 		c += decimal_point_pos - digits_pos; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 		memcpy(c, decimal_point, decimal_point_len); | 
					
						
							|  |  |  | 		c += decimal_point_len; | 
					
						
							| 
									
										
										
										
											2008-03-17 12:14:29 +00:00
										 |  |  | 		memcpy(c, decimal_point_pos + 1, | 
					
						
							|  |  |  | 		       end - (decimal_point_pos + 1)); | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 		c += end - (decimal_point_pos + 1); | 
					
						
							|  |  |  | 		*c = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		val = strtod(copy, &fail_pos); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (fail_pos) | 
					
						
							|  |  |  | 		{ | 
					
						
							|  |  |  | 			if (fail_pos > decimal_point_pos) | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 				fail_pos = (char *)digits_pos + | 
					
						
							|  |  |  | 					(fail_pos - copy) - | 
					
						
							|  |  |  | 					(decimal_point_len - 1); | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 			else | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 				fail_pos = (char *)digits_pos + | 
					
						
							|  |  |  | 					(fail_pos - copy); | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-05-25 20:44:08 +00:00
										 |  |  | 		PyMem_FREE(copy); | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 	else { | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 		val = strtod(digits_pos, &fail_pos); | 
					
						
							| 
									
										
										
										
											2005-12-18 05:03:17 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-01-05 00:59:59 +00:00
										 |  |  | 	if (fail_pos == digits_pos) | 
					
						
							|  |  |  | 		fail_pos = (char *)nptr; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (negate && fail_pos != nptr) | 
					
						
							|  |  |  | 		val = -val; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	if (endptr) | 
					
						
							|  |  |  | 		*endptr = fail_pos; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	return val; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | /* Given a string that may have a decimal point in the current
 | 
					
						
							|  |  |  |    locale, change it back to a dot.  Since the string cannot get | 
					
						
							|  |  |  |    longer, no need for a maximum buffer size parameter. */ | 
					
						
							|  |  |  | Py_LOCAL_INLINE(void) | 
					
						
							|  |  |  | change_decimal_from_locale_to_dot(char* buffer) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct lconv *locale_data = localeconv(); | 
					
						
							|  |  |  | 	const char *decimal_point = locale_data->decimal_point; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (decimal_point[0] != '.' || decimal_point[1] != 0) { | 
					
						
							|  |  |  | 		size_t decimal_point_len = strlen(decimal_point); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (*buffer == '+' || *buffer == '-') | 
					
						
							|  |  |  | 			buffer++; | 
					
						
							|  |  |  | 		while (isdigit(Py_CHARMASK(*buffer))) | 
					
						
							|  |  |  | 			buffer++; | 
					
						
							|  |  |  | 		if (strncmp(buffer, decimal_point, decimal_point_len) == 0) { | 
					
						
							|  |  |  | 			*buffer = '.'; | 
					
						
							|  |  |  | 			buffer++; | 
					
						
							|  |  |  | 			if (decimal_point_len > 1) { | 
					
						
							|  |  |  | 				/* buffer needs to get smaller */ | 
					
						
							|  |  |  | 				size_t rest_len = strlen(buffer + | 
					
						
							|  |  |  | 						     (decimal_point_len - 1)); | 
					
						
							|  |  |  | 				memmove(buffer, | 
					
						
							|  |  |  | 					buffer + (decimal_point_len - 1), | 
					
						
							|  |  |  | 					rest_len); | 
					
						
							|  |  |  | 				buffer[rest_len] = 0; | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | /* 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
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | /* Ensure that any exponent, if present, is at least MIN_EXPONENT_DIGITS
 | 
					
						
							|  |  |  |    in length. */ | 
					
						
							|  |  |  | Py_LOCAL_INLINE(void) | 
					
						
							|  |  |  | ensure_minumim_exponent_length(char* buffer, size_t buf_size) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	char *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; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		/* Skip over the exponent and the sign. */ | 
					
						
							|  |  |  | 		p += 2; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		/* Find the end of the exponent, keeping track of leading
 | 
					
						
							|  |  |  | 		   zeros. */ | 
					
						
							|  |  |  | 		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_size) { | 
					
						
							|  |  |  | 				memmove(start + zeros, start, | 
					
						
							|  |  |  | 					exponent_digit_cnt + 1); | 
					
						
							|  |  |  | 				memset(start, '0', zeros); | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Ensure that buffer has a decimal point in it.  The decimal point
 | 
					
						
							|  |  |  |    will not be in the current locale, it will always be '.' */ | 
					
						
							|  |  |  | Py_LOCAL_INLINE(void) | 
					
						
							|  |  |  | ensure_decimal_point(char* buffer, size_t buf_size) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	int insert_count = 0; | 
					
						
							|  |  |  | 	char* chars_to_insert; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* search for the first non-digit character */ | 
					
						
							|  |  |  | 	char *p = buffer; | 
					
						
							| 
									
										
										
										
											2008-07-19 00:24:05 +00:00
										 |  |  | 	if (*p == '-' || *p == '+') | 
					
						
							|  |  |  | 		/* Skip leading sign, if present.  I think this could only
 | 
					
						
							|  |  |  | 		   ever be '-', but it can't hurt to check for both. */ | 
					
						
							|  |  |  | 		++p; | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	while (*p && isdigit(Py_CHARMASK(*p))) | 
					
						
							|  |  |  | 		++p; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (*p == '.') { | 
					
						
							|  |  |  | 		if (isdigit(Py_CHARMASK(*(p+1)))) { | 
					
						
							|  |  |  | 			/* Nothing to do, we already have a decimal
 | 
					
						
							|  |  |  | 			   point and a digit after it */ | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		else { | 
					
						
							|  |  |  | 			/* We have a decimal point, but no following
 | 
					
						
							|  |  |  | 			   digit.  Insert a zero after the decimal. */ | 
					
						
							|  |  |  | 			++p; | 
					
						
							|  |  |  | 			chars_to_insert = "0"; | 
					
						
							|  |  |  | 			insert_count = 1; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	else { | 
					
						
							|  |  |  | 		chars_to_insert = ".0"; | 
					
						
							|  |  |  | 		insert_count = 2; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (insert_count) { | 
					
						
							|  |  |  | 		size_t buf_len = strlen(buffer); | 
					
						
							|  |  |  | 		if (buf_len + insert_count + 1 >= buf_size) { | 
					
						
							|  |  |  | 			/* If there is not enough room in the buffer
 | 
					
						
							|  |  |  | 			   for the additional text, just skip it.  It's | 
					
						
							|  |  |  | 			   not worth generating an error over. */ | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		else { | 
					
						
							|  |  |  | 			memmove(p + insert_count, p, | 
					
						
							|  |  |  | 				buffer + strlen(buffer) - p + 1); | 
					
						
							|  |  |  | 			memcpy(p, chars_to_insert, insert_count); | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Add the locale specific grouping characters to buffer.  Note
 | 
					
						
							|  |  |  |    that any decimal point (if it's present) in buffer is already | 
					
						
							|  |  |  |    locale-specific.  Return 0 on error, else 1. */ | 
					
						
							|  |  |  | Py_LOCAL_INLINE(int) | 
					
						
							|  |  |  | add_thousands_grouping(char* buffer, size_t buf_size) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2008-05-11 19:52:48 +00:00
										 |  |  | 	Py_ssize_t len = strlen(buffer); | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	struct lconv *locale_data = localeconv(); | 
					
						
							|  |  |  | 	const char *decimal_point = locale_data->decimal_point; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/* Find the decimal point, if any.  We're only concerned
 | 
					
						
							|  |  |  | 	   about the characters to the left of the decimal when | 
					
						
							|  |  |  | 	   adding grouping. */ | 
					
						
							|  |  |  | 	char *p = strstr(buffer, decimal_point); | 
					
						
							|  |  |  | 	if (!p) { | 
					
						
							|  |  |  | 		/* No decimal, use the entire string. */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		/* If any exponent, adjust p. */ | 
					
						
							|  |  |  | 		p = strpbrk(buffer, "eE"); | 
					
						
							|  |  |  | 		if (!p) | 
					
						
							|  |  |  | 			/* No exponent and no decimal.  Use the entire
 | 
					
						
							|  |  |  | 			   string. */ | 
					
						
							| 
									
										
										
										
											2008-05-11 19:52:48 +00:00
										 |  |  | 			p = buffer + len; | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | 	/* At this point, p points just past the right-most character we
 | 
					
						
							|  |  |  | 	   want to format.  We need to add the grouping string for the | 
					
						
							|  |  |  | 	   characters between buffer and p. */ | 
					
						
							| 
									
										
										
										
											2008-06-24 00:42:10 +00:00
										 |  |  | 	return _PyString_InsertThousandsGrouping(buffer, len, p-buffer, | 
					
						
							| 
									
										
										
										
											2008-05-11 19:52:48 +00:00
										 |  |  | 						 buf_size, NULL, 1); | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | /* see FORMATBUFLEN in unicodeobject.c */ | 
					
						
							|  |  |  | #define FLOAT_FORMATBUFLEN 120
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | /**
 | 
					
						
							|  |  |  |  * PyOS_ascii_formatd: | 
					
						
							|  |  |  |  * @buffer: A buffer to place the resulting string in | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  |  * @buf_size: The length of the buffer. | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  |  * @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 | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  |  * specifiers are 'e', 'E', 'f', 'F', 'g', 'G', and 'n'. | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  |  *  | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  |  * 'n' is the same as 'g', except it uses the current locale. | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  |  * 'Z' is the same as 'g', except it always has a decimal and | 
					
						
							|  |  |  |  *     at least one digit after the decimal. | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  |  * | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  |  * Return value: The pointer to the buffer with the converted string. | 
					
						
							|  |  |  |  **/ | 
					
						
							|  |  |  | char * | 
					
						
							|  |  |  | PyOS_ascii_formatd(char       *buffer,  | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 		   size_t      buf_size,  | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 		   const char *format,  | 
					
						
							|  |  |  | 		   double      d) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	char format_char; | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 	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. */ | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 	/* Issue 2264: code 'Z' requires copying the format.  'Z' is 'g', but
 | 
					
						
							|  |  |  | 	   also with at least one character past the decimal. */ | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 	char tmp_format[FLOAT_FORMATBUFLEN]; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 	/* The last character in the format string must be the format char */ | 
					
						
							|  |  |  | 	format_char = format[format_len - 1]; | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (format[0] != '%') | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 	/* 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. */ | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	if (strpbrk(format + 1, "'l%")) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 	/* Also curious about this function is that it accepts format strings
 | 
					
						
							|  |  |  | 	   like "%xg", which are invalid for floats.  In general, the | 
					
						
							|  |  |  | 	   interface to this function is not very good, but changing it is | 
					
						
							|  |  |  | 	   difficult because it's a public API. */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	if (!(format_char == 'e' || format_char == 'E' ||  | 
					
						
							|  |  |  | 	      format_char == 'f' || format_char == 'F' ||  | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 	      format_char == 'g' || format_char == 'G' || | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 	      format_char == 'n' || format_char == 'Z')) | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 	/* Map 'n' or 'Z' format_char to 'g', by copying the format string and
 | 
					
						
							|  |  |  | 	   replacing the final char with a 'g' */ | 
					
						
							|  |  |  | 	if (format_char == 'n' || format_char == 'Z') { | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 		if (format_len + 1 >= sizeof(tmp_format)) { | 
					
						
							|  |  |  | 			/* The format won't fit in our copy.  Error out.  In
 | 
					
						
							| 
									
										
										
										
											2008-03-17 12:14:29 +00:00
										 |  |  | 			   practice, this will never happen and will be | 
					
						
							|  |  |  | 			   detected by returning NULL */ | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		strcpy(tmp_format, format); | 
					
						
							|  |  |  | 		tmp_format[format_len - 1] = 'g'; | 
					
						
							|  |  |  | 		format = tmp_format; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 	/* Have PyOS_snprintf do the hard work */ | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 	PyOS_snprintf(buffer, buf_size, format, d); | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	/* Do various fixups on the return string */ | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	/* Get the current locale, and find the decimal point string.
 | 
					
						
							|  |  |  | 	   Convert that string back to a dot.  Do not do this if using the | 
					
						
							|  |  |  | 	   'n' (number) format code, since we want to keep the localized | 
					
						
							|  |  |  | 	   decimal point in that case. */ | 
					
						
							|  |  |  | 	if (format_char != 'n') | 
					
						
							|  |  |  | 		change_decimal_from_locale_to_dot(buffer); | 
					
						
							| 
									
										
										
										
											2008-02-20 23:34:22 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	/* 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 */ | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	ensure_minumim_exponent_length(buffer, buf_size); | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 	/* If format_char is 'Z', make sure we have at least one character
 | 
					
						
							|  |  |  | 	   after the decimal point (and make sure we have a decimal point). */ | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	if (format_char == 'Z') | 
					
						
							|  |  |  | 		ensure_decimal_point(buffer, buf_size); | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-04-30 01:09:30 +00:00
										 |  |  | 	/* If format_char is 'n', add the thousands grouping. */ | 
					
						
							|  |  |  | 	if (format_char == 'n') | 
					
						
							|  |  |  | 		if (!add_thousands_grouping(buffer, buf_size)) | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							| 
									
										
										
										
											2008-03-17 11:01:01 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2004-06-08 18:52:54 +00:00
										 |  |  | 	return buffer; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | double | 
					
						
							|  |  |  | PyOS_ascii_atof(const char *nptr) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	return PyOS_ascii_strtod(nptr, NULL); | 
					
						
							|  |  |  | } |