Mercurial > hg > xemacs-beta

diff src/ui-gtk.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 2aa9cd456ae7
children
line wrap: on
line diff
--- a/src/ui-gtk.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/ui-gtk.c	Sun Oct 09 09:51:57 2011 +0100
@@ -252,19 +252,19 @@
 
   if (NILP (Venumeration_info))
     {
-      Venumeration_info = call2 (intern ("make-hashtable"), make_int (100), Qequal);
+      Venumeration_info = call2 (intern ("make-hashtable"), make_fixnum (100), Qequal);
     }
   
   while (vals && vals->value_name)
     {
-      assoc = Fcons (Fcons (intern (vals->value_nick), make_int (vals->value)), assoc);
-      assoc = Fcons (Fcons (intern (vals->value_name), make_int (vals->value)), assoc);
+      assoc = Fcons (Fcons (intern (vals->value_nick), make_fixnum (vals->value)), assoc);
+      assoc = Fcons (Fcons (intern (vals->value_name), make_fixnum (vals->value)), assoc);
       vals++;
     }
 
   assoc = Fnreverse (assoc);
 
-  Fputhash (make_int (the_type), assoc, Venumeration_info);
+  Fputhash (make_fixnum (the_type), assoc, Venumeration_info);
 }
 
 static void
@@ -693,7 +693,7 @@
   CHECK_FFI (func);
   CHECK_LIST (args);
 
-  n_args = XINT (Flength (args));
+  n_args = XFIXNUM (Flength (args));
 
 #ifdef XEMACS_IS_SMARTER_THAN_THE_PROGRAMMER
   /* #### I think this is too dangerous to enable by default.
@@ -709,14 +709,14 @@
       if (n_args > XFFI(func)->n_args)
 	{
 	  return Fsignal (Qwrong_number_of_arguments,
-			  list2 (func, make_int (n_args)));
+			  list2 (func, make_fixnum (n_args)));
 	}
 
       /* If they did not provide enough arguments, be nice and assume
       ** they wanted `nil' in there.
       */
       for_append[0] = args;
-      for_append[1] = Fmake_list (make_int (XFFI(func)->n_args - n_args), Qnil);
+      for_append[1] = Fmake_list (make_fixnum (XFFI(func)->n_args - n_args), Qnil);
 
       args = Fappend (2, for_append);
     }
@@ -725,7 +725,7 @@
     {
       /* Signal an error if they do not pass in the correct # of arguments */
       return Fsignal (Qwrong_number_of_arguments,
-		      list2 (func, make_int (n_args)));
+		      list2 (func, make_fixnum (n_args)));
     }
 #endif
 
@@ -1003,7 +1003,7 @@
 
   lisp_data = GET_LISP_FROM_VOID (data);
 
-  ungcpro_popup_callbacks (XINT (XCAR (lisp_data)));
+  ungcpro_popup_callbacks (XFIXNUM (XCAR (lisp_data)));
 }
 
 static void
@@ -1078,7 +1078,7 @@
 
   id = new_gui_id ();
   func = Fcons (cb_data, func);
-  func = Fcons (make_int (id), func);
+  func = Fcons (make_fixnum (id), func);
 
   gcpro_popup_callbacks (id, func);
 
@@ -1206,7 +1206,7 @@
     {
       invalid_argument ("Not a GTK type", type);
     }
-  return (make_int (GTK_FUNDAMENTAL_TYPE (t)));
+  return (make_fixnum (GTK_FUNDAMENTAL_TYPE (t)));
 }
 
 DEFUN ("gtk-object-type", Fgtk_object_type, 1, 1, 0, /*
@@ -1215,7 +1215,7 @@
        (object))
 {
   CHECK_GTK_OBJECT (object);
-  return (make_int (GTK_OBJECT_TYPE (XGTK_OBJECT (object)->object)));
+  return (make_fixnum (GTK_OBJECT_TYPE (XGTK_OBJECT (object)->object)));
 }
 
 DEFUN ("gtk-describe-type", Fgtk_describe_type, 1, 1, 0, /*
@@ -1245,8 +1245,8 @@
     }
   else
     {
-      CHECK_INT (type);
-      t = XINT (type);
+      CHECK_FIXNUM (type);
+      t = XFIXNUM (type);
     }
 
   if (GTK_FUNDAMENTAL_TYPE (t) != GTK_TYPE_OBJECT)
@@ -1473,13 +1473,13 @@
     case GTK_TYPE_BOOL:
       return (GTK_VALUE_BOOL (*arg) ? Qt : Qnil);
     case GTK_TYPE_INT:
-      return (make_int (GTK_VALUE_INT (*arg)));
+      return (make_fixnum (GTK_VALUE_INT (*arg)));
     case GTK_TYPE_UINT:
-      return (make_int (GTK_VALUE_INT (*arg)));
+      return (make_fixnum (GTK_VALUE_INT (*arg)));
     case GTK_TYPE_LONG:		/* I think these are wrong! */
-      return (make_int (GTK_VALUE_INT (*arg)));
+      return (make_fixnum (GTK_VALUE_INT (*arg)));
     case GTK_TYPE_ULONG:	/* I think these are wrong! */
-      return (make_int (GTK_VALUE_INT (*arg)));
+      return (make_fixnum (GTK_VALUE_INT (*arg)));
     case GTK_TYPE_FLOAT:
       return (make_float (GTK_VALUE_FLOAT (*arg)));
     case GTK_TYPE_DOUBLE:
@@ -1583,19 +1583,19 @@
 	}
       else
 	{
-	  CHECK_INT (obj);
-	  GTK_VALUE_INT(*arg) = XINT (obj);
+	  CHECK_FIXNUM (obj);
+	  GTK_VALUE_INT(*arg) = XFIXNUM (obj);
 	}
       break;
     case GTK_TYPE_LONG:
     case GTK_TYPE_ULONG:
       ABORT();
     case GTK_TYPE_FLOAT:
