Mercurial > hg > xemacs-beta

diff src/text.c @ 5581:56144c8593a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4dee0387b9de
children 7a538e1a4676
line wrap: on
line diff
--- a/src/text.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/text.c	Sun Oct 09 09:51:57 2011 +0100
@@ -3649,8 +3649,8 @@
   Charbpos ind;
   Charbpos min_allowed, max_allowed;
 
-  CHECK_INT_COERCE_MARKER (pos);
-  ind = XINT (pos);
+  CHECK_FIXNUM_COERCE_MARKER (pos);
+  ind = XFIXNUM (pos);
   min_allowed = flags & GB_ALLOW_PAST_ACCESSIBLE ? BUF_BEG (b) : BUF_BEGV (b);
   max_allowed = flags & GB_ALLOW_PAST_ACCESSIBLE ? BUF_Z   (b) : BUF_ZV   (b);
 
@@ -3762,8 +3762,8 @@
 
   /* Computation of KNOWN_LENGTH is potentially expensive so we pass
      it in. */
-  CHECK_INT (pos);
-  ccpos = XINT (pos);
+  CHECK_FIXNUM (pos);
+  ccpos = XFIXNUM (pos);
   if (ccpos < 0 && flags & GB_NEGATIVE_FROM_END)
     ccpos += max_allowed;
 
@@ -4745,7 +4745,7 @@
 #ifdef ENABLE_COMPOSITE_CHARS
       if (f1 + FIELD1_TO_OFFICIAL_LEADING_BYTE == LEADING_BYTE_COMPOSITE)
 	{
-	  if (UNBOUNDP (Fgethash (make_int (ch),
+	  if (UNBOUNDP (Fgethash (make_fixnum (ch),
 				  Vcomposite_char_char2string_hash_table,
 				  Qunbound)))
 	    return 0;
@@ -4918,14 +4918,14 @@
 
   get_charset_limits (charset, &lowlim, &highlim);
 
-  CHECK_INT (arg1);
+  CHECK_FIXNUM (arg1);
   /* It is useful (and safe, according to Olivier Galibert) to strip
      the 8th bit off ARG1 and ARG2 because it allows programmers to
      write (make-char 'latin-iso8859-2 CODE) where code is the actual
      Latin 2 code of the character.  */
-  a1 = XINT (arg1) & 0x7f;
+  a1 = XFIXNUM (arg1) & 0x7f;
   if (a1 < lowlim || a1 > highlim)
-    args_out_of_range_3 (arg1, make_int (lowlim), make_int (highlim));
+    args_out_of_range_3 (arg1, make_fixnum (lowlim), make_fixnum (highlim));
 
   if (CHARSET_DIMENSION (cs) == 1)
     {
@@ -4935,10 +4935,10 @@
       return make_char (make_ichar (charset, a1, 0));
     }
 
-  CHECK_INT (arg2);
-  a2 = XINT (arg2) & 0x7f;
+  CHECK_FIXNUM (arg2);
+  a2 = XFIXNUM (arg2) & 0x7f;
   if (a2 < lowlim || a2 > highlim)
-    args_out_of_range_3 (arg2, make_int (lowlim), make_int (highlim));
+    args_out_of_range_3 (arg2, make_fixnum (lowlim), make_fixnum (highlim));
 
   return make_char (make_ichar (charset, a1, a2));
 #else
@@ -4949,14 +4949,14 @@
   else if (EQ (charset, Qcontrol_1)) lowlim =  0, highlim =  31;
   else	                             lowlim =  0, highlim = 127;
 
-  CHECK_INT (arg1);
+  CHECK_FIXNUM (arg1);
   /* It is useful (and safe, according to Olivier Galibert) to strip
      the 8th bit off ARG1 and ARG2 because it allows programmers to
      write (make-char 'latin-iso8859-2 CODE) where code is the actual
      Latin 2 code of the character.  */
-  a1 = XINT (arg1) & 0x7f;
+  a1 = XFIXNUM (arg1) & 0x7f;
   if (a1 < lowlim || a1 > highlim)
-    args_out_of_range_3 (arg1, make_int (lowlim), make_int (highlim));
+    args_out_of_range_3 (arg1, make_fixnum (lowlim), make_fixnum (highlim));
 
   if (EQ (charset, Qascii))
     return make_char (a1);
@@ -4991,9 +4991,9 @@
   BREAKUP_ICHAR (XCHAR (ch), charset, octet0, octet1);
 
   if (NILP (n) || EQ (n, Qzero))
-    return make_int (octet0);
-  else if (EQ (n, make_int (1)))
-    return make_int (octet1);
+    return make_fixnum (octet0);
+  else if (EQ (n, make_fixnum (1)))
+    return make_fixnum (octet1);
   else
     invalid_constant ("Octet number must be 0 or 1", n);
 }
@@ -5018,11 +5018,11 @@
 
   if (XCHARSET_DIMENSION (charset) == 2)
     {
-      rc = list3 (XCHARSET_NAME (charset), make_int (c1), make_int (c2));
+      rc = list3 (XCHARSET_NAME (charset), make_fixnum (c1), make_fixnum (c2));
     }
   else
     {
-      rc = list2 (XCHARSET_NAME (charset), make_int (c1));
+      rc = list2 (XCHARSET_NAME (charset), make_fixnum (c1));
     }
   UNGCPRO;