Mercurial > hg > xemacs-beta
diff src/lisp-disunion.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 | 0d05accafc63 |
line wrap: on
line diff
--- a/src/lisp-disunion.h Sat Oct 08 12:26:09 2011 +0100 +++ b/src/lisp-disunion.h Sun Oct 09 09:51:57 2011 +0100 @@ -41,7 +41,7 @@ The object is obtained by masking off the type bits. Bit 1 is used as a value bit by splitting the Lisp integer type - into two subtypes, Lisp_Type_Int_Even and Lisp_Type_Int_Odd. + into two subtypes, Lisp_Type_Fixnum_Even and Lisp_Type_Fixnum_Odd. By this trickery we get 31 bits for integers instead of 30. For non-integral types, the value bits of a Lisp_Object contain @@ -67,46 +67,46 @@ XTYPE The type bits of a Lisp_Object XPNTRVAL The value bits of a Lisp_Object storing a pointer XCHARVAL The value bits of a Lisp_Object storing a Ichar - XREALINT The value bits of a Lisp_Object storing an integer, signed + XREALFIXNUM The value bits of a Lisp_Object storing an integer, signed XUINT The value bits of a Lisp_Object storing an integer, unsigned - INTP Non-zero if this Lisp_Object is an integer + FIXNUMP Non-zero if this Lisp_Object is an integer Qzero Lisp Integer 0 EQ Non-zero if two Lisp_Objects are identical, not merely equal. */ typedef EMACS_INT Lisp_Object; -#define Lisp_Type_Int_Bit (Lisp_Type_Int_Even & Lisp_Type_Int_Odd) +#define Lisp_Type_Fixnum_Bit (Lisp_Type_Fixnum_Even & Lisp_Type_Fixnum_Odd) #define VALMASK (((1UL << VALBITS) - 1UL) << GCTYPEBITS) #define XTYPE(x) ((enum Lisp_Type) (((EMACS_UINT)(x)) & ~VALMASK)) #define XPNTRVAL(x) (x) /* This depends on Lisp_Type_Record == 0 */ #define XCHARVAL(x) ((x) >> GCBITS) -#define XREALINT(x) ((x) >> INT_GCBITS) -#define XUINT(x) ((EMACS_UINT)(x) >> INT_GCBITS) +#define XREALFIXNUM(x) ((x) >> FIXNUM_GCBITS) +#define XUINT(x) ((EMACS_UINT)(x) >> FIXNUM_GCBITS) #define wrap_pointer_1(ptr) ((Lisp_Object) (ptr)) DECLARE_INLINE_HEADER ( Lisp_Object -make_int_verify (EMACS_INT val) +make_fixnum_verify (EMACS_INT val) ) { - Lisp_Object obj = (Lisp_Object) ((val << INT_GCBITS) | Lisp_Type_Int_Bit); - type_checking_assert (XREALINT (obj) == val); + Lisp_Object obj = (Lisp_Object) ((val << FIXNUM_GCBITS) | Lisp_Type_Fixnum_Bit); + type_checking_assert (XREALFIXNUM (obj) == val); return obj; } -#define make_int(x) ((Lisp_Object) (((x) << INT_GCBITS) | Lisp_Type_Int_Bit)) +#define make_fixnum(x) ((Lisp_Object) (((x) << FIXNUM_GCBITS) | Lisp_Type_Fixnum_Bit)) #define make_char_1(x) ((Lisp_Object) (((x) << GCBITS) | Lisp_Type_Char)) -#define INTP(x) ((EMACS_UINT)(x) & Lisp_Type_Int_Bit) -#define INT_PLUS(x,y) ((x)+(y)-Lisp_Type_Int_Bit) -#define INT_MINUS(x,y) ((x)-(y)+Lisp_Type_Int_Bit) -#define INT_PLUS1(x) INT_PLUS (x, make_int (1)) -#define INT_MINUS1(x) INT_MINUS (x, make_int (1)) +#define FIXNUMP(x) ((EMACS_UINT)(x) & Lisp_Type_Fixnum_Bit) +#define FIXNUM_PLUS(x,y) ((x)+(y)-Lisp_Type_Fixnum_Bit) +#define FIXNUM_MINUS(x,y) ((x)-(y)+Lisp_Type_Fixnum_Bit) +#define FIXNUM_PLUS1(x) FIXNUM_PLUS (x, make_fixnum (1)) +#define FIXNUM_MINUS1(x) FIXNUM_MINUS (x, make_fixnum (1)) -#define Qzero make_int (0) +#define Qzero make_fixnum (0) #define Qnull_pointer ((Lisp_Object) 0) #define EQ(x,y) ((x) == (y))