userdiff: fix some corner cases in dts regex

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>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4018/dts-nodes-boolean-prop b/t/t4018/dts-nodes-boolean-prop
new file mode 100644 (file)
index 0000000..afc6b5b
--- /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 (file)
index 0000000..072d58b
--- /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 2ef9e6ffaa2ca9a1343bc7481562467fa0683b08..4353b8220c9160860fc9432d7abc55da19de07d2 100644 (file)
--- 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 (file)
index 0000000..333a625
--- /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 86e3244e15ddc8beaf2fc6e6a0b4b0767c87f96c..e187d356f6fff746547f14129cbe7668e11b4adb 100644 (file)
--- 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,._+?#-]+"