-
Notifications
You must be signed in to change notification settings - Fork 103
Fix: simplecpp ## fails to expand function-like macro when '(' is not adjacent #655
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
paulafy6
wants to merge
2
commits into
cppcheck-opensource:master
Choose a base branch
from
paulafy6:fix-preprocessor-concat
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2381,16 +2381,63 @@ namespace simplecpp { | |||||
| output.deleteToken(A); | ||||||
| TokenList tokens(files); | ||||||
| tokens.push_back(new Token(strAB, tok->location)); | ||||||
| // for function like macros, push the (...) | ||||||
| if (tokensB.empty() && sameline(B,B->next) && B->next->op=='(') { | ||||||
| const MacroMap::const_iterator it = macros.find(strAB); | ||||||
| if (it != macros.end() && expandedmacros.find(strAB) == expandedmacros.end() && it->second.functionLike()) { | ||||||
| const Token * const tok2 = appendTokens(tokens, loc, B->next, macros, expandedmacros, parametertokens); | ||||||
| // If strAB names a function-like macro, locate and append its argument list '(...)' | ||||||
| // from the remaining replacement tokens, then expand the whole call. | ||||||
| // 'forwardScan' is true when the argument list was consumed via the forward scan | ||||||
| // path below (not adjacent), so that expandToken() is called instead of | ||||||
| // the normal takeTokens() path even when expandResult is false. | ||||||
| bool forwardScan = false; | ||||||
| const MacroMap::const_iterator it = macros.find(strAB); | ||||||
| const bool isFunctionLikeMacro = (it != macros.end() && expandedmacros.find(strAB) == expandedmacros.end() && it->second.functionLike()); | ||||||
| if (tokensB.empty() && isFunctionLikeMacro) { | ||||||
| // Fast path: '(' is the very next token after B on the same line. | ||||||
| const Token *lpar = (sameline(B, B->next) && B->next->op == '(') ? B->next : nullptr; | ||||||
| if (!lpar && !expandResult) { | ||||||
| // Forward-scan path: '(' is not immediately adjacent to B. | ||||||
| // This handles PAR-style indirection patterns such as: | ||||||
| // #define PAR(a, ...) a __VA_ARGS__ | ||||||
| // #define DISPATCH(kind, ...) PAR(PREFIX_ ## kind, (__VA_ARGS__)) | ||||||
| // where the '(' for PREFIX_kind belongs to the __VA_ARGS__ parameter | ||||||
| // and is separated from B by a comma in the replacement text. | ||||||
| // Only active in the appendTokens context (expandResult==false) to | ||||||
| // avoid unintended side-effects inside the main expansion loop. | ||||||
| const Token *scan = nextTok; | ||||||
| while (scan && sameline(B, scan)) { | ||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I believe this
Suggested change
|
||||||
| if (scan->op == '(') { | ||||||
| // Found a literal '(' after skipping separators. | ||||||
| lpar = scan; | ||||||
| forwardScan = true; | ||||||
| break; | ||||||
| } | ||||||
| if (scan->op == ',') { | ||||||
| // Argument separator — skip and keep scanning. | ||||||
| scan = scan->next; | ||||||
| continue; | ||||||
| } | ||||||
| if (scan->name) { | ||||||
| // Named token: expand it and check whether it starts with '(...)' | ||||||
| // (covers the case where __VA_ARGS__ expands to a parenthesised list). | ||||||
| TokenList expanded(files); | ||||||
| if (expandArg(expanded, scan, loc, macros, expandedmacros, parametertokens) && | ||||||
| expanded.cfront() && expanded.cfront()->op == '(') { | ||||||
| for (Token *t = expanded.front(); t; t = t->next) | ||||||
| t->location = loc; | ||||||
| tokens.takeTokens(expanded); | ||||||
| nextTok = scan->next; | ||||||
| forwardScan = true; | ||||||
| } | ||||||
| break; // stop at any name token, whether consumed or not | ||||||
| } | ||||||
| break; // any other operator — stop scan | ||||||
| } | ||||||
| } | ||||||
| if (lpar) { | ||||||
| const Token * const tok2 = appendTokens(tokens, loc, lpar, macros, expandedmacros, parametertokens); | ||||||
| if (tok2) | ||||||
| nextTok = tok2->next; | ||||||
| } | ||||||
| } | ||||||
| if (expandResult) | ||||||
| if (expandResult || forwardScan) | ||||||
| expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens); | ||||||
| else | ||||||
| output.takeTokens(tokens); | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since scan is only used in the while loop, I believe it would be nicer to write a for loop.