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

Fix #1279 (Change error message: Invalid number of character ({). Can't process file.) 

http://sourceforge.net/apps/trac/cppcheck/ticket/1279
This commit is contained in:
Reijo Tomperi 2010-01-23 23:18:11 +02:00
parent 4d7ac2f82e
commit 7817d5b142
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cppcheck.cpp
View File

@ -531,7 +531,7 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
{
std::istringstream istr(code);
TIMER_START();
if (!_tokenizer.tokenize(istr, FileName))
if (!_tokenizer.tokenize(istr, FileName, cfg))
{
// File had syntax errors, abort
return;

11
lib/tokenize.cpp
View File

@ -805,8 +805,10 @@ void Tokenizer::simplifyTypedef()
}
}
bool Tokenizer::tokenize(std::istream &code, const char FileName[])
bool Tokenizer::tokenize(std::istream &code, const char FileName[], const std::string configuration)
{
_configuration = configuration;
// The "_files" vector remembers what files have been tokenized..
_files.push_back(FileLister::simplifyPath(FileName));
@ -5023,7 +5025,12 @@ void Tokenizer::syntaxError(const Token *tok, char c)
const ErrorLogger::ErrorMessage errmsg(locationList,
"error",
std::string("Invalid number of character (") + c + "). Can't process file.",
std::string("Invalid number of character (") +
c +
") " +
"when these macros are defined: '" +
_configuration +
"'.",
"syntaxError");
if (_errorLogger)

7
lib/tokenize.h
View File

@ -64,9 +64,10 @@ public:
* \endcode
*
* @param FileName The filename
* @param configuration E.g. "A" for code where "#ifdef A" is true
* @return false if Source code contains syntax errors
*/
bool tokenize(std::istream &code, const char FileName[]);
bool tokenize(std::istream &code, const char FileName[], const std::string configuration = "");
/**
* Create tokens from code.
@ -397,6 +398,10 @@ private:
std::vector<std::string> _files;
const Settings * const _settings;
ErrorLogger * const _errorLogger;
/** E.g. "A" for code where "#ifdef A" is true. This is used to
print additional information in error situations. */
std::string _configuration;
};
/// @}

2
test/teststl.cpp
View File

@ -585,7 +585,7 @@ private:
Tokenizer tokenizer(0, this);
std::istringstream istr(src);
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp"));
ASSERT_EQUALS("[test.cpp:3]: (error) Invalid number of character ((). Can't process file.\n", errout.str());
ASSERT_EQUALS("[test.cpp:3]: (error) Invalid number of character (() when these macros are defined: ''.\n", errout.str());
}

14
test/testtokenize.cpp
View File

@ -2500,7 +2500,7 @@ private:
Tokenizer tokenizer(0, this);
std::istringstream istr(code);
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp"));
ASSERT_EQUALS("[test.cpp:1]: (error) Invalid number of character ({). Can't process file.\n", errout.str());
ASSERT_EQUALS("[test.cpp:1]: (error) Invalid number of character ({) when these macros are defined: ''.\n", errout.str());
}
{
@ -2509,7 +2509,7 @@ private:
Tokenizer tokenizer(0, this);
std::istringstream istr(code);
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp"));
ASSERT_EQUALS("[test.cpp:1]: (error) Invalid number of character ((). Can't process file.\n", errout.str());
ASSERT_EQUALS("[test.cpp:1]: (error) Invalid number of character (() when these macros are defined: ''.\n", errout.str());
}
{
@ -2530,8 +2530,8 @@ private:
"}\n";
Tokenizer tokenizer(0, this);
std::istringstream istr(code);
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp"));
ASSERT_EQUALS("[test.cpp:3]: (error) Invalid number of character ((). Can't process file.\n", errout.str());
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp", "ABC"));
ASSERT_EQUALS("[test.cpp:3]: (error) Invalid number of character (() when these macros are defined: 'ABC'.\n", errout.str());
}
{
@ -2543,7 +2543,7 @@ private:
Tokenizer tokenizer(0, this);
std::istringstream istr(code);
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp"));
ASSERT_EQUALS("[test.cpp:2]: (error) Invalid number of character ({). Can't process file.\n", errout.str());
ASSERT_EQUALS("[test.cpp:2]: (error) Invalid number of character ({) when these macros are defined: ''.\n", errout.str());
}
{
@ -2555,7 +2555,7 @@ private:
Tokenizer tokenizer(0, this);
std::istringstream istr(code);
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp"));
ASSERT_EQUALS("[test.cpp:3]: (error) Invalid number of character ([). Can't process file.\n", errout.str());
ASSERT_EQUALS("[test.cpp:3]: (error) Invalid number of character ([) when these macros are defined: ''.\n", errout.str());
}
{
@ -2569,7 +2569,7 @@ private:
Tokenizer tokenizer(0, this);
std::istringstream istr(code);
ASSERT_EQUALS(false, tokenizer.tokenize(istr, "test.cpp"));
ASSERT_EQUALS("[test.cpp:2]: (error) Invalid number of character ((). Can't process file.\n", errout.str());
ASSERT_EQUALS("[test.cpp:2]: (error) Invalid number of character (() when these macros are defined: ''.\n", errout.str());
}
}