Mercurial > hg > xemacs-beta
diff src/lisp-union.h @ 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 | 308d34e9f07d |
| children |
line wrap: on
line diff
--- a/src/lisp-union.h Sat Oct 08 12:26:09 2011 +0100 +++ b/src/lisp-union.h Sun Oct 09 09:51:57 2011 +0100 @@ -38,14 +38,14 @@ struct { - signed EMACS_INT val : INT_VALBITS; - unsigned int bits : INT_GCBITS; + signed EMACS_INT val : FIXNUM_VALBITS; + unsigned int bits : FIXNUM_GCBITS; } s; struct { - EMACS_UINT val : INT_VALBITS; - unsigned int bits : INT_GCBITS; + EMACS_UINT val : FIXNUM_VALBITS; + unsigned int bits : FIXNUM_GCBITS; } u; #else /* non-valbits are at higher addresses */ struct @@ -56,14 +56,14 @@ struct { - unsigned int bits : INT_GCBITS; - signed EMACS_INT val : INT_VALBITS; + unsigned int bits : FIXNUM_GCBITS; + signed EMACS_INT val : FIXNUM_VALBITS; } s; struct { - unsigned int bits : INT_GCBITS; - EMACS_UINT val : INT_VALBITS; + unsigned int bits : FIXNUM_GCBITS; + EMACS_UINT val : FIXNUM_VALBITS; } u; #endif /* non-valbits are at higher addresses */ @@ -81,26 +81,26 @@ #define XCHARVAL(x) ((EMACS_INT)(x).gu.val) #define XPNTRVAL(x) ((x).ui) -#define XREALINT(x) ((EMACS_INT)(x).s.val) +#define XREALFIXNUM(x) ((EMACS_INT)(x).s.val) #define XUINT(x) ((EMACS_UINT)(x).u.val) #define XTYPE(x) ((x).gu.type) #define EQ(x,y) ((x).v == (y).v) DECLARE_INLINE_HEADER ( Lisp_Object -make_int_verify (EMACS_INT val) +make_fixnum_verify (EMACS_INT val) ) { Lisp_Object obj; obj.s.bits = 1; obj.s.val = val; - type_checking_assert (XREALINT (obj) == val); + type_checking_assert (XREALFIXNUM (obj) == val); return obj; } DECLARE_INLINE_HEADER ( Lisp_Object -make_int (EMACS_INT val) +make_fixnum (EMACS_INT val) ) { Lisp_Object obj; @@ -132,11 +132,11 @@ extern MODULE_API Lisp_Object Qnull_pointer, Qzero; -#define INTP(x) ((x).s.bits) -#define INT_PLUS(x,y) make_int (XINT (x) + XINT (y)) -#define INT_MINUS(x,y) make_int (XINT (x) - XINT (y)) -#define INT_PLUS1(x) make_int (XINT (x) + 1) -#define INT_MINUS1(x) make_int (XINT (x) - 1) +#define FIXNUMP(x) ((x).s.bits) +#define FIXNUM_PLUS(x,y) make_fixnum (XFIXNUM (x) + XFIXNUM (y)) +#define FIXNUM_MINUS(x,y) make_fixnum (XFIXNUM (x) - XFIXNUM (y)) +#define FIXNUM_PLUS1(x) make_fixnum (XFIXNUM (x) + 1) +#define FIXNUM_MINUS1(x) make_fixnum (XFIXNUM (x) - 1) /* WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!