Re: [PATCH v3] userdiff: Fix some corner cases in dts regex

2019-10-20 Thread Johannes Sixt
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 

-- Hannes


[PATCH v3] userdiff: Fix some corner cases in dts regex

2019-10-20 Thread Stephen Boyd
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 = ,
   ;

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 
Cc: Frank Rowand 
Signed-off-by: Stephen Boyd 
---

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 +-
 t/t4018/dts-root-comment |  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 ..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 ..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>;
diff --git a/t/t4018/dts-root-comment b/t/t4018/dts-root-comment
new file mode 100644
index ..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