[cocci] Nested macros

[Luca Coelho <luca@coelho.fi>]

Hi,

I've been struggling with a change I want to make, so I hope someone
can help.

Basically I have something like this in the code:

/* regs below are bits 15:0 */
#define _MIPIA_HSYNC_PADDING_COUNT     (_MIPI_MMIO_BASE(dev_priv) + 0xb028)
#define _MIPIC_HSYNC_PADDING_COUNT     (_MIPI_MMIO_BASE(dev_priv) + 0xb828)
#define MIPI_HSYNC_PADDING_COUNT(port) _MMIO_MIPI(port, _MIPIA_HSYNC_PADDING_COUNT, _MIPIC_HSYNC_PADDING_COUNT)

As you can see, these macros assume that the calling functions have a
local called dev_priv, and I want to fix that. 

So, I'm trying to find all users of macros that have this construct. 
My problem is matching the nesting in the macros.

I have tried this:

@macros_noargs@
identifier m;
expression e =~ "dev_priv";
@@
#define m <+...e...+>

@nested_macros@
identifier macros_noargs.m;
identifier nm;
@@
#define nm(...) <+...m...+>

@@
identifier nested_macros.nm;
@@
-nm
+foo

(this last rule is just for testing if anything is matching, obviously)

But the "nested_macros" rule doesn't seem to work.  Does anyone know
how I can solve this?

Thanks!

--
Cheers,
Luca.