walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Tokenizer::copyTokens: add optional parameter which preserve the line number differences between tokens to be copied.

This commit is contained in:
Edoardo Prezioso 2012-01-21 17:15:00 +01:00
parent 78461093f0
commit b0dac2fa2e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tokenize.cpp
View File

@ -225,15 +225,17 @@ void Tokenizer::insertTokens(Token *dest, const Token *src, unsigned int n)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
Token *Tokenizer::copyTokens(Token *dest, const Token *first, const Token *last) Token *Tokenizer::copyTokens(Token *dest, const Token *first, const Token *last, bool one_line)
{ {
std::stack<Token *> links; std::stack<Token *> links;
Token *tok2 = dest; Token *tok2 = dest;
unsigned int linenrs = dest->linenr();
unsigned int commonFileIndex = dest->fileIndex();
for (const Token *tok = first; tok != last->next(); tok = tok->next()) { for (const Token *tok = first; tok != last->next(); tok = tok->next()) {
tok2->insertToken(tok->str()); tok2->insertToken(tok->str());
tok2 = tok2->next(); tok2 = tok2->next();
tok2->fileIndex(dest->fileIndex()); tok2->fileIndex(commonFileIndex);
tok2->linenr(dest->linenr()); tok2->linenr(linenrs);
tok2->isName(tok->isName()); tok2->isName(tok->isName());
tok2->isNumber(tok->isNumber()); tok2->isNumber(tok->isNumber());
tok2->isBoolean(tok->isBoolean()); tok2->isBoolean(tok->isBoolean());
@ -256,6 +258,8 @@ Token *Tokenizer::copyTokens(Token *dest, const Token *first, const Token *last)
links.pop(); links.pop();
} }
if (!one_line && tok->next())
linenrs += tok->next()->linenr() - tok->linenr();
} }
return tok2; return tok2;
} }

2
lib/tokenize.h
View File

@ -557,7 +557,7 @@ public:
* @param last last token to copy * @param last last token to copy
* @return new location of last token copied * @return new location of last token copied
*/ */
Token *copyTokens(Token *dest, const Token *first, const Token *last); Token *copyTokens(Token *dest, const Token *first, const Token *last, bool one_line = true);
/** /**
* Send error message to error logger about internal bug. * Send error message to error logger about internal bug.