Rename integerp->fixnum, etc, in preparation for bignums

* src/json.c, src/keyboard.c, src/keyboard.h, src/keymap.c,
src/kqueue.c, src/lcms.c, src/lisp.h, src/lread.c, src/macros.c,
src/marker.c, src/menu.c, src/minibuf.c, src/msdos.c, src/print.c,
src/process.c, src/profiler.c, src/search.c, src/sound.c,
src/syntax.c, src/sysdep.c, src/term.c, src/terminal.c,
src/textprop.c, src/undo.c, src/w16select.c, src/w32.c,
src/w32console.c, src/w32cygwinx.c, src/w32fns.c, src/w32font.c,
src/w32inevt.c, src/w32proc.c, src/w32select.c, src/w32term.c,
src/w32uniscribe.c, src/widget.c, src/window.c, src/xdisp.c,
src/xfaces.c, src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c,
src/xrdb.c, src/xselect.c, src/xterm.c, src/xwidget.c: Rename
INTEGERP->FIXNUM, make_number->make_fixnum, CHECK_NUMBER->CHECK_FIXNUM,
make_natnum->make_fixed_natum, NUMBERP->FIXED_OR_FLOATP,
NATNUMP->FIXNATP, CHECK_NATNUM->CHECK_FIXNAT.

1 files changed, 64 insertions, 64 deletions

