[cpp] Regression in cpp parsing of marcros

[petr-bauch]

Hey team. I noticed that recent changed introduced a small regression specifically

int main() {
  P *p = new P();
  foreach (QString arg, options->args)
    p->play(arg);
}

Crashes the parser with

PARSING ERROR: File "cpp_tree.ml", line 248, characters 22-28: Assertion failed

Somehow the fact that p was declared and then used in the macro confuses the hash table in the visitor.

[codinuum]

Thank you for reporting. We will look into it.

[codinuum]

We think we have fixed the issue.

[petr-bauch]

This looks great. It may be intentional but we noticed that parsing some macro definitions now gives up sooner, e.g.

#define CC_BITS_NZC   (CC_BIT_N | CC_BIT_Z | CC_BIT_C)

now does not go into the bit-or and just has STMTS as the child of the object-like-macro.

or

#define CONTINUE_UNWINDING \
  do                                \
    {                               \
      if (__gnu_unwind_frame (ue_header, context) != _URC_OK)   \
    return _URC_FAILURE;                    \
      return _URC_CONTINUE_UNWIND;              \
    }                               \
  while (0)

used to contain the loop.

[codinuum]

We have just fixed the regression.

[petr-bauch]

Perfect. Thank you.