[Emacs-diffs] /srv/bzr/emacs/trunk r109001: Use XCAR and XCDR instead of Fcar and Fcdr where possible.

[Dmitry Antipov]

------------------------------------------------------------
revno: 109001
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-10 20:53:26 +0400
message:
  Use XCAR and XCDR instead of Fcar and Fcdr where possible.
  * admin/coccinelle/list_loop.cocci: Semantic patch to convert from Fcdr
  to XCDR and consistently use CONSP in the list iteration loops.
  * admin/coccinelle/vector_contents.cocci: Fix indentation.
  * src/callint.c, src/coding.c, src/doc.c, src/editfns.c, src/eval.c,
  * src/font.c, src/fontset.c, src/frame.c, src/gnutls.c, src/minibuf.c,
  * src/msdos.c, src/textprop.c, src/w32fns.c, src/w32menu.c, src/window.c,
  * src/xmenu.c: Changed to use XCAR and XCDR where argument type is known
  to be a Lisp_Cons.
added:
  admin/coccinelle/list_loop.cocci
modified:
  admin/ChangeLog
  admin/coccinelle/vector_contents.cocci
  src/ChangeLog
  src/callint.c
  src/coding.c
  src/doc.c
  src/editfns.c
  src/eval.c
  src/font.c
  src/fontset.c
  src/frame.c
  src/gnutls.c
  src/minibuf.c
  src/msdos.c
  src/textprop.c
  src/w32fns.c
  src/w32menu.c
  src/window.c
  src/xmenu.c

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2012-07-10 11:51:54 +0000
+++ b/admin/ChangeLog   2012-07-10 16:53:26 +0000
@@ -1,3 +1,9 @@
+2012-07-10  Dmitry Antipov  <address@hidden>
+
+       * coccinelle/list_loop.cocci: Semantic patch to convert from Fcdr
+       to XCDR and consistently use CONSP in the list iteration loops.
+       * coccinelle/vector_contents.cocci: Fix indentation.
+
 2012-07-10  Stefan Monnier  <address@hidden>
 
        * bzrmerge.el: Use cl-lib.

=== added file 'admin/coccinelle/list_loop.cocci'
--- a/admin/coccinelle/list_loop.cocci  1970-01-01 00:00:00 +0000
+++ b/admin/coccinelle/list_loop.cocci  2012-07-10 16:53:26 +0000
@@ -0,0 +1,19 @@
+// Omit redundant type check, consistently use CONSP.
+@@
+identifier A;
+expression X;
+statement S;
+@@
+(
+for (A = X; 
+- !NILP (A); 
++ CONSP (A);
+- A = Fcdr (A))
++ A = XCDR (A))
+S
+|
+for (A = X; CONSP (A);
+- A = Fcdr (A))
++ A = XCDR (A))
+S
+)

=== modified file 'admin/coccinelle/vector_contents.cocci'
--- a/admin/coccinelle/vector_contents.cocci    2012-06-24 16:18:41 +0000
+++ b/admin/coccinelle/vector_contents.cocci    2012-07-10 16:53:26 +0000
@@ -11,6 +11,6 @@
 - XVECTOR (I1)->contents[E1] = E2
 + ASET (I1, E1, E2)
 |
--XVECTOR (I1)->contents[E1]
-+AREF (I1, E1)
+- XVECTOR (I1)->contents[E1]
++ AREF (I1, E1)
 )

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-10 14:25:22 +0000
+++ b/src/ChangeLog     2012-07-10 16:53:26 +0000
@@ -1,3 +1,11 @@
+2012-07-10  Dmitry Antipov  <address@hidden>
+
+       Use XCAR and XCDR instead of Fcar and Fcdr where possible.
+       * callint.c, coding.c, doc.c, editfns.c, eval.c, font.c, fontset.c,
+       * frame.c, gnutls.c, minibuf.c, msdos.c, textprop.c, w32fns.c,
+       * w32menu.c, window.c, xmenu.c: Changed to use XCAR and XCDR
+       where argument type is known to be a Lisp_Cons.
+
 2012-07-10  Tom Tromey  <address@hidden>
 
        * bytecode.c (BYTE_CODE_THREADED): New macro.

