userdiff: Fix some corner cases in dts regex
PATCH v2 1/1 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.
---
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 | 14 ++++++++++++++ t/t4018/dts-root | 2 +- t/t4018/dts-root-comment | 8 ++++++++ userdiff.c | 3 ++- 5 files changed, 34 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
t/t4018/dts-nodes-boolean-prop new file +9 -0
@@ -0,0 +1,9 @@ +/ { + label_1: node1@ff00 { + RIGHT@deadf00,4000 { + boolean-prop1; + + ChangeMe; + }; + }; +};
t/t4018/dts-nodes-multiline-prop new file +14 -0
@@ -0,0 +1,14 @@ +/ { + label_1: node1@ff00 { + RIGHT@deadf00,4000 { + multilineprop = <3>, + + + <4>; + + + + ChangeMe = <0xffeedd00>; + }; + }; +};
t/t4018/dts-root +1 -1
@@ -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>;
t/t4018/dts-root-comment new file +8 -0
@@ -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>; +};
userdiff.c +2 -1
@@ -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,._+?#-]+"
Signature · 1 line
Sent by a computer through tubes
[Removed bouncing addresses of Matthieu Moy and William Duclot from Cc]
Am 16.10.19 um 22:32 schrieb Stephen Boyd:
t/t4018/dts-nodes-multiline-prop line 7
Quoted 13 lines
t/t4018/dts-nodes-multiline-prop new file +7
-0@@ -0,0 +1,14 @@ +/ { + label_1: node1@ff00 { + RIGHT@deadf00,4000 { + multilineprop = <3>, + + + <4>;
I was actually thinking about something like
multilineprop = <3>, <0xabcd>, "text", name, <4>;
or something like that -- whatever occurs in the real world.
t/t4018/dts-nodes-multiline-prop line 14
Quoted 7 lines
t/t4018/dts-nodes-multiline-prop new file +7
-0+ + + + ChangeMe = <0xffeedd00>; + }; + }; +};
Apart from that, the patch looks good.
-- Hannes
Quoting Johannes Sixt (2019-10-16 14:10:09)
Quoted 19 lines
[Removed bouncing addresses of Matthieu Moy and William Duclot from Cc]
Am 16.10.19 um 22:32 schrieb Stephen Boyd:
t/t4018/dts-nodes-multiline-prop line 7
Quoted 13 lines
t/t4018/dts-nodes-multiline-prop new file +7
-0@@ -0,0 +1,14 @@ +/ { + label_1: node1@ff00 { + RIGHT@deadf00,4000 { + multilineprop = <3>, + + + <4>;I was actually thinking about something like
Quoted 8 lines
multilineprop = <3>, <0xabcd>, "text", name, <4>;or something like that -- whatever occurs in the real world.
Ok sure. I can have a list of numbers that spans four or five lines.
Quoted 10 lines
t/t4018/dts-nodes-multiline-prop line 14
Quoted 7 lines
t/t4018/dts-nodes-multiline-prop new file +7
-0+ + + + ChangeMe = <0xffeedd00>; + }; + }; +};Apart from that, the patch looks good.
Cool. I'll resend.