diff options
| author | Jim Blandy | 1993-03-30 21:21:49 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-03-30 21:21:49 +0000 |
| commit | f298026408cb2c7216eeed489c01ad1f20858980 (patch) | |
| tree | 29be0610b24384225591b395411e1161f6241203 /src | |
| parent | 555b2421bb1cc67980a63ca581001657b788a4b4 (diff) | |
| download | emacs-f298026408cb2c7216eeed489c01ad1f20858980.tar.gz emacs-f298026408cb2c7216eeed489c01ad1f20858980.zip | |
Rename int-to-string to number-to-string, since it can handle
floating-point as well as integer arguments. subr.el defines the
former as an alias for the latter.
* data.c (Fnumber_to_string): Renamed from Fint_to_string.
(wrong_type_argument): Adjust caller.
(syms_of_data): Adjust defsubr.
* fns.c (concat): Adjust caller.
* lisp.h (Fnumber_to_string): Adjust extern declaration.
* mocklisp.c (Finsert_string): Adjust caller.
* process.c (status_message): Adjust caller.
Diffstat (limited to 'src')
| -rw-r--r-- | src/data.c | 6 | ||||
| -rw-r--r-- | src/fns.c | 2 | ||||
| -rw-r--r-- | src/lisp.h | 2 | ||||
| -rw-r--r-- | src/mocklisp.c | 2 | ||||
| -rw-r--r-- | src/process.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/data.c b/src/data.c index fe71c6768cb..4b2fa3cebbf 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -72,7 +72,7 @@ wrong_type_argument (predicate, value) | |||
| 72 | (EQ (predicate, Qintegerp) || EQ (predicate, Qinteger_or_marker_p))) | 72 | (EQ (predicate, Qintegerp) || EQ (predicate, Qinteger_or_marker_p))) |
| 73 | return Fstring_to_number (value); | 73 | return Fstring_to_number (value); |
| 74 | if (XTYPE (value) == Lisp_Int && EQ (predicate, Qstringp)) | 74 | if (XTYPE (value) == Lisp_Int && EQ (predicate, Qstringp)) |
| 75 | return Fint_to_string (value); | 75 | return Fnumber_to_string (value); |
| 76 | } | 76 | } |
| 77 | value = Fsignal (Qwrong_type_argument, Fcons (predicate, Fcons (value, Qnil))); | 77 | value = Fsignal (Qwrong_type_argument, Fcons (predicate, Fcons (value, Qnil))); |
| 78 | tem = call1 (predicate, value); | 78 | tem = call1 (predicate, value); |
| @@ -1425,7 +1425,7 @@ DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0, "T if NUMBER is zero.") | |||
| 1425 | return Qnil; | 1425 | return Qnil; |
| 1426 | } | 1426 | } |
| 1427 | 1427 | ||
| 1428 | DEFUN ("int-to-string", Fint_to_string, Sint_to_string, 1, 1, 0, | 1428 | DEFUN ("number-to-string", Fnumber_to_string, Snumber_to_string, 1, 1, 0, |
| 1429 | "Convert NUM to a string by printing it in decimal.\n\ | 1429 | "Convert NUM to a string by printing it in decimal.\n\ |
| 1430 | Uses a minus sign if negative.\n\ | 1430 | Uses a minus sign if negative.\n\ |
| 1431 | NUM may be an integer or a floating point number.") | 1431 | NUM may be an integer or a floating point number.") |
| @@ -2121,7 +2121,7 @@ syms_of_data () | |||
| 2121 | defsubr (&Skill_local_variable); | 2121 | defsubr (&Skill_local_variable); |
| 2122 | defsubr (&Saref); | 2122 | defsubr (&Saref); |
| 2123 | defsubr (&Saset); | 2123 | defsubr (&Saset); |
| 2124 | defsubr (&Sint_to_string); | 2124 | defsubr (&Snumber_to_string); |
| 2125 | defsubr (&Sstring_to_number); | 2125 | defsubr (&Sstring_to_number); |
| 2126 | defsubr (&Seqlsign); | 2126 | defsubr (&Seqlsign); |
| 2127 | defsubr (&Slss); | 2127 | defsubr (&Slss); |
| @@ -262,7 +262,7 @@ concat (nargs, args, target_type, last_special) | |||
| 262 | || XTYPE (this) == Lisp_Compiled)) | 262 | || XTYPE (this) == Lisp_Compiled)) |
| 263 | { | 263 | { |
| 264 | if (XTYPE (this) == Lisp_Int) | 264 | if (XTYPE (this) == Lisp_Int) |
| 265 | args[argnum] = Fint_to_string (this); | 265 | args[argnum] = Fnumber_to_string (this); |
| 266 | else | 266 | else |
| 267 | args[argnum] = wrong_type_argument (Qsequencep, this); | 267 | args[argnum] = wrong_type_argument (Qsequencep, this); |
| 268 | } | 268 | } |
diff --git a/src/lisp.h b/src/lisp.h index cac35d1c00e..2d62363e413 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -974,7 +974,7 @@ extern Lisp_Object Fdefault_value (), Fset_default (), Fdefault_boundp (); | |||
| 974 | 974 | ||
| 975 | extern Lisp_Object Faref (), Faset (), Farray_length (); | 975 | extern Lisp_Object Faref (), Faset (), Farray_length (); |
| 976 | 976 | ||
| 977 | extern Lisp_Object Fstring_to_number (), Fint_to_string (); | 977 | extern Lisp_Object Fstring_to_number (), Fnumber_to_string (); |
| 978 | extern Lisp_Object Feqlsign (), Fgtr (), Flss (), Fgeq (), Fleq (); | 978 | extern Lisp_Object Feqlsign (), Fgtr (), Flss (), Fgeq (), Fleq (); |
| 979 | extern Lisp_Object Fneq (), Fzerop (); | 979 | extern Lisp_Object Fneq (), Fzerop (); |
| 980 | extern Lisp_Object Fplus (), Fminus (), Ftimes (), Fquo (), Frem (); | 980 | extern Lisp_Object Fplus (), Fminus (), Ftimes (), Fquo (), Frem (); |
diff --git a/src/mocklisp.c b/src/mocklisp.c index 5e86a8fe4d3..cc3396152c0 100644 --- a/src/mocklisp.c +++ b/src/mocklisp.c | |||
| @@ -211,7 +211,7 @@ is converted into a string by expressing it in decimal.") | |||
| 211 | tem = args[argnum]; | 211 | tem = args[argnum]; |
| 212 | retry: | 212 | retry: |
| 213 | if (XTYPE (tem) == Lisp_Int) | 213 | if (XTYPE (tem) == Lisp_Int) |
| 214 | tem = Fint_to_string (tem); | 214 | tem = Fnumber_to_string (tem); |
| 215 | if (XTYPE (tem) == Lisp_String) | 215 | if (XTYPE (tem) == Lisp_String) |
| 216 | insert1 (tem); | 216 | insert1 (tem); |
| 217 | else | 217 | else |
diff --git a/src/process.c b/src/process.c index 1e537f736c2..ed80460286a 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -359,7 +359,7 @@ status_message (status) | |||
| 359 | { | 359 | { |
| 360 | if (code == 0) | 360 | if (code == 0) |
| 361 | return build_string ("finished\n"); | 361 | return build_string ("finished\n"); |
| 362 | string = Fint_to_string (make_number (code)); | 362 | string = Fnumber_to_string (make_number (code)); |
| 363 | string2 = build_string (coredump ? " (core dumped)\n" : "\n"); | 363 | string2 = build_string (coredump ? " (core dumped)\n" : "\n"); |
| 364 | return concat2 (build_string ("exited abnormally with code "), | 364 | return concat2 (build_string ("exited abnormally with code "), |
| 365 | concat2 (string, string2)); | 365 | concat2 (string, string2)); |