C Instrumentation Framework

Assume we have such the program:

#define A(lock) lock
#define B(lock) lock
int c = A(10) + 2 * B(10);

and such the aspect:

around: define(A(lock)) || define (B(lock))
{
  100
}

The original program initializes c with 30. One expect that the instrumented program will initialize c with 300, but we have such the code after instrumentation:

int c = 120;

that means that macro A(lock) was replaced by 100 while macro B(lock) was left as is.
So we need '||' support for macros as well as for functions. Workaround is to separate composite pointcuts for macros:

around: define(A(lock)).
{
  100
}
around: define(B(lock))
{
  100
}