comparison src/emacs.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 58b38d5b32d0
children 1a507c4c6c42
comparison
equal deleted inserted replaced
5580:a0e81357194e 5581:56144c8593a8
733 when they are done with the generated list. */ 733 when they are done with the generated list. */
734 void 734 void
735 make_argc_argv (Lisp_Object argv_list, int *argc, Wexttext ***argv) 735 make_argc_argv (Lisp_Object argv_list, int *argc, Wexttext ***argv)
736 { 736 {
737 Lisp_Object next; 737 Lisp_Object next;
738 int n = XINT (Flength (argv_list)); 738 int n = XFIXNUM (Flength (argv_list));
739 REGISTER int i; 739 REGISTER int i;
740 *argv = xnew_array (Wexttext *, n + 1); 740 *argv = xnew_array (Wexttext *, n + 1);
741 741
742 for (i = 0, next = argv_list; i < n; i++, next = XCDR (next)) 742 for (i = 0, next = argv_list; i < n; i++, next = XCDR (next))
743 { 743 {
2058 - make_string() 2058 - make_string()
2059 - build_istring() 2059 - build_istring()
2060 - build_cistring() 2060 - build_cistring()
2061 - build_ascstring() 2061 - build_ascstring()
2062 - make_vector() 2062 - make_vector()
2063 - make_int() 2063 - make_fixnum()
2064 - make_char() 2064 - make_char()
2065 - make_extent() 2065 - make_extent()
2066 - ALLOC_NORMAL_LISP_OBJECT() 2066 - ALLOC_NORMAL_LISP_OBJECT()
2067 - ALLOC_SIZED_LISP_OBJECT() 2067 - ALLOC_SIZED_LISP_OBJECT()
2068 - Fcons() 2068 - Fcons()
3786 (TYPEOF (__free_hook)) 3786 (TYPEOF (__free_hook))
3787 #endif 3787 #endif
3788 voodoo_free_hook; 3788 voodoo_free_hook;
3789 #endif 3789 #endif
3790 3790
3791 exit (INTP (arg) ? XINT (arg) : 0); 3791 exit (FIXNUMP (arg) ? XFIXNUM (arg) : 0);
3792 RETURN_NOT_REACHED (Qnil); 3792 RETURN_NOT_REACHED (Qnil);
3793 } 3793 }
3794 3794
3795 /* -------------------------------- */ 3795 /* -------------------------------- */
3796 /* abnormal shutdowns: GP faults */ 3796 /* abnormal shutdowns: GP faults */
4297 Major version number of this version of Emacs, as an integer. 4297 Major version number of this version of Emacs, as an integer.
4298 Warning: this variable did not exist in Emacs versions earlier than: 4298 Warning: this variable did not exist in Emacs versions earlier than:
4299 FSF Emacs: 19.23 4299 FSF Emacs: 19.23
4300 XEmacs: 19.10 4300 XEmacs: 19.10
4301 */ ); 4301 */ );
4302 Vemacs_major_version = make_int (EMACS_MAJOR_VERSION); 4302 Vemacs_major_version = make_fixnum (EMACS_MAJOR_VERSION);
4303 4303
4304 DEFVAR_LISP ("emacs-minor-version", &Vemacs_minor_version /* 4304 DEFVAR_LISP ("emacs-minor-version", &Vemacs_minor_version /*
4305 Minor version number of this version of Emacs, as an integer. 4305 Minor version number of this version of Emacs, as an integer.
4306 Warning: this variable did not exist in Emacs versions earlier than: 4306 Warning: this variable did not exist in Emacs versions earlier than:
4307 FSF Emacs: 19.23 4307 FSF Emacs: 19.23
4308 XEmacs: 19.10 4308 XEmacs: 19.10
4309 */ ); 4309 */ );
4310 Vemacs_minor_version = make_int (EMACS_MINOR_VERSION); 4310 Vemacs_minor_version = make_fixnum (EMACS_MINOR_VERSION);
4311 4311
4312 DEFVAR_LISP ("emacs-patch-level", &Vemacs_patch_level /* 4312 DEFVAR_LISP ("emacs-patch-level", &Vemacs_patch_level /*
4313 The patch level of this version of Emacs, as an integer. 4313 The patch level of this version of Emacs, as an integer.
4314 The value is non-nil if this version of XEmacs is part of a series of 4314 The value is non-nil if this version of XEmacs is part of a series of
4315 stable XEmacsen, but has bug fixes applied. 4315 stable XEmacsen, but has bug fixes applied.
4316 Warning: this variable does not exist in FSF Emacs or in XEmacs versions 4316 Warning: this variable does not exist in FSF Emacs or in XEmacs versions
4317 earlier than 21.1.1 4317 earlier than 21.1.1
4318 */ ); 4318 */ );
4319 #ifdef EMACS_PATCH_LEVEL 4319 #ifdef EMACS_PATCH_LEVEL
4320 Vemacs_patch_level = make_int (EMACS_PATCH_LEVEL); 4320 Vemacs_patch_level = make_fixnum (EMACS_PATCH_LEVEL);
4321 #else 4321 #else
4322 Vemacs_patch_level = Qnil; 4322 Vemacs_patch_level = Qnil;
4323 #endif 4323 #endif
4324 4324
4325 DEFVAR_LISP ("emacs-beta-version", &Vemacs_beta_version /* 4325 DEFVAR_LISP ("emacs-beta-version", &Vemacs_beta_version /*
4327 The value is nil if this is an officially released version of XEmacs. 4327 The value is nil if this is an officially released version of XEmacs.
4328 Warning: this variable does not exist in FSF Emacs or in XEmacs versions 4328 Warning: this variable does not exist in FSF Emacs or in XEmacs versions
4329 earlier than 20.3. 4329 earlier than 20.3.
4330 */ ); 4330 */ );
4331 #ifdef EMACS_BETA_VERSION 4331 #ifdef EMACS_BETA_VERSION
4332 Vemacs_beta_version = make_int (EMACS_BETA_VERSION); 4332 Vemacs_beta_version = make_fixnum (EMACS_BETA_VERSION);
4333 #else 4333 #else
4334 Vemacs_beta_version = Qnil; 4334 Vemacs_beta_version = Qnil;
4335 #endif 4335 #endif
4336 4336
4337 4337