[PATCH v1] kernel-doc: Allow anonymous enum

[PATCH v1] kernel-doc: Allow anonymous enum

[Andy Shevchenko]

In C is a valid construction to have an anonymous enumerator.

Though we have now:

  drivers/pinctrl/intel/pinctrl-intel.c:240: error: Cannot parse enum!

Support it in the kernel-doc script.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 scripts/kernel-doc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 6b03012750da..079502bcc5a3 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1245,7 +1245,7 @@ sub dump_enum($$) {
     # strip #define macros inside enums
     $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
 
-    if ($x =~ /enum\s+(\w+)\s*\{(.*)\}/) {
+    if ($x =~ /enum\s+(\w*)\s*\{(.*)\}/) {
 	$declaration_name = $1;
 	my $members = $2;
 	my %_members;
-- 
2.20.1

Re: [PATCH v1] kernel-doc: Allow anonymous enum

[Jonathan Corbet]

On Mon, 12 Aug 2019 19:06:31 +0300
Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:

> In C is a valid construction to have an anonymous enumerator.
> 
> Though we have now:
> 
>   drivers/pinctrl/intel/pinctrl-intel.c:240: error: Cannot parse enum!
> 
> Support it in the kernel-doc script.

So I don't get this error; I guess the only anonymous enum of interest has
yet to find its way into the mainline.

> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  scripts/kernel-doc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/kernel-doc b/scripts/kernel-doc
> index 6b03012750da..079502bcc5a3 100755
> --- a/scripts/kernel-doc
> +++ b/scripts/kernel-doc
> @@ -1245,7 +1245,7 @@ sub dump_enum($$) {
>      # strip #define macros inside enums
>      $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
>  
> -    if ($x =~ /enum\s+(\w+)\s*\{(.*)\}/) {
> +    if ($x =~ /enum\s+(\w*)\s*\{(.*)\}/) {

Ah the joy of regexes...

Applied, thanks.

jon

Re: [PATCH v1] kernel-doc: Allow anonymous enum

[Andy Shevchenko]

On Mon, Aug 12, 2019 at 03:13:17PM -0600, Jonathan Corbet wrote:
> On Mon, 12 Aug 2019 19:06:31 +0300
> Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> 
> > In C is a valid construction to have an anonymous enumerator.
> > 
> > Though we have now:
> > 
> >   drivers/pinctrl/intel/pinctrl-intel.c:240: error: Cannot parse enum!
> > 
> > Support it in the kernel-doc script.
> 
> So I don't get this error; I guess the only anonymous enum of interest has
> yet to find its way into the mainline.

The other one is already in mainline (drivers/remoteproc/omap_remoteproc.h),
but suddenly it misses the second * in the header of kernel-doc comment
(perhaps to avoid above error, or for another reason).

> 
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > ---
> >  scripts/kernel-doc | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/scripts/kernel-doc b/scripts/kernel-doc
> > index 6b03012750da..079502bcc5a3 100755
> > --- a/scripts/kernel-doc
> > +++ b/scripts/kernel-doc
> > @@ -1245,7 +1245,7 @@ sub dump_enum($$) {
> >      # strip #define macros inside enums
> >      $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
> >  
> > -    if ($x =~ /enum\s+(\w+)\s*\{(.*)\}/) {
> > +    if ($x =~ /enum\s+(\w*)\s*\{(.*)\}/) {
> 
> Ah the joy of regexes...
> 
> Applied, thanks.

Thanks!

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v1] kernel-doc: Allow anonymous enum

[Andy Shevchenko]

On Tue, Aug 13, 2019 at 03:19:12PM +0300, Andy Shevchenko wrote:
> On Mon, Aug 12, 2019 at 03:13:17PM -0600, Jonathan Corbet wrote:
> > On Mon, 12 Aug 2019 19:06:31 +0300
> > Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> > 
> > > In C is a valid construction to have an anonymous enumerator.
> > > 
> > > Though we have now:
> > > 
> > >   drivers/pinctrl/intel/pinctrl-intel.c:240: error: Cannot parse enum!
> > > 
> > > Support it in the kernel-doc script.
> > 
> > So I don't get this error; I guess the only anonymous enum of interest has
> > yet to find its way into the mainline.
> 
> The other one is already in mainline (drivers/remoteproc/omap_remoteproc.h),
> but suddenly it misses the second * in the header of kernel-doc comment
> (perhaps to avoid above error, or for another reason).

Actually more without full description

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h:186:

Or with format which messes name with description

drivers/misc/mic/cosm/cosm_main.h:19:
include/linux/amba/pl022.h:166:

Or above variants together

drivers/pinctrl/pinctrl-rockchip.c:86:
drivers/pinctrl/pinctrl-rockchip.c:98:


Noticed also broken references like

drivers/scsi/isci/port.c:1193:
drivers/usb/host/ehci-timer.c:381:

where enum mentioned without leading &.

-- 
With Best Regards,
Andy Shevchenko