* [PATCH v3] userdiff: Fix some corner cases in dts regex
@ 2019-10-20 18:52 Stephen Boyd
2019-10-20 19:54 ` Johannes Sixt
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Boyd @ 2019-10-20 18:52 UTC (permalink / raw)
To: git
Cc: Adrian Johnson, Johannes Sixt, Junio C Hamano, devicetree,
Rob Herring, Frank Rowand
While reviewing some dts diffs recently I noticed that the hunk header
logic was failing to find the containing node. This is because the regex
doesn't consider properties that may span multiple lines, i.e.
property = <something>,
<something_else>;
and it got hung up on comments inside nodes that look like the root node
because they start with '/*'. Add tests for these cases and update the
regex to find them. Maybe detecting the root node is too complicated but
forcing it to be a backslash with any amount of whitespace up to an open
bracket seemed OK. I tried to detect that a comment is in-between the
two parts but I wasn't happy so I just dropped it.
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
Changes from v2:
* Updated test to be really multiline.
Changes from v1:
* Added a new boolean property unit test
* Updated the regex to simplify multi-line property skipping
* Added some space to multieline prop test between cells in
first property
t/t4018/dts-nodes-boolean-prop | 9 +++++++++
t/t4018/dts-nodes-multiline-prop | 13 +++++++++++++
t/t4018/dts-root | 2 +-
| 8 ++++++++
userdiff.c | 3 ++-
5 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 t/t4018/dts-nodes-boolean-prop
create mode 100644 t/t4018/dts-nodes-multiline-prop
create mode 100644 t/t4018/dts-root-comment
diff --git a/t/t4018/dts-nodes-boolean-prop b/t/t4018/dts-nodes-boolean-prop
new file mode 100644
index 000000000000..afc6b5b404e4
--- /dev/null
+++ b/t/t4018/dts-nodes-boolean-prop
@@ -0,0 +1,9 @@
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 {
+ boolean-prop1;
+
+ ChangeMe;
+ };
+ };
+};
diff --git a/t/t4018/dts-nodes-multiline-prop b/t/t4018/dts-nodes-multiline-prop
new file mode 100644
index 000000000000..072d58b69dc2
--- /dev/null
+++ b/t/t4018/dts-nodes-multiline-prop
@@ -0,0 +1,13 @@
+/ {
+ label_1: node1@ff00 {
+ RIGHT@deadf00,4000 {
+ multilineprop = <3>,
+ <4>,
+ <5>,
+ <6>,
+ <7>;
+
+ ChangeMe = <0xffeedd00>;
+ };
+ };
+};
diff --git a/t/t4018/dts-root b/t/t4018/dts-root
index 2ef9e6ffaa2c..4353b8220c91 100644
--- a/t/t4018/dts-root
+++ b/t/t4018/dts-root
@@ -1,4 +1,4 @@
-/RIGHT { /* Technically just supposed to be a slash */
+/ { RIGHT /* Technically just supposed to be a slash and brace */
#size-cells = <1>;
ChangeMe = <0xffeedd00>;
--git a/t/t4018/dts-root-comment b/t/t4018/dts-root-comment
new file mode 100644
index 000000000000..333a625c7007
--- /dev/null
+++ b/t/t4018/dts-root-comment
@@ -0,0 +1,8 @@
+/ { RIGHT /* Technically just supposed to be a slash and brace */
+ #size-cells = <1>;
+
+ /* This comment should be ignored */
+
+ some-property = <40+2>;
+ ChangeMe = <0xffeedd00>;
+};
diff --git a/userdiff.c b/userdiff.c
index 86e3244e15dd..e187d356f6ff 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -25,8 +25,9 @@ IPATTERN("ada",
"|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
PATTERNS("dts",
"!;\n"
+ "!=\n"
/* lines beginning with a word optionally preceded by '&' or the root */
- "^[ \t]*((/|&?[a-zA-Z_]).*)",
+ "^[ \t]*((/[ \t]*\\{|&?[a-zA-Z_]).*)",
/* -- */
/* Property names and math operators */
"[a-zA-Z0-9,._+?#-]+"
--
Sent by a computer through tubes
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] userdiff: Fix some corner cases in dts regex
2019-10-20 18:52 [PATCH v3] userdiff: Fix some corner cases in dts regex Stephen Boyd
@ 2019-10-20 19:54 ` Johannes Sixt
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Sixt @ 2019-10-20 19:54 UTC (permalink / raw)
To: Stephen Boyd
Cc: git, Adrian Johnson, Junio C Hamano, devicetree, Rob Herring,
Frank Rowand
Am 20.10.19 um 20:52 schrieb Stephen Boyd:
> --- /dev/null
> +++ b/t/t4018/dts-nodes-multiline-prop
> @@ -0,0 +1,13 @@
> +/ {
> + label_1: node1@ff00 {
> + RIGHT@deadf00,4000 {
> + multilineprop = <3>,
> + <4>,
> + <5>,
> + <6>,
> + <7>;
There is little variation in the lines, but if that is what occurs in
real life, so be it.
This patch is good. Thanks!
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
-- Hannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-20 19:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-20 18:52 [PATCH v3] userdiff: Fix some corner cases in dts regex Stephen Boyd
2019-10-20 19:54 ` Johannes Sixt
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).