diff --git a/src/process.c b/src/process.c
index 5bd8c255a26..10af79a0155 100644
--- a/src/process.c
+++ b/src/process.c
@@ -684,12 +684,12 @@ static Lisp_Object
 status_convert (int w)
 {
   if (WIFSTOPPED (w))
-    return Fcons (Qstop, Fcons (make_number (WSTOPSIG (w)), Qnil));
+    return Fcons (Qstop, Fcons (make_fixnum (WSTOPSIG (w)), Qnil));
   else if (WIFEXITED (w))
-    return Fcons (Qexit, Fcons (make_number (WEXITSTATUS (w)),
+    return Fcons (Qexit, Fcons (make_fixnum (WEXITSTATUS (w)),
                                 WCOREDUMP (w) ? Qt : Qnil));
   else if (WIFSIGNALED (w))
-    return Fcons (Qsignal, Fcons (make_number (WTERMSIG (w)),
+    return Fcons (Qsignal, Fcons (make_fixnum (WTERMSIG (w)),
                                   WCOREDUMP (w) ? Qt : Qnil));
   else
     return Qrun;
@@ -718,7 +718,7 @@ decode_status (Lisp_Object l, Lisp_Object *symbol, Lisp_Object *code,
   if (SYMBOLP (l))
     {
       *symbol = l;
-      *code = make_number (0);
+      *code = make_fixnum (0);
       *coredump = 0;
     }
   else
@@ -761,7 +761,7 @@ status_message (struct Lisp_Process *p)
           c1 = STRING_CHAR (SDATA (string));
           c2 = downcase (c1);
           if (c1 != c2)
-            Faset (string, make_number (0), make_number (c2));
+            Faset (string, make_fixnum (0), make_fixnum (c2));
         }
       AUTO_STRING (suffix, coredump ? " (core dumped)\n" : "\n");
       return concat2 (string, suffix);
@@ -1064,7 +1064,7 @@ nil, indicating the current buffer's process.  */)
   p->raw_status_new = 0;
   if (NETCONN1_P (p) || SERIALCONN1_P (p) || PIPECONN1_P (p))
     {
-      pset_status (p, list2 (Qexit, make_number (0)));
+      pset_status (p, list2 (Qexit, make_fixnum (0)));
       p->tick = ++process_tick;
       status_notify (p, NULL);
       redisplay_preserve_echo_area (13);
@@ -1083,7 +1083,7 @@ nil, indicating the current buffer's process.  */)
             update_status (p);
           symbol = CONSP (p->status) ? XCAR (p->status) : p->status;
           if (! (EQ (symbol, Qsignal) || EQ (symbol, Qexit)))
-            pset_status (p, list2 (Qsignal, make_number (SIGKILL)));
+            pset_status (p, list2 (Qsignal, make_fixnum (SIGKILL)));
 
           p->tick = ++process_tick;
           status_notify (p, NULL);
@@ -1151,7 +1151,7 @@ If PROCESS has not yet exited or died, return 0.  */)
     update_status (XPROCESS (process));
   if (CONSP (XPROCESS (process)->status))
     return XCAR (XCDR (XPROCESS (process)->status));
-  return make_number (0);
+  return make_fixnum (0);
 }
 
 DEFUN ("process-id", Fprocess_id, Sprocess_id, 1, 1, 0,
@@ -1584,7 +1584,7 @@ Return nil if format of ADDRESS is invalid.  */)
 
       for (i = 0; i < nargs; i++)
         {
-          if (! RANGED_INTEGERP (0, p->contents[i], 65535))
+          if (! RANGED_FIXNUMP (0, p->contents[i], 65535))
             return Qnil;
 
           if (nargs <= 5         /* IPv4 */
@@ -1864,7 +1864,7 @@ usage: (make-process &rest ARGS)  */)
         {
           tem = Qnil;
           openp (Vexec_path, program, Vexec_suffixes, &tem,
-                 make_number (X_OK), false);
+                 make_fixnum (X_OK), false);
           if (NILP (tem))
             report_file_error ("Searching for program", program);
           tem = Fexpand_file_name (tem, Qnil);
@@ -2503,9 +2503,9 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, ptrdiff_t len)
       {
         DECLARE_POINTER_ALIAS (sin, struct sockaddr_in, sa);
         len = sizeof (sin->sin_addr) + 1;
-        address = Fmake_vector (make_number (len), Qnil);
+        address = Fmake_vector (make_fixnum (len), Qnil);
         p = XVECTOR (address);
-        p->contents[--len] = make_number (ntohs (sin->sin_port));
+        p->contents[--len] = make_fixnum (ntohs (sin->sin_port));
         cp = (unsigned char *) &sin->sin_addr;
         break;
       }
@@ -2515,11 +2515,11 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, ptrdiff_t len)
         DECLARE_POINTER_ALIAS (sin6, struct sockaddr_in6, sa);
         DECLARE_POINTER_ALIAS (ip6, uint16_t, &sin6->sin6_addr);
         len = sizeof (sin6->sin6_addr) / 2 + 1;
-        address = Fmake_vector (make_number (len), Qnil);
+        address = Fmake_vector (make_fixnum (len), Qnil);
         p = XVECTOR (address);
-        p->contents[--len] = make_number (ntohs (sin6->sin6_port));
+        p->contents[--len] = make_fixnum (ntohs (sin6->sin6_port));
         for (i = 0; i < len; i++)
-          p->contents[i] = make_number (ntohs (ip6[i]));
+          p->contents[i] = make_fixnum (ntohs (ip6[i]));
         return address;
       }
 #endif
@@ -2547,8 +2547,8 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, ptrdiff_t len)
 #endif
     default:
       len -= offsetof (struct sockaddr, sa_family) + sizeof (sa->sa_family);
-      address = Fcons (make_number (sa->sa_family),
-                       Fmake_vector (make_number (len), Qnil));
+      address = Fcons (make_fixnum (sa->sa_family),
+                       Fmake_vector (make_fixnum (len), Qnil));
       p = XVECTOR (XCDR (address));
       cp = (unsigned char *) &sa->sa_family + sizeof (sa->sa_family);
       break;
@@ -2556,7 +2556,7 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, ptrdiff_t len)
 
   i = 0;
   while (i < len)
-    p->contents[i++] = make_number (*cp++);
+    p->contents[i++] = make_fixnum (*cp++);
 
   return address;
 }
@@ -2566,7 +2566,7 @@ conv_sockaddr_to_lisp (struct sockaddr *sa, ptrdiff_t len)
 static Lisp_Object
 conv_addrinfo_to_lisp (struct addrinfo *res)
 {
-  Lisp_Object protocol = make_number (res->ai_protocol);
+  Lisp_Object protocol = make_fixnum (res->ai_protocol);
   eassert (XINT (protocol) == res->ai_protocol);
   return Fcons (protocol, conv_sockaddr_to_lisp (res->ai_addr, res->ai_addrlen));
 }
