From 7e8839a991d751dea8cf1f621a1bf5b33ad5efea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 11 Nov 2020 14:24:55 +0100 Subject: [PATCH] Addons: Reuse cppcheckdata.simpleMatch --- addons/cert.py | 7 ++----- addons/misc.py | 6 +----- addons/misra.py | 6 +----- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/addons/cert.py b/addons/cert.py index 748cb8389..21c172114 100755 --- a/addons/cert.py +++ b/addons/cert.py @@ -25,11 +25,8 @@ def reportError(token, severity, msg, id): cppcheckdata.reportError(token, severity, msg, 'cert', id) def simpleMatch(token, pattern): - for p in pattern.split(' '): - if not token or token.str != p: - return False - token = token.next - return True + return cppcheckdata.simpleMatch(token, pattern) + def isUnpackedStruct(token): if token.valueType is None: diff --git a/addons/misc.py b/addons/misc.py index 2c8c63c28..15a742c28 100644 --- a/addons/misc.py +++ b/addons/misc.py @@ -24,11 +24,7 @@ def reportError(token, severity, msg, id): cppcheckdata.reportError(token, severity, msg, 'misc', id) def simpleMatch(token, pattern): - for p in pattern.split(' '): - if not token or token.str != p: - return False - token = token.next - return True + return cppcheckdata.simpleMatch(token, pattern) # Get function arguments def getArgumentsRecursive(tok, arguments): diff --git a/addons/misra.py b/addons/misra.py index 7c7d90348..9aa96db42 100755 --- a/addons/misra.py +++ b/addons/misra.py @@ -59,11 +59,7 @@ def isUnsignedType(ty): def simpleMatch(token, pattern): - for p in pattern.split(' '): - if not token or token.str != p: - return False - token = token.next - return True + return cppcheckdata.simpleMatch(token, pattern) def rawlink(rawtoken):