coccinelle: exclude JsonVariant* from the IN_SET transformation

JsonVariant* doesn't work with the current IN_SET implementation, so
let's exclude it from the transformation altogether
This commit is contained in:
Frantisek Sumsal 2019-04-29 13:15:27 +02:00
parent ed0cb34682
commit 1f72479037
2 changed files with 29 additions and 66 deletions

View file

@ -1,54 +1,37 @@
@@ @@
expression e; expression e;
constant n0, n1, n2, n3, n4, n5, n6, n7, n8, n9; /* Exclude JsonVariant * from the transformation, as it can't work with the
* current version of the IN_SET macro */
typedef JsonVariant;
type T != JsonVariant*;
constant T n0, n1, n2, n3, n4, n5, n6, n7, n8, n9;
@@ @@
(
- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8 || e == n9 - e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8 || e == n9
+ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9) + IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5, n6, n7, n8;
@@
- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8 - e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 || e == n8
+ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8) + IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5, n6, n7;
@@
- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7 - e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 || e == n7
+ IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7) + IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5, n6;
@@
- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6 - e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 || e == n6
+ IN_SET(e, n0, n1, n2, n3, n4, n5, n6) + IN_SET(e, n0, n1, n2, n3, n4, n5, n6)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5;
@@
- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5 - e == n0 || e == n1 || e == n2 || e == n3 || e == n4 || e == n5
+ IN_SET(e, n0, n1, n2, n3, n4, n5) + IN_SET(e, n0, n1, n2, n3, n4, n5)
@@ |
expression e;
constant n0, n1, n2, n3, n4;
@@
- e == n0 || e == n1 || e == n2 || e == n3 || e == n4 - e == n0 || e == n1 || e == n2 || e == n3 || e == n4
+ IN_SET(e, n0, n1, n2, n3, n4) + IN_SET(e, n0, n1, n2, n3, n4)
@@ |
expression e;
constant n0, n1, n2, n3;
@@
- e == n0 || e == n1 || e == n2 || e == n3 - e == n0 || e == n1 || e == n2 || e == n3
+ IN_SET(e, n0, n1, n2, n3) + IN_SET(e, n0, n1, n2, n3)
@@ |
expression e;
constant n0, n1, n2;
@@
- e == n0 || e == n1 || e == n2 - e == n0 || e == n1 || e == n2
+ IN_SET(e, n0, n1, n2) + IN_SET(e, n0, n1, n2)
@@ |
expression e;
constant n0, n1;
@@
- e == n0 || e == n1 - e == n0 || e == n1
+ IN_SET(e, n0, n1) + IN_SET(e, n0, n1)
)

View file

@ -1,54 +1,34 @@
@@ @@
expression e; expression e;
constant n0, n1, n2, n3, n4, n5, n6, n7, n8, n9; typedef JsonVariant;
type T != JsonVariant*;
constant T n0, n1, n2, n3, n4, n5, n6, n7, n8, n9;
@@ @@
(
- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9
+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9) + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5, n6, n7, n8;
@@
- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8
+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8) + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5, n6, n7;
@@
- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7
+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7) + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5, n6;
@@
- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6
+ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6) + !IN_SET(e, n0, n1, n2, n3, n4, n5, n6)
@@ |
expression e;
constant n0, n1, n2, n3, n4, n5;
@@
- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5
+ !IN_SET(e, n0, n1, n2, n3, n4, n5) + !IN_SET(e, n0, n1, n2, n3, n4, n5)
@@ |
expression e;
constant n0, n1, n2, n3, n4;
@@
- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 - e != n0 && e != n1 && e != n2 && e != n3 && e != n4
+ !IN_SET(e, n0, n1, n2, n3, n4) + !IN_SET(e, n0, n1, n2, n3, n4)
@@ |
expression e;
constant n0, n1, n2, n3;
@@
- e != n0 && e != n1 && e != n2 && e != n3 - e != n0 && e != n1 && e != n2 && e != n3
+ !IN_SET(e, n0, n1, n2, n3) + !IN_SET(e, n0, n1, n2, n3)
@@ |
expression e;
constant n0, n1, n2;
@@
- e != n0 && e != n1 && e != n2 - e != n0 && e != n1 && e != n2
+ !IN_SET(e, n0, n1, n2) + !IN_SET(e, n0, n1, n2)
@@ |
expression e;
constant n0, n1;
@@
- e != n0 && e != n1 - e != n0 && e != n1
+ !IN_SET(e, n0, n1) + !IN_SET(e, n0, n1)
)