diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | arith.c | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,9 @@ 2014-03-19 Kaz Kylheku <kaz@kylheku.com> + * arith.c (int_flo): Fix non-handling of negative values. + +2014-03-19 Kaz Kylheku <kaz@kylheku.com> + * arith.c (tofloat, toint): New functions. * arith.h (tofloat, toint): Declared. @@ -1474,7 +1474,7 @@ val int_flo(val f) sprintf(text, "%.64g", d); - if (!isdigit(text[0])) + if (!isdigit(text[0]) && (text[0] != '-' || !isdigit(text[1]))) uw_throwf(error_s, lit("int-flo: cannot convert #<bad-float> to integer"), nao); @@ -1483,11 +1483,11 @@ val int_flo(val f) have_point = (strchr(text, '.') != 0); if (have_exp && have_point) - sscanf(text, "%127[0-9].%127[0-9]e%d", mint, mfrac, &exp); + sscanf(text, "%127[-0-9].%127[0-9]e%d", mint, mfrac, &exp); else if (have_exp) - sscanf(text, "%127[0-9]e%d", mint, &exp); + sscanf(text, "%127[-0-9]e%d", mint, &exp); else if (have_point) - sscanf(text, "%127[0-9].%127[0-9]", mint, mfrac); + sscanf(text, "%127[-0-9].%127[0-9]", mint, mfrac); else return int_str(string_utf8(text), nil); |