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

Refactoring: Rename some variables and funtions in tokenizer. 

Small logic change also for count variable to make new name more logical.
This commit is contained in:
Reijo Tomperi 2011-12-26 00:06:27 +02:00
parent b742c03b65
commit e112bfdd47
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/tokenize.cpp
View File

@ -3171,9 +3171,9 @@ int Tokenizer::simplifyTemplatesGetTemplateNamePosition(const Token *tok)
void Tokenizer::simplifyTemplatesExpandTemplate(const Token *tok, void Tokenizer::simplifyTemplatesExpandTemplate(const Token *tok,
const std::string &name, const std::string &name,
std::vector<const Token *> &type, std::vector<const Token *> &typeParametersInDeclaration,
const std::string &newName, const std::string &newName,
std::vector<const Token *> &types2, std::vector<const Token *> &typesUsedInTemplateInstantion,
std::list<Token *> &templateInstantiations) std::list<Token *> &templateInstantiations)
{ {
int _indentlevel = 0; int _indentlevel = 0;
@ -3196,7 +3196,7 @@ void Tokenizer::simplifyTemplatesExpandTemplate(const Token *tok,
// member function implemented outside class definition // member function implemented outside class definition
else if (_indentlevel == 0 && else if (_indentlevel == 0 &&
_parlevel == 0 && _parlevel == 0 &&
simplifyTemplatesInstantiateMatch(tok3, name, type.size(), ":: ~| %var% (")) { simplifyTemplatesInstantiateMatch(tok3, name, typeParametersInDeclaration.size(), ":: ~| %var% (")) {
addtoken(newName.c_str(), tok3->linenr(), tok3->fileIndex()); addtoken(newName.c_str(), tok3->linenr(), tok3->fileIndex());
while (tok3->str() != "::") while (tok3->str() != "::")
tok3 = tok3->next(); tok3 = tok3->next();
@ -3233,12 +3233,12 @@ void Tokenizer::simplifyTemplatesExpandTemplate(const Token *tok,
if (tok3->isName()) { if (tok3->isName()) {
// search for this token in the type vector // search for this token in the type vector
unsigned int itype = 0; unsigned int itype = 0;
while (itype < type.size() && type[itype]->str() != tok3->str()) while (itype < typeParametersInDeclaration.size() && typeParametersInDeclaration[itype]->str() != tok3->str())
++itype; ++itype;
// replace type with given type.. // replace type with given type..
if (itype < type.size()) { if (itype < typeParametersInDeclaration.size()) {
for (const Token *typetok = types2[itype]; for (const Token *typetok = typesUsedInTemplateInstantion[itype];
typetok && !Token::Match(typetok, "[,>]"); typetok && !Token::Match(typetok, "[,>]");
typetok = typetok->next()) { typetok = typetok->next()) {
addtoken(typetok, tok3->linenr(), tok3->fileIndex()); addtoken(typetok, tok3->linenr(), tok3->fileIndex());
@ -3289,7 +3289,7 @@ void Tokenizer::simplifyTemplatesExpandTemplate(const Token *tok,
} }
} }
void Tokenizer::simplifyTemplatesInstantiate(const Token *tok, void Tokenizer::simplifyTemplateInstantions(const Token *tok,
std::list<Token *> &templateInstantiations, std::list<Token *> &templateInstantiations,
std::set<std::string> &expandedtemplates) std::set<std::string> &expandedtemplates)
{ {
@ -3297,10 +3297,11 @@ void Tokenizer::simplifyTemplatesInstantiate(const Token *tok,
// allow continuous instantiations until all templates has been expanded // allow continuous instantiations until all templates has been expanded
//bool done = false; //bool done = false;
std::vector<const Token *> type; // Contains tokens such as "T"
std::vector<const Token *> typeParametersInDeclaration;
for (tok = tok->tokAt(2); tok && tok->str() != ">"; tok = tok->next()) { for (tok = tok->tokAt(2); tok && tok->str() != ">"; tok = tok->next()) {
if (Token::Match(tok, "%var% ,|>")) if (Token::Match(tok, "%var% ,|>"))
type.push_back(tok); typeParametersInDeclaration.push_back(tok);
} }
// bail out if the end of the file was reached // bail out if the end of the file was reached
@ -3346,11 +3347,11 @@ void Tokenizer::simplifyTemplatesInstantiate(const Token *tok,
} }
if (Token::Match(tok2->previous(), "[;{}=]") && if (Token::Match(tok2->previous(), "[;{}=]") &&
!simplifyTemplatesInstantiateMatch(*iter2, name, type.size(), isfunc ? "(" : "*| %var%")) !simplifyTemplatesInstantiateMatch(*iter2, name, typeParametersInDeclaration.size(), isfunc ? "(" : "*| %var%"))
continue; continue;
// New type.. // New type..
std::vector<const Token *> types2; std::vector<const Token *> typesUsedInTemplateInstantion;
std::string typeForNewNameStr; std::string typeForNewNameStr;
std::string templateMatchPattern(name + " < "); std::string templateMatchPattern(name + " < ");
for (const Token *tok3 = tok2->tokAt(2); tok3 && tok3->str() != ">"; tok3 = tok3->next()) { for (const Token *tok3 = tok2->tokAt(2); tok3 && tok3->str() != ">"; tok3 = tok3->next()) {
@ -3367,7 +3368,7 @@ void Tokenizer::simplifyTemplatesInstantiate(const Token *tok,
templateMatchPattern += tok3->str(); templateMatchPattern += tok3->str();
templateMatchPattern += " "; templateMatchPattern += " ";
if (Token::Match(tok3->previous(), "[<,]")) if (Token::Match(tok3->previous(), "[<,]"))
types2.push_back(tok3); typesUsedInTemplateInstantion.push_back(tok3);
// add additional type information // add additional type information
if (tok3->isUnsigned()) if (tok3->isUnsigned())
typeForNewNameStr += "unsigned"; typeForNewNameStr += "unsigned";
@ -3380,7 +3381,7 @@ void Tokenizer::simplifyTemplatesInstantiate(const Token *tok,
templateMatchPattern += ">"; templateMatchPattern += ">";
const std::string typeForNewName(typeForNewNameStr); const std::string typeForNewName(typeForNewNameStr);
if (typeForNewName.empty() || type.size() != types2.size()) { if (typeForNewName.empty() || typeParametersInDeclaration.size() != typesUsedInTemplateInstantion.size()) {
if (_settings->debugwarnings) { if (_settings->debugwarnings) {
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
ErrorLogger::ErrorMessage::FileLocation loc; ErrorLogger::ErrorMessage::FileLocation loc;
@ -3406,7 +3407,7 @@ void Tokenizer::simplifyTemplatesInstantiate(const Token *tok,
if (expandedtemplates.find(newName) == expandedtemplates.end()) { if (expandedtemplates.find(newName) == expandedtemplates.end()) {
expandedtemplates.insert(newName); expandedtemplates.insert(newName);
simplifyTemplatesExpandTemplate(tok,name,type,newName,types2,templateInstantiations); simplifyTemplatesExpandTemplate(tok,name,typeParametersInDeclaration,newName,typesUsedInTemplateInstantion,templateInstantiations);
} }
// Replace all these template usages.. // Replace all these template usages..
@ -3414,8 +3415,8 @@ void Tokenizer::simplifyTemplatesInstantiate(const Token *tok,
for (Token *tok4 = tok2; tok4; tok4 = tok4->next()) { for (Token *tok4 = tok2; tok4; tok4 = tok4->next()) {
if (Token::simpleMatch(tok4, templateMatchPattern.c_str())) { if (Token::simpleMatch(tok4, templateMatchPattern.c_str())) {
Token * tok5 = tok4->tokAt(2); Token * tok5 = tok4->tokAt(2);
unsigned int count = 0; unsigned int typeCountInInstantion = 1U; // There is always atleast one type
const Token *typetok = (!types2.empty()) ? types2[0] : 0; const Token *typetok = (!typesUsedInTemplateInstantion.empty()) ? typesUsedInTemplateInstantion[0] : 0;
while (tok5 && tok5->str() != ">") { while (tok5 && tok5->str() != ">") {
if (tok5->str() != ",") { if (tok5->str() != ",") {
if (!typetok || if (!typetok ||
@ -3427,15 +3428,15 @@ void Tokenizer::simplifyTemplatesInstantiate(const Token *tok,
typetok = typetok ? typetok->next() : 0; typetok = typetok ? typetok->next() : 0;
} else { } else {
++count; typetok = (typeCountInInstantion < typesUsedInTemplateInstantion.size()) ? typesUsedInTemplateInstantion[typeCountInInstantion] : 0;
typetok = (count < types2.size()) ? types2[count] : 0; ++typeCountInInstantion;
} }
tok5 = tok5->next(); tok5 = tok5->next();
} }
// matching template usage => replace tokens.. // matching template usage => replace tokens..
// Foo < int > => Foo<int> // Foo < int > => Foo<int>
if (tok5 && tok5->str() == ">" && count + 1U == types2.size()) { if (tok5 && tok5->str() == ">" && typeCountInInstantion == typesUsedInTemplateInstantion.size()) {
tok4->str(newName); tok4->str(newName);
for (Token *tok6 = tok4->next(); tok6 != tok5; tok6 = tok6->next()) { for (Token *tok6 = tok4->next(); tok6 != tok5; tok6 = tok6->next()) {
if (tok6->isName()) if (tok6->isName())
@ -3500,7 +3501,7 @@ void Tokenizer::simplifyTemplates()
{ {
//done = true; //done = true;
for (std::list<Token *>::reverse_iterator iter1 = templates.rbegin(); iter1 != templates.rend(); ++iter1) { for (std::list<Token *>::reverse_iterator iter1 = templates.rbegin(); iter1 != templates.rend(); ++iter1) {
simplifyTemplatesInstantiate(*iter1, templateInstantiations, expandedtemplates); simplifyTemplateInstantions(*iter1, templateInstantiations, expandedtemplates);
} }
} }

6
lib/tokenize.h
View File

@ -503,15 +503,15 @@ public:
* @param templateInstantiations a list of template usages (not necessarily just for this template) * @param templateInstantiations a list of template usages (not necessarily just for this template)
* @param expandedtemplates all templates that has been expanded so far. The full names are stored. * @param expandedtemplates all templates that has been expanded so far. The full names are stored.
*/ */
void simplifyTemplatesInstantiate(const Token *tok, void simplifyTemplateInstantions(const Token *tok,
std::list<Token *> &templateInstantiations, std::list<Token *> &templateInstantiations,
std::set<std::string> &expandedtemplates); std::set<std::string> &expandedtemplates);
void simplifyTemplatesExpandTemplate(const Token *tok, void simplifyTemplatesExpandTemplate(const Token *tok,
const std::string &name, const std::string &name,
std::vector<const Token *> &type, std::vector<const Token *> &typeParametersInDeclaration,
const std::string &newName, const std::string &newName,
std::vector<const Token *> &types2, std::vector<const Token *> &typesUsedInTemplateInstantion,
std::list<Token *> &templateInstantiations); std::list<Token *> &templateInstantiations);
/** /**