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

Fixed #5836: Make showing $ in stringified tokens optional

This commit is contained in:
PKEuS 2014-09-29 14:50:00 +02:00
parent 448195f255
commit 1df1b9c2bd
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkio.cpp
View File

@ -1867,7 +1867,7 @@ void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
os << type->str() << "::"; os << type->str() << "::";
type = type->tokAt(2); type = type->tokAt(2);
} }
type->stringify(os, false, true); type->stringify(os, false, true, false);
if (type->strAt(1) == "*" && !argInfo->element) if (type->strAt(1) == "*" && !argInfo->element)
os << " *"; os << " *";
else if (argInfo->variableInfo && !argInfo->element && argInfo->variableInfo->isArray()) else if (argInfo->variableInfo && !argInfo->element && argInfo->variableInfo->isArray())
@ -1883,7 +1883,7 @@ void CheckIO::argumentType(std::ostream& os, const ArgumentInfo * argInfo)
if (type->strAt(1) == "*" || argInfo->address) if (type->strAt(1) == "*" || argInfo->address)
os << " *"; os << " *";
os << " {aka "; os << " {aka ";
type->stringify(os, false, true); type->stringify(os, false, true, false);
if (type->strAt(1) == "*" || argInfo->address) if (type->strAt(1) == "*" || argInfo->address)
os << " *"; os << " *";
os << "}"; os << "}";

6
lib/token.cpp
View File

@ -928,7 +928,7 @@ void Token::printOut(const char *title, const std::vector<std::string> &fileName
std::cout << stringifyList(true, true, true, true, true, &fileNames, 0) << std::endl; std::cout << stringifyList(true, true, true, true, true, &fileNames, 0) << std::endl;
} }
void Token::stringify(std::ostream& os, bool varid, bool attributes) const void Token::stringify(std::ostream& os, bool varid, bool attributes, bool macro) const
{ {
if (attributes) { if (attributes) {
if (isUnsigned()) if (isUnsigned())
@ -942,7 +942,7 @@ void Token::stringify(std::ostream& os, bool varid, bool attributes) const
os << "long "; os << "long ";
} }
} }
if (isExpandedMacro()) if (macro && isExpandedMacro())
os << "$"; os << "$";
if (_str[0] != '\"' || _str.find("\0") == std::string::npos) if (_str[0] != '\"' || _str.find("\0") == std::string::npos)
os << _str; os << _str;
@ -1007,7 +1007,7 @@ std::string Token::stringifyList(bool varid, bool attributes, bool linenumbers,
lineNumber = tok->linenr(); lineNumber = tok->linenr();
} }
tok->stringify(ret, varid, attributes); // print token tok->stringify(ret, varid, attributes, attributes); // print token
if (tok->next() != end && (!linebreaks || (tok->next()->linenr() <= tok->linenr() && tok->next()->fileIndex() == tok->fileIndex()))) if (tok->next() != end && (!linebreaks || (tok->next()->linenr() <= tok->linenr() && tok->next()->fileIndex() == tok->fileIndex())))
ret << ' '; ret << ' ';
} }

3
lib/token.h
View File

@ -481,8 +481,9 @@ public:
* @param os The result is shifted into that output stream * @param os The result is shifted into that output stream
* @param varid Print varids. (Style: "varname@id") * @param varid Print varids. (Style: "varname@id")
* @param attributes Print attributes of tokens like "unsigned" in front of it. * @param attributes Print attributes of tokens like "unsigned" in front of it.
* @param macro Prints $ in front of the token if it was expanded from a macro.
*/ */
void stringify(std::ostream& os, bool varid, bool attributes) const; void stringify(std::ostream& os, bool varid, bool attributes, bool macro) const;
/** /**
* Stringify a list of token, from current instance on. * Stringify a list of token, from current instance on.