Mercurial > hg > xemacs-beta

diff src/font-mgr.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 8d29f1c4bb98
children 3192994c49ca
line wrap: on
line diff
--- a/src/font-mgr.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/font-mgr.c	Sun Oct 09 09:51:57 2011 +0100
@@ -296,9 +296,9 @@
       FcChar8 *str = (FcChar8 *) extract_fcapi_string (value);
       res = FcPatternAddString (fcpat, obj, str);
     }
-  else if (INTP (value)) 
+  else if (FIXNUMP (value)) 
     {
-      res = FcPatternAddInteger (fcpat, obj, XINT (value));
+      res = FcPatternAddInteger (fcpat, obj, XFIXNUM (value));
     }
   else if (FLOATP (value)) 
     {
@@ -438,10 +438,10 @@
     {
 #ifdef HAVE_BIGNUM
       check_integer_range (id, Qzero, make_integer (INT_MAX));
-      int_id = BIGNUMP (id) ? bignum_to_int (XBIGNUM_DATA (id)) : XINT (id);
+      int_id = BIGNUMP (id) ? bignum_to_int (XBIGNUM_DATA (id)) : XFIXNUM (id);
 #else
-      check_integer_range (id, Qzero, make_integer (EMACS_INT_MAX));
-      int_id = XINT (id);      
+      check_integer_range (id, Qzero, make_integer (MOST_POSITIVE_FIXNUM));
+      int_id = XFIXNUM (id);      
 #endif
     }
   if (!NILP (type)) CHECK_SYMBOL (type);
@@ -458,7 +458,7 @@
 	{
 	case FcTypeInteger:
 	  return ((!NILP (type) && !EQ (type, Qinteger))
-		  ? Qfc_result_type_mismatch : make_int (fc_value.u.i));
+		  ? Qfc_result_type_mismatch : make_fixnum (fc_value.u.i));
 	case FcTypeDouble:
 	  return ((!NILP (type) && !EQ (type, intern ("double"))
 		   && !EQ (type, Qfloat))
@@ -474,13 +474,13 @@
 	  return Qfc_result_type_mismatch;
 	  /* #### unimplemented
 	  return ((!NILP (type) && !EQ (type, intern ("matrix")))
-		  ? Qfc_result_type_mismatch : make_int (fc_value.u.m));
+		  ? Qfc_result_type_mismatch : make_fixnum (fc_value.u.m));
 	  */
 	case FcTypeCharSet:
 	  return Qfc_result_type_mismatch;
 	  /* #### unimplemented
 	  return ((!NILP (type) && !EQ (type, intern ("charset")))
-		  ? Qfc_result_type_mismatch : make_int (fc_value.u.c));
+		  ? Qfc_result_type_mismatch : make_fixnum (fc_value.u.c));
 	  */
 	}
     case FcResultTypeMismatch:
@@ -747,7 +747,7 @@
       (config))
 {
   CHECK_FC_CONFIG (config);
-  return make_int (FcConfigGetRescanInterval (XFC_CONFIG_PTR (config)));
+  return make_fixnum (FcConfigGetRescanInterval (XFC_CONFIG_PTR (config)));
 }
 
 DEFUN ("fc-config-set-rescan-interval", Ffc_config_set_rescan_interval, 2, 2, 0, /*
@@ -758,9 +758,9 @@
       (config, rescan_interval))
 {
   CHECK_FC_CONFIG (config);
-  CHECK_INT (rescan_interval);
+  CHECK_FIXNUM (rescan_interval);
   if (FcConfigSetRescanInterval (XFC_CONFIG_PTR (config),
-				 XINT (rescan_interval)) == FcFalse)
+				 XFIXNUM (rescan_interval)) == FcFalse)
     signal_error (Qio_error, "FcConfigSetRescanInverval barfed",
 		  intern ("fc-config-set-rescan-interval"));
   return Qnil;
@@ -1137,7 +1137,7 @@
 It's probably not a disaster if `(> (fc-get-version) fc-version)'. */
       ())
 {
-  return make_int (FcGetVersion ());
+  return make_fixnum (FcGetVersion ());
 }
 
 DEFUN ("fc-init-reinitialize", Ffc_init_reinitialize, 0, 0, 0, /*