@@ -2602,7 +2602,7 @@ get_lisp_to_sockaddr_size (Lisp_Object address, int *familyp)
       return sizeof (struct sockaddr_un);
     }
 #endif
-  else if (CONSP (address) && TYPE_RANGED_INTEGERP (int, XCAR (address))
+  else if (CONSP (address) && TYPE_RANGED_FIXNUMP (int, XCAR (address))
            && VECTORP (XCDR (address)))
     {
       struct sockaddr *sa;
@@ -2653,7 +2653,7 @@ conv_lisp_to_sockaddr (int family, Lisp_Object address, struct sockaddr *sa, int
           hostport = XINT (p->contents[--len]);
           sin6->sin6_port = htons (hostport);
           for (i = 0; i < len; i++)
-            if (INTEGERP (p->contents[i]))
+            if (FIXNUMP (p->contents[i]))
               {
                 int j = XFASTINT (p->contents[i]) & 0xffff;
                 ip6[i] = ntohs (j);
@@ -2686,7 +2686,7 @@ conv_lisp_to_sockaddr (int family, Lisp_Object address, struct sockaddr *sa, int
     }
 
   for (i = 0; i < len; i++)
-    if (INTEGERP (p->contents[i]))
+    if (FIXNUMP (p->contents[i]))
       *cp++ = XFASTINT (p->contents[i]) & 0xff;
 }
 
@@ -2818,7 +2818,7 @@ set_socket_option (int s, Lisp_Object opt, Lisp_Object val)
     case SOPT_INT:
       {
         int optval;
-        if (TYPE_RANGED_INTEGERP (int, val))
+        if (TYPE_RANGED_FIXNUMP (int, val))
           optval = XINT (val);
         else
           error ("Bad option value for %s", name);
@@ -2857,7 +2857,7 @@ set_socket_option (int s, Lisp_Object opt, Lisp_Object val)
 
         linger.l_onoff = 1;
         linger.l_linger = 0;
-        if (TYPE_RANGED_INTEGERP (int, val))
+        if (TYPE_RANGED_FIXNUMP (int, val))
           linger.l_linger = XINT (val);
         else
           linger.l_onoff = NILP (val) ? 0 : 1;
@@ -3102,7 +3102,7 @@ usage:  (make-serial-process &rest ARGS)  */)
   if (NILP (Fplist_member (contact, QCspeed)))
     error (":speed not specified");
   if (!NILP (Fplist_get (contact, QCspeed)))
-    CHECK_NUMBER (Fplist_get (contact, QCspeed));
+    CHECK_FIXNUM (Fplist_get (contact, QCspeed));
 
   name = Fplist_get (contact, QCname);
   if (NILP (name))
@@ -3464,7 +3464,7 @@ connect_network_socket (Lisp_Object proc, Lisp_Object addrinfos,
               DECLARE_POINTER_ALIAS (psa1, struct sockaddr, &sa1);
               if (getsockname (s, psa1, &len1) == 0)
                 {
-                  Lisp_Object service = make_number (ntohs (sa1.sin_port));
+                  Lisp_Object service = make_fixnum (ntohs (sa1.sin_port));
                   contact = Fplist_put (contact, QCservice, service);
                   /* Save the port number so that we can stash it in
                      the process object later.  */
@@ -3916,7 +3916,7 @@ usage: (make-network-process &rest ARGS)  */)
       if (!get_lisp_to_sockaddr_size (address, &family))
         error ("Malformed :address");
 
-      addrinfos = list1 (Fcons (make_number (any_protocol), address));
+      addrinfos = list1 (Fcons (make_fixnum (any_protocol), address));
       goto open_socket;
     }
 
@@ -3940,7 +3940,7 @@ usage: (make-network-process &rest ARGS)  */)
 #endif
   else if (EQ (tem, Qipv4))
     family = AF_INET;
-  else if (TYPE_RANGED_INTEGERP (int, tem))
+  else if (TYPE_RANGED_FIXNUMP (int, tem))
     family = XINT (tem);
   else
     error ("Unknown address family");
@@ -3980,7 +3980,7 @@ usage: (make-network-process &rest ARGS)  */)
       CHECK_STRING (service);
       if (sizeof address_un.sun_path <= SBYTES (service))
         error ("Service name too long");
-      addrinfos = list1 (Fcons (make_number (any_protocol), service));
+      addrinfos = list1 (Fcons (make_fixnum (any_protocol), service));
       goto open_socket;
     }
 #endif
