* [PATCH] coccinelle: misc: add excluded_middle.cocci script
@ 2020-09-02 15:18 ` Denis Efremov
0 siblings, 0 replies; 10+ messages in thread
From: Denis Efremov @ 2020-09-02 15:18 UTC (permalink / raw)
To: Julia Lawall; +Cc: Denis Efremov, cocci, linux-kernel
Check for "!A || A && B" condition. It's equivalent to
"!A || B" condition.
Signed-off-by: Denis Efremov <efremov@linux.com>
---
scripts/coccinelle/misc/excluded_middle.cocci | 40 +++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
new file mode 100644
index 000000000000..1b8c20f13966
--- /dev/null
+++ b/scripts/coccinelle/misc/excluded_middle.cocci
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-only
+///
+/// Condition "!A || A && B" is equalent to "!A || B".
+///
+// Confidence: High
+// Copyright: (C) 2020 Denis Efremov ISPRAS
+// Options: --no-includes --include-headers
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@r depends on !patch@
+expression A, B;
+position p;
+@@
+
+* !A || (A && B)@p
+
+@depends on patch@
+expression A, B;
+@@
+
+ !A ||
+- (A &&
+ B
+- )
+
+@script:python depends on report@
+p << r.p;
+@@
+
+coccilib.report.print_report(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
+
+@script:python depends on org@
+p << r.p;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Cocci] [PATCH] coccinelle: misc: add excluded_middle.cocci script
2020-09-02 15:18 ` Denis Efremov
@ 2020-09-02 15:23 ` Jim Davis
-1 siblings, 0 replies; 10+ messages in thread
From: Jim Davis @ 2020-09-02 15:23 UTC (permalink / raw)
To: Denis Efremov; +Cc: cocci, linux-kernel
On Wed, Sep 2, 2020 at 8:19 AM Denis Efremov <efremov@linux.com> wrote:
>
> Check for "!A || A && B" condition. It's equivalent to
> "!A || B" condition.
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
> ---
> scripts/coccinelle/misc/excluded_middle.cocci | 40 +++++++++++++++++++
> 1 file changed, 40 insertions(+)
> create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
>
> diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
> new file mode 100644
> index 000000000000..1b8c20f13966
> --- /dev/null
> +++ b/scripts/coccinelle/misc/excluded_middle.cocci
> @@ -0,0 +1,40 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +///
> +/// Condition "!A || A && B" is equalent to "!A || B".
s/equalent/equivalent/
> +///
> +// Confidence: High
> +// Copyright: (C) 2020 Denis Efremov ISPRAS
> +// Options: --no-includes --include-headers
> +
> +virtual patch
> +virtual context
> +virtual org
> +virtual report
> +
> +@r depends on !patch@
> +expression A, B;
> +position p;
> +@@
> +
> +* !A || (A && B)@p
> +
> +@depends on patch@
> +expression A, B;
> +@@
> +
> + !A ||
> +- (A &&
> + B
> +- )
> +
> +@script:python depends on report@
> +p << r.p;
> +@@
> +
> +coccilib.report.print_report(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
> +
> +@script:python depends on org@
> +p << r.p;
> +@@
> +
> +coccilib.org.print_todo(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
> --
> 2.26.2
>
> _______________________________________________
> Cocci mailing list
> Cocci@systeme.lip6.fr
> https://systeme.lip6.fr/mailman/listinfo/cocci
--
Jim
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Cocci] [PATCH] coccinelle: misc: add excluded_middle.cocci script
@ 2020-09-02 15:23 ` Jim Davis
0 siblings, 0 replies; 10+ messages in thread
From: Jim Davis @ 2020-09-02 15:23 UTC (permalink / raw)
To: Denis Efremov; +Cc: Julia Lawall, cocci, linux-kernel
On Wed, Sep 2, 2020 at 8:19 AM Denis Efremov <efremov@linux.com> wrote:
>
> Check for "!A || A && B" condition. It's equivalent to
> "!A || B" condition.
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
> ---
> scripts/coccinelle/misc/excluded_middle.cocci | 40 +++++++++++++++++++
> 1 file changed, 40 insertions(+)
> create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
>
> diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
> new file mode 100644
> index 000000000000..1b8c20f13966
> --- /dev/null
> +++ b/scripts/coccinelle/misc/excluded_middle.cocci
> @@ -0,0 +1,40 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +///
> +/// Condition "!A || A && B" is equalent to "!A || B".
s/equalent/equivalent/
> +///
> +// Confidence: High
> +// Copyright: (C) 2020 Denis Efremov ISPRAS
> +// Options: --no-includes --include-headers
> +
> +virtual patch
> +virtual context
> +virtual org
> +virtual report
> +
> +@r depends on !patch@
> +expression A, B;
> +position p;
> +@@
> +
> +* !A || (A && B)@p
> +
> +@depends on patch@
> +expression A, B;
> +@@
> +
> + !A ||
> +- (A &&
> + B
> +- )
> +
> +@script:python depends on report@
> +p << r.p;
> +@@
> +
> +coccilib.report.print_report(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
> +
> +@script:python depends on org@
> +p << r.p;
> +@@
> +
> +coccilib.org.print_todo(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
> --
> 2.26.2
>
> _______________________________________________
> Cocci mailing list
> Cocci@systeme.lip6.fr
> https://systeme.lip6.fr/mailman/listinfo/cocci
--
Jim
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Cocci] [PATCH] coccinelle: misc: add excluded_middle.cocci script
2020-09-02 15:18 ` Denis Efremov
@ 2020-09-04 20:39 ` Julia Lawall
-1 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2020-09-04 20:39 UTC (permalink / raw)
To: Denis Efremov; +Cc: cocci, linux-kernel
On Wed, 2 Sep 2020, Denis Efremov wrote:
> Check for "!A || A && B" condition. It's equivalent to
> "!A || B" condition.
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
> ---
> scripts/coccinelle/misc/excluded_middle.cocci | 40 +++++++++++++++++++
> 1 file changed, 40 insertions(+)
> create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
>
> diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
> new file mode 100644
> index 000000000000..1b8c20f13966
> --- /dev/null
> +++ b/scripts/coccinelle/misc/excluded_middle.cocci
> @@ -0,0 +1,40 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +///
> +/// Condition "!A || A && B" is equalent to "!A || B".
As was noted, there is a spelling mistake here.
> +///
> +// Confidence: High
> +// Copyright: (C) 2020 Denis Efremov ISPRAS
> +// Options: --no-includes --include-headers
> +
> +virtual patch
> +virtual context
> +virtual org
> +virtual report
> +
> +@r depends on !patch@
> +expression A, B;
> +position p;
> +@@
> +
> +* !A || (A && B)@p
In org mode, the token with the position variable gets highlighted in
color. It would be more meaningful to put the position variable on the &&
operator.
> +
> +@depends on patch@
> +expression A, B;
> +@@
> +
> + !A ||
> +- (A &&
> + B
> +- )
I found it better to say
- (A && B)
+ B
There are some cases where B should be moved one space to the left and by
removing B and adding it back again that will happen. I didn't see any
case where the result was less good.
> +@script:python depends on report@
> +p << r.p;
> +@@
> +
> +coccilib.report.print_report(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
> +
> +@script:python depends on org@
> +p << r.p;
> +@@
> +
> +coccilib.org.print_todo(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
I'm not sure that you need the word condition, but up to you.
julia
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] coccinelle: misc: add excluded_middle.cocci script
@ 2020-09-04 20:39 ` Julia Lawall
0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2020-09-04 20:39 UTC (permalink / raw)
To: Denis Efremov; +Cc: cocci, linux-kernel
On Wed, 2 Sep 2020, Denis Efremov wrote:
> Check for "!A || A && B" condition. It's equivalent to
> "!A || B" condition.
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
> ---
> scripts/coccinelle/misc/excluded_middle.cocci | 40 +++++++++++++++++++
> 1 file changed, 40 insertions(+)
> create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
>
> diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
> new file mode 100644
> index 000000000000..1b8c20f13966
> --- /dev/null
> +++ b/scripts/coccinelle/misc/excluded_middle.cocci
> @@ -0,0 +1,40 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +///
> +/// Condition "!A || A && B" is equalent to "!A || B".
As was noted, there is a spelling mistake here.
> +///
> +// Confidence: High
> +// Copyright: (C) 2020 Denis Efremov ISPRAS
> +// Options: --no-includes --include-headers
> +
> +virtual patch
> +virtual context
> +virtual org
> +virtual report
> +
> +@r depends on !patch@
> +expression A, B;
> +position p;
> +@@
> +
> +* !A || (A && B)@p
In org mode, the token with the position variable gets highlighted in
color. It would be more meaningful to put the position variable on the &&
operator.
> +
> +@depends on patch@
> +expression A, B;
> +@@
> +
> + !A ||
> +- (A &&
> + B
> +- )
I found it better to say
- (A && B)
+ B
There are some cases where B should be moved one space to the left and by
removing B and adding it back again that will happen. I didn't see any
case where the result was less good.
> +@script:python depends on report@
> +p << r.p;
> +@@
> +
> +coccilib.report.print_report(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
> +
> +@script:python depends on org@
> +p << r.p;
> +@@
> +
> +coccilib.org.print_todo(p[0], "WARNING condition !A || A && B is equivalent to !A || B")
I'm not sure that you need the word condition, but up to you.
julia
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Cocci] [PATCH v2] coccinelle: misc: add excluded_middle.cocci script
2020-09-02 15:18 ` Denis Efremov
@ 2020-09-21 15:28 ` Denis Efremov
-1 siblings, 0 replies; 10+ messages in thread
From: Denis Efremov @ 2020-09-21 15:28 UTC (permalink / raw)
To: Julia Lawall; +Cc: cocci, linux-kernel
Check for !A || A && B condition. It's equivalent to !A || B.
Signed-off-by: Denis Efremov <efremov@linux.com>
---
Changes in v2:
- spelling mistake fixed
- position variable moved on the && operator
- patch pattern changed to - (A && B)
- word "condition" removed from warning message
scripts/coccinelle/misc/excluded_middle.cocci | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
new file mode 100644
index 000000000000..ab28393e4843
--- /dev/null
+++ b/scripts/coccinelle/misc/excluded_middle.cocci
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0-only
+///
+/// Condition !A || A && B is equivalent to !A || B.
+///
+// Confidence: High
+// Copyright: (C) 2020 Denis Efremov ISPRAS
+// Options: --no-includes --include-headers
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@r depends on !patch@
+expression A, B;
+position p;
+@@
+
+* !A || (A &&@p B)
+
+@depends on patch@
+expression A, B;
+@@
+
+ !A ||
+- (A && B)
++ B
+
+@script:python depends on report@
+p << r.p;
+@@
+
+coccilib.report.print_report(p[0], "WARNING !A || A && B is equivalent to !A || B")
+
+@script:python depends on org@
+p << r.p;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING !A || A && B is equivalent to !A || B")
--
2.26.2
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v2] coccinelle: misc: add excluded_middle.cocci script
@ 2020-09-21 15:28 ` Denis Efremov
0 siblings, 0 replies; 10+ messages in thread
From: Denis Efremov @ 2020-09-21 15:28 UTC (permalink / raw)
To: Julia Lawall; +Cc: Denis Efremov, cocci, linux-kernel
Check for !A || A && B condition. It's equivalent to !A || B.
Signed-off-by: Denis Efremov <efremov@linux.com>
---
Changes in v2:
- spelling mistake fixed
- position variable moved on the && operator
- patch pattern changed to - (A && B)
- word "condition" removed from warning message
scripts/coccinelle/misc/excluded_middle.cocci | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
new file mode 100644
index 000000000000..ab28393e4843
--- /dev/null
+++ b/scripts/coccinelle/misc/excluded_middle.cocci
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0-only
+///
+/// Condition !A || A && B is equivalent to !A || B.
+///
+// Confidence: High
+// Copyright: (C) 2020 Denis Efremov ISPRAS
+// Options: --no-includes --include-headers
+
+virtual patch
+virtual context
+virtual org
+virtual report
+
+@r depends on !patch@
+expression A, B;
+position p;
+@@
+
+* !A || (A &&@p B)
+
+@depends on patch@
+expression A, B;
+@@
+
+ !A ||
+- (A && B)
++ B
+
+@script:python depends on report@
+p << r.p;
+@@
+
+coccilib.report.print_report(p[0], "WARNING !A || A && B is equivalent to !A || B")
+
+@script:python depends on org@
+p << r.p;
+@@
+
+coccilib.org.print_todo(p[0], "WARNING !A || A && B is equivalent to !A || B")
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Cocci] [PATCH v2] coccinelle: misc: add excluded_middle.cocci script
2020-09-21 15:28 ` Denis Efremov
@ 2020-09-21 17:47 ` Julia Lawall
-1 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2020-09-21 17:47 UTC (permalink / raw)
To: Denis Efremov; +Cc: cocci, linux-kernel
On Mon, 21 Sep 2020, Denis Efremov wrote:
> Check for !A || A && B condition. It's equivalent to !A || B.
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
Applied, thanks.
> ---
> Changes in v2:
> - spelling mistake fixed
> - position variable moved on the && operator
> - patch pattern changed to - (A && B)
> - word "condition" removed from warning message
>
> scripts/coccinelle/misc/excluded_middle.cocci | 39 +++++++++++++++++++
> 1 file changed, 39 insertions(+)
> create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
>
> diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
> new file mode 100644
> index 000000000000..ab28393e4843
> --- /dev/null
> +++ b/scripts/coccinelle/misc/excluded_middle.cocci
> @@ -0,0 +1,39 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +///
> +/// Condition !A || A && B is equivalent to !A || B.
> +///
> +// Confidence: High
> +// Copyright: (C) 2020 Denis Efremov ISPRAS
> +// Options: --no-includes --include-headers
> +
> +virtual patch
> +virtual context
> +virtual org
> +virtual report
> +
> +@r depends on !patch@
> +expression A, B;
> +position p;
> +@@
> +
> +* !A || (A &&@p B)
> +
> +@depends on patch@
> +expression A, B;
> +@@
> +
> + !A ||
> +- (A && B)
> ++ B
> +
> +@script:python depends on report@
> +p << r.p;
> +@@
> +
> +coccilib.report.print_report(p[0], "WARNING !A || A && B is equivalent to !A || B")
> +
> +@script:python depends on org@
> +p << r.p;
> +@@
> +
> +coccilib.org.print_todo(p[0], "WARNING !A || A && B is equivalent to !A || B")
> --
> 2.26.2
>
>
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] coccinelle: misc: add excluded_middle.cocci script
@ 2020-09-21 17:47 ` Julia Lawall
0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2020-09-21 17:47 UTC (permalink / raw)
To: Denis Efremov; +Cc: cocci, linux-kernel
On Mon, 21 Sep 2020, Denis Efremov wrote:
> Check for !A || A && B condition. It's equivalent to !A || B.
>
> Signed-off-by: Denis Efremov <efremov@linux.com>
Applied, thanks.
> ---
> Changes in v2:
> - spelling mistake fixed
> - position variable moved on the && operator
> - patch pattern changed to - (A && B)
> - word "condition" removed from warning message
>
> scripts/coccinelle/misc/excluded_middle.cocci | 39 +++++++++++++++++++
> 1 file changed, 39 insertions(+)
> create mode 100644 scripts/coccinelle/misc/excluded_middle.cocci
>
> diff --git a/scripts/coccinelle/misc/excluded_middle.cocci b/scripts/coccinelle/misc/excluded_middle.cocci
> new file mode 100644
> index 000000000000..ab28393e4843
> --- /dev/null
> +++ b/scripts/coccinelle/misc/excluded_middle.cocci
> @@ -0,0 +1,39 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +///
> +/// Condition !A || A && B is equivalent to !A || B.
> +///
> +// Confidence: High
> +// Copyright: (C) 2020 Denis Efremov ISPRAS
> +// Options: --no-includes --include-headers
> +
> +virtual patch
> +virtual context
> +virtual org
> +virtual report
> +
> +@r depends on !patch@
> +expression A, B;
> +position p;
> +@@
> +
> +* !A || (A &&@p B)
> +
> +@depends on patch@
> +expression A, B;
> +@@
> +
> + !A ||
> +- (A && B)
> ++ B
> +
> +@script:python depends on report@
> +p << r.p;
> +@@
> +
> +coccilib.report.print_report(p[0], "WARNING !A || A && B is equivalent to !A || B")
> +
> +@script:python depends on org@
> +p << r.p;
> +@@
> +
> +coccilib.org.print_todo(p[0], "WARNING !A || A && B is equivalent to !A || B")
> --
> 2.26.2
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread