coccinelle: simplify the SD_JSON_BUILD_PAIR_* transformations

And also disable them on test-json.c, since there we use the macros
intentionally in a "non-optimal" way to actually test them.

diff --git a/coccinelle/sd_build_pair.cocci b/coccinelle/sd_build_pair.cocci
index f0724ef8241c0e2108914b74ff691b5f82a2ff8d..8c9af38cb2d1345dc5aa486db57cbceb9753b43f 100644 (file)
--- a/coccinelle/sd_build_pair.cocci
+++ b/coccinelle/sd_build_pair.cocci
@@ -1,26 +1,22 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 @@
+/* Disable this transformation on test-json.c */
+position p : script:python() { p[0].file != "src/test/test-json.c" };
 expression key, val;
 @@
-- SD_JSON_BUILD_PAIR(key, SD_JSON_BUILD_BOOLEAN(val))
+(
+- SD_JSON_BUILD_PAIR@p(key, SD_JSON_BUILD_BOOLEAN(val))
 + SD_JSON_BUILD_PAIR_BOOLEAN(key, val)
-@@
-expression key, val;
-@@
-- SD_JSON_BUILD_PAIR(key, SD_JSON_BUILD_INTEGER(val))
+|
+- SD_JSON_BUILD_PAIR@p(key, SD_JSON_BUILD_INTEGER(val))
 + SD_JSON_BUILD_PAIR_INTEGER(key, val)
-@@
-expression key, val;
-@@
-- SD_JSON_BUILD_PAIR(key, SD_JSON_BUILD_STRING(val))
+|
+- SD_JSON_BUILD_PAIR@p(key, SD_JSON_BUILD_STRING(val))
 + SD_JSON_BUILD_PAIR_STRING(key, val)
-@@
-expression key, val;
-@@
-- SD_JSON_BUILD_PAIR(key, SD_JSON_BUILD_UNSIGNED(val))
+|
+- SD_JSON_BUILD_PAIR@p(key, SD_JSON_BUILD_UNSIGNED(val))
 + SD_JSON_BUILD_PAIR_UNSIGNED(key, val)
-@@
-expression key, val;
-@@
-- SD_JSON_BUILD_PAIR(key, SD_JSON_BUILD_VARIANT(val))
+|
+- SD_JSON_BUILD_PAIR@p(key, SD_JSON_BUILD_VARIANT(val))
 + SD_JSON_BUILD_PAIR_VARIANT(key, val)
+)