diff options
| -rw-r--r-- | coccinelle/in_set.cocci | 51 | ||||
| -rw-r--r-- | coccinelle/not_in_set.cocci | 46 |
2 files changed, 30 insertions, 67 deletions
diff --git a/coccinelle/in_set.cocci b/coccinelle/in_set.cocci index 12d5475fd9..2c9b94ceb6 100644 --- a/coccinelle/in_set.cocci +++ b/coccinelle/in_set.cocci @@ -1,54 +1,37 @@ @@ 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 + 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 + 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 + 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 + 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 + 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 + IN_SET(e, n0, n1, n2, n3, n4) -@@ -expression e; -constant n0, n1, n2, n3; -@@ +| - e == n0 || e == n1 || e == n2 || e == n3 + IN_SET(e, n0, n1, n2, n3) -@@ -expression e; -constant n0, n1, n2; -@@ +| - e == n0 || e == n1 || e == n2 + IN_SET(e, n0, n1, n2) -@@ -expression e; -constant n0, n1; -@@ +| - e == n0 || e == n1 + IN_SET(e, n0, n1) +) diff --git a/coccinelle/not_in_set.cocci b/coccinelle/not_in_set.cocci index 7cf98500cd..aed2c3490c 100644 --- a/coccinelle/not_in_set.cocci +++ b/coccinelle/not_in_set.cocci @@ -1,54 +1,34 @@ @@ 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 + !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 + !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 + !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 + !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 + !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 + !IN_SET(e, n0, n1, n2, n3, n4) -@@ -expression e; -constant n0, n1, n2, n3; -@@ +| - e != n0 && e != n1 && e != n2 && e != n3 + !IN_SET(e, n0, n1, n2, n3) -@@ -expression e; -constant n0, n1, n2; -@@ +| - e != n0 && e != n1 && e != n2 + !IN_SET(e, n0, n1, n2) -@@ -expression e; -constant n0, n1; -@@ +| - e != n0 && e != n1 + !IN_SET(e, n0, n1) +) |