From 8646e95b6f91942e7741830dc057daa0e9a40aed Mon Sep 17 00:00:00 2001 From: tycho Date: Wed, 11 Mar 2015 10:39:49 +0000 Subject: Fixed style and removed false positives Relaxed the rules for < followed by an && and removed rule for < following an && --- src/CheckBasicStyle.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/CheckBasicStyle.lua') diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua index 648a5711b..16e34e321 100644 --- a/src/CheckBasicStyle.lua +++ b/src/CheckBasicStyle.lua @@ -101,9 +101,9 @@ local g_ViolationPatterns = {"&&[^(]+!=", "Add parenthesis around comparison"}, {"!=[^)]+||", "Add parenthesis around comparison"}, {"||[^(]+!=", "Add parenthesis around comparison"}, - {"<[^)T][^)]*&&", "Add parenthesis around comparison"}, -- Must take special care of templates: "template fn(Args && ...)" - {"&&[^(]+<", "Add parenthesis around comparison"}, - {"<[^)T][^)]*||", "Add parenthesis around comparison"}, -- Must take special care of templates: "template fn(Args && ...)" + {"<[^)>]*&&", "Add parenthesis around comparison"}, -- Must take special care of templates: "template fn(Args && ...)" + -- Cannot check a < following a && due to functions of the form x fn(y&& a, z c) + {"<[^)>]*||", "Add parenthesis around comparison"}, -- Must take special care of templates: "template fn(Args && ...)" {"||[^(]+<", "Add parenthesis around comparison"}, -- Cannot check ">" because of "obj->m_Flag &&". Check at least ">=": {">=[^)]+&&", "Add parenthesis around comparison"}, -- cgit v1.2.3