[Numpy-svn] r6281 - branches/fix_float_format/numpy/core/src

numpy-svn@scip... numpy-svn@scip...
Tue Dec 30 15:39:35 CST 2008


Author: ptvirtan
Date: 2008-12-30 15:39:23 -0600 (Tue, 30 Dec 2008)
New Revision: 6281

Modified:
   branches/fix_float_format/numpy/core/src/npy_format.c
Log:
Reindent and pep-7ize npy_format.c

Modified: branches/fix_float_format/numpy/core/src/npy_format.c
===================================================================
--- branches/fix_float_format/numpy/core/src/npy_format.c	2008-12-30 21:14:04 UTC (rev 6280)
+++ branches/fix_float_format/numpy/core/src/npy_format.c	2008-12-30 21:39:23 UTC (rev 6281)
@@ -1,9 +1,9 @@
 #include <locale.h>
 #include <stdio.h>
 
-/* 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.
+/* 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.
 */
 /* We force 3 digits on windows for python < 2.6 for compatibility reason */
 #if defined(MS_WIN32) && (PY_VERSION_HEX < 0x02060000)
@@ -14,115 +14,113 @@
 
 /* Ensure that any exponent, if present, is at least MIN_EXPONENT_DIGITS
    in length. */
-static void ensure_minumim_exponent_length(char* buffer, size_t buf_size)
+static void
+_ensure_minimum_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;
+    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;
+        /* 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;
-		}
+        /* 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;
+        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;
+            /* 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);
+            /* 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);
-			}
-		}
-	}
+            /* 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 '.' */
-void ensure_decimal_point(char* buffer, size_t buf_size)
+static void
+_ensure_decimal_point(char* buffer, size_t buf_size)
 {
-	int insert_count = 0;
-	char* chars_to_insert;
+    int insert_count = 0;
+    char* chars_to_insert;
 
-	/* search for the first non-digit character */
-	char *p = buffer;
-	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;
-	while (*p && isdigit(Py_CHARMASK(*p)))
-		++p;
+    /* search for the first non-digit character */
+    char *p = buffer;
+    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;
+    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);
-		}
-	}
+    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);
+        }
+    }
 }
 
 /* see FORMATBUFLEN in unicodeobject.c */
@@ -131,69 +129,71 @@
 /* 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. */
-static void change_decimal_from_locale_to_dot(char* buffer)
+static void
+_change_decimal_from_locale_to_dot(char* buffer)
 {
-	struct lconv *locale_data = localeconv();
-	const char *decimal_point = locale_data->decimal_point;
+    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 (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;
-			}
-		}
-	}
+        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;
+            }
+        }
+    }
 }
 
 /*
  * Check that the format string is a valid one for NumPyOS_ascii_format*
  */
-static int _check_ascii_format(const char *format)
+static int
+_check_ascii_format(const char *format)
 {
-	char format_char;
-	size_t format_len = strlen(format);
+    char format_char;
+    size_t format_len = strlen(format);
 
-	/* The last character in the format string must be the format char */
-	format_char = format[format_len - 1];
+    /* The last character in the format string must be the format char */
+    format_char = format[format_len - 1];
 
-	if (format[0] != '%') {
-		return -1;
-	}
+    if (format[0] != '%') {
+        return -1;
+    }
 
-	/* 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 -1;
-	}
+    /* 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 -1;
+    }
 
-	/* 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. */
+    /* 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. */
 
-	if (!(format_char == 'e' || format_char == 'E' || 
-	      format_char == 'f' || format_char == 'F' || 
-	      format_char == 'g' || format_char == 'G')) {
-		return -1;
-	}
+    if (!(format_char == 'e' || format_char == 'E' ||
+          format_char == 'f' || format_char == 'F' ||
+          format_char == 'g' || format_char == 'G')) {
+        return -1;
+    }
 
-	return 0;
+    return 0;
 }
 
 /*
@@ -202,24 +202,25 @@
  * decimal if decimal argument != 0 (Same effect that 'Z' format in
  * PyOS_ascii_formatd
  */
-static char* _fix_ascii_format(char* buf, size_t buflen, int decimal)
+static char*
+_fix_ascii_format(char* buf, size_t buflen, int decimal)
 {
-	/* Get the current locale, and find the decimal point string.
-	   Convert that string back to a dot. */
-	change_decimal_from_locale_to_dot(buf);
+    /* Get the current locale, and find the decimal point string.
+       Convert that string back to a dot. */
+    _change_decimal_from_locale_to_dot(buf);
 
-	/* 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 */
-	ensure_minumim_exponent_length(buf, buflen);
+    /* 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 */
+    _ensure_minimum_exponent_length(buf, buflen);
 
-	if (decimal != 0) {
-		ensure_decimal_point(buf, buflen);
-	}
+    if (decimal != 0) {
+        _ensure_decimal_point(buf, buflen);
+    }
 
-	return buf;
+    return buf;
 }
 
 /*
@@ -227,7 +228,7 @@
  * 	- buffer: A buffer to place the resulting string in
  * 	- buf_size: The length of the buffer.
  * 	- format: The printf()-style format to use for the code to use for
- * 	converting. 
+ * 	converting.
  * 	- value: The value to convert
  * 	- decimal: if != 0, always has a decimal, and at leasat one digit after
  * 	the decimal. This has the same effect as passing 'Z' in the origianl
@@ -239,40 +240,44 @@
  * 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'.
- * 
+ *
  * Return value: The pointer to the buffer with the converted string.
  */
