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

Put 'isExpandedMacro' info in the dump files

This commit is contained in:
Daniel Marjamäki 2019-08-15 14:24:39 +02:00
parent 178568f41f
commit f33a8a417f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/cppcheckdata.py
View File

@ -118,6 +118,7 @@ class Token:
isLogicalOp Is this token a logical operator: && || isLogicalOp Is this token a logical operator: && ||
isUnsigned Is this token a unsigned type isUnsigned Is this token a unsigned type
isSigned Is this token a signed type isSigned Is this token a signed type
isExpandedMacro Is this token a expanded macro token
varId varId for token, each variable has a unique non-zero id varId varId for token, each variable has a unique non-zero id
variable Variable information for this token. See the Variable class. variable Variable information for this token. See the Variable class.
function If this token points at a function call, this attribute has the Function function If this token points at a function call, this attribute has the Function
@ -165,6 +166,7 @@ class Token:
isLogicalOp = False isLogicalOp = False
isUnsigned = False isUnsigned = False
isSigned = False isSigned = False
isExpandedMacro = False
varId = None varId = None
variableId = None variableId = None
variable = None variable = None
@ -223,6 +225,8 @@ class Token:
self.isComparisonOp = True self.isComparisonOp = True
elif element.get('isLogicalOp'): elif element.get('isLogicalOp'):
self.isLogicalOp = True self.isLogicalOp = True
if element.get('isExpandedMacro'):
self.isExpandedMacro = True
self.linkId = element.get('link') self.linkId = element.get('link')
self.link = None self.link = None
if element.get('varId'): if element.get('varId'):

2
lib/tokenize.cpp
View File

@ -4860,6 +4860,8 @@ void Tokenizer::dump(std::ostream &out) const
else if (tok->tokType() == Token::eLogicalOp) else if (tok->tokType() == Token::eLogicalOp)
out << " isLogicalOp=\"True\""; out << " isLogicalOp=\"True\"";
} }
if (tok->isExpandedMacro())
out << " isExpandedMacro=\"True\"";
if (tok->link()) if (tok->link())
out << " link=\"" << tok->link() << '\"'; out << " link=\"" << tok->link() << '\"';
if (tok->varId() > 0) if (tok->varId() > 0)