Skip to content

Add TokenList::setLocation() for setting the location of all tokens #753

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.

Sign up for GitHub

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

Merged
danmar merged 1 commit into from
Nov 9, 2026
Merged

Add TokenList::setLocation() for setting the location of all tokens #753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1850,6 +1850,13 @@ namespace simplecpp {
class Macro;
using MacroMap = std::unordered_map<TokenString,Macro>;

/** Set the location of all tokens */
static void setLocation(TokenList &tokens, const Location &loc)
{
for (Token *tok = tokens.front(); tok; tok = tok->next)
tok->location = loc;
}

class Macro {
public:
explicit Macro(std::vector<std::string> &f) : nameTokDef(nullptr), valueToken(nullptr), endToken(nullptr), files(f), tokenListDefine(f), variadic(false), variadicOpt(false), valueDefinedInCode_(false) {}
Expand Down Expand Up @@ -2301,8 +2308,7 @@ namespace simplecpp {
tok = tok->next;
}
}
for (Token *tok2 = tokens.front(); tok2; tok2 = tok2->next)
tok2->location = lpar->location;
setLocation(tokens, lpar->location);
return sameline(lpar,tok) ? tok : nullptr;
}

Expand Down Expand Up @@ -2793,8 +2799,7 @@ namespace simplecpp {
// It seems clearer to handle this case separately even though the code is similar-ish, but we don't want to merge here.
// TODO The question is whether the ## or varargs may still apply, and how to provoke?
if (expandArg(tokensB, B, parametertokens)) {
for (Token *b = tokensB.front(); b; b = b->next)
b->location = loc;
setLocation(tokensB, loc);
} else {
tokensB.push_back(new Token(*B));
tokensB.back()->location = loc;
Expand Down Expand Up @@ -2829,8 +2834,7 @@ namespace simplecpp {
}
else if (strAB != "," && macros.find(strAB) == macros.end()) {
A->setstr(strAB);
for (Token *b = tokensB.front(); b; b = b->next)
b->location = loc;
setLocation(tokensB, loc);
output.takeTokens(tokensB);
} else if (sameline(B, nextTok) && sameline(B, nextTok->next) && nextTok->op == '#' && nextTok->next->op == '#') {
TokenList output2(files);
Expand All @@ -2855,8 +2859,7 @@ namespace simplecpp {
expandToken(output, loc, tokens.cfront(), macros, expandedmacros, parametertokens, outputList);
else
output.takeTokens(tokens);
for (Token *b = tokensB.front(); b; b = b->next)
b->location = loc;
setLocation(tokensB, loc);
output.takeTokens(tokensB);
}
}
Expand Down
Loading