Fix token-pasting macros not working in preprocessor directives. (#2453)

Fixes #2443
This commit is contained in:
rdb 2020-11-06 18:51:07 +01:00 committed by GitHub
parent 3d7984dd1e
commit 383eaf3293
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 44 deletions

View file

@ -455,6 +455,7 @@ int TPpContext::eval(int token, int precedence, bool shortCircuit, int& res, boo
token = scanToken(ppToken);
}
} else {
token = tokenPaste(token, *ppToken);
token = evalToToken(token, shortCircuit, res, err, ppToken);
return eval(token, precedence, shortCircuit, res, err, ppToken);
}