@@ -4007,7 +4007,7 @@ usage: (make-network-process &rest ARGS)  */)
           portstring = "0";
           portstringlen = 1;
         }
-      else if (INTEGERP (service))
+      else if (FIXNUMP (service))
         {
           portstring = portbuf;
           portstringlen = sprintf (portbuf, "%"pI"d", XINT (service));
@@ -4095,7 +4095,7 @@ usage: (make-network-process &rest ARGS)  */)
 
   if (EQ (service, Qt))
     port = 0;
-  else if (INTEGERP (service))
+  else if (FIXNUMP (service))
     port = XINT (service);
   else
     {
@@ -4169,7 +4169,7 @@ usage: (make-network-process &rest ARGS)  */)
 
   /* :server QLEN */
   p->is_server = !NILP (server);
-  if (TYPE_RANGED_INTEGERP (int, server))
+  if (TYPE_RANGED_FIXNUMP (int, server))
     p->backlog = XINT (server);
 
   /* :nowait BOOL */
@@ -4394,7 +4394,7 @@ network_interface_info (Lisp_Object ifname)
         {
           if (flags & 1)
             {
-              elt = Fcons (make_number (fnum), elt);
+              elt = Fcons (make_fixnum (fnum), elt);
             }
         }
     }
@@ -4405,21 +4405,21 @@ network_interface_info (Lisp_Object ifname)
 #if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR)
   if (ioctl (s, SIOCGIFHWADDR, &rq) == 0)
     {
-      Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
+      Lisp_Object hwaddr = Fmake_vector (make_fixnum (6), Qnil);
       register struct Lisp_Vector *p = XVECTOR (hwaddr);
       int n;
 
       any = 1;
       for (n = 0; n < 6; n++)
-        p->contents[n] = make_number (((unsigned char *)
+        p->contents[n] = make_fixnum (((unsigned char *)
                                        &rq.ifr_hwaddr.sa_data[0])
                                       [n]);
-      elt = Fcons (make_number (rq.ifr_hwaddr.sa_family), hwaddr);
+      elt = Fcons (make_fixnum (rq.ifr_hwaddr.sa_family), hwaddr);
     }
 #elif defined (HAVE_GETIFADDRS) && defined (LLADDR)
   if (getifaddrs (&ifap) != -1)
     {
-      Lisp_Object hwaddr = Fmake_vector (make_number (6), Qnil);
+      Lisp_Object hwaddr = Fmake_vector (make_fixnum (6), Qnil);
       register struct Lisp_Vector *p = XVECTOR (hwaddr);
       struct ifaddrs *it;
 
@@ -4436,9 +4436,9 @@ network_interface_info (Lisp_Object ifname)
 
           memcpy (linkaddr, LLADDR (sdl), sdl->sdl_alen);
           for (n = 0; n < 6; n++)
-            p->contents[n] = make_number (linkaddr[n]);
+            p->contents[n] = make_fixnum (linkaddr[n]);
 
-          elt = Fcons (make_number (it->ifa_addr->sa_family), hwaddr);
+          elt = Fcons (make_fixnum (it->ifa_addr->sa_family), hwaddr);
           break;
         }
     }
@@ -4625,12 +4625,12 @@ is nil, from any process) before the timeout expired.  */)
 
   if (!NILP (millisec))
     { /* Obsolete calling convention using integers rather than floats.  */
-      CHECK_NUMBER (millisec);
+      CHECK_FIXNUM (millisec);
       if (NILP (seconds))
         seconds = make_float (XINT (millisec) / 1000.0);
       else
         {
-          CHECK_NUMBER (seconds);
+          CHECK_FIXNUM (seconds);
           seconds = make_float (XINT (millisec) / 1000.0 + XINT (seconds));
         }
     }