-#define _ASCII_FORMAT(type, suffix, print_type) \
-char* NumPyOS_ascii_format ## suffix(char *buffer, size_t buf_size, \
-			      const char *format, \
-			      type val, int decimal) \
-{\
-	if (isfinite(val)) { \
-		if(_check_ascii_format(format)) {\
-			return NULL; \
-		} \
-		PyOS_snprintf(buffer, buf_size, format, (print_type)val); \
-		return _fix_ascii_format(buffer, buf_size, decimal);\
-	} else if (isnan(val)){ \
-		if (buf_size < 4) { \
-			return NULL; \
-		} \
-		strncpy(buffer, "nan", 4); \
-	} else { \
-		if (signbit(val)) { \
-			if (buf_size < 5) { \
-				return NULL; \
-			} \
-			strncpy(buffer, "-inf", 5); \
-		} else { \
-			if (buf_size < 4) { \
-				return NULL; \
-			} \
-			strncpy(buffer, "inf", 4); \
-		} \
-	} \
-	return buffer; \
-}
+#define _ASCII_FORMAT(type, suffix, print_type)                         \
+    static char*                                                        \
+    NumPyOS_ascii_format ## suffix(char *buffer, size_t buf_size,       \
+                                   const char *format,                  \
+                                   type val, int decimal)               \
+    {                                                                   \
+	if (isfinite(val)) {                                            \
+            if(_check_ascii_format(format)) {                           \
+                return NULL;                                            \
+            }                                                           \
+            PyOS_snprintf(buffer, buf_size, format, (print_type)val);   \
+            return _fix_ascii_format(buffer, buf_size, decimal);        \
+	}                                                               \
+        else if (isnan(val)){                                           \
+            if (buf_size < 4) {                                         \
+                return NULL;                                            \
+            }                                                           \
+            strncpy(buffer, "nan", 4);                                  \
+	}                                                               \
+        else {                                                          \
+            if (signbit(val)) {                                         \
+                if (buf_size < 5) {                                     \
+                    return NULL;                                        \
+                }                                                       \
+                strncpy(buffer, "-inf", 5);                             \
+            }                                                           \
+            else {                                                      \
+                if (buf_size < 4) {                                     \
+                    return NULL;                                        \
+                }                                                       \
+                strncpy(buffer, "inf", 4);                              \
+            }                                                           \
+	}                                                               \
+	return buffer;                                                  \
+    }
 
 _ASCII_FORMAT(float, f, float)
 _ASCII_FORMAT(double, d, double)
@@ -290,8 +295,8 @@
 static int
 NumPyOS_ascii_isspace(char c)
 {
-    return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t'
-        || c == '\v';
+    return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' ||
+        c == '\v';
 }
 
 
@@ -319,8 +324,10 @@
      * under foreign locale.
      */
     p = s;
-    if (*p == '+' || *p == '-') ++p;
-    while (*p >= '0' && *p <= '9') ++p;
+    if (*p == '+' || *p == '-')
+        ++p;
+    while (*p >= '0' && *p <= '9')
+        ++p;
     if (*p == ',') {
         n = (size_t)(p - s);
         if (n > FLOAT_FORMATBUFLEN)
@@ -352,7 +359,6 @@
  *      * 1 if a number read,
  *      * EOF if end-of-file met before reading anything.
  */
-
 static int
 NumPyOS_ascii_ftolf(FILE *fp, double *value)
 {
@@ -433,7 +439,7 @@
     if (c == 'n' || c == 'N') {
         NEXT_CHAR();
         MATCH_ALPHA_STRING_NOCASE("an");
-        
+
         /* accept nan([:alphanum:_]*), similarly to strtod */
         if (c == '(') {
             NEXT_CHAR();
@@ -441,7 +447,8 @@
             if (c == ')') NEXT_CHAR();
         }
         END_MATCH();
-    } else if (c == 'i' || c == 'I') {
+    }
+    else if (c == 'i' || c == 'I') {
         NEXT_CHAR();
         MATCH_ALPHA_STRING_NOCASE("nfinity");
         END_MATCH();
@@ -488,4 +495,3 @@
 #undef IS_NUMBER
 #undef IS_ALPHA
 #undef IS_ALPHANUM
-



More information about the Numpy-svn mailing list