Mercurial > hg > xemacs-beta

diff src/mule-charset.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 308d34e9f07d
children
line wrap: on
line diff
--- a/src/mule-charset.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/mule-charset.c	Sun Oct 09 09:51:57 2011 +0100
@@ -302,7 +302,7 @@
 
   if (!lb)
     invalid_operation
-      ("No more character sets free for this dimension", make_int (dimension));
+      ("No more character sets free for this dimension", make_fixnum (dimension));
 
   return lb;
 }
@@ -507,32 +507,32 @@
 
 	else if (EQ (keyword, Qdimension))
 	  {
-	    CHECK_INT (value);
-	    dimension = XINT (value);
+	    CHECK_FIXNUM (value);
+	    dimension = XFIXNUM (value);
 	    if (dimension < 1 || dimension > 2)
 	      invalid_constant ("Invalid value for `dimension'", value);
 	  }
 
 	else if (EQ (keyword, Qchars))
 	  {
-	    CHECK_INT (value);
-	    chars = XINT (value);
+	    CHECK_FIXNUM (value);
+	    chars = XFIXNUM (value);
 	    if (chars != 94 && chars != 96)
 	      invalid_constant ("Invalid value for `chars'", value);
 	  }
 
 	else if (EQ (keyword, Qcolumns))
 	  {
-	    CHECK_INT (value);
-	    columns = XINT (value);
+	    CHECK_FIXNUM (value);
+	    columns = XFIXNUM (value);
 	    if (columns != 1 && columns != 2)
 	      invalid_constant ("Invalid value for `columns'", value);
 	  }
 
 	else if (EQ (keyword, Qgraphic))
 	  {
-	    CHECK_INT (value);
-	    graphic = XINT (value);
+	    CHECK_FIXNUM (value);
+	    graphic = XFIXNUM (value);
 	    if (graphic < 0 || graphic > 1)
 	      invalid_constant ("Invalid value for `graphic'", value);
 	  }
@@ -734,13 +734,13 @@
   int type;
   Lisp_Object obj = Qnil;
 
-  CHECK_INT (dimension);
-  dm = XINT (dimension);
+  CHECK_FIXNUM (dimension);
+  dm = XFIXNUM (dimension);
   if (dm < 1 || dm > 2)
     invalid_constant ("Invalid value for DIMENSION", dimension);
 
-  CHECK_INT (chars);
-  ch = XINT (chars);
+  CHECK_FIXNUM (chars);
+  ch = XFIXNUM (chars);
   if (ch != 94 && ch != 96)
     invalid_constant ("Invalid value for CHARS", chars);
 
@@ -808,7 +808,7 @@
 */
        (charset))
 {
-  return make_int (XCHARSET_DIMENSION (Fget_charset (charset)));
+  return make_fixnum (XCHARSET_DIMENSION (Fget_charset (charset)));
 }
 
 DEFUN ("charset-property", Fcharset_property, 2, 2, 0, /*
@@ -828,11 +828,11 @@
   if (EQ (prop, Qshort_name))  return CHARSET_SHORT_NAME (cs);
   if (EQ (prop, Qlong_name))   return CHARSET_LONG_NAME (cs);
   if (EQ (prop, Qdoc_string))  return CHARSET_DOC_STRING (cs);
-  if (EQ (prop, Qdimension))   return make_int (CHARSET_DIMENSION (cs));
-  if (EQ (prop, Qcolumns))     return make_int (CHARSET_COLUMNS (cs));
-  if (EQ (prop, Qgraphic))     return make_int (CHARSET_GRAPHIC (cs));
+  if (EQ (prop, Qdimension))   return make_fixnum (CHARSET_DIMENSION (cs));
+  if (EQ (prop, Qcolumns))     return make_fixnum (CHARSET_COLUMNS (cs));
+  if (EQ (prop, Qgraphic))     return make_fixnum (CHARSET_GRAPHIC (cs));
   if (EQ (prop, Qfinal))       return make_char (CHARSET_FINAL (cs));
-  if (EQ (prop, Qchars))       return make_int (CHARSET_CHARS (cs));
+  if (EQ (prop, Qchars))       return make_fixnum (CHARSET_CHARS (cs));
   if (EQ (prop, Qregistries))    return CHARSET_REGISTRIES (cs);
   if (EQ (prop, Qencode_as_utf_8))
     return CHARSET_ENCODE_AS_UTF_8 (cs) ? Qt : Qnil;
@@ -854,7 +854,7 @@
 */
 	(charset))
 {
-  return make_int (XCHARSET_LEADING_BYTE (Fget_charset (charset)));
+  return make_fixnum (XCHARSET_LEADING_BYTE (Fget_charset (charset)));
 }
 
 /* #### We need to figure out which properties we really want to