All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH 27/29] scripts: kernel-doc: fix typedef parsing
Date: Tue, 17 Nov 2020 17:53:10 +0100	[thread overview]
Message-ID: <20201117165312.118257-28-pbonzini@redhat.com> (raw)
In-Reply-To: <20201117165312.118257-1-pbonzini@redhat.com>

From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

The include/linux/genalloc.h file defined this typedef:

	typedef unsigned long (*genpool_algo_t)(unsigned long *map,unsigned long size,unsigned long start,unsigned int nr,void *data, struct gen_pool *pool, unsigned long start_addr);

Because it has a type composite of two words (unsigned long),
the parser gets the typedef name wrong:

.. c:macro:: long

   **Typedef**: Allocation callback function type definition

Fix the regex in order to accept composite types when
defining a typedef for a function pointer.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/328e8018041cc44f7a1684e57f8d111230761c4f.1603792384.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/kernel-doc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index d3a289628c..862b77686e 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1434,13 +1434,14 @@ sub dump_typedef($$) {
     $x =~ s@/\*.*?\*/@@gos;	# strip comments.
 
     # Parse function prototypes
-    if ($x =~ /typedef\s+(\w+)\s*\(\*\s*(\w\S+)\s*\)\s*\((.*)\);/ ||
-	$x =~ /typedef\s+(\w+)\s*(\w\S+)\s*\s*\((.*)\);/) {
+    if ($x =~ /typedef((?:\s+[\w\*]+){1,8})\s*\(\*?\s*(\w\S+)\s*\)\s*\((.*)\);/ ||
+	$x =~ /typedef((?:\s+[\w\*]+\s+){1,8})\s*\*?(\w\S+)\s*\s*\((.*)\);/) {
 
 	# Function typedefs
 	$return_type = $1;
 	$declaration_name = $2;
 	my $args = $3;
+	$return_type =~ s/^\s+//;
 
 	create_parameterlist($args, ',', $file, $declaration_name);
 
-- 
2.28.0




  parent reply	other threads:[~2020-11-17 17:03 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-17 16:52 [RFC PATCH 00/29] kernel-doc: update from Linux 5.10 Paolo Bonzini
2020-11-17 16:52 ` [PATCH 01/29] kernel-doc: fix processing nested structs with attributes Paolo Bonzini
2020-11-17 16:52 ` [PATCH 02/29] kernel-doc: add support for ____cacheline_aligned_in_smp attribute Paolo Bonzini
2020-11-17 16:52 ` [PATCH 03/29] scripts/kernel-doc: Add support for named variable macro arguments Paolo Bonzini
2020-11-17 16:52 ` [PATCH 04/29] scripts: kernel-doc: proper handle @foo->bar() Paolo Bonzini
2020-11-17 16:52 ` [PATCH 05/29] scripts: kernel-doc: accept negation like !@var Paolo Bonzini
2020-11-17 16:52 ` [PATCH 06/29] scripts: kernel-doc: accept blank lines on parameter description Paolo Bonzini
2020-11-17 16:52 ` [PATCH 07/29] Replace HTTP links with HTTPS ones: documentation Paolo Bonzini
2020-11-17 16:52 ` [PATCH 08/29] scripts/kernel-doc: parse __ETHTOOL_DECLARE_LINK_MODE_MASK Paolo Bonzini
2020-11-17 16:52 ` [PATCH 09/29] scripts/kernel-doc: handle function pointer prototypes Paolo Bonzini
2020-11-17 16:52 ` [PATCH 10/29] scripts/kernel-doc: optionally treat warnings as errors Paolo Bonzini
2020-11-17 16:52 ` [PATCH 11/29] kernel-doc: include line numbers for function prototypes Paolo Bonzini
2020-11-17 16:52 ` [PATCH 12/29] kernel-doc: add support for ____cacheline_aligned attribute Paolo Bonzini
2020-11-17 16:52 ` [PATCH 13/29] scripts: kernel-doc: add support for typedef enum Paolo Bonzini
2020-11-17 16:52 ` [PATCH 14/29] Revert "scripts/kerneldoc: For Sphinx 3 use c:macro for macros with arguments" Paolo Bonzini
2020-11-17 16:52 ` [PATCH 15/29] Revert "kernel-doc: Use c:struct for Sphinx 3.0 and later" Paolo Bonzini
2020-11-17 16:52 ` [PATCH 16/29] scripts: kernel-doc: make it more compatible with Sphinx 3.x Paolo Bonzini
2020-11-17 16:53 ` [PATCH 17/29] scripts: kernel-doc: use a less pedantic markup for funcs on " Paolo Bonzini
2020-11-17 16:53 ` [PATCH 18/29] scripts: kernel-doc: fix troubles with line counts Paolo Bonzini
2020-11-17 16:53 ` [PATCH 19/29] scripts: kernel-doc: reimplement -nofunction argument Paolo Bonzini
2020-11-17 16:53 ` [PATCH 20/29] scripts: kernel-doc: fix typedef identification Paolo Bonzini
2020-11-17 16:53 ` [PATCH 21/29] scripts: kernel-doc: don't mangle with parameter list Paolo Bonzini
2020-11-17 16:53 ` [PATCH 22/29] scripts: kernel-doc: allow passing desired Sphinx C domain dialect Paolo Bonzini
2020-11-17 16:53 ` [PATCH 23/29] scripts: kernel-doc: fix line number handling Paolo Bonzini
2020-11-17 16:53 ` [PATCH 24/29] scripts: kernel-doc: try to use c:function if possible Paolo Bonzini
2020-11-17 16:53 ` [PATCH 25/29] Revert "kernel-doc: Handle function typedefs without asterisks" Paolo Bonzini
2020-11-17 16:53 ` [PATCH 26/29] Revert "kernel-doc: Handle function typedefs that return pointers" Paolo Bonzini
2020-11-17 16:53 ` Paolo Bonzini [this message]
2020-11-17 16:53 ` [PATCH 28/29] scripts: kernel-doc: split typedef complex regex Paolo Bonzini
2020-11-17 16:53 ` [PATCH 29/29] scripts: kernel-doc: use :c:union when needed Paolo Bonzini
2020-11-30 11:28 ` [RFC PATCH 00/29] kernel-doc: update from Linux 5.10 Peter Maydell
2020-11-30 11:59   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201117165312.118257-28-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.