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

Fixed and cleaned up Token::Match engine

This commit is contained in:
PKEuS 2014-06-26 17:32:24 +02:00
parent f6523e384b
commit 817d32f791
3 changed files with 40 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
lib/token.cpp
View File

@ -73,8 +73,8 @@ void Token::update_property_info()
_type = eString;
else if (_str.length() > 1 && _str[0] == '\'' && _str[_str.length()-1] == '\'')
_type = eChar;
else if (_str == "=" || _str == "<<=" || _str == ">>=" ||
(_str.size() == 2U && _str[1] == '=' && std::strchr("+-*/%&^|",_str[0])))
else if (_str == "=" || _str == "<<=" || _str == ">>=" ||
(_str.size() == 2U && _str[1] == '=' && std::strchr("+-*/%&^|", _str[0])))
_type = eAssignmentOp;
else if (_str.size() == 1 && _str.find_first_of(",[]()?:") != std::string::npos)
_type = eExtendedOp;
@ -82,19 +82,22 @@ void Token::update_property_info()
_type = eArithmeticalOp;
else if (_str.size() == 1 && _str.find_first_of("&|^~") != std::string::npos)
_type = eBitOp;
else if (_str == "&&" ||
_str == "||" ||
_str == "!")
else if (_str.size() <= 2 &&
(_str == "&&" ||
_str == "||" ||
_str == "!"))
_type = eLogicalOp;
else if ((_str == "==" ||
else if (_str.size() <= 2 && !_link &&
(_str == "==" ||
_str == "!=" ||
_str == "<" ||
_str == "<=" ||
_str == ">" ||
_str == ">=") && !_link)
_str == ">="))
_type = eComparisonOp;
else if (_str == "++" ||
_str == "--")
else if (_str.size() == 2 &&
(_str == "++" ||
_str == "--"))
_type = eIncDecOp;
else if (_str.size() == 1 && (_str.find_first_of("{}") != std::string::npos || (_link && _str.find_first_of("<>") != std::string::npos)))
_type = eBracket;
@ -276,9 +279,7 @@ const std::string &Token::strAt(int index) const
return tok ? tok->_str : emptyString;
}
static int multiComparePercent(const Token *tok, const char ** haystack_p,
const char * needle,
bool emptyStringFound)
static int multiComparePercent(const Token *tok, const char ** haystack_p, bool emptyStringFound)
{
const char *haystack = *haystack_p;
@ -299,7 +300,7 @@ static int multiComparePercent(const Token *tok, const char ** haystack_p,
} else if (haystack[1] == 'o' && // "%or%"
haystack[2] == 'r' &&
haystack[3] == '%') {
if (*needle == '|' && needle[1] != '|' && needle[1] != '=')
if (tok->type() == Token::eBitOp && tok->str() == "|")
return 1;
*haystack_p = haystack = haystack + 4;
} else if (haystack[1] == 'o' && // "%oror%"
@ -307,7 +308,7 @@ static int multiComparePercent(const Token *tok, const char ** haystack_p,
haystack[3] == 'o' &&
haystack[4] == 'r' &&
haystack[5] == '%') {
if (needle[0] == '|' && needle[1] == '|')
if (tok->type() == Token::eLogicalOp && tok->str() == "||")
return 1;
*haystack_p = haystack = haystack + 6;
} else if (haystack[1] == 'v' && // "%var%"
@ -330,39 +331,10 @@ static int multiComparePercent(const Token *tok, const char ** haystack_p,
return 0xFFFF;
}
int Token::multiCompare(const Token *tok, const char *haystack, const char *needle)
int Token::multiCompare(const Token *tok, const char *haystack)
{
if (haystack[0] == '%' && haystack[1] == 'o') {
if (haystack[2] == 'p' && // "%op%|"
haystack[3] == '%' &&
haystack[4] == '|') {
haystack = haystack + 5;
if (tok->isOp())
return 1;
} else if (haystack[2] == 'r' && // "%or%|"
haystack[3] == '%' &&
haystack[4] == '|') {
haystack = haystack + 5;
if (*needle == '|' && needle[1] != '|' && needle[1] != '=')
return 1;
} else if (haystack[2] == 'r' && // "%oror%|"
haystack[3] == 'o' &&
haystack[4] == 'r' &&
haystack[5] == '%' &&
haystack[6] == '|') {
haystack = haystack + 7;
if (needle[0] == '|' && needle[1] == '|')
return 1;
}
} else if (haystack[0] == '%' && haystack[1] == 'c' && haystack[2] == 'o' && // "%cop%|"
haystack[3] == 'p' && haystack[4] == '%' &&
haystack[5] == '|') {
haystack = haystack + 6;
if (tok->isConstOp())
return 1;
}
bool emptyStringFound = false;
const char *needle = tok->str().c_str();
const char *needlePointer = needle;
for (;;) {
if (*needlePointer == *haystack) {
@ -382,14 +354,14 @@ int Token::multiCompare(const Token *tok, const char *haystack, const char *need
needlePointer = needle;
++haystack;
int ret = multiComparePercent(tok, &haystack, needle, emptyStringFound);
if (ret < 2)
return ret;
} else if (*haystack == ' ' || *haystack == '\0') {
if (needlePointer == needle)
return 0;
break;
} else if (haystack[0] == '%' && haystack[1] != '|' && haystack[1] != '\0' && haystack[1] != ' ') {
int ret = multiComparePercent(tok, &haystack, emptyStringFound);
if (ret < 2)
return ret;
}
// If haystack and needle don't share the same character,
// find next '|' character.
@ -405,10 +377,6 @@ int Token::multiCompare(const Token *tok, const char *haystack, const char *need
}
++haystack;
int ret = multiComparePercent(tok, &haystack, needle, emptyStringFound);
if (ret < 2)
return ret;
}
}
@ -689,7 +657,7 @@ bool Token::Match(const Token *tok, const char pattern[], unsigned int varid)
// Parse multi options, such as void|int|char (accept token which is one of these 3)
else if (chrInFirstWord(p, '|') && (p[0] != '|' || firstWordLen(p) > 2)) {
int res = multiCompare(tok, p, tok->_str.c_str());
int res = multiCompare(tok, p);
if (res == 0) {
// Empty alternative matches, use the same token on next round
while (*p && *p != ' ')

5
lib/token.h
View File

@ -371,14 +371,13 @@ public:
* string, return value is 0. If needle was not found, return
* value is -1.
*
* @param tok Current token
* @param needle Current token
* @param haystack e.g. "one|two" or "|one|two"
* @param needle e.g. "one", "two" or "invalid"
* @return 1 if needle is found from the haystack
* 0 if needle was empty string
* -1 if needle was not found
*/
static int multiCompare(const Token *tok, const char *haystack, const char *needle);
static int multiCompare(const Token *needle, const char *haystack);
unsigned int linenr() const {
return _linenr;

32
test/testtoken.cpp
View File

@ -126,52 +126,52 @@ private:
// Test for found
Token one(0);
one.str("one");
ASSERT_EQUALS(1, Token::multiCompare(&one, "one|two", "one"));
ASSERT_EQUALS(1, Token::multiCompare(&one, "one|two"));
Token two(0);
two.str("two");
ASSERT_EQUALS(1, Token::multiCompare(&two, "one|two", "two"));
ASSERT_EQUALS(1, Token::multiCompare(&two, "verybig|two|", "two"));
ASSERT_EQUALS(1, Token::multiCompare(&two, "one|two"));
ASSERT_EQUALS(1, Token::multiCompare(&two, "verybig|two|"));
// Test for empty string found
Token notfound(0);
notfound.str("notfound");
ASSERT_EQUALS(0, Token::multiCompare(&notfound, "|one|two", "notfound"));
ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one||two", "notfound"));
ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one|two|", "notfound"));
ASSERT_EQUALS(0, Token::multiCompare(&notfound, "|one|two"));
ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one||two"));
ASSERT_EQUALS(0, Token::multiCompare(&notfound, "one|two|"));
// Test for not found
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&notfound, "one|two", "notfound")));
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&notfound, "one|two")));
Token s(0);
s.str("s");
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&s, "verybig|two", "s")));
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&s, "verybig|two")));
Token ne(0);
ne.str("ne");
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&ne, "one|two", "ne")));
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&ne, "one|two")));
Token a(0);
a.str("a");
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&a, "abc|def", "a")));
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&a, "abc|def")));
Token abcd(0);
abcd.str("abcd");
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&abcd, "abc|def", "abcd")));
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&abcd, "abc|def")));
Token def(0);
def.str("default");
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&def, "abc|def", "default")));
ASSERT_EQUALS(static_cast<unsigned int>(-1), static_cast<unsigned int>(Token::multiCompare(&def, "abc|def")));
// %op%
Token plus(0);
plus.str("+");
ASSERT_EQUALS(1, Token::multiCompare(&plus, "one|%op%", "+"));
ASSERT_EQUALS(1, Token::multiCompare(&plus, "%op%|two", "+"));
ASSERT_EQUALS(1, Token::multiCompare(&plus, "one|%op%"));
ASSERT_EQUALS(1, Token::multiCompare(&plus, "%op%|two"));
Token x(0);
x.str("x");
ASSERT_EQUALS(-1, Token::multiCompare(&x, "one|%op%", "x"));
ASSERT_EQUALS(-1, Token::multiCompare(&x, "%op%|two", "x"));
ASSERT_EQUALS(-1, Token::multiCompare(&x, "one|%op%"));
ASSERT_EQUALS(-1, Token::multiCompare(&x, "%op%|two"));
}
void multiCompare2() const { // #3294