@@ -4640,7 +4640,7 @@ is nil, from any process) before the timeout expired.  */)
 
   if (!NILP (seconds))
     {
-      if (INTEGERP (seconds))
+      if (FIXNUMP (seconds))
         {
           if (XINT (seconds) > 0)
             {
@@ -4668,7 +4668,7 @@ is nil, from any process) before the timeout expired.  */)
                                    Qnil,
                                    !NILP (process) ? XPROCESS (process) : NULL,
                                    (NILP (just_this_one) ? 0
-                                    : !INTEGERP (just_this_one) ? 1 : -1))
+                                    : !FIXNUMP (just_this_one) ? 1 : -1))
       <= 0)
      ? Qnil : Qt);
 }
@@ -4697,7 +4697,7 @@ server_accept_connection (Lisp_Object server, int channel)
       if (!would_block (code) && !NILP (ps->log))
         call3 (ps->log, server, Qnil,
                concat3 (build_string ("accept failed with code"),
-                        Fnumber_to_string (make_number (code)),
+                        Fnumber_to_string (make_fixnum (code)),
                         build_string ("\n")));
       return;
     }
@@ -4725,9 +4725,9 @@ server_accept_connection (Lisp_Object server, int channel)
         args[nargs++] = procname_format_in;
         nargs++;
         unsigned char *ip = (unsigned char *)&saddr.in.sin_addr.s_addr;
-        service = make_number (ntohs (saddr.in.sin_port));
+        service = make_fixnum (ntohs (saddr.in.sin_port));
         for (int i = 0; i < 4; i++)
-          args[nargs++] = make_number (ip[i]);
+          args[nargs++] = make_fixnum (ip[i]);
         args[nargs++] = service;
       }
       break;
@@ -4738,9 +4738,9 @@ server_accept_connection (Lisp_Object server, int channel)
         args[nargs++] = procname_format_in6;
         nargs++;
         DECLARE_POINTER_ALIAS (ip6, uint16_t, &saddr.in6.sin6_addr);
-        service = make_number (ntohs (saddr.in.sin_port));
+        service = make_fixnum (ntohs (saddr.in.sin_port));
         for (int i = 0; i < 8; i++)
-          args[nargs++] = make_number (ip6[i]);
+          args[nargs++] = make_fixnum (ip6[i]);
         args[nargs++] = service;
       }
       break;
@@ -4749,7 +4749,7 @@ server_accept_connection (Lisp_Object server, int channel)
     default:
       args[nargs++] = procname_format_default;
       nargs++;
-      args[nargs++] = make_number (connect_counter);
+      args[nargs++] = make_fixnum (connect_counter);
       break;
     }
 
@@ -5671,7 +5671,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                   deactivate_process (proc);
                   if (EQ (XPROCESS (proc)->status, Qrun))
                     pset_status (XPROCESS (proc),
-                                 list2 (Qexit, make_number (0)));
+                                 list2 (Qexit, make_fixnum (0)));
                 }
               else
                 {
@@ -5682,7 +5682,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                     update_status (XPROCESS (proc));
                   if (EQ (XPROCESS (proc)->status, Qrun))
                     pset_status (XPROCESS (proc),
-                                 list2 (Qexit, make_number (256)));
+                                 list2 (Qexit, make_fixnum (256)));
                 }
             }
           if (FD_ISSET (channel, &Writeok)
@@ -5734,7 +5734,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                   else
                     {
                       p->tick = ++process_tick;
-                      pset_status (p, list2 (Qfailed, make_number (xerrno)));
+                      pset_status (p, list2 (Qfailed, make_fixnum (xerrno)));
                     }
                   deactivate_process (proc);
                   if (!NILP (addrinfos))
@@ -5803,7 +5803,7 @@ read_process_output_error_handler (Lisp_Object error_val)
   cmd_error_internal (error_val, "error in process filter: ");
   Vinhibit_quit = Qt;
   update_echo_area ();
-  Fsleep_for (make_number (2), Qnil);
+  Fsleep_for (make_fixnum (2), Qnil);
   return Qt;
 }
 
