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

Library: Added <valid> element that is used to define valid input values for functions

This commit is contained in:
Daniel Marjamäki 2013-12-22 19:10:14 +01:00
parent 85c62f98d7
commit be03d4718a
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/library.cpp
View File

@ -112,6 +112,7 @@ bool Library::load(const tinyxml2::XMLDocument &doc)
bool notuninit = false; bool notuninit = false;
bool formatstr = false; bool formatstr = false;
bool strz = false; bool strz = false;
std::string valid;
for (const tinyxml2::XMLElement *argnode = functionnode->FirstChildElement(); argnode; argnode = argnode->NextSiblingElement()) { for (const tinyxml2::XMLElement *argnode = functionnode->FirstChildElement(); argnode; argnode = argnode->NextSiblingElement()) {
if (strcmp(argnode->Name(), "not-null") == 0) if (strcmp(argnode->Name(), "not-null") == 0)
notnull = true; notnull = true;
@ -121,6 +122,25 @@ bool Library::load(const tinyxml2::XMLDocument &doc)
formatstr = true; formatstr = true;
else if (strcmp(argnode->Name(), "strz") == 0) else if (strcmp(argnode->Name(), "strz") == 0)
strz = true; strz = true;
else if (strcmp(argnode->Name(), "valid") == 0) {
// Validate the validation expression
const char *p = argnode->GetText();
if (!std::isdigit(*p))
return false;
for (; *p; p++) {
if (std::isdigit(*p))
continue;
if (*p == '-' && std::isdigit(*(p-1)))
continue;
if (*p == ',' && *(p+1) != ',')
continue;
return false;
}
// Set validation expression
valid = argnode->GetText();
}
else else
return false; return false;
} }
@ -128,6 +148,7 @@ bool Library::load(const tinyxml2::XMLDocument &doc)
argumentChecks[name][nr].notuninit = notuninit; argumentChecks[name][nr].notuninit = notuninit;
argumentChecks[name][nr].formatstr = formatstr; argumentChecks[name][nr].formatstr = formatstr;
argumentChecks[name][nr].strz = strz; argumentChecks[name][nr].strz = strz;
argumentChecks[name][nr].valid = valid;
} else if (strcmp(functionnode->Name(), "ignorefunction") == 0) { } else if (strcmp(functionnode->Name(), "ignorefunction") == 0) {
_ignorefunction[name] = (strcmp(functionnode->GetText(), "true") == 0); _ignorefunction[name] = (strcmp(functionnode->GetText(), "true") == 0);
} else } else

1
lib/library.h
View File

@ -100,6 +100,7 @@ public:
bool notuninit; bool notuninit;
bool formatstr; bool formatstr;
bool strz; bool strz;
std::string valid;
}; };
// function name, argument nr => argument data // function name, argument nr => argument data

4
test/testlibrary.cpp
View File

@ -79,6 +79,9 @@ private:
" <arg nr=\"4\">\n" " <arg nr=\"4\">\n"
" <strz/>\n" " <strz/>\n"
" </arg>\n" " </arg>\n"
" <arg nr=\"5\">\n"
" <valid>1-</valid>\n"
" </arg>\n"
" </function>\n" " </function>\n"
"</def>"; "</def>";
tinyxml2::XMLDocument doc; tinyxml2::XMLDocument doc;
@ -90,6 +93,7 @@ private:
ASSERT_EQUALS(true, library.argumentChecks["foo"][2].notnull); ASSERT_EQUALS(true, library.argumentChecks["foo"][2].notnull);
ASSERT_EQUALS(true, library.argumentChecks["foo"][3].formatstr); ASSERT_EQUALS(true, library.argumentChecks["foo"][3].formatstr);
ASSERT_EQUALS(true, library.argumentChecks["foo"][4].strz); ASSERT_EQUALS(true, library.argumentChecks["foo"][4].strz);
ASSERT_EQUALS("1-", library.argumentChecks["foo"][5].valid);
} }
void memory() { void memory() {