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

astyle formatting

This commit is contained in:
Daniel Marjamäki 2009-03-19 20:53:23 +01:00
parent dfe867fded
commit d4fdfc0f5a
3 changed files with 284 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/checkautovariables.cpp
View File

@ -39,40 +39,41 @@
// Register this check class into cppcheck by creating a static instance of it..
namespace
{
static CheckAutoVariables instance;
static CheckAutoVariables instance;
}
// _callStack used when parsing into subfunctions.
bool CheckAutoVariables::error_av(const Token* left,const Token* right)
bool CheckAutoVariables::error_av(const Token* left, const Token* right)
{
std::string left_var=left->str();
std::string right_var=right->str();
std::string left_var = left->str();
std::string right_var = right->str();
std::list<std::string>::iterator it_fp;
for(it_fp=fp_list.begin();it_fp!=fp_list.end();it_fp++)
for (it_fp = fp_list.begin();it_fp != fp_list.end();it_fp++)
{
std::string vname=(*it_fp);
std::string vname = (*it_fp);
//cout << "error_av " << vname << " " << left_var << endl;
if (vname==left_var){
if (vname == left_var)
{
//cout << "Beccato" << endl;
break; //The left argument is a formal parameter
}
}
if (it_fp==fp_list.end())
if (it_fp == fp_list.end())
return false; //The left argument is NOT a formal parameter
std::list<std::string>::iterator id_vd;
for(id_vd=vd_list.begin();id_vd!=vd_list.end();id_vd++)
for (id_vd = vd_list.begin();id_vd != vd_list.end();id_vd++)
{
std::string vname=(*id_vd);
if (vname==right_var)
std::string vname = (*id_vd);
if (vname == right_var)
break; //The left argument is a variable declaration
}
if (id_vd==vd_list.end())
if (id_vd == vd_list.end())
return false; //The left argument is NOT a variable declaration
//If I reach this point there is a wrong assignement of an auto-variable to an effective parameter of a function
return true;
@ -81,31 +82,31 @@ bool CheckAutoVariables::error_av(const Token* left,const Token* right)
bool CheckAutoVariables::is_auto_var(const Token* t)
{
std::list<std::string>::iterator id_vd;
std::string v=t->str();
for(id_vd=vd_list.begin();id_vd!=vd_list.end();id_vd++)
std::string v = t->str();
for (id_vd = vd_list.begin();id_vd != vd_list.end();id_vd++)
{
std::string vname=(*id_vd);
if (vname==v)
std::string vname = (*id_vd);
if (vname == v)
return true;
}
return false;
}
void print(const Token *tok, int num)
{
const Token *t=tok;
const Token *t = tok;
std::cout << tok->linenr() << " PRINT ";
for (int i=0;i<num;i++)
for (int i = 0;i < num;i++)
{
std::cout <<" [" << t->str() << "] ";
t=t->next();
std::cout << " [" << t->str() << "] ";
t = t->next();
}
std::cout << std::endl;
}
bool isTypeName(const Token *tok)
{
bool ret = false;
std::string _str=tok->str();
const char *type[] = {"case", "return","delete",0};
std::string _str = tok->str();
const char *type[] = {"case", "return", "delete", 0};
for (int i = 0; type[i]; i++)
ret |= (_str == type[i]);
return !ret;
@ -113,15 +114,15 @@ bool isTypeName(const Token *tok)
void CheckAutoVariables::addVD(const Token* tok)
{
std::string var_name;
var_name=tok->str();
var_name = tok->str();
//cout << "VD " << tok->linenr() << " " << var_name << endl;
vd_list.push_back(var_name);
}
void CheckAutoVariables::autoVariables()
{
bool begin_function=false;
bool begin_function_decl=false;
int bindent=0;
bool begin_function = false;
bool begin_function_decl = false;
int bindent = 0;
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{
@ -130,7 +131,7 @@ void CheckAutoVariables::autoVariables()
Token::Match(tok, "%type% * %var% (") ||
Token::Match(tok, "%type% :: %var% ("))
{
begin_function=true;
begin_function = true;
fp_list.clear();
vd_list.clear();
}
@ -138,15 +139,15 @@ void CheckAutoVariables::autoVariables()
{
std::string var_name;
var_name=tok->tokAt(2)->str();
var_name = tok->tokAt(2)->str();
//cout << "FP " << tok->linenr() << " " << var_name << endl;
fp_list.push_back(var_name);
}
else if (begin_function && Token::Match(tok, "("))
begin_function_decl=true;
begin_function_decl = true;
else if (begin_function && Token::Match(tok, ")"))
{
begin_function_decl=false;
begin_function_decl = false;
}
else if (begin_function && Token::Match(tok, "{"))
bindent++;
@ -154,40 +155,40 @@ void CheckAutoVariables::autoVariables()
{
bindent--;
}
else if (bindent>0 && Token::Match(tok, "%type% :: %any%")) //Inside a function
else if (bindent > 0 && Token::Match(tok, "%type% :: %any%")) //Inside a function
{
std::string var_name;
//print(tok,5);
var_name=tok->tokAt(2)->str();
var_name = tok->tokAt(2)->str();
vd_list.push_back(var_name);
}
else if (bindent>0 && Token::Match(tok, "%var% %var% ;")) //Inside a function
else if (bindent > 0 && Token::Match(tok, "%var% %var% ;")) //Inside a function
{
if (!isTypeName(tok))
continue;
addVD(tok->tokAt(1));
}
else if (bindent>0 && Token::Match(tok, "const %var% %var% ;")) //Inside a function
else if (bindent > 0 && Token::Match(tok, "const %var% %var% ;")) //Inside a function
{
if (!isTypeName(tok->tokAt(1)))
continue;
addVD(tok->tokAt(2));
}
else if (bindent>0 && Token::Match(tok, "%var% = & %var%")) //Critical assignement
else if (bindent > 0 && Token::Match(tok, "%var% = & %var%")) //Critical assignement
{
if (error_av(tok->tokAt(0),tok->tokAt(3)))
if (error_av(tok->tokAt(0), tok->tokAt(3)))
_errorLogger->genericError(_tokenizer,
tok,
"Wrong assignement of an auto-variable to an effective parameter of a function");
}
else if (bindent>0 && Token::Match(tok, "%var% [ %any% ] = & %var%")) //Critical assignement
else if (bindent > 0 && Token::Match(tok, "%var% [ %any% ] = & %var%")) //Critical assignement
{
if (error_av(tok->tokAt(0),tok->tokAt(6)))
if (error_av(tok->tokAt(0), tok->tokAt(6)))
_errorLogger->genericError(_tokenizer,
tok,
"Wrong assignement of an auto-variable to an effective parameter of a function");
}
else if (bindent>0 && Token::Match(tok, "return & %var%")) //Critical return
else if (bindent > 0 && Token::Match(tok, "return & %var%")) //Critical return
{
if (is_auto_var(tok->tokAt(2)))
_errorLogger->genericError(_tokenizer,

2
src/checkautovariables.h
View File

@ -43,7 +43,7 @@ public:
private:
std::list<std::string> fp_list;
std::list<std::string> vd_list;
bool error_av(const Token* left,const Token* right);
bool error_av(const Token* left, const Token* right);
bool is_auto_var(const Token* t);
void addVD(const Token* t);
const Tokenizer *_tokenizer;