@@ -6121,7 +6121,7 @@ Otherwise it discards the output.  */)
 
       /* If the restriction isn't what it should be, set it.  */
       if (old_begv != BEGV || old_zv != ZV)
-        Fnarrow_to_region (make_number (old_begv), make_number (old_zv));
+        Fnarrow_to_region (make_fixnum (old_begv), make_fixnum (old_zv));
 
       bset_read_only (current_buffer, old_read_only);
       SET_PT_BOTH (opoint, opoint_byte);
@@ -6168,7 +6168,7 @@ write_queue_push (struct Lisp_Process *p, Lisp_Object input_obj,
       obj = make_unibyte_string (buf, len);
     }
 
-  entry = Fcons (obj, Fcons (make_number (offset), make_number (len)));
+  entry = Fcons (obj, Fcons (make_fixnum (offset), make_fixnum (len)));
 
   if (front)
     pset_write_queue (p, Fcons (entry, p->write_queue));
@@ -6415,7 +6415,7 @@ send_process (Lisp_Object proc, const char *buf, ptrdiff_t len,
               else if (errno == EPIPE)
                 {
                   p->raw_status_new = 0;
-                  pset_status (p, list2 (Qexit, make_number (256)));
+                  pset_status (p, list2 (Qexit, make_fixnum (256)));
                   p->tick = ++process_tick;
                   deactivate_process (proc);
                   error ("process %s no longer connected to pipe; closed it",
@@ -6537,7 +6537,7 @@ process group.  */)
   if (gid == p->pid)
     return Qnil;
   if (gid != -1)
-    return make_number (gid);
+    return make_fixnum (gid);
   return Qt;
 }
 
@@ -6845,13 +6845,13 @@ SIGCODE may be an integer, or a symbol whose name is a signal name.  */)
         tem = string_to_number (SSDATA (process), 10, S2N_OVERFLOW_TO_FLOAT);
       process = tem;
     }
-  else if (!NUMBERP (process))
+  else if (!FIXED_OR_FLOATP (process))
     process = get_process (process);
 
   if (NILP (process))
     return process;
 
-  if (NUMBERP (process))
+  if (FIXED_OR_FLOATP (process))
     CONS_TO_INTEGER (process, pid_t, pid);
   else
     {
@@ -6861,7 +6861,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name.  */)
         error ("Cannot signal process %s", SDATA (XPROCESS (process)->name));
     }
 
-  if (INTEGERP (sigcode))
+  if (FIXNUMP (sigcode))
     {
       CHECK_TYPE_RANGED_INTEGER (int, sigcode);
       signo = XINT (sigcode);
@@ -6878,7 +6878,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name.  */)
         error ("Undefined signal name %s", name);
     }
 
-  return make_number (kill (pid, signo));
+  return make_fixnum (kill (pid, signo));
 }
 
 DEFUN ("process-send-eof", Fprocess_send_eof, Sprocess_send_eof, 0, 1, 0,
@@ -7048,10 +7048,10 @@ handle_child_signal (int sig)
       if (! CONSP (head))
         continue;
       xpid = XCAR (head);
-      if (all_pids_are_fixnums ? INTEGERP (xpid) : NUMBERP (xpid))
+      if (all_pids_are_fixnums ? FIXNUMP (xpid) : FIXED_OR_FLOATP (xpid))
         {
           pid_t deleted_pid;
-          if (INTEGERP (xpid))
+          if (FIXNUMP (xpid))
             deleted_pid = XINT (xpid);
           else
             deleted_pid = XFLOAT_DATA (xpid);
@@ -7118,7 +7118,7 @@ exec_sentinel_error_handler (Lisp_Object error_val)
   cmd_error_internal (error_val, "error in process sentinel: ");
   Vinhibit_quit = Qt;
   update_echo_area ();
-  Fsleep_for (make_number (2), Qnil);
+  Fsleep_for (make_fixnum (2), Qnil);
   return Qt;
 }