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

Refactoring Tokenizer::syntaxError

This commit is contained in:
Daniel Marjamäki 2010-07-24 10:39:01 +02:00
parent dd07d82c34
commit 9b49202da8
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/tokenize.cpp
View File

@ -6936,39 +6936,28 @@ const Token * Tokenizer::findClassFunction(const Token *tok, const std::string &
void Tokenizer::syntaxError(const Token *tok) void Tokenizer::syntaxError(const Token *tok)
{ {
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
if (tok) if (tok)
{ {
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
ErrorLogger::ErrorMessage::FileLocation loc; ErrorLogger::ErrorMessage::FileLocation loc;
loc.line = tok->linenr(); loc.line = tok->linenr();
loc.setfile(file(tok)); loc.setfile(file(tok));
locationList.push_back(loc); locationList.push_back(loc);
const ErrorLogger::ErrorMessage errmsg(locationList,
Severity::error,
"syntax error",
"syntaxError");
if (_errorLogger)
_errorLogger->reportErr(errmsg);
else
Check::reportError(errmsg);
} }
const ErrorLogger::ErrorMessage errmsg(locationList,
Severity::error,
"syntax error",
"syntaxError");
if (_errorLogger)
_errorLogger->reportErr(errmsg);
else
Check::reportError(errmsg);
} }
void Tokenizer::syntaxError(const Token *tok, char c) void Tokenizer::syntaxError(const Token *tok, char c)
{ {
if (_settings && _settings->_debug)
{
_tokens->printOut();
}
if (!_errorLogger && tok)
{
std::ostringstream err;
err << "### Unlogged error at Tokenizer::syntaxError: Invalid number of character (" << c << ")";
std::cerr << err.str() << std::endl;
return;
}
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
if (tok) if (tok)
{ {
@ -6992,19 +6981,10 @@ void Tokenizer::syntaxError(const Token *tok, char c)
_errorLogger->reportErr(errmsg); _errorLogger->reportErr(errmsg);
else else
Check::reportError(errmsg); Check::reportError(errmsg);
} }
void Tokenizer::cppcheckError(const Token *tok) const void Tokenizer::cppcheckError(const Token *tok) const
{ {
if (!_errorLogger && tok)
{
std::ostringstream err;
err << "### Unlogged error at Tokenizer::cppcheckError";
std::cerr << err.str() << std::endl;
return;
}
std::list<ErrorLogger::ErrorMessage::FileLocation> locationList; std::list<ErrorLogger::ErrorMessage::FileLocation> locationList;
if (tok) if (tok)
{ {