StarMirror/styleguide
1
0
Fork 0
mirror of https://github.com/google/styleguide.git synced 2024-03-22 13:11:43 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #187 from google/revert-169-gh-pages

Browse Source 
Revert "Fix the `cpplint.py` `build/endif_comment` check."
This commit is contained in:
Elliot Glaysher 2016-09-30 15:35:21 -07:00 committed by GitHub
commit 71ec7f1e52
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpplint/cpplint.py vendored
View File

@ -2710,11 +2710,6 @@ def CheckForNonStandardConstructs(filename, clean_lines, linenum,
filename, line number, error level, and message 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. # Remove comments from the line, but leave in strings for now.
line = clean_lines.lines[linenum] line = clean_lines.lines[linenum]
@ -2745,6 +2740,10 @@ def CheckForNonStandardConstructs(filename, clean_lines, linenum,
'Storage-class specifier (static, extern, typedef, etc) should be ' 'Storage-class specifier (static, extern, typedef, etc) should be '
'at the beginning of the declaration.') '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): if Match(r'\s*class\s+(\w+\s*::\s*)+\w+\s*;', line):
error(filename, linenum, 'build/forward_decl', 5, error(filename, linenum, 'build/forward_decl', 5,
'Inner-style forward declarations are invalid. Remove this line.') 'Inner-style forward declarations are invalid. Remove this line.')

29
cpplint/cpplint_unittest.py
View File

@ -3754,7 +3754,7 @@ class CpplintTest(CpplintTestBase):
#else #else
baz; baz;
qux; qux;
#endif // foo""", #endif""",
'') '')
self.TestMultiLineLint( self.TestMultiLineLint(
"""void F() { """void F() {
@ -3920,7 +3920,7 @@ class CpplintTest(CpplintTestBase):
'#include "path/unique.h"', '#include "path/unique.h"',
'#else', '#else',
'#include "path/unique.h"', '#include "path/unique.h"',
'#endif // MACRO', '#endif',
''], ''],
error_collector) error_collector)
self.assertEquals( self.assertEquals(
@ -3969,7 +3969,7 @@ class CpplintTest(CpplintTestBase):
struct Foo : public Goo { struct Foo : public Goo {
#else #else
struct Foo : public Hoo { struct Foo : public Hoo {
#endif // DERIVE_FROM_GOO #endif
};""", };""",
'') '')
self.TestMultiLineLint( self.TestMultiLineLint(
@ -3979,7 +3979,7 @@ class CpplintTest(CpplintTestBase):
: public Goo { : public Goo {
#else #else
: public Hoo { : public Hoo {
#endif // DERIVE_FROM_GOO #endif
};""", };""",
'') '')
# Test incomplete class # Test incomplete class
@ -3997,27 +3997,6 @@ class CpplintTest(CpplintTestBase):
'Uncommented text after #endif is non-standard. Use a comment.' 'Uncommented text after #endif is non-standard. Use a comment.'
' [build/endif_comment] [5]') ' [build/endif_comment] [5]')
correct_lines = [
'#endif // text',
'#endif //'
]
for line in correct_lines:
self.TestLint(line, '')
incorrect_lines = [
'#endif',
'#endif Not a comment',
'#endif / One `/` is not enough to start a comment'
]
for line in incorrect_lines:
self.TestLint(
line,
'Uncommented text after #endif is non-standard. Use a comment.'
' [build/endif_comment] [5]')
def testBuildForwardDecl(self): def testBuildForwardDecl(self):
# The crosstool compiler we currently use will fail to compile the # The crosstool compiler we currently use will fail to compile the
# code in this test, so we might consider removing the lint check. # code in this test, so we might consider removing the lint check.