Em Thu, 14 Aug 2025 09:40:33 -0600
Jonathan Corbet <corbet@xxxxxxx> escreveu:
> Simplify one gnarly regex and remove another altogether; add a comment
> describing what is going on. There will be no #-substituted commas in this
> case, so don't bother trying to put them back.
>
> Signed-off-by: Jonathan Corbet <corbet@xxxxxxx>
LGTM.
Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
> ---
> scripts/lib/kdoc/kdoc_parser.py | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/scripts/lib/kdoc/kdoc_parser.py b/scripts/lib/kdoc/kdoc_parser.py
> index 29881757bf1c..7f4d95dd47d4 100644
> --- a/scripts/lib/kdoc/kdoc_parser.py
> +++ b/scripts/lib/kdoc/kdoc_parser.py
> @@ -527,23 +527,21 @@ class KernelDoc:
> dtype = KernRe(r'([^\(]+\(\*?)\s*' + re.escape(param)).sub(r'\1', arg)
> self.push_parameter(ln, decl_type, param, dtype,
> arg, declaration_name)
> -
> + #
> + # The array-of-pointers case. Dig the parameter name out from the middle
> + # of the declaration.
> + #
> elif KernRe(r'\(.+\)\s*\[').search(arg):
> - # Array-of-pointers
> -
> - arg = arg.replace('#', ',')
> - r = KernRe(r'[^\(]+\(\s*\*\s*([\w\[\].]*?)\s*(\s*\[\s*[\w]+\s*\]\s*)*\)')
> + r = KernRe(r'[^\(]+\(\s*\*\s*' # Up to "(" and maybe "*"
> + r'([\w.]*?)' # The actual pointer name
> + r'\s*(\[\s*\w+\s*\]\s*)*\)') # The [array portion]
> if r.match(arg):
> param = r.group(1)
> else:
> self.emit_msg(ln, f"Invalid param: {arg}")
> param = arg
> -
> - dtype = KernRe(r'([^\(]+\(\*?)\s*' + re.escape(param)).sub(r'\1', arg)
> -
> - self.push_parameter(ln, decl_type, param, dtype,
> - arg, declaration_name)
> -
> + dtype = arg.replace(param, '')
> + self.push_parameter(ln, decl_type, param, dtype, arg, declaration_name)
> elif arg:
> #
> # Clean up extraneous spaces and split the string at commas; the first
Thanks,
Mauro
