Mercurial > hg > xemacs-beta
diff src/specifier.c @ 5581:56144c8593a8
Mechanically change INT to FIXNUM in our sources.
src/ChangeLog addition:
2011-10-09 Aidan Kehoe <kehoea@parhasard.net>
[...]
Mechanically change INT (where it refers to non-bignum Lisp
integers) to FIXNUM in our sources. Done for the following
functions, enums, and macros: Lisp_Type_Int_Even,
Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(),
XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(),
EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to
MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to
NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT.
The EMACS_INT typedef was not changed, it does not describe
non-bignum Lisp integers.
Script that did the change available in
http://mid.gmane.org/20067.17650.181273.12014@parhasard.net .
modules/ChangeLog addition:
2011-10-09 Aidan Kehoe <kehoea@parhasard.net>
[...]
Mechanically change INT to FIXNUM, where the usage describes non-bignum
Lisp integers. See the src/ChangeLog entry for more details.
man/ChangeLog addition:
2011-10-09 Aidan Kehoe <kehoea@parhasard.net>
* internals/internals.texi (How Lisp Objects Are Represented in C):
* internals/internals.texi (Integers and Characters):
Mechanically change INT to FIXNUM, where the usage describes non-bignum
Lisp integers.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 09 Oct 2011 09:51:57 +0100 |
| parents | d12a0c55b174 |
| children | b0d40183ac79 |
line wrap: on
line diff
--- a/src/specifier.c Sat Oct 08 12:26:09 2011 +0100 +++ b/src/specifier.c Sun Oct 09 09:51:57 2011 +0100 @@ -286,8 +286,8 @@ /* #### Not obvious this is useful, and overrides user settings; if we resurrect this, create variables like `print-specifier-length' so it can be controlled. */ - specbind (Qprint_string_length, make_int (100)); - specbind (Qprint_length, make_int (5)); + specbind (Qprint_string_length, make_fixnum (100)); + specbind (Qprint_length, make_fixnum (5)); #endif the_specs = Fspecifier_specs (obj, Qglobal, Qnil, Qnil); if (NILP (the_specs)) @@ -885,7 +885,7 @@ static Lisp_Object canonicalize_tag_set (Lisp_Object tag_set) { - int len = XINT (Flength (tag_set)); + int len = XFIXNUM (Flength (tag_set)); Lisp_Object *tags, rest; int i, j; @@ -1053,7 +1053,7 @@ { struct gcpro gcpro1; Lisp_Object charpres = make_vector (NUM_MATCHSPEC_STAGES, Qnil); - int max_args = XINT (Ffunction_max_args (charset_predicate)); + int max_args = XFIXNUM (Ffunction_max_args (charset_predicate)); GCPRO1 (charpres); @@ -1242,8 +1242,8 @@ { Lisp_Object min_args = Ffunction_min_args (charset_predicate); Lisp_Object max_args = Ffunction_max_args (charset_predicate); - if (!(INTP (min_args) && XINT (min_args) == 1 && - INTP (max_args) && XINT (max_args) == 1)) + if (!(FIXNUMP (min_args) && XFIXNUM (min_args) == 1 && + FIXNUMP (max_args) && XFIXNUM (max_args) == 1)) { /* We only allow the stage argument to be specifed from C. */ invalid_change ("Charset predicate must take one argument", @@ -2964,8 +2964,8 @@ /* device had better be determined by now; abort if not. */ (void) DEVICE_CLASS (XDEVICE (device)); - depth = make_int (1 + XINT (depth)); - if (XINT (depth) > 20) + depth = make_fixnum (1 + XFIXNUM (depth)); + if (XFIXNUM (depth) > 20) { maybe_signal_error (Qstack_overflow, "Apparent loop in specifier inheritance", @@ -3615,7 +3615,7 @@ static void integer_validate (Lisp_Object instantiator) { - CHECK_INT (instantiator); + CHECK_FIXNUM (instantiator); } DEFUN ("integer-specifier-p", Finteger_specifier_p, 1, 1, 0, /*