misra.py: Fixed 13.1 fp for struct initialization

danmar · danmar · commit dbe2a42e8955 · 2018-05-22T13:11:39.000+02:00
diff --git a/addons/misra.py b/addons/misra.py
@@ -968,10 +968,10 @@ def misra_12_4(data):
 
 def misra_13_1(data):
     for token in data.tokenlist:
-        if token.str != '=':
+        if not simpleMatch(token, '] = {'):
             continue
-        init = token.next
-        if init and init.str == '{' and hasSideEffectsRecursive(init):
+        init = token.next.next
+        if hasSideEffectsRecursive(init):
             reportError(init, 13, 1)
 
 
diff --git a/addons/test/misra-test.c b/addons/test/misra-test.c
@@ -218,10 +218,12 @@ void misra_12_4() {
   x = 123456u * 123456u; // 12.4
 }
 
+struct misra_13_1_t { int a; int b; };
 void misra_13_1(int *p) {
   volatile int v;
   int a[3] = {0, (*p)++, 2}; // 13.1
-  int b[2] = {v,1}; // TODO
+  int b[2] = {v,1};
+  struct misra_13_1_t c = { .a=4, .b=5 }; // no fp
 }
 
 void misra_13_3() {
