Mercurial > hg > xemacs-beta

diff src/sound.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/sound.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/sound.c	Sun Oct 09 09:51:57 2011 +0100
@@ -124,8 +124,8 @@
     vol = bell_volume;
   else
     {
-      CHECK_INT (volume);
-      vol = XINT (volume);
+      CHECK_FIXNUM (volume);
+      vol = XFIXNUM (volume);
     }
 
   GCPRO1 (file);
@@ -245,14 +245,14 @@
     {
       *sound = XCAR (elt);
     }
-  else if (INT_OR_FLOATP (XCAR (elt)) &&	/* ( name <vol> . <sound> ) */
+  else if (FIXNUM_OR_FLOATP (XCAR (elt)) &&	/* ( name <vol> . <sound> ) */
 	   (SYMBOLP (XCDR (elt)) ||
 	    STRINGP (XCDR (elt))))
     {
       *volume = XCAR (elt);
       *sound = XCDR (elt);
     }
-  else if (INT_OR_FLOATP (XCAR (elt)) &&	/* ( name <vol> <sound> ) */
+  else if (FIXNUM_OR_FLOATP (XCAR (elt)) &&	/* ( name <vol> <sound> ) */
 	   CONSP (XCDR (elt)) &&
 	   NILP (XCDR (XCDR (elt))) &&
 	   (SYMBOLP (XCAR (XCDR (elt))) ||
@@ -263,7 +263,7 @@
     }
   else if ((SYMBOLP (XCAR (elt)) ||	/* ( name <sound> . <vol> ) */
 	    STRINGP (XCAR (elt))) &&
-	   INT_OR_FLOATP (XCDR (elt)))
+	   FIXNUM_OR_FLOATP (XCDR (elt)))
     {
       *sound = XCAR (elt);
       *volume = XCDR (elt);
@@ -273,7 +273,7 @@
 	    STRINGP (XCAR (elt))) &&
 	   CONSP (XCDR (elt)) &&
 	   NILP (XCDR (XCDR (elt))) &&
-	   INT_OR_FLOATP (XCAR (XCDR (elt))))
+	   FIXNUM_OR_FLOATP (XCAR (XCDR (elt))))
     {
       *sound = XCAR (elt);
       *volume = XCAR (XCDR (elt));
@@ -292,16 +292,16 @@
 	  val = XCAR (val);
 	  if (EQ (key, Q_volume))
 	    {
-	      if (INT_OR_FLOATP (val)) *volume = val;
+	      if (FIXNUM_OR_FLOATP (val)) *volume = val;
 	    }
 	  else if (EQ (key, Q_pitch))
 	    {
-	      if (INT_OR_FLOATP (val)) *pitch = val;
+	      if (FIXNUM_OR_FLOATP (val)) *pitch = val;
 	      if (NILP (*sound)) *sound = Qt;
 	    }
 	  else if (EQ (key, Q_duration))
 	    {
-	      if (INT_OR_FLOATP (val)) *duration = val;
+	      if (FIXNUM_OR_FLOATP (val)) *duration = val;
 	      if (NILP (*sound)) *sound = Qt;
 	    }
 	  else if (EQ (key, Q_sound))
@@ -366,9 +366,9 @@
     }
 
 
-  vol = (INT_OR_FLOATP (volume)   ? (int) XFLOATINT (volume)   : bell_volume);
-  pit = (INT_OR_FLOATP (pitch)    ? (int) XFLOATINT (pitch)    : -1);
-  dur = (INT_OR_FLOATP (duration) ? (int) XFLOATINT (duration) : -1);
+  vol = (FIXNUM_OR_FLOATP (volume)   ? (int) XFLOATFIXNUM (volume)   : bell_volume);
+  pit = (FIXNUM_OR_FLOATP (pitch)    ? (int) XFLOATFIXNUM (pitch)    : -1);
+  dur = (FIXNUM_OR_FLOATP (duration) ? (int) XFLOATFIXNUM (duration) : -1);
 
   /* If the sound is a string, and we're connected to ALSA, NAS, or ESD, do
      that.  Else if the sound is a string, and we're on console, play it