Preprocessor macro problem

[mingodad]

While testing some files I've used to test https://github.com/tyfkda/xcc I found one that cxx stil can't handle:

#define FOO(x)  {x}

FOO(
#if 1
    bar
#else
    qux
#endif
)

g++ -E foo-if.c
# 1 "foo-if.c"
# 1 "<built-in>"
# 1 "<command-line>"
# 1 "/usr/include/stdc-predef.h" 1 3 4
# 1 "<command-line>" 2
# 1 "foo-if.c"
{bar}

cxx -E foo-if.c
# 1 "foo-if.c"
{
# 5 "foo-if.c"
bar

Notice that cxx is eating the closing brace !

[mingodad]

I've been testing this C++ parser https://github.com/panda3d/panda3d/tree/master/dtool/src/cppparser and we had a bit of work done with it's preprocessor here panda3d/panda3d#1638 probably it's worth for you to now about it and maybe even collaborate both ways with then.

[mingodad]

Even when adding other text at the end of the macro the output miss the closing brace:

#define FOO(x)  {x}

FOO(
#if 1
    bar
#else
    qux
#endif
)
int x;

Output:

# 1 "foo-if.c"
                {
    bar
int x;

[mingodad]

The problem seem to be here :

cplusplus/src/parser/cxx/preprocessor.cc

Lines 2658 to 2665 in 3b93d2b

	auto Preprocessor::Private::skipLine(TokIterator it,
	TokIterator last) -> TokIterator {
	for (; it != last; ++it) {
	if (it->kind == TokenKind::T_EOF_SYMBOL) break;
	if (it->bol) break;
	}
	return it;
	}

When skipping the endif you are only breaking the loop when it->bol is true but when tokenizing the } is not marked with bol equals true and is skipped, we need another way to manage it here.

[mingodad]

With this hack it seems to work, all tests pass and it parses sqlite3.c so far:

------------------------ src/parser/cxx/preprocessor.cc ------------------------
index c07548e..2fe9d51 100644
@@ -1651,7 +1651,8 @@ auto Preprocessor::Private::expand(
 
     if (const auto start = it; it->bol && match(it, last, TokenKind::T_HASH)) {
       // skip the rest of the line
-      it = skipLine(it, last);
+      if (it->kind == TokenKind::T_IDENTIFIER && it->text == "endif") ++it;
+      else it = skipLine(it, last);
 
       if (auto parsedInclude = parseDirective(source, start.toTokList())) {
         NeedToResolveInclude status{

Output:

# 1 "foo-if.c"
                {
    bar }
int x;