From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63CD3C4363A for ; Tue, 13 Oct 2020 11:54:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B3712222F for ; Tue, 13 Oct 2020 11:54:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602590092; bh=WH7NQxltJQ8vKrUjPm4oW9OKV59fzbWXlQA+seUql9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Sa2rmXCE+q+o9r+R/Cb1KWA0LKbNKdn5z7k6nohFztt3bHQO2am9tFnsO2SZAXFoK lbQZMoXnLs/ayRo0ZESsQsPOkr6WxetPl08nUMio3GDvr3DQmSxiJ24IFu+u39O/KW uRxoZ7lM3c+NN9vUTZXK6Aq4XHh17Ndbss2/niss= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727684AbgJMLyt (ORCPT ); Tue, 13 Oct 2020 07:54:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:57146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727302AbgJMLyk (ORCPT ); Tue, 13 Oct 2020 07:54:40 -0400 Received: from mail.kernel.org (ip5f5ad5b2.dynamic.kabel-deutschland.de [95.90.213.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 82A9B21582; Tue, 13 Oct 2020 11:54:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602590079; bh=WH7NQxltJQ8vKrUjPm4oW9OKV59fzbWXlQA+seUql9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WdCyIDanYltgh5iY2S9O/jR/JqiaBmzvhMxekMDWHtnUZsW1iUlyiv3DbhHj4b3OD YTiT3ruV42gBo9rnghqzypStJ4io0VSw/Xh2+QqhnhBnmybdduElwGUqQwXAOCk4QS ZaIbufuXA3blaJNSibzOjsNEYchT/QEVrKEfnjTI= Received: from mchehab by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1kSIt3-006CT5-3x; Tue, 13 Oct 2020 13:54:37 +0200 From: Mauro Carvalho Chehab To: Linux Doc Mailing List Cc: Mauro Carvalho Chehab , "David S. Miller" , "Jonathan Corbet" , Andrew Lunn , linux-kernel@vger.kernel.org Subject: [PATCH v6 01/80] scripts: kernel-doc: add support for typedef enum Date: Tue, 13 Oct 2020 13:53:16 +0200 Message-Id: <2a2ef251d948cda935689473359fe0da8bb9713e.1602589096.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PHY kernel-doc markup has gained support for documenting a typedef enum. However, right now the parser was not prepared for it. So, add support for parsing it. Fixes: 4069a572d423 ("net: phy: Document core PHY structures") Signed-off-by: Mauro Carvalho Chehab --- scripts/kernel-doc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/kernel-doc b/scripts/kernel-doc index 724528f4b7d6..adc05406c68e 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -1265,14 +1265,22 @@ sub show_warnings($$) { sub dump_enum($$) { my $x = shift; my $file = shift; + my $members; + $x =~ s@/\*.*?\*/@@gos; # strip comments. # strip #define macros inside enums $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos; - if ($x =~ /enum\s+(\w*)\s*\{(.*)\}/) { + if ($x =~ /typedef\s+enum\s*\{(.*)\}\s*(\w*)\s*;/) { + $declaration_name = $2; + $members = $1; + } elsif ($x =~ /enum\s+(\w*)\s*\{(.*)\}/) { $declaration_name = $1; - my $members = $2; + $members = $2; + } + + if ($declaration_name) { my %_members; $members =~ s/\s+$//; @@ -1307,8 +1315,7 @@ sub dump_enum($$) { 'sections' => \%sections, 'purpose' => $declaration_purpose }); - } - else { + } else { print STDERR "${file}:$.: error: Cannot parse enum!\n"; ++$errors; } -- 2.26.2