tools: bump cpplint to 1.5.4

PR-URL: #36324
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

Author: Trott

tools/cpplint.py

@@ -59,7 +59,7 @@
 # if empty, use defaults
 _valid_extensions=set([])
 
-__VERSION__='1.5.3'
+__VERSION__='1.5.4'
 
 try:
 xrange# Python 2
@@ -295,7 +295,6 @@
 'build/include',
 'build/include_subdir',
 'build/include_alpha',
-'build/include_inline',
 'build/include_order',
 'build/include_what_you_use',
 'build/namespaces_headers',
@@ -311,13 +310,11 @@
 'readability/constructors',
 'readability/fn_size',
 'readability/inheritance',
-'readability/pointer_notation',
 'readability/multiline_comment',
 'readability/multiline_string',
 'readability/namespace',
 'readability/nolint',
 'readability/nul',
-'readability/null_usage',
 'readability/strings',
 'readability/todo',
 'readability/utf8',
@@ -337,7 +334,6 @@
 'runtime/string',
 'runtime/threadsafe_fn',
 'runtime/vlog',
-'runtime/v8_persistent',
 'whitespace/blank_line',
 'whitespace/braces',
 'whitespace/comma',
@@ -846,14 +842,6 @@
 'Missing space after ,': r's/,\([^ ]\)/, \1/g',
 }
 
-_NULL_TOKEN_PATTERN=re.compile(r'\bNULL\b')
-
-_V8_PERSISTENT_PATTERN=re.compile(r'\bv8::Persistent\b')
-
-_RIGHT_LEANING_POINTER_PATTERN=re.compile(r'[^=|(,\s><);&?:}]'
-r'(?<!(sizeof|return))'
-r'\s\*[a-zA-Z_][0-9a-zA-Z_]*')
-
 _regexp_compile_cache= {}
 
 # {str, set(int)}: a map from error categories to sets of linenumbers
@@ -1094,11 +1082,10 @@ class _IncludeState(object):
 # needs to move backwards, CheckNextIncludeOrder will raise an error.
 _INITIAL_SECTION=0
 _MY_H_SECTION=1
-_OTHER_H_SECTION=2
-_OTHER_SYS_SECTION=3
-_C_SECTION=4
-_CPP_SECTION=5
-
+_C_SECTION=2
+_CPP_SECTION=3
+_OTHER_SYS_SECTION=4
+_OTHER_H_SECTION=5
 
 _TYPE_NAMES= {
 _C_SYS_HEADER: 'C system header',
@@ -1873,7 +1860,7 @@ def FindNextMultiLineCommentEnd(lines, lineix):
 
 defRemoveMultiLineCommentsFromRange(lines, begin, end):
 """Clears a range of lines for multi-line comments."""
-# Having // dummy comments makes the lines non-empty, so we will not get
+# Having // <empty> comments makes the lines non-empty, so we will not get
 # unnecessary blank line warnings later in the code.
 foriinrange(begin, end):
 lines[i] ='/**/'
@@ -2247,7 +2234,7 @@ def CheckForCopyright(filename, lines, error):
 """Logs an error if no Copyright message appears at the top of the file."""
 
 # We'll say it should occur by line 10. Don't forget there's a
-# dummy line at the front.
+# placeholder line at the front.
 forlineinxrange(1, min(len(lines), 11)):
 ifre.search(r'Copyright', lines[line], re.I): break
 else: # means no copyright line was found
@@ -2533,21 +2520,6 @@ def CheckForBadCharacters(filename, lines, error):
 error(filename, linenum, 'readability/nul', 5, 'Line contains NUL byte.')
 
 
-defCheckInlineHeader(filename, include_state, error):
-"""Logs an error if both a header and its inline variant are included."""
-
-all_headers=dict(itemforsublistininclude_state.include_list
-foriteminsublist)
-bad_headers=set('%s.h'%name[:-6] fornameinall_headers.keys()
-ifname.endswith('-inl.h'))
-bad_headers&=set(all_headers.keys())
-
-fornameinbad_headers:
-err='%s includes both %s and %s-inl.h'% (filename, name, name)
-linenum=all_headers[name]
-error(filename, linenum, 'build/include_inline', 5, err)
-
-
 defCheckForNewlineAtEOF(filename, lines, error):
 """Logs an error if there is no newline char at the end of the file.
 
@@ -3571,7 +3543,7 @@ def CheckForFunctionLengths(filename, clean_lines, linenum,
 """Reports for long function bodies.
 
  For an overview why this is done, see:
- https://google.github.io/styleguide/cppguide.html#Write_Short_Functions
+ https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Write_Short_Functions
 
  Uses a simplistic algorithm assuming other style guidelines
  (especially spacing) are followed.
@@ -3805,9 +3777,10 @@ def CheckSpacing(filename, clean_lines, linenum, nesting_state, error):
 # get rid of comments and strings
 line=clean_lines.elided[linenum]
 
-# You shouldn't have spaces before your brackets, except maybe after
-# 'delete []', 'return []() {};', or 'auto [abc, ...] = ...;'.
-ifSearch(r'\w\s+\[', line) andnotSearch(r'(?:auto&?|delete|return)\s+\[', line):
+# You shouldn't have spaces before your brackets, except for C++11 attributes
+# or maybe after 'delete []', 'return []() {};', or 'auto [abc, ...] = ...;'.
+if (Search(r'\w\s+\[(?!\[)', line) and
+notSearch(r'(?:auto&?|delete|return)\s+\[', line)):
 error(filename, linenum, 'whitespace/braces', 5,
 'Extra space before [')
 
@@ -4797,71 +4770,6 @@ def CheckAltTokens(filename, clean_lines, linenum, error):
 'Use operator %s instead of %s'% (
 _ALT_TOKEN_REPLACEMENT[match.group(1)], match.group(1)))
 
