coccinelle: misc: move constants to the right
Subsystems (2)
PATCH 1/1 coccinelle: misc: move constants to the right
Move constants to the right in binary operators.
Signed-off-by Julia Lawall <[email protected]>
--- scripts/coccinelle/misc/compare_const_fl.cocci | 171 +++++++++++++++++++++++++ 1 file changed, 171 insertions(+)
scripts/coccinelle/misc/compare_const_fl.cocci new file +171 -0
@@ -0,0 +1,171 @@ +/// Move constants to the right of binary operators. +//# Depends on personal taste in some cases. +/// +// Confidence: Moderate +// Copyright: (C) 2015 Copyright: (C) 2015 Julia Lawall, Inria. GPLv2. +// URL: http://coccinelle.lip6.fr/ +// Options: --no-includes --include-headers + +virtual patch +virtual context +virtual org +virtual report + + at r1 depends on patch && !context && !org && !report + disable bitor_comm, neg_if_exp@ +constant c,c1; +local idexpression i; +expression e,e1,e2; +binary operator b = {==,!=,&,|}; +type t; +@@ + +( +c b (c1) +| +sizeof(t) b e1 +| +sizeof e b e1 +| +i b e1 +| +c | e1 | e2 | ... +| +c | (e ? e1 : e2) +| +- c ++ e +b +- e ++ c +) + + at r2 depends on patch && !context && !org && !report + disable gtr_lss, gtr_lss_eq, not_int2@ +constant c,c1; +expression e,e1,e2; +binary operator b; +binary operator b1 = {<,<=},b2 = {<,<=}; +binary operator b3 = {>,>=},b4 = {>,>=}; +local idexpression i; +type t; +@@ + +( +c b c1 +| +sizeof(t) b e1 +| +sizeof e b e1 +| + (e1 b1 e) && (e b2 e2) +| + (e1 b3 e) && (e b4 e2) +| +i b e +| +- c < e ++ e > c +| +- c <= e ++ e >= c +| +- c > e ++ e < c +| +- c >= e ++ e <= c +) + +// ---------------------------------------------------------------------------- + + at r1_context depends on !patch && (context || org || report) + disable bitor_comm, neg_if_exp exists@ +type t; +binary operator b = {==,!=,&,|}; +constant c, c1; +expression e, e1, e2; +local idexpression i; +position j0; +@@ + +( +c b (c1) +| +sizeof(t) b e1 +| +sizeof e b e1 +| +i b e1 +| +c | e1 | e2 | ... +| +c | (e ? e1 : e2) +| +* c at j0 b e +) + +@r2_context depends on !patch && (context || org || report) + disable gtr_lss, gtr_lss_eq, not_int2 exists@ +type t; +binary operator b, b1 = {<,<=}, b2 = {<,<=}, b3 = {>,>=}, b4 = {>,>=}; +constant c, c1; +expression e, e1, e2; +local idexpression i; +position j0; +@@ + +( +c b c1 +| +sizeof(t) b e1 +| +sizeof e b e1 +| + (e1 b1 e) && (e b2 e2) +| + (e1 b3 e) && (e b4 e2) +| +i b e +| +* c at j0 < e +| +* c at j0 <= e +| +* c@j0 > e +| +* c at j0 >= e +) + +// ---------------------------------------------------------------------------- + + at script:python r1_org depends on org@ +j0 << r1_context.j0; +@@ + +msg = "Move constant to right." +coccilib.org.print_todo(j0[0], msg) + + at script:python r2_org depends on org@ +j0 << r2_context.j0; +@@ + +msg = "Move constant to right." +coccilib.org.print_todo(j0[0], msg) + +// ---------------------------------------------------------------------------- + + at script:python r1_report depends on report@ +j0 << r1_context.j0; +@@ + +msg = "Move constant to right." +coccilib.report.print_report(j0[0], msg) + +@script:python r2_report depends on report@ +j0 << r2_context.j0; +@@ + +msg = "Move constant to right." +coccilib.report.print_report(j0[0], msg) +
PATCH 1/1 coccinelle: misc: move constants to the right
Quoted 1 line · Julia Lawall
Move constants to the right in binary operators.
Thanks Julia.
I think this should be sent to lkml.
Does this manage to not move upper case identifiers that aren't constants?
{
int E = foo();
if (E < bar())
baz();
}var/julia/linuxcopy/scripts/coccinelle/misc/compare_const_fl.cocci
Quoted 1 line
var/julia/linuxcopy/scripts/coccinelle/misc/compare_const_fl.cocci +0
-0
[]
var/julia/linuxcopy/scripts/coccinelle/misc/compare_const_fl.cocci line 4
Quoted 6 lines
+++
b/scripts/coccinelle/misc/compare_const_fl.coccivar/julia/linuxcopy/scripts/coccinelle/misc/compare_const_fl.cocci +4
-0@@ -0,0 +1,171 @@ +/// Move constants to the right of binary operators. +//# Depends on personal taste in some cases. +/// +// Confidence: Moderate
If not, maybe some of the cases that don't work
well should be noted in the commit message and
perhaps here in the code comments as well.