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

misra; fix essential type for char literals

This commit is contained in:
Daniel Marjamäki 2021-07-20 16:39:59 +02:00
parent 6f7722873e
commit b320a092d0
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
addons/misra.py
View File

@ -459,6 +459,12 @@ def getEssentialType(expr):
if not expr: if not expr:
return None return None
# See Appendix D, section D.6, Character constants
if expr.str[0] == "'" and expr.str[-1] == "'":
if len(expr.str) == 3 or (len(expr.str) == 4 and expr.str[1] == '\\'):
return 'char'
return '%s %s' % (expr.valueType.sign, expr.valueType.type)
if expr.variable: if expr.variable:
if expr.valueType: if expr.valueType:
if expr.valueType.type == 'bool': if expr.valueType.type == 'bool':
@ -1964,37 +1970,33 @@ class MisraChecker:
def misra_10_2(self, data): def misra_10_2(self, data):
def isEssentiallySignedOrUnsigned(op): def isEssentiallySignedOrUnsigned(op):
if op and op.valueType: e = getEssentialType(op)
if op.valueType.sign in ['unsigned', 'signed']: return e and (e.split(' ')[0] in ('unsigned', 'signed'))
return True
return False
def isEssentiallyChar(op): def isEssentiallyChar(op):
if op.isName: if op is None:
return getEssentialType(op).split(' ')[-1] == 'char' return False
if op.str == '+':
return isEssentiallyChar(op.astOperand1) or isEssentiallyChar(op.astOperand2)
return op.isChar return op.isChar
for token in data.tokenlist: for token in data.tokenlist:
if not token.isArithmeticalOp or token.str not in ['+', '-']: if token.str not in ('+', '-'):
continue continue
operand1 = token.astOperand1 if (not isEssentiallyChar(token.astOperand1)) and (not isEssentiallyChar(token.astOperand2)):
operand2 = token.astOperand2
if not operand1 or not operand2:
continue
if not operand1.isChar and not operand2.isChar:
continue continue
if token.str == '+': if token.str == '+':
if isEssentiallyChar(operand1) and not isEssentiallySignedOrUnsigned(operand2): if isEssentiallyChar(token.astOperand1) and not isEssentiallySignedOrUnsigned(token.astOperand2):
self.reportError(token, 10, 2) self.reportError(token, 10, 2)
if isEssentiallyChar(operand2) and not isEssentiallySignedOrUnsigned(operand1): if isEssentiallyChar(token.astOperand2) and not isEssentiallySignedOrUnsigned(token.astOperand1):
self.reportError(token, 10, 2) self.reportError(token, 10, 2)
if token.str == '-': if token.str == '-':
if not isEssentiallyChar(operand1): if getEssentialType(token.astOperand1).split(' ')[-1] != 'char':
self.reportError(token, 10, 2) self.reportError(token, 10, 2)
if not isEssentiallyChar(operand2) and not isEssentiallySignedOrUnsigned(operand2): if not isEssentiallyChar(token.astOperand2) and not isEssentiallySignedOrUnsigned(token.astOperand2):
self.reportError(token, 10, 2) self.reportError(token, 10, 2)
def misra_10_3(self, cfg): def misra_10_3(self, cfg):

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

@ -643,10 +643,10 @@ static void misra_10_1_ternary(void)
} }
static void misra_10_2(void) { static void misra_10_2(void) {
unsigned int u8a = 0; uint8_t u8a = 0;
signed char cha = 0; char cha = 0;
signed int s8a = 0; int8_t s8a = 0;
signed short s16a = 0; int16_t s16a = 0;
float f32a = 0.0; float f32a = 0.0;
char res; char res;
@ -654,9 +654,9 @@ static void misra_10_2(void) {
res = s8a + '0'; res = s8a + '0';
res = cha - '0'; res = cha - '0';
res = '0' - s8a; res = '0' - s8a;
res = cha + ':'; res = cha + ':'; // 10.2
res = s16a - 'a'; // 10.2 res = s16a - 'a'; // 10.2 10.3
res = '0' + f32a; // 10.2 10.4 res = '0' + f32a; // 10.2 10.4
} }