=== modified file 'src/callint.c'
--- a/src/callint.c     2012-07-05 18:35:48 +0000
+++ b/src/callint.c     2012-07-10 16:53:26 +0000
@@ -205,7 +205,7 @@
              if (CONSP (elt))
                {
                  Lisp_Object presflag, carelt;
-                 carelt = Fcar (elt);
+                 carelt = XCAR (elt);
                  /* If it is (if X Y), look at Y.  */
                  if (EQ (carelt, Qif)
                      && EQ (Fnthcdr (make_number (3), elt), Qnil))

=== modified file 'src/coding.c'
--- a/src/coding.c      2012-07-10 08:43:46 +0000
+++ b/src/coding.c      2012-07-10 16:53:26 +0000
@@ -9791,7 +9791,7 @@
 
       val = args[coding_arg_ccl_valids];
       valids = Fmake_string (make_number (256), make_number (0));
-      for (tail = val; !NILP (tail); tail = Fcdr (tail))
+      for (tail = val; CONSP (tail); tail = XCDR (tail))
        {
          int from, to;
 
@@ -9892,7 +9892,7 @@
       CHECK_NUMBER_CDR (reg_usage);
 
       request = Fcopy_sequence (args[coding_arg_iso2022_request]);
-      for (tail = request; ! NILP (tail); tail = Fcdr (tail))
+      for (tail = request; CONSP (tail); tail = XCDR (tail))
        {
          int id;
          Lisp_Object tmp1;

=== modified file 'src/doc.c'
--- a/src/doc.c 2012-07-05 18:35:48 +0000
+++ b/src/doc.c 2012-07-10 16:53:26 +0000
@@ -381,7 +381,7 @@
     }
   else if (CONSP (fun))
     {
-      funcar = Fcar (fun);
+      funcar = XCAR (fun);
       if (!SYMBOLP (funcar))
        xsignal1 (Qinvalid_function, fun);
       else if (EQ (funcar, Qkeymap))

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2012-07-09 12:02:27 +0000
+++ b/src/editfns.c     2012-07-10 16:53:26 +0000
@@ -1915,7 +1915,7 @@
   tm.tm_isdst = -1;
 
   if (CONSP (zone))
-    zone = Fcar (zone);
+    zone = XCAR (zone);
   if (NILP (zone))
     {
       BLOCK_INPUT;

=== modified file 'src/eval.c'
--- a/src/eval.c        2012-07-05 18:35:48 +0000
+++ b/src/eval.c        2012-07-10 16:53:26 +0000
@@ -2070,8 +2070,8 @@
        error ("Lisp nesting exceeds `max-lisp-eval-depth'");
     }
 
-  original_fun = Fcar (form);
-  original_args = Fcdr (form);
+  original_fun = XCAR (form);
+  original_args = XCDR (form);
 
   backtrace.next = backtrace_list;
   backtrace_list = &backtrace;

=== modified file 'src/font.c'
--- a/src/font.c        2012-07-10 07:59:31 +0000
+++ b/src/font.c        2012-07-10 16:53:26 +0000
@@ -1827,7 +1827,7 @@
   CHECK_CONS (otf_features);
   CHECK_SYMBOL (XCAR (otf_features));
   otf_features = XCDR (otf_features);
-  for (val = Fcar (otf_features); ! NILP (val);  val = Fcdr (val))
+  for (val = Fcar (otf_features); CONSP (val); val = XCDR (val))
     {
       CHECK_SYMBOL (Fcar (val));
       if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
@@ -1835,7 +1835,7 @@
               SDATA (SYMBOL_NAME (XCAR (val))));
     }
   otf_features = XCDR (otf_features);
-  for (val = Fcar (otf_features); ! NILP (val);  val = Fcdr (val))
+  for (val = Fcar (otf_features); CONSP (val); val = XCDR (val))
     {
       CHECK_SYMBOL (Fcar (val));
       if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)

=== modified file 'src/fontset.c'
--- a/src/fontset.c     2012-07-10 08:43:46 +0000
+++ b/src/fontset.c     2012-07-10 16:53:26 +0000
@@ -1668,7 +1668,7 @@
       Fset_char_table_range (fontset, Qt, Qnil);
     }
 
-  for (; ! NILP (fontlist); fontlist = Fcdr (fontlist))
+  for (; CONSP (fontlist); fontlist = XCDR (fontlist))
     {
       Lisp_Object elt, script;
 

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-07-10 08:43:46 +0000
+++ b/src/frame.c       2012-07-10 16:53:26 +0000
@@ -2754,7 +2754,7 @@
   struct gcpro gcpro1, gcpro2;
 
   i = 0;
-  for (tail = alist; CONSP (tail); tail = Fcdr (tail))
+  for (tail = alist; CONSP (tail); tail = XCDR (tail))
     i++;
 
   parms = alloca (i * sizeof *parms);

=== modified file 'src/gnutls.c'
--- a/src/gnutls.c      2012-06-29 06:28:37 +0000
+++ b/src/gnutls.c      2012-07-10 16:53:26 +0000
@@ -871,7 +871,7 @@
       int file_format = GNUTLS_X509_FMT_PEM;
       Lisp_Object tail;
 
-      for (tail = trustfiles; !NILP (tail); tail = Fcdr (tail))
+      for (tail = trustfiles; CONSP (tail); tail = XCDR (tail))
        {
          Lisp_Object trustfile = Fcar (tail);
          if (STRINGP (trustfile))
@@ -893,7 +893,7 @@
            }
        }
 
-      for (tail = crlfiles; !NILP (tail); tail = Fcdr (tail))
+      for (tail = crlfiles; CONSP (tail); tail = XCDR (tail))
        {
          Lisp_Object crlfile = Fcar (tail);
          if (STRINGP (crlfile))
@@ -913,7 +913,7 @@
            }
        }
 
