diff src/tests.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 308d34e9f07d
children 65d65b52d608
line wrap: on
line diff
--- a/src/tests.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/tests.c	Sun Oct 09 09:51:57 2011 +0100
@@ -573,7 +573,7 @@
 			 void *extra_arg)
 {
   test_hash_tables_data *p = (test_hash_tables_data *) extra_arg;
-  p->sum += XINT (value);
+  p->sum += XFIXNUM (value);
   return 0;
 }
 
@@ -582,10 +582,10 @@
 				   void *extra_arg)
 {
   test_hash_tables_data *p = (test_hash_tables_data *) extra_arg;
-  Fputhash (make_int (- XINT (key)),
-	    make_int (2 * XINT (value)),
+  Fputhash (make_fixnum (- XFIXNUM (key)),
+	    make_fixnum (2 * XFIXNUM (value)),
 	    p->hash_table);
-  p->sum += XINT (value);
+  p->sum += XFIXNUM (value);
   return 0;
 }
 
@@ -594,7 +594,7 @@
 			    Lisp_Object UNUSED (value),
 			    void *UNUSED (extra_arg))
 {
-  return XINT (key) < 0;
+  return XFIXNUM (key) < 0;
 }
 
 
@@ -615,8 +615,8 @@
   data.hash_table = make_lisp_hash_table (50, HASH_TABLE_NON_WEAK,
 					  Qequal);
 
-  Fputhash (make_int (1), make_int (2), data.hash_table);
-  Fputhash (make_int (3), make_int (4), data.hash_table);
+  Fputhash (make_fixnum (1), make_fixnum (2), data.hash_table);
+  Fputhash (make_fixnum (3), make_fixnum (4), data.hash_table);
 
   data.sum = 0;
   elisp_maphash_unsafe (test_hash_tables_mapper,
@@ -674,7 +674,7 @@
   assert (GET_VOID_FROM_LISP (STORE_VOID_IN_LISP (pval)) == pval);	\
 }									\
 while (0)
-  assert (INT_VALBITS >= 31);
+  assert (FIXNUM_VALBITS >= 31);
   FROB (&baz);
   FROB (&baz.x);
   FROB (&baz.y);
@@ -689,12 +689,12 @@
   FROB (0x80808080);
   FROB (0xCAFEBABE);
   FROB (0xFFFFFFFE);
-#if INT_VALBITS >= 63
+#if FIXNUM_VALBITS >= 63
   FROB (0x0000808080808080);
   FROB (0x8080808080808080);
   FROB (0XDEADBEEFCAFEBABE);
   FROB (0XFFFFFFFFFFFFFFFE);
-#endif /* INT_VALBITS >= 63 */
+#endif /* FIXNUM_VALBITS >= 63 */
 
   return list1 (list3 (build_ascstring ("STORE_VOID_IN_LISP"), Qt, Qnil));
 }