Mercurial > hg > xemacs-beta

diff modules/canna/canna_api.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/modules/canna/canna_api.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/modules/canna/canna_api.c	Sun Oct 09 09:51:57 2011 +0100
@@ -237,7 +237,7 @@
     {
       /* 確定した文字列 (the confirmed string) */
       Vcanna_kakutei_string = make_euc_string (buf, len);
-      val = make_int (len);
+      val = make_fixnum (len);
       /* 確定した文字列の読みの情報...
 	 (info about the reading of the confirmed string) */
       Vcanna_kakutei_yomi = Vcanna_kakutei_romaji = Qnil;
@@ -375,8 +375,8 @@
     }
   else
     {
-      CHECK_INT (num);
-      kugiri = (XINT (num) == 1) ? (char *) 1 : (char *) 0;
+      CHECK_FIXNUM (num);
+      kugiri = (XFIXNUM (num) == 1) ? (char *) 1 : (char *) 0;
     }
 
   if (NILP (server))
@@ -506,9 +506,9 @@
 */
        (num))
 {
-  CHECK_INT (num);
+  CHECK_FIXNUM (num);
 
-  jrKanjiControl (0, KC_SETWIDTH,  (char *) XINT (num));
+  jrKanjiControl (0, KC_SETWIDTH,  (char *) XFIXNUM (num));
   return Qnil;
 }
 
@@ -520,12 +520,12 @@
   jrKanjiStatusWithValue ksv;
   jrKanjiStatus ks;
 
-  CHECK_INT (num);
+  CHECK_FIXNUM (num);
 
   ksv.buffer = (unsigned char *) key_buffer;
   ksv.bytes_buffer = KEYTOSTRSIZE;
   ksv.ks = &ks;
-  ksv.val = XINT (num);
+  ksv.val = XFIXNUM (num);
   jrKanjiControl (0, KC_CHANGEMODE,  (char *)&ksv);
   return storeResults (key_buffer, ksv.val, ksv.ks);
 }
@@ -596,7 +596,7 @@
   jrKanjiStatusWithValue ksv;
   jrKanjiStatus ks;
 
-  CHECK_INT (num);
+  CHECK_FIXNUM (num);
 
   if (NILP (ch))
     {
@@ -611,7 +611,7 @@
   ksv.buffer = (unsigned char *) key_buffer;
   ksv.bytes_buffer = KEYTOSTRSIZE;
   ksv.ks = &ks;
-  ksv.val = XINT (num);
+  ksv.val = XFIXNUM (num);
   jrKanjiControl (0, KC_DO, (char *) &ksv);
   return storeResults (key_buffer, ksv.val, ksv.ks);
 }
@@ -762,12 +762,12 @@
   UExtbyte *p, RkBuf[RKBUFSIZE];
   Lisp_Object res = Qnil;
 
-  CHECK_INT (bunsetsu);
+  CHECK_FIXNUM (bunsetsu);
   if (confirmContext () == 0)
     {
       return Qnil;
     }
-  RkGoTo (IRCP_context, XINT (bunsetsu));
+  RkGoTo (IRCP_context, XFIXNUM (bunsetsu));
   len = RkGetKanjiList (IRCP_context, RkBuf, RKBUFSIZE);
   p = RkBuf;
   for (i = 0 ; i < len ; i++)
@@ -793,16 +793,16 @@
 {
   int nbun, len;
 
-  CHECK_INT (bunsetsu);
-  CHECK_INT (bunlen);
+  CHECK_FIXNUM (bunsetsu);
+  CHECK_FIXNUM (bunlen);
 
-  nbun = XINT (bunsetsu);
+  nbun = XFIXNUM (bunsetsu);
   if (confirmContext () == 0)
     {
       return Qnil;
     }
   RkGoTo (IRCP_context, nbun);
-  len = byteLen (nbun, XINT (bunlen));
+  len = byteLen (nbun, XFIXNUM (bunlen));
   return kanjiYomiList (IRCP_context, RkResize (IRCP_context, len));
 }
 
@@ -817,10 +817,10 @@
     {
       return Qnil;
     }
-  nbun = XINT(bun);
+  nbun = XFIXNUM(bun);
   RkGoTo (IRCP_context, nbun);
 
-  nkouho = XINT(kouho);
+  nkouho = XFIXNUM(kouho);
   RkXfer (IRCP_context, nkouho);
   return Qt;
 }