Mercurial > emacs
changeset 106406:b793459cea92
Fix `string-to-number' to deal consistently with integers and floats.
* lread.c (isfloat_string): New argument ignore_trailing to accept all
trailing characters, not just whitespace.
(read1): Pass new arg 0 to keep old behavior.
* data.c (Fstring_to_number): Pass 1 to isfloat_string to ignore
trailing chars, as it is already done for integers. Doc fixes.
* lisp.h (isfloat_string): Add new arg to declaration of isfloat_string.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Fri, 04 Dec 2009 16:16:26 +0000 |
| parents | a74fd8f1fd64 |
| children | 1119f2c554bc |
| files | src/ChangeLog src/data.c src/lisp.h src/lread.c |
| diffstat | 4 files changed, 20 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Dec 04 10:51:37 2009 +0000 +++ b/src/ChangeLog Fri Dec 04 16:16:26 2009 +0000 @@ -1,3 +1,13 @@ +2009-12-04 Juanma Barranquero <lekktu@gmail.com> + + Fix `string-to-number' to deal consistently with integers and floats. + * lread.c (isfloat_string): New argument ignore_trailing to accept all + trailing characters, not just whitespace. + (read1): Pass new arg 0 to keep old behavior. + * data.c (Fstring_to_number): Pass 1 to isfloat_string to ignore + trailing chars, as it is already done for integers. Doc fixes. + * lisp.h (isfloat_string): Add new arg to declaration of isfloat_string. + 2009-12-04 Eli Zaretskii <eliz@gnu.org> * dispextern.h (enum prop_idx) <AUTO_COMPOSED_PROP_IDX>: Delete
--- a/src/data.c Fri Dec 04 10:51:37 2009 +0000 +++ b/src/data.c Fri Dec 04 16:16:26 2009 +0000 @@ -1770,7 +1770,7 @@ CHECK_SYMBOL (variable); sym = indirect_variable (XSYMBOL (variable)); XSETSYMBOL (variable, sym); - + valcontents = sym->value; if (BUFFER_LOCAL_VALUEP (valcontents)) { @@ -2353,11 +2353,11 @@ DEFUN ("string-to-number", Fstring_to_number, Sstring_to_number, 1, 2, 0, doc: /* Parse STRING as a decimal number and return the number. This parses both integers and floating point numbers. -It ignores leading spaces and tabs. +It ignores leading spaces and tabs, and all trailing chars. If BASE, interpret STRING as a number in that base. If BASE isn't present, base 10 is used. BASE must be between 2 and 16 (inclusive). -If the base used is not 10, floating point is not recognized. */) +If the base used is not 10, STRING is always parsed as integer. */) (string, base) register Lisp_Object string, base; { @@ -2392,7 +2392,7 @@ else if (*p == '+') p++; - if (isfloat_string (p) && b == 10) + if (isfloat_string (p, 1) && b == 10) val = make_float (sign * atof (p)); else {
--- a/src/lisp.h Fri Dec 04 10:51:37 2009 +0000 +++ b/src/lisp.h Fri Dec 04 16:16:26 2009 +0000 @@ -2795,7 +2795,7 @@ extern Lisp_Object Vload_history, Vload_suffixes, Vload_file_rep_suffixes; extern int openp P_ ((Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object *, Lisp_Object)); -extern int isfloat_string P_ ((char *)); +extern int isfloat_string P_ ((char *, int)); extern void map_obarray P_ ((Lisp_Object, void (*) (Lisp_Object, Lisp_Object), Lisp_Object)); extern void dir_warning P_ ((char *, Lisp_Object));
--- a/src/lread.c Fri Dec 04 10:51:37 2009 +0000 +++ b/src/lread.c Fri Dec 04 16:16:26 2009 +0000 @@ -3026,7 +3026,7 @@ } } } - if (isfloat_string (read_buffer)) + if (isfloat_string (read_buffer, 0)) { /* Compute NaN and infinities using 0.0 in a variable, to cope with compilers that think they are smarter @@ -3244,8 +3244,9 @@ #define EXP_INT 16 int -isfloat_string (cp) +isfloat_string (cp, ignore_trailing) register char *cp; + int ignore_trailing; { register int state; @@ -3299,7 +3300,8 @@ cp += 3; } - return (((*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) + return ((ignore_trailing + || (*cp == 0) || (*cp == ' ') || (*cp == '\t') || (*cp == '\n') || (*cp == '\r') || (*cp == '\f')) && (state == (LEAD_INT|DOT_CHAR|TRAIL_INT) || state == (DOT_CHAR|TRAIL_INT) || state == (LEAD_INT|E_CHAR|EXP_INT)