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

Changes in misra c rule 5.4 and 5.5 (#1219) 

* Added rule 5.2

* updated 5.2

request-checks: true

* Added rule 5.3

* Changed rule 5.4, 5.5

* Updated test suite for Rule 5.2

* Changes in Rule 5.4 and 5.5

* Change in function name in test suite and removed type from class token in cppcheck

* Changed the name of function in misra-test.c
This commit is contained in:
swasti16 2018-05-11 18:27:08 +05:30 committed by Daniel Marjamäki
parent ce30a3ca71
commit 4956b89506
2 changed files with 74 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
addons/misra.py
View File

@ -499,10 +499,41 @@ def misra_5_3(data):
def misra_5_4(data):
compiled = re.compile(r'#define [a-zA-Z0-9_]{64,}')
macro = {}
compile_name = re.compile(r'#define ([a-zA-Z0-9_]+)')
compile_param = re.compile(r'#define ([a-zA-Z0-9_]+)[\(]([a-zA-Z0-9_, ]+)[\)]')
for dir in data.directives:
if compiled.match(dir.str):
reportError(dir, 5, 4)
res1 = compile_name.match(dir.str)
if res1:
if dir not in macro:
macro.setdefault(dir, {})["name"] = []
macro.setdefault(dir, {})["params"] = []
macro[dir]["name"] = res1.group(1)
res2 = compile_param.match(dir.str)
if res2:
res_gp2 = res2.group(2).split(",")
res_gp2 = [macroname.replace(" ", "") for macroname in res_gp2]
macro[dir]["params"].extend(res_gp2)
for mvar in macro:
if len(macro[mvar]["params"]) > 0:
for i, macroparam1 in enumerate(macro[mvar]["params"]):
for j, macroparam2 in enumerate(macro[mvar]["params"]):
if j > i and macroparam1[:31] == macroparam2[:31]:
reportError(mvar, 5, 4)
for x, m_var1 in enumerate(macro):
for y, m_var2 in enumerate(macro):
if x < y and macro[m_var1]["name"][:31] == macro[m_var2]["name"][:31]:
if m_var1.linenr > m_var2.linenr:
reportError(m_var1, 5, 4)
else:
reportError(m_var2, 5, 4)
for param in macro[m_var2]["params"]:
if macro[m_var1]["name"][:31] == param[:31]:
if m_var1.linenr > m_var2.linenr:
reportError(m_var1, 5, 4)
else:
reportError(m_var2, 5, 4)
def misra_5_5(data):
@ -513,8 +544,13 @@ def misra_5_5(data):
if res:
macroNames.append(res.group(1))
for var in data.variables:
if var.nameToken.str in macroNames:
reportError(var.nameToken, 5, 5)
for macro in macroNames:
if var.nameToken.str[:31] == macro[:31]:
reportError(var.nameToken, 5, 5)
for scope in data.scopes:
for macro in macroNames:
if scope.className and scope.className[:31] == macro[:31]:
reportError(scope.bodyStart, 5, 5)
def misra_7_1(rawTokens):

37
addons/test/misra-test.c
View File

@ -65,11 +65,40 @@ void misra_5_3() {
} else {}
}
#define m54_123456789012345678901234567890123456789012345678901234567890 1 // 5.4
#define m54_1234567890123456789012345678901234567890123456789012345678901 2 // 5.4
#define misra_5_4_macro_hides_macro__31x 1
#define misra_5_4_param_hides_macro__31x 1
#define misra_5_4_macro_hides_macro__31y 2 //5.4
#define m1(misra_5_4_param_hides_macro__31y) 1 //5.4
#define m2(misra_5_4_param_hides_param__31x,misra_5_4_param_hides_param__31y) 1 //5.4
#define misra_5_5_var_hides_macro____31x 1
#define misra_5_5_functionhides_macro31x 1
#define misra_5_5_param_hides_macro__31x 1
#define misra_5_5_tag_hides_macro____31x 1
#define misra_5_5_hides_macro________31x 1
int misra_5_5_var_hides_macro____31y; //5.5
void misra_5_5_functionhides_macro31y(int misra_5_5_param_hides_macro__31y){} //5.5
struct misra_5_5_tag_hides_macro____31y { //5.5
int x;
};
void misra_5_5_func1()
{
switch(misra_5_5_func2())
{
case 1:
{
do
{
if(misra_5_5_func3())
{
int misra_5_5_hides_macro________31y; //5.5
}
} while(misra_5_5_func2());
}
}
}
#define m55(x,y) (x+y)
int m55; // 5.5
void misra_7_1() {
int x = 066; // 7.1