]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
scripts: kernel-doc: support in-line comments on nested structs/unions
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 16 Feb 2018 13:48:18 +0000 (11:48 -0200)
committerJonathan Corbet <corbet@lwn.net>
Sun, 18 Feb 2018 23:55:03 +0000 (16:55 -0700)
The parser at kernel-doc rejects names with dots in the middle.
Fix it, in order to support nested structs/unions.

Tested-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
scripts/kernel-doc

index a6a9a8ef116c97f0f273ebf4f8f8a5524009161a..dc68d76f21abc6a405a72aa83dbfb4a77de4ef1a 100755 (executable)
@@ -363,7 +363,7 @@ my $doc_sect = $doc_com .
 my $doc_content = $doc_com_body . '(.*)';
 my $doc_block = $doc_com . 'DOC:\s*(.*)?';
 my $doc_inline_start = '^\s*/\*\*\s*$';
-my $doc_inline_sect = '\s*\*\s*(@[\w\s]+):(.*)';
+my $doc_inline_sect = '\s*\*\s*(@\s*[\w][\w\.]*\s*):(.*)';
 my $doc_inline_end = '^\s*\*/\s*$';
 my $doc_inline_oneline = '^\s*/\*\*\s*(@[\w\s]+):\s*(.*)\s*\*/\s*$';
 my $export_symbol = '^\s*EXPORT_SYMBOL(_GPL)?\s*\(\s*(\w+)\s*\)\s*;';