From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Date: Tue, 1 Oct 2019 15:50:10 +0200 Values from expressions were occasionally assigned to local variables before they will be returned by the subsequent statement. Such expressions can be directly specified in the return statement instead. Adjust affected source code by the means of the semantic patch language (Coccinelle software). Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> --- v2: * Application of the SmPL construct “<+... … ...+>” * Addition of a hint for the supported coccicheck operation modes .../coccinelle/misc/move_code_to_return.cocci | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 scripts/coccinelle/misc/move_code_to_return.cocci diff --git a/scripts/coccinelle/misc/move_code_to_return.cocci b/scripts/coccinelle/misc/move_code_to_return.cocci new file mode 100644 index 000000000000..22ce7c9d0fd2 --- /dev/null +++ b/scripts/coccinelle/misc/move_code_to_return.cocci @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: GPL-2.0 +/// Return expressions directly instead of assigning them to +/// local variables immediately before affected statements. +// +// Keywords: return statements variable assignments coding style +// Confidence: Medium + +virtual patch +virtual report + +@replacement1 depends on patch@ +expression x; +identifier f, rc; +local idexpression lrc; +type rt; +@@ + rt f(...) + { + <+... + if (...) +-{ +-lrc@rc = x; + return +- rc ++ x + ; +-} + ...+> + } + +@replacement2 depends on patch@ +expression x; +identifier f, rc; +local idexpression lrc; +type rt; +@@ + rt f(...) + { + <+... +-lrc@rc = x; + return +- rc ++ x + ; + ...+> + } + +@deletion2 depends on patch@ +identifier replacement2.f, replacement2.rc; +type replacement2.rt, t; +@@ + rt f(...) + { + ... when any +-t rc; + ... when != rc + } + +@deletion1 depends on patch@ +identifier replacement1.f, replacement1.rc; +type replacement1.rt, t; +@@ + rt f(...) + { + ... when any +-t rc; + ... when != rc + } + +@script:python info depends on report@ +@@ +import sys +sys.stderr.write("INFO: Unfortunately, specific software limitations have got the consequence that only the operation mode “patch” can be supported by this SmPL script so far as expected.\n") -- 2.23.0