-defCheckNullTokens(filename, clean_lines, linenum, error):
-"""Check NULL usage.
-
- Args:
- filename: The name of the current file.
- clean_lines: A CleansedLines instance containing the file.
- linenum: The number of the line to check.
- error: The function to call with any errors found.
- """
-line=clean_lines.elided[linenum]
-
-# Avoid preprocessor lines
-ifMatch(r'^\s*#', line):
-return
-
-ifline.find('/*') >=0orline.find('*/') >=0:
-return
-
-formatchin_NULL_TOKEN_PATTERN.finditer(line):
-error(filename, linenum, 'readability/null_usage', 2,
-'Use nullptr instead of NULL')
-
-defCheckV8PersistentTokens(filename, clean_lines, linenum, error):
-"""Check v8::Persistent usage.
-
- Args:
- filename: The name of the current file.
- clean_lines: A CleansedLines instance containing the file.
- linenum: The number of the line to check.
- error: The function to call with any errors found.
- """
-line=clean_lines.elided[linenum]
-
-# Avoid preprocessor lines
-ifMatch(r'^\s*#', line):
-return
-
-ifline.find('/*') >=0orline.find('*/') >=0:
-return
-
-formatchin_V8_PERSISTENT_PATTERN.finditer(line):
-error(filename, linenum, 'runtime/v8_persistent', 2,
-'Use v8::Global instead of v8::Persistent')
-
-defCheckLeftLeaningPointer(filename, clean_lines, linenum, error):
-"""Check for left-leaning pointer placement.
-
- Args:
- filename: The name of the current file.
- clean_lines: A CleansedLines instance containing the file.
- linenum: The number of the line to check.
- error: The function to call with any errors found.
- """
-line=clean_lines.elided[linenum]
-
-# Avoid preprocessor lines
-ifMatch(r'^\s*#', line):
-return
-
-if'/*'inlineor'*/'inline:
-return
-
-formatchin_RIGHT_LEANING_POINTER_PATTERN.finditer(line):
-error(filename, linenum, 'readability/pointer_notation', 2,
-'Use left leaning pointer instead of right leaning')
 
 defGetLineWidth(line):
 """Determines the width of the line in column positions.
@@ -5016,9 +4924,6 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state,
 CheckSpacingForFunctionCall(filename, clean_lines, linenum, error)
 CheckCheck(filename, clean_lines, linenum, error)
 CheckAltTokens(filename, clean_lines, linenum, error)
-CheckNullTokens(filename, clean_lines, linenum, error)
-CheckV8PersistentTokens(filename, clean_lines, linenum, error)
-CheckLeftLeaningPointer(filename, clean_lines, linenum, error)
 classinfo=nesting_state.InnermostClass()
 ifclassinfo:
 CheckSectionSpacing(filename, clean_lines, classinfo, linenum, error)
@@ -5204,10 +5109,11 @@ def CheckIncludeLine(filename, clean_lines, linenum, include_state, error):
 include_state.include_list[-1].append((include, linenum))
 
 # We want to ensure that headers appear in the right order:
-# 1) for foo.cc, foo.h
-# 2) other project headers
-# 3) c system files
-# 4) cpp system files
+# 1) for foo.cc, foo.h (preferred location)
+# 2) c system files
+# 3) cpp system files
+# 4) for foo.cc, foo.h (deprecated location)
+# 5) other google headers
 #
 # We classify each include statement as one of those 5 types
 # using a number of techniques. The include_state object keeps
@@ -5470,7 +5376,7 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension,
 andline[-1] !='\\'):
 error(filename, linenum, 'build/namespaces_headers', 4,
 'Do not use unnamed namespaces in header files. See '
-'https://google.github.io/styleguide/cppguide.html#Namespaces'
+'https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces'
 ' for more information.')
 
 
@@ -6592,8 +6498,6 @@ def ProcessFileData(filename, file_extension, lines, error,
 
 CheckForNewlineAtEOF(filename, lines, error)
 
-CheckInlineHeader(filename, include_state, error)
-
 defProcessConfigOverrides(filename):
 """ Loads the configuration files and processes the config overrides.
 
@@ -6612,7 +6516,7 @@ def ProcessConfigOverrides(filename):
 ifnotbase_name:
 break# Reached the root directory.
 
-cfg_file=os.path.join(abs_path, ".cpplint")
+cfg_file=os.path.join(abs_path, "CPPLINT.cfg")
 abs_filename=abs_path
 ifnotos.path.isfile(cfg_file):
 continue