-      CHECK_INT_OR_FLOAT (obj);
+      CHECK_FIXNUM_OR_FLOAT (obj);
       GTK_VALUE_FLOAT(*arg) = extract_float (obj);
       break;
     case GTK_TYPE_DOUBLE:
-      CHECK_INT_OR_FLOAT (obj);
+      CHECK_FIXNUM_OR_FLOAT (obj);
       GTK_VALUE_DOUBLE(*arg) = extract_float (obj);
       break;
     case GTK_TYPE_STRING:
@@ -1761,7 +1761,7 @@
 
 	id = new_gui_id ();
 	obj = Fcons (Qnil, obj); /* Empty data */
-	obj = Fcons (make_int (id), obj);
+	obj = Fcons (make_fixnum (id), obj);
 
 	gcpro_popup_callbacks (id, obj);
 
@@ -1863,19 +1863,19 @@
 	}
       else
 	{
-	  CHECK_INT (obj);
-	  *(GTK_RETLOC_INT(*arg)) = XINT (obj);
+	  CHECK_FIXNUM (obj);
+	  *(GTK_RETLOC_INT(*arg)) = XFIXNUM (obj);
 	}
       break;
     case GTK_TYPE_LONG:
     case GTK_TYPE_ULONG:
       ABORT();
     case GTK_TYPE_FLOAT:
-      CHECK_INT_OR_FLOAT (obj);
+      CHECK_FIXNUM_OR_FLOAT (obj);
       *(GTK_RETLOC_FLOAT(*arg)) = extract_float (obj);
       break;
     case GTK_TYPE_DOUBLE:
-      CHECK_INT_OR_FLOAT (obj);
+      CHECK_FIXNUM_OR_FLOAT (obj);
       *(GTK_RETLOC_DOUBLE(*arg)) = extract_float (obj);
       break;
     case GTK_TYPE_STRING:
@@ -2041,7 +2041,7 @@
 
 	id = new_gui_id ();
 	obj = Fcons (Qnil, obj); /* Empty data */
-	obj = Fcons (make_int (id), obj);
+	obj = Fcons (make_fixnum (id), obj);
 
 	gcpro_popup_callbacks (id, obj);
 
@@ -2104,15 +2104,15 @@
 
   if (NILP (Venumeration_info))
     {
-      Venumeration_info = call2 (intern ("make-hashtable"), make_int (100), Qequal);
+      Venumeration_info = call2 (intern ("make-hashtable"), make_fixnum (100), Qequal);
     }
 
-  alist = Fgethash (make_int (t), Venumeration_info, Qnil);  
+  alist = Fgethash (make_fixnum (t), Venumeration_info, Qnil);  
 
   if (NILP (alist))
     {
       import_gtk_enumeration_internal (t);
-      alist = Fgethash (make_int (t), Venumeration_info, Qnil);
+      alist = Fgethash (make_fixnum (t), Venumeration_info, Qnil);
     }
   return (alist);
 }
@@ -2135,9 +2135,9 @@
       invalid_argument ("Unknown value", obj);
     }
 
-  CHECK_INT (XCDR (value));
+  CHECK_FIXNUM (XCDR (value));
 
-  return (XINT (XCDR (value)));
+  return (XFIXNUM (XCDR (value)));
 }
 
 static guint
@@ -2176,10 +2176,10 @@
 
   while (!NILP (alist))
     {
-      if (value & XINT (XCDR (XCAR (alist))))
+      if (value & XFIXNUM (XCDR (XCAR (alist))))
 	{
 	  rval = Fcons (XCAR (XCAR (alist)), rval);
-	  value &= ~(XINT (XCDR (XCAR (alist))));
+	  value &= ~(XFIXNUM (XCDR (XCAR (alist))));
 	}
       alist = XCDR (alist);
     }
@@ -2197,7 +2197,7 @@
       invalid_argument ("Unknown enumeration", build_cistring (gtk_type_name (t)));
     }
 
-  cell = Frassq (make_int (value), alist);
+  cell = Frassq (make_fixnum (value), alist);
 
   return (NILP (cell) ? Qnil : XCAR (cell));
 }