Fix the `build/endif_comment` check.
- The check needs to be run before we remove comments, otherwise valid
lines will be found as invalid.
- A single character different from `/` after the spaces is enough to
indicate an error.
- Also catch errors when only one `/` is present.
(For example `#endif / MY_FILE_H`.)
diff --git a/cpplint/cpplint.py b/cpplint/cpplint.py
index 796a4a4..2b6c5c8 100755
--- a/cpplint/cpplint.py
+++ b/cpplint/cpplint.py
@@ -2683,6 +2683,11 @@
filename, line number, error level, and message
"""
+ line = clean_lines.lines_without_raw_strings[linenum]
+ if Match(r'\s*#\s*endif\s*([^/\s]|/[^/]|$)', line):
+ error(filename, linenum, 'build/endif_comment', 5,
+ 'Uncommented text after #endif is non-standard. Use a comment.')
+
# Remove comments from the line, but leave in strings for now.
line = clean_lines.lines[linenum]
@@ -2713,10 +2718,6 @@
'Storage-class specifier (static, extern, typedef, etc) should be '
'at the beginning of the declaration.')
- if Match(r'\s*#\s*endif\s*[^/\s]+', line):
- error(filename, linenum, 'build/endif_comment', 5,
- 'Uncommented text after #endif is non-standard. Use a comment.')
-
if Match(r'\s*class\s+(\w+\s*::\s*)+\w+\s*;', line):
error(filename, linenum, 'build/forward_decl', 5,
'Inner-style forward declarations are invalid. Remove this line.')