catch identifiers ending or starting with _ when checking operator spacing

[ardour.git] / tools / cstyle.py

diff --git a/tools/cstyle.py b/tools/cstyle.py
index 314d7746ae36fc458169e563cd5a7bc37fbc1cf4..d5d7391dffbac3da27caffedfc8e9c9c83e51cef 100755 (executable)
--- a/tools/cstyle.py
+++ b/tools/cstyle.py
@@ -209,7 +209,7 @@ class CStyleChecker:
                        if check_re.search (line):
                                self.error (msg)
 
-               if re.search ("[a-zA-Z0-9][<>!=^/&\|]{1,2}[a-zA-Z0-9]", line):
+               if re.search ("[a-zA-Z0-9_][<>!=^/&\|]{1,2}[a-zA-Z0-9_]", line):
                         # ignore #include <foo.h> and C++ templates with indirection/pointer/reference operators
                        if not re.search (".*#include.*[a-zA-Z0-9]/[a-zA-Z]", line) and not re.search ("[a-zA-Z0-9_]>[&\*]", line):
                                self.error ("missing space around operator")