diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | stream.c | 54 | ||||
| -rw-r--r-- | tests/009/json.expected | 2 |
3 files changed, 58 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2012-03-27 Kaz Kylheku <kaz@kylheku.com> + + * stream.c (vformat): Compensate for differences in printf + implementations with regard to printing floating point exponents. + by deleting any plus sign and leading zeros after the 'e'. + + * tests/009/json.expected: Regenerated. + 2012-03-26 Kaz Kylheku <kaz@kylheku.com> Filtering on lists and nested lists is hereby made to work. @@ -1151,11 +1151,33 @@ val vformat(val stream, val fmtstr, va_list vl) uw_throwf(error_s, lit("excessive precision in format: ~s\n"), num(precision), nao); - if (ch == 'e') + if (ch == 'e') { sprintf(num_buf, "%.*e", precision, n); - else + { + char *dec = strchr(num_buf, '.'); + char *exp = strchr(dec ? dec : num_buf, 'e'); + + if (exp) { + char *scan = ++exp; + + if (*scan == '-') + *exp++ = *scan++; + else if (*scan == '+') + scan++; + + while (scan[0] == '0' && scan[1] == '0') + scan++; + + while (*scan) + *exp++ = *scan++; + + *exp = 0; + } + } + } else { sprintf(num_buf, "%.*f", precision, n); - if (!isdigit(num_buf[0])) { + } + if (!isdigit(num_buf[0]) && !isdigit(num_buf[1])) { if (!vformat_str(stream, lit("#<bad-float>"), width, left, 0)) return nil; @@ -1191,8 +1213,30 @@ val vformat(val stream, val fmtstr, va_list vl) sprintf(num_buf, "%.*g", precision, obj->fl.n); - if (ch == 's' && !precision_p && !strpbrk(num_buf, "e.")) - strcat(num_buf, ".0"); + { + char *dec = strchr(num_buf, '.'); + char *exp = strchr(dec ? dec : num_buf, 'e'); + + if (exp) { + char *scan = ++exp; + + if (*scan == '-') + *exp++ = *scan++; + else if (*scan == '+') + scan++; + + while (*scan == 0) + scan++; + + while (*scan) + *exp++ = *scan++; + + *exp = 0; + } + + if (ch == 's' && !precision_p && !dec && !exp) + strcat(num_buf, ".0"); + } if (!isdigit(num_buf[0]) && !isdigit(num_buf[1])) { if (!vformat_str(stream, lit("#<bad-float>"), diff --git a/tests/009/json.expected b/tests/009/json.expected index b2d5f0b7..f0d5fcd3 100644 --- a/tests/009/json.expected +++ b/tests/009/json.expected @@ -2,7 +2,7 @@ AST: #H((:equal-based) ("web-app" #H((:equal-based) ("servlet-mapping" #H((:equa Unmatched junk: "" -AST: #("JSON Test Pattern pass1" #H((:equal-based) ("object with 1 member" #("array with 1 element"))) #H((:equal-based)) #() -42.0 :true :false :null #H((:equal-based) ("" 2.3456789012e+76) ("digit" "0123456789") ("\\/\\\\\"쫾몾ꮘﳞ볚\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?" "A key can be any string") ("null" :null) ("one" 1.0) ("E" 1.23456789e+34) ("special" "`1~!@#$%^&*()_+-={':[,]}|;.</>?") ("e" 1.23456789e-13) ("comment" "// /* <!-- --") ("# -- --> */" " ") ("real" -9876.54321) ("backslash" "\\\\") ("array" #()) ("url" "http://www.JSON.org/") ("zero" 0.0) ("false" :false) ("space" " ") ("slash" "/ & \\/") ("address" "50 St. James Street") ("compact" #(1.0 2.0 3.0 4.0 5.0 6.0 7.0)) ("object" #H((:equal-based))) ("quote" "\"") ("jsontext" "{\"object with 1 member\":[\"array with 1 element\"]}") ("true" :true) ("integer" 1234567890.0) ("ALPHA" "ABCDEFGHIJKLMNOPQRSTUVWYZ") ("quotes" "" \" %22 0x22 034 "") ("hex" "ģ䕧覫췯ꯍ") ("0123456789" "digit") ("controls" "\b\f\n\r\t") ("alpha" "abcdefghijklmnopqrstuvwyz") (" s p a c e d " #(1.0 2.0 3.0 4.0 5.0 6.0 7.0))) 0.5 98.6 99.44 1066.0 10.0 1.0 0.1 1.0 2.0 2.0 "rosebud") +AST: #("JSON Test Pattern pass1" #H((:equal-based) ("object with 1 member" #("array with 1 element"))) #H((:equal-based)) #() -42.0 :true :false :null #H((:equal-based) ("" 2.3456789012e76) ("digit" "0123456789") ("\\/\\\\\"쫾몾ꮘﳞ볚\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?" "A key can be any string") ("null" :null) ("one" 1.0) ("E" 1.23456789e34) ("special" "`1~!@#$%^&*()_+-={':[,]}|;.</>?") ("e" 1.23456789e-13) ("comment" "// /* <!-- --") ("# -- --> */" " ") ("real" -9876.54321) ("backslash" "\\\\") ("array" #()) ("url" "http://www.JSON.org/") ("zero" 0.0) ("false" :false) ("space" " ") ("slash" "/ & \\/") ("address" "50 St. James Street") ("compact" #(1.0 2.0 3.0 4.0 5.0 6.0 7.0)) ("object" #H((:equal-based))) ("quote" "\"") ("jsontext" "{\"object with 1 member\":[\"array with 1 element\"]}") ("true" :true) ("integer" 1234567890.0) ("ALPHA" "ABCDEFGHIJKLMNOPQRSTUVWYZ") ("quotes" "" \" %22 0x22 034 "") ("hex" "ģ䕧覫췯ꯍ") ("0123456789" "digit") ("controls" "\b\f\n\r\t") ("alpha" "abcdefghijklmnopqrstuvwyz") (" s p a c e d " #(1.0 2.0 3.0 4.0 5.0 6.0 7.0))) 0.5 98.6 99.44 1066.0 10.0 1.0 0.1 1.0 2.0 2.0 "rosebud") Unmatched junk: "" |