-      for (tail = keylist; !NILP (tail); tail = Fcdr (tail))
+      for (tail = keylist; CONSP (tail); tail = XCDR (tail))
        {
          Lisp_Object keyfile = Fcar (Fcar (tail));
          Lisp_Object certfile = Fcar (Fcdr (tail));

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2012-07-09 12:02:27 +0000
+++ b/src/minibuf.c     2012-07-10 16:53:26 +0000
@@ -425,7 +425,7 @@
       if (CONSP (initial))
        {
          Lisp_Object backup_n = Fcdr (initial);
-         initial = Fcar (initial);
+         initial = XCAR (initial);
          CHECK_STRING (initial);
          if (!NILP (backup_n))
            {

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2012-07-09 12:02:27 +0000
+++ b/src/msdos.c       2012-07-10 16:53:26 +0000
@@ -1618,7 +1618,7 @@
 
   /* Extract parm names and values into those vectors.  */
   i = 0;
-  for (tail = alist; CONSP (tail); tail = Fcdr (tail))
+  for (tail = alist; CONSP (tail); tail = XCDR (tail))
     {
       Lisp_Object elt;
 

=== modified file 'src/textprop.c'
--- a/src/textprop.c    2012-07-03 18:24:42 +0000
+++ b/src/textprop.c    2012-07-10 16:53:26 +0000
@@ -271,7 +271,7 @@
   /* Go through each element of LIST.  */
   for (tail1 = list; CONSP (tail1); tail1 = XCDR (tail1))
     {
-      sym = Fcar (tail1);
+      sym = XCAR (tail1);
 
       /* Go through i's plist, looking for tail1 */
       for (tail2 = i->plist; CONSP (tail2); tail2 = XCDR (XCDR (tail2)))

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2012-07-10 08:43:46 +0000
+++ b/src/w32fns.c      2012-07-10 16:53:26 +0000
@@ -678,7 +678,7 @@
       elt = XCAR (tail);
       if (!CONSP (elt)) continue;
 
-      tem = Fcar (elt);
+      tem = XCAR (elt);
 
       if (lstrcmpi (SDATA (tem), colorname) == 0)
        {

=== modified file 'src/w32menu.c'
--- a/src/w32menu.c     2012-06-16 12:24:15 +0000
+++ b/src/w32menu.c     2012-07-10 16:53:26 +0000
@@ -162,8 +162,7 @@
     }
   else if (CONSP (position))
     {
-      Lisp_Object tem;
-      tem = Fcar (position);
+      Lisp_Object tem = XCAR (position);
       if (CONSP (tem))
        window = Fcar (Fcdr (position));
       else

=== modified file 'src/window.c'
--- a/src/window.c      2012-07-06 05:07:44 +0000
+++ b/src/window.c      2012-07-10 16:53:26 +0000
@@ -4854,7 +4854,7 @@
   else
     {
       if (CONSP (arg))
-       arg = Fcar (arg);
+       arg = XCAR (arg);
       CHECK_NUMBER (arg);
       window_scroll (window, XINT (arg), 0, 1);
     }

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2012-07-05 18:35:48 +0000
+++ b/src/xmenu.c       2012-07-10 16:53:26 +0000
@@ -258,8 +258,7 @@
     }
   else if (CONSP (position))
     {
-      Lisp_Object tem;
-      tem = Fcar (position);
+      Lisp_Object tem = XCAR (position);
       if (CONSP (tem))
        window = Fcar (Fcdr (position));
       else