diff options
| author | Dmitry Antipov | 2012-07-10 20:53:26 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-07-10 20:53:26 +0400 |
| commit | 7d7bbefd049fc22cf3bf333592abf57a3bde8766 (patch) | |
| tree | ab416b8873bb2c77a6d247b1c65a94ec5d274d3b /admin | |
| parent | 3a4c8000fba422ac9d005d29ad0c5d8becc58167 (diff) | |
| download | emacs-7d7bbefd049fc22cf3bf333592abf57a3bde8766.tar.gz emacs-7d7bbefd049fc22cf3bf333592abf57a3bde8766.zip | |
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.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 6 | ||||
| -rw-r--r-- | admin/coccinelle/list_loop.cocci | 19 | ||||
| -rw-r--r-- | admin/coccinelle/vector_contents.cocci | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 6c5b1342d32..3a71c1c8d78 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-07-10 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * coccinelle/list_loop.cocci: Semantic patch to convert from Fcdr | ||
| 4 | to XCDR and consistently use CONSP in the list iteration loops. | ||
| 5 | * coccinelle/vector_contents.cocci: Fix indentation. | ||
| 6 | |||
| 1 | 2012-07-10 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2012-07-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * bzrmerge.el: Use cl-lib. | 9 | * bzrmerge.el: Use cl-lib. |
diff --git a/admin/coccinelle/list_loop.cocci b/admin/coccinelle/list_loop.cocci new file mode 100644 index 00000000000..89f0bfff7b3 --- /dev/null +++ b/admin/coccinelle/list_loop.cocci | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | // Omit redundant type check, consistently use CONSP. | ||
| 2 | @@ | ||
| 3 | identifier A; | ||
| 4 | expression X; | ||
| 5 | statement S; | ||
| 6 | @@ | ||
| 7 | ( | ||
| 8 | for (A = X; | ||
| 9 | - !NILP (A); | ||
| 10 | + CONSP (A); | ||
| 11 | - A = Fcdr (A)) | ||
| 12 | + A = XCDR (A)) | ||
| 13 | S | ||
| 14 | | | ||
| 15 | for (A = X; CONSP (A); | ||
| 16 | - A = Fcdr (A)) | ||
| 17 | + A = XCDR (A)) | ||
| 18 | S | ||
| 19 | ) | ||
diff --git a/admin/coccinelle/vector_contents.cocci b/admin/coccinelle/vector_contents.cocci index beebc2d2089..3c696ffd237 100644 --- a/admin/coccinelle/vector_contents.cocci +++ b/admin/coccinelle/vector_contents.cocci | |||
| @@ -11,6 +11,6 @@ expression E1, E2; | |||
| 11 | - XVECTOR (I1)->contents[E1] = E2 | 11 | - XVECTOR (I1)->contents[E1] = E2 |
| 12 | + ASET (I1, E1, E2) | 12 | + ASET (I1, E1, E2) |
| 13 | | | 13 | | |
| 14 | -XVECTOR (I1)->contents[E1] | 14 | - XVECTOR (I1)->contents[E1] |
| 15 | +AREF (I1, E1) | 15 | + AREF (I1, E1) |
| 16 | ) | 16 | ) |