From 33df4037272c2bf3e33e33f10ab7d66d45a6d9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 14 Apr 2017 13:01:02 +0200
Subject: [PATCH] Misra: Refactoring with simpleMatch

---
 addons/misra.py | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/addons/misra.py b/addons/misra.py
index 7ae6ead03..6d94cdc31 100644
--- a/addons/misra.py
+++ b/addons/misra.py
@@ -407,22 +407,11 @@ def misra_15_6(rawTokens):
 
 def misra_15_7(data):
     for token in data.tokenlist:
-        if token.str != 'if':
+        if not simpleMatch(token, 'if ('):
             continue
-        lpar = token.next
-        if not lpar or lpar.str != '(':
+        if not simpleMatch(token.next.link, ') {'):
             continue
-        rpar = lpar.link
-        if not rpar or rpar.str != ')':
-            continue
-        brace1 = rpar.next
-        if not brace1 or brace1.str != '{':
-            continue
-        brace2 = brace1.link
-        if not brace2 or brace2.str != '}':
-            continue
-        else_ = brace2.next
-        if not else_ or else_.str != 'else':
+        if not simpleMatch(token.next.link.next.link, '} else'):
             reportError(token, 15, 7)
 
 # TODO add 16.1 rule