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

Check tokType in match compiler (#4219) 

* Check tokType in match compiler

* Set keyword when tokenlist is missing
This commit is contained in:
Paul Fultz II 2022-06-18 14:30:42 -05:00 committed by GitHub
parent a7815ed5b0
commit 2a0b2f538e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/token.cpp
View File

@ -86,6 +86,37 @@ static const std::unordered_set<std::string> controlFlowKeywords = {
"return" "return"
}; };
// Another list of keywords
static const std::unordered_set<std::string> baseKeywords = {
"asm",
"auto",
"break",
"case",
"const",
"continue",
"default",
"do",
"else",
"enum",
"extern",
"for",
"goto",
"if",
"inline",
"register",
"restrict",
"return",
"sizeof",
"static",
"struct",
"switch",
"typedef",
"union",
"volatile",
"while",
"void"
};
void Token::update_property_info() void Token::update_property_info()
{ {
setFlag(fIsControlFlowKeyword, controlFlowKeywords.find(mStr) != controlFlowKeywords.end()); setFlag(fIsControlFlowKeyword, controlFlowKeywords.find(mStr) != controlFlowKeywords.end());
@ -102,6 +133,8 @@ void Token::update_property_info()
tokType(eVariable); tokType(eVariable);
else if (mTokensFrontBack && mTokensFrontBack->list && mTokensFrontBack->list->isKeyword(mStr)) else if (mTokensFrontBack && mTokensFrontBack->list && mTokensFrontBack->list->isKeyword(mStr))
tokType(eKeyword); tokType(eKeyword);
else if (baseKeywords.count(mStr) > 0)
tokType(eKeyword);
else if (mTokType != eVariable && mTokType != eFunction && mTokType != eType && mTokType != eKeyword) else if (mTokType != eVariable && mTokType != eFunction && mTokType != eType && mTokType != eKeyword)
tokType(eName); tokType(eName);
} else if (std::isdigit((unsigned char)mStr[0]) || (mStr.length() > 1 && mStr[0] == '-' && std::isdigit((unsigned char)mStr[1]))) } else if (std::isdigit((unsigned char)mStr[0]) || (mStr.length() > 1 && mStr[0] == '-' && std::isdigit((unsigned char)mStr[1])))

1
lib/tokenlist.cpp
View File

@ -52,6 +52,7 @@ TokenList::TokenList(const Settings* settings) :
mIsCpp(false) mIsCpp(false)
{ {
mTokensFrontBack.list = this; mTokensFrontBack.list = this;
mKeywords.insert("asm");
mKeywords.insert("auto"); mKeywords.insert("auto");
mKeywords.insert("break"); mKeywords.insert("break");
mKeywords.insert("case"); mKeywords.insert("case");

75
tools/matchcompiler.py
View File

@ -24,6 +24,77 @@ import glob
import argparse import argparse
import errno import errno
tokTypes = {
'+': ['eArithmeticalOp'],
'-': ['eArithmeticalOp'],
'*': ['eArithmeticalOp'],
'/': ['eArithmeticalOp'],
'%': ['eArithmeticalOp'],
'>>': ['eArithmeticalOp'],
'<<': ['eArithmeticalOp'],
'=': ['eAssignmentOp'],
'+=': ['eAssignmentOp'],
'-=': ['eAssignmentOp'],
'*=': ['eAssignmentOp'],
'/=': ['eAssignmentOp'],
'%=': ['eAssignmentOp'],
'&=': ['eAssignmentOp'],
'|=': ['eAssignmentOp'],
'^=': ['eAssignmentOp'],
'&': ['eBitOp'],
'^': ['eBitOp'],
'~': ['eBitOp'],
'true': ['eBoolean'],
'false': ['eBoolean'],
'{': ['eBracket'],
'}': ['eBracket'],
'<': ['eBracket', 'eComparisonOp'],
'>': ['eBracket', 'eComparisonOp'],
'==': ['eComparisonOp'],
'!=': ['eComparisonOp'],
'<=': ['eComparisonOp'],
'>=': ['eComparisonOp'],
'<=>': ['eComparisonOp'],
'...': ['eEllipsis'],
',': ['eExtendedOp'],
'?': ['eExtendedOp'],
':': ['eExtendedOp'],
'(': ['eExtendedOp'],
')': ['eExtendedOp'],
'[': ['eExtendedOp', 'eLambda'],
']': ['eExtendedOp', 'eLambda'],
'++': ['eIncDecOp'],
'--': ['eIncDecOp'],
'asm': ['eKeyword'],
'auto': ['eKeyword', 'eType'],
'break': ['eKeyword'],
'case': ['eKeyword'],
'const': ['eKeyword'],
'continue': ['eKeyword'],
'default': ['eKeyword'],
'do': ['eKeyword'],
'else': ['eKeyword'],
'enum': ['eKeyword'],
'extern': ['eKeyword'],
'for': ['eKeyword'],
'goto': ['eKeyword'],
'if': ['eKeyword'],
'inline': ['eKeyword'],
'register': ['eKeyword'],
'restrict': ['eKeyword'],
'return': ['eKeyword'],
'sizeof': ['eKeyword'],
'static': ['eKeyword'],
'struct': ['eKeyword'],
'switch': ['eKeyword'],
'typedef': ['eKeyword'],
'union': ['eKeyword'],
'volatile': ['eKeyword'],
'while': ['eKeyword'],
'void': ['eKeyword', 'eType'],
'&&': ['eLogicalOp'],
'!': ['eLogicalOp']
}
class MatchCompiler: class MatchCompiler:
@ -117,7 +188,9 @@ class MatchCompiler:
return '(tok->isName() && tok->varId() == varid)' return '(tok->isName() && tok->varId() == varid)'
elif (len(tok) > 2) and (tok[0] == "%"): elif (len(tok) > 2) and (tok[0] == "%"):
print("unhandled:" + tok) print("unhandled:" + tok)
elif tok in tokTypes:
cond = ' || '.join(['tok->tokType() == Token::{}'.format(tokType) for tokType in tokTypes[tok]])
return '(({cond}) && tok->str() == MatchCompiler::makeConstString("{tok}"))'.format(cond=cond, tok=tok)
return ( return (
'(tok->str() == MatchCompiler::makeConstString("' + tok + '"))' '(tok->str() == MatchCompiler::makeConstString("' + tok + '"))'
) )