From 14445f32950bf5b86e638658c54131fd2fd82c55 Mon Sep 17 00:00:00 2001 From: Hs293Go Date: Sun, 1 Dec 2024 20:18:25 -0500 Subject: [PATCH 01/63] Fix missing comma between items in _CPP_HEADERS --- cpplint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpplint.py b/cpplint.py index 10a69c0..79a16f2 100755 --- a/cpplint.py +++ b/cpplint.py @@ -557,7 +557,7 @@ 'concepts', 'coroutine', 'format', - 'latch' + 'latch', 'numbers', 'ranges', 'semaphore', From fd77bc009ff0823e8715f4454539bf7f993d22c5 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Wed, 29 Jan 2025 18:07:40 -0500 Subject: [PATCH 02/63] Fix false positive for indented parameters in namespaces This also speeds up execution by on average 1.3%. Huh. --- CHANGELOG.rst | 7 ++ cpplint.py | 12 ++- cpplint_unittest.py | 5 +- samples/boost-sample/exclude.def | 7 +- samples/boost-sample/headers_inspect.def | 7 +- samples/boost-sample/simple.def | 26 +----- samples/chromium-sample/simple.def | 9 +- samples/protobuf-sample/simple.def | 103 +---------------------- 8 files changed, 26 insertions(+), 150 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4dfac75..bd67068 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog ********* +2.0.1 (2025-01-??) +================== + +Yet another overdue... hotfix. Sorry this took so long. + +* The false positive for indented function parameters in namespaces was eradicated. + 2.0 (2024-10-06) ================ diff --git a/cpplint.py b/cpplint.py index 79a16f2..7e8470a 100755 --- a/cpplint.py +++ b/cpplint.py @@ -3035,6 +3035,11 @@ def __init__(self): # the full nesting stack would slow down cpplint by ~10%. self.previous_stack_top = [] + # The number of open parentheses in the previous stack top before the last update. + # Used to prevent false indentation detection when e.g. a function parameter is indented. + # We can't use previous_stack_top, a shallow copy whose open_parentheses value is updated. + self.previous_open_parentheses = 0 + # Stack of _PreprocessorInfo objects. self.pp_stack = [] @@ -3206,6 +3211,7 @@ def Update(self, filename, clean_lines, linenum, error): # deepcopy would slow down cpplint by ~28%. if self.stack: self.previous_stack_top = self.stack[-1] + self.previous_open_parentheses = self.stack[-1].open_parentheses else: self.previous_stack_top = None @@ -6372,7 +6378,7 @@ def IsBlockInNameSpace(nesting_state, is_forward_declaration): return False -def ShouldCheckNamespaceIndentation(nesting_state, is_namespace_indent_item, +def ShouldCheckNamespaceIndentation(nesting_state: NestingState, is_namespace_indent_item, raw_lines_no_comments, linenum): """This method determines if we should apply our namespace indentation check. @@ -6399,6 +6405,10 @@ def ShouldCheckNamespaceIndentation(nesting_state, is_namespace_indent_item, if IsMacroDefinition(raw_lines_no_comments, linenum): return False + # Skip if we are inside an open parenthesis block (e.g. function parameters). + if nesting_state.previous_stack_top and nesting_state.previous_open_parentheses > 0: + return False + return IsBlockInNameSpace(nesting_state, is_forward_declaration) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index c20384c..d5f126d 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -309,9 +309,10 @@ def testNamespaceIndentationForClass(self): 'Do not indent within a namespace. ' ' [whitespace/indent_namespace] [4]']) - def testNamespaceIndentationNoError(self): + def testNamespaceIndentationIndentedParameter(self): lines = ['namespace Test {', - 'void foo() { }', + 'void foo(' + ' SuperLongTypeName d = 418) { }', '} // namespace Test'] results = self.GetNamespaceResults(lines) diff --git a/samples/boost-sample/exclude.def b/samples/boost-sample/exclude.def index e9fef89..731ffad 100644 --- a/samples/boost-sample/exclude.def +++ b/samples/boost-sample/exclude.def @@ -3,15 +3,13 @@ 4 Done processing src/inspect/unnamed_namespace_check.hpp Done processing src/tr1/c_policy.hpp -Total errors found: 126 +Total errors found: 121 src/inspect/unnamed_namespace_check.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_INSPECT_UNNAMED_NAMESPACE_CHECK_HPP_ [build/header_guard] [5] src/inspect/unnamed_namespace_check.hpp:11: Include the directory when naming header files [build/include_subdir] [4] src/inspect/unnamed_namespace_check.hpp:14: Do not use unnamed namespaces in header files. See https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces for more information. [build/namespaces_headers] [4] src/inspect/unnamed_namespace_check.hpp:17: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:18: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:18: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:19: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:19: Closing ) should be moved to the previous line [whitespace/parens] [2] src/inspect/unnamed_namespace_check.hpp:21: Anonymous namespace should be terminated with "// namespace" [readability/namespace] [5] src/inspect/unnamed_namespace_check.hpp:21: At least two spaces is best between code and comments [whitespace/comments] [2] @@ -44,9 +42,6 @@ src/inspect/unnamed_namespace_check.hpp:38: Do not indent within a namespace. src/inspect/unnamed_namespace_check.hpp:38: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/inspect/unnamed_namespace_check.hpp:40: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:40: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:41: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:42: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:43: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:44: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:44: { should almost always be at the end of the previous line [whitespace/braces] [4] src/inspect/unnamed_namespace_check.hpp:48: Lines should be <= 80 characters long [whitespace/line_length] [2] diff --git a/samples/boost-sample/headers_inspect.def b/samples/boost-sample/headers_inspect.def index 6c61efc..3c1d647 100644 --- a/samples/boost-sample/headers_inspect.def +++ b/samples/boost-sample/headers_inspect.def @@ -2,15 +2,13 @@ src/inspect/* 1 3 Done processing src/inspect/unnamed_namespace_check.hpp -Total errors found: 55 +Total errors found: 50 src/inspect/unnamed_namespace_check.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_INSPECT_UNNAMED_NAMESPACE_CHECK_HPP_ [build/header_guard] [5] src/inspect/unnamed_namespace_check.hpp:11: Include the directory when naming header files [build/include_subdir] [4] src/inspect/unnamed_namespace_check.hpp:14: Do not use unnamed namespaces in header files. See https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces for more information. [build/namespaces_headers] [4] src/inspect/unnamed_namespace_check.hpp:17: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:18: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:18: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:19: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:19: Closing ) should be moved to the previous line [whitespace/parens] [2] src/inspect/unnamed_namespace_check.hpp:21: Anonymous namespace should be terminated with "// namespace" [readability/namespace] [5] src/inspect/unnamed_namespace_check.hpp:21: At least two spaces is best between code and comments [whitespace/comments] [2] @@ -43,9 +41,6 @@ src/inspect/unnamed_namespace_check.hpp:38: Do not indent within a namespace. src/inspect/unnamed_namespace_check.hpp:38: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/inspect/unnamed_namespace_check.hpp:40: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:40: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:41: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:42: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:43: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:44: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:44: { should almost always be at the end of the previous line [whitespace/braces] [4] src/inspect/unnamed_namespace_check.hpp:48: Lines should be <= 80 characters long [whitespace/line_length] [2] diff --git a/samples/boost-sample/simple.def b/samples/boost-sample/simple.def index 823013c..229b367 100644 --- a/samples/boost-sample/simple.def +++ b/samples/boost-sample/simple.def @@ -2,7 +2,7 @@ include/boost/math/* 1 3 Done processing include/boost/math/octonion.hpp -Total errors found: 2924 +Total errors found: 2900 include/boost/math/octonion.hpp:11: #ifndef header guard has wrong style, please use: SAMPLES_BOOST_SAMPLE_INCLUDE_BOOST_MATH_OCTONION_HPP_ [build/header_guard] [5] include/boost/math/octonion.hpp:4250: #endif line should be "#endif // SAMPLES_BOOST_SAMPLE_INCLUDE_BOOST_MATH_OCTONION_HPP_" [build/header_guard] [5] @@ -1167,7 +1167,6 @@ include/boost/math/octonion.hpp:1711: Do not indent within a namespace. [white include/boost/math/octonion.hpp:1711: Lines should be <= 80 characters long [whitespace/line_length] [2] include/boost/math/octonion.hpp:1711: Missing space after , [whitespace/comma] [3] include/boost/math/octonion.hpp:1711: Extra space after ( [whitespace/parens] [2] -include/boost/math/octonion.hpp:1712: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:1713: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:1713: { should almost always be at the end of the previous line [whitespace/braces] [4] include/boost/math/octonion.hpp:1716: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -2616,7 +2615,6 @@ include/boost/math/octonion.hpp:3856: Do not indent within a namespace. [white include/boost/math/octonion.hpp:3856: Lines should be <= 80 characters long [whitespace/line_length] [2] include/boost/math/octonion.hpp:3856: Missing space after , [whitespace/comma] [3] include/boost/math/octonion.hpp:3856: Extra space after ( [whitespace/parens] [2] -include/boost/math/octonion.hpp:3857: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:3857: Lines should be <= 80 characters long [whitespace/line_length] [2] include/boost/math/octonion.hpp:3858: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:3858: { should almost always be at the end of the previous line [whitespace/braces] [4] @@ -2728,13 +2726,6 @@ include/boost/math/octonion.hpp:3999: Do not indent within a namespace. [white include/boost/math/octonion.hpp:3999: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] include/boost/math/octonion.hpp:4000: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4001: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4002: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4003: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4004: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4005: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4006: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4007: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4008: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4009: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4009: { should almost always be at the end of the previous line [whitespace/braces] [4] include/boost/math/octonion.hpp:4012: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] @@ -2772,13 +2763,6 @@ include/boost/math/octonion.hpp:4054: Do not indent within a namespace. [white include/boost/math/octonion.hpp:4054: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] include/boost/math/octonion.hpp:4055: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4056: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4057: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4058: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4059: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4060: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4061: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4062: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4063: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4064: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4064: { should almost always be at the end of the previous line [whitespace/braces] [4] include/boost/math/octonion.hpp:4067: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] @@ -2791,13 +2775,6 @@ include/boost/math/octonion.hpp:4080: Do not indent within a namespace. [white include/boost/math/octonion.hpp:4080: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] include/boost/math/octonion.hpp:4081: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4082: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4083: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4084: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4085: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4086: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4087: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4088: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4089: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4090: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4090: { should almost always be at the end of the previous line [whitespace/braces] [4] include/boost/math/octonion.hpp:4093: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] @@ -2886,7 +2863,6 @@ include/boost/math/octonion.hpp:4192: Do not indent within a namespace. [white include/boost/math/octonion.hpp:4192: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] include/boost/math/octonion.hpp:4193: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4194: Do not indent within a namespace. [whitespace/indent_namespace] [4] -include/boost/math/octonion.hpp:4195: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4196: Do not indent within a namespace. [whitespace/indent_namespace] [4] include/boost/math/octonion.hpp:4196: { should almost always be at the end of the previous line [whitespace/braces] [4] include/boost/math/octonion.hpp:4198: { should almost always be at the end of the previous line [whitespace/braces] [4] diff --git a/samples/chromium-sample/simple.def b/samples/chromium-sample/simple.def index 1e68efd..a5c6c5c 100644 --- a/samples/chromium-sample/simple.def +++ b/samples/chromium-sample/simple.def @@ -5,12 +5,9 @@ Done processing src/chrome_content_renderer_client.cc Done processing src/chrome_content_renderer_client.h Done processing src/io_thread.cc Done processing src/io_thread.h -Total errors found: 25 +Total errors found: 18 src/chrome_content_renderer_client.cc:303: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/chrome_content_renderer_client.cc:308: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/chrome_content_renderer_client.cc:309: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/chrome_content_renderer_client.cc:310: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/chrome_content_renderer_client.cc:308: Add #include for vector<> [build/include_what_you_use] [4] src/chrome_content_renderer_client.cc:1540: Add #include for set<> [build/include_what_you_use] [4] src/chrome_content_renderer_client.cc:1841: Add #include for string [build/include_what_you_use] [4] @@ -19,10 +16,6 @@ src/chrome_content_renderer_client.h:5: #ifndef header guard has wrong style, p src/chrome_content_renderer_client.h:225: #endif line should be "#endif // SAMPLES_CHROMIUM_SAMPLE_SRC_CHROME_CONTENT_RENDERER_CLIENT_H_" [build/header_guard] [5] src/chrome_content_renderer_client.h:115: Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4] src/chrome_content_renderer_client.h:117: Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4] -src/io_thread.cc:242: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/io_thread.cc:286: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/io_thread.cc:298: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/io_thread.cc:299: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/io_thread.cc:1148: Closing ) should be moved to the previous line [whitespace/parens] [2] src/io_thread.cc:1547: Missing space around colon in range-based for loop [whitespace/forcolon] [2] src/io_thread.cc:651: Add #include for map<> [build/include_what_you_use] [4] diff --git a/samples/protobuf-sample/simple.def b/samples/protobuf-sample/simple.def index a01d2b0..963eaba 100644 --- a/samples/protobuf-sample/simple.def +++ b/samples/protobuf-sample/simple.def @@ -4,7 +4,7 @@ src/* Done processing src/descriptor.pb.cc Done processing src/descriptor.pb.h Done processing src/descriptor_unittest.cc -Total errors found: 3212 +Total errors found: 3111 src/descriptor.pb.cc:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/descriptor.pb.cc:9: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] @@ -266,12 +266,9 @@ src/descriptor.pb.cc:900: Do not indent within a namespace. [whitespace/indent src/descriptor.pb.cc:917: If statement had no body and no else clause [whitespace/empty_if_body] [4] src/descriptor.pb.cc:932: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:938: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:956: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:961: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:964: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:970: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1004: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1020: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:1030: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1063: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] src/descriptor.pb.cc:1064: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -297,7 +294,6 @@ src/descriptor.pb.cc:1249: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:1252: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1260: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1280: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:1285: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1288: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1347: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -314,8 +310,6 @@ src/descriptor.pb.cc:1455: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:1456: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1459: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1460: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1510: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1608: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:1708: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1733: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] src/descriptor.pb.cc:1756: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] @@ -479,16 +473,13 @@ src/descriptor.pb.cc:2482: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:2484: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2502: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] src/descriptor.pb.cc:2506: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:2522: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:2527: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2530: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2535: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2550: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2583: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:2587: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2592: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2602: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2603: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:2607: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2612: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2616: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -515,16 +506,13 @@ src/descriptor.pb.cc:2781: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:2783: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2801: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] src/descriptor.pb.cc:2805: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:2821: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:2826: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2829: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2834: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2849: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2882: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:2886: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2891: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2901: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2902: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:2906: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2911: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2915: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -547,7 +535,6 @@ src/descriptor.pb.cc:3071: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:3088: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3106: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3109: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3127: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:3132: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3135: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3158: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -560,9 +547,7 @@ src/descriptor.pb.cc:3237: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:3252: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3263: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3268: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3321: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:3351: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3399: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:3433: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3479: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3504: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] @@ -693,7 +678,6 @@ src/descriptor.pb.cc:4322: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:4325: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4328: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4334: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4347: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:4352: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4355: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4394: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -703,11 +687,9 @@ src/descriptor.pb.cc:4430: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:4433: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4482: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4496: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4546: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:4570: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4613: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4633: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4634: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:4660: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4706: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:4721: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -862,12 +844,9 @@ src/descriptor.pb.cc:5381: If statement had no body and no else clause [whites src/descriptor.pb.cc:5396: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5402: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5413: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5422: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:5427: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5430: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5470: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:5489: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5490: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:5504: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5536: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] src/descriptor.pb.cc:5537: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -903,13 +882,10 @@ src/descriptor.pb.cc:5699: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:5716: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5722: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5734: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5748: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:5753: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5756: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5779: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5794: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5826: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5858: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:5886: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5911: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] src/descriptor.pb.cc:5935: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] @@ -955,15 +931,12 @@ src/descriptor.pb.cc:6200: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:6206: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6218: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6222: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6232: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:6237: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6240: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6262: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6276: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6308: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:6322: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6338: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6339: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:6354: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6365: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6397: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] @@ -1014,14 +987,11 @@ src/descriptor.pb.cc:6672: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:6678: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6690: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6693: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6704: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:6709: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6712: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6735: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6750: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6782: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:6813: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6814: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:6842: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6867: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] src/descriptor.pb.cc:6888: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1077,17 +1047,14 @@ src/descriptor.pb.cc:7199: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:7202: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7205: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7208: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7222: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:7227: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7230: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7285: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7299: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7314: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7347: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:7387: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7392: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7402: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7403: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:7447: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7452: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7456: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1200,7 +1167,6 @@ src/descriptor.pb.cc:8014: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:8018: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8024: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8027: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8042: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:8047: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8050: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8074: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1218,7 +1184,6 @@ src/descriptor.pb.cc:8231: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:8248: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8275: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8320: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:8335: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8342: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8350: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1229,7 +1194,6 @@ src/descriptor.pb.cc:8380: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:8385: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8390: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8436: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:8452: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8460: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8468: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1419,7 +1383,6 @@ src/descriptor.pb.cc:9363: If statement had no body and no else clause [whites src/descriptor.pb.cc:9378: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9403: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] src/descriptor.pb.cc:9407: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:9424: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:9429: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9432: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9437: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1428,12 +1391,10 @@ src/descriptor.pb.cc:9467: Lines should be <= 80 characters long [whitespace/l src/descriptor.pb.cc:9482: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9492: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9498: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9537: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:9541: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9546: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9551: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9556: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9577: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:9581: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9586: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9591: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1476,7 +1437,6 @@ src/descriptor.pb.cc:9972: If statement had no body and no else clause [whites src/descriptor.pb.cc:9987: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10012: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] src/descriptor.pb.cc:10016: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:10036: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:10041: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10044: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10045: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1491,13 +1451,11 @@ src/descriptor.pb.cc:10118: Lines should be <= 80 characters long [whitespace/ src/descriptor.pb.cc:10134: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10144: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10189: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:10199: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10204: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10209: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10212: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10220: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10241: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:10251: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10256: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10261: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1547,17 +1505,14 @@ src/descriptor.pb.cc:10664: If statement had no body and no else clause [white src/descriptor.pb.cc:10679: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10704: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] src/descriptor.pb.cc:10708: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:10725: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:10730: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10733: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10738: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10753: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10763: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10769: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10808: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:10812: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10817: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10838: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:10842: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10847: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10862: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1584,15 +1539,12 @@ src/descriptor.pb.cc:11083: Do not indent within a namespace. [whitespace/inde src/descriptor.pb.cc:11101: If statement had no body and no else clause [whitespace/empty_if_body] [4] src/descriptor.pb.cc:11116: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11122: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11142: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11147: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11150: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11155: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11165: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11210: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11214: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11235: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11239: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11254: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11294: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] @@ -1613,15 +1565,12 @@ src/descriptor.pb.cc:11439: Do not indent within a namespace. [whitespace/inde src/descriptor.pb.cc:11440: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11458: If statement had no body and no else clause [whitespace/empty_if_body] [4] src/descriptor.pb.cc:11473: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11499: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11504: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11507: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11512: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11522: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11528: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11567: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11571: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11592: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11596: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11611: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11651: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] @@ -1642,15 +1591,12 @@ src/descriptor.pb.cc:11796: Do not indent within a namespace. [whitespace/inde src/descriptor.pb.cc:11797: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11815: If statement had no body and no else clause [whitespace/empty_if_body] [4] src/descriptor.pb.cc:11830: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11856: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11861: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11864: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11869: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11879: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11885: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11924: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11928: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11949: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:11953: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11968: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12008: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] @@ -1678,14 +1624,11 @@ src/descriptor.pb.cc:12190: Lines should be <= 80 characters long [whitespace/ src/descriptor.pb.cc:12194: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12196: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12208: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12219: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:12224: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12227: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12249: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12282: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:12296: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12306: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12307: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:12322: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12326: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12355: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1714,18 +1657,15 @@ src/descriptor.pb.cc:12544: Missing space after , [whitespace/comma] [3] src/descriptor.pb.cc:12551: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12554: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12557: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12572: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:12577: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12580: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12586: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12619: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12634: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12649: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12712: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:12732: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12737: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12742: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12769: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:12791: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12796: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12801: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1868,7 +1808,6 @@ src/descriptor.pb.cc:13396: Lines should be <= 80 characters long [whitespace/ src/descriptor.pb.cc:13402: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13414: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13417: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13430: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:13435: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13438: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13442: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -1883,12 +1822,10 @@ src/descriptor.pb.cc:13498: Lines should be <= 80 characters long [whitespace/ src/descriptor.pb.cc:13515: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13516: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13518: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13550: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:13554: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13564: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13595: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13610: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:13665: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13673: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13698: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] @@ -1905,12 +1842,9 @@ src/descriptor.pb.cc:13847: Do not indent within a namespace. [whitespace/inde src/descriptor.pb.cc:13848: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:13865: If statement had no body and no else clause [whitespace/empty_if_body] [4] src/descriptor.pb.cc:13880: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13904: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:13909: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13912: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13918: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13952: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13968: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:13978: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14011: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] src/descriptor.pb.cc:14012: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -2037,7 +1971,6 @@ src/descriptor.pb.cc:14395: Lines should be <= 80 characters long [whitespace/ src/descriptor.pb.cc:14413: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] src/descriptor.pb.cc:14417: Missing space after , [whitespace/comma] [3] src/descriptor.pb.cc:14424: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14439: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:14444: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14447: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14451: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -2046,12 +1979,10 @@ src/descriptor.pb.cc:14455: Lines should be <= 80 characters long [whitespace/ src/descriptor.pb.cc:14456: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14487: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14502: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14535: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:14539: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14559: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14564: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14574: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14575: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:14604: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14609: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14613: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -2071,12 +2002,9 @@ src/descriptor.pb.cc:14770: Do not indent within a namespace. [whitespace/inde src/descriptor.pb.cc:14787: If statement had no body and no else clause [whitespace/empty_if_body] [4] src/descriptor.pb.cc:14802: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14808: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14826: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:14831: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14834: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14840: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14874: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14890: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.cc:14900: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14933: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] src/descriptor.pb.cc:14934: Lines should be <= 80 characters long [whitespace/line_length] [2] @@ -2143,31 +2071,26 @@ src/descriptor.pb.h:88: Lines should be <= 80 characters long [whitespace/line src/descriptor.pb.h:89: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:91: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:92: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.h:97: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.h:98: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:107: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:108: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:109: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:111: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:112: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.h:117: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.h:118: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:127: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:128: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:129: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:131: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.h:137: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.h:147: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:148: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:151: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.h:157: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.h:167: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:168: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:169: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:171: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:172: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.h:177: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor.pb.h:183: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:225: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.h:227: private: should be indented +1 space inside class FileDescriptorSet [whitespace/indent] [3] @@ -2984,25 +2907,6 @@ src/descriptor_unittest.cc:57: "google/protobuf/stubs/logging.h" already includ src/descriptor_unittest.cc:58: Found C system header after C++ system header. Should be: descriptor_unittest.h, c system, c++ system, other. [build/include_order] [4] src/descriptor_unittest.cc:59: Found C system header after C++ system header. Should be: descriptor_unittest.h, c system, c++ system, other. [build/include_order] [4] src/descriptor_unittest.cc:60: Found C system header after C++ system header. Should be: descriptor_unittest.h, c system, c++ system, other. [build/include_order] [4] -src/descriptor_unittest.cc:88: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:95: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:102: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:103: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:104: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:114: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:115: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:116: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:117: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:128: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:129: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:130: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:131: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:142: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:150: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:158: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:166: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:167: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:168: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor_unittest.cc:734: Extra space before ) [whitespace/parens] [2] src/descriptor_unittest.cc:735: Extra space before ) [whitespace/parens] [2] src/descriptor_unittest.cc:822: Extra space after ( in function call [whitespace/parens] [4] @@ -3165,13 +3069,9 @@ src/descriptor_unittest.cc:2325: Extra space before ( in function call [whites src/descriptor_unittest.cc:2327: Extra space after ( in function call [whitespace/parens] [4] src/descriptor_unittest.cc:2327: Extra space before ( in function call [whitespace/parens] [4] src/descriptor_unittest.cc:2383: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor_unittest.cc:2627: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:2698: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:2699: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor_unittest.cc:2781: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor_unittest.cc:3038: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor_unittest.cc:3120: Missing space after , [whitespace/comma] [3] -src/descriptor_unittest.cc:4183: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor_unittest.cc:4475: Closing ) should be moved to the previous line [whitespace/parens] [2] src/descriptor_unittest.cc:4489: Closing ) should be moved to the previous line [whitespace/parens] [2] src/descriptor_unittest.cc:4502: Closing ) should be moved to the previous line [whitespace/parens] [2] @@ -3184,7 +3084,6 @@ src/descriptor_unittest.cc:5273: Do not indent within a namespace. [whitespace src/descriptor_unittest.cc:5274: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor_unittest.cc:5276: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor_unittest.cc:5277: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor_unittest.cc:5856: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/descriptor_unittest.cc:5929: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/descriptor_unittest.cc:5968: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/descriptor_unittest.cc:6401: Do not indent within a namespace. [whitespace/indent_namespace] [4] From 3af0cd82cfed858600d64663524d5b11c4a1e0f6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 3 Mar 2025 16:01:50 +0100 Subject: [PATCH 03/63] Fix typos discovered by codespell --- CHANGELOG.rst | 2 +- cpplint.py | 12 ++++++------ samples/boost-sample/include/boost/math/octonion.hpp | 4 ++-- .../src/chrome_content_renderer_client.cc | 4 ++-- samples/codelite-sample/src/pptable.cpp | 4 ++-- samples/protobuf-sample/src/descriptor_unittest.cc | 8 ++++---- samples/v8-sample/src/interface-descriptors.h | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bd67068..49e31a1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -43,7 +43,7 @@ A large long-overdue modernization of the codebase! * `build/class` and `build/namespaces` no longer check for whether a namespace or class has a closing brace from @geoffviola (https://github.com/cpplint/cpplint/pull/272). This should be done in a more efficient manner by a compiler or language server instead. As part of this, the `build/class` category was removed. * Fixed false positive when an if/else statement has braces everywhere but one of the closing braces before the final block is on a separate line by @aaronliu0130 (https://github.com/cpplint/cpplint/pull/265) * For header files, the check for a header guard's name will now be cached and only run once, as opposed to previously being run on every line. This results in a ~5.6% reduction in run time thanks to @matyalatte, who figured it out, and @aaronliu0130 for implementing it (https://github.com/cpplint/cpplint/pull/291) -* Usages of the deprecated sre_compile were refectored by @jspricke (https://github.com/cpplint/cpplint/pull/214) +* Usages of the deprecated sre_compile were refactored by @jspricke (https://github.com/cpplint/cpplint/pull/214) * Usages of deprecated unittest aliases were refactored by @tirkarthi (https://github.com/cpplint/cpplint/pull/182), @aaronliu0130 and @jayvdb * Typos in this changelog, comments and functions were fixed by @jayvdb (https://github.com/cpplint/cpplint/pull/245), @aaronliu0130 and @tkruse * %-strings were modernized into f-strings by @aaronliu0130 diff --git a/cpplint.py b/cpplint.py index 7e8470a..73427c6 100755 --- a/cpplint.py +++ b/cpplint.py @@ -5255,7 +5255,7 @@ def _GetTextInside(text, start_pattern): Given a string of lines and a regular expression string, retrieve all the text following the expression and between opening punctuation symbols like (, [, or {, and the matching close-punctuation symbol. This properly nested - occurrences of the punctuations, so for the text like + occurrences of the punctuation, so for the text like printf(a(), b(c())); a call to _GetTextInside(text, r'printf\(') will return 'a(), b(c())'. start_pattern must match string having an open punctuation symbol at the end. @@ -5272,7 +5272,7 @@ def _GetTextInside(text, start_pattern): # TODO(unknown): Audit cpplint.py to see what places could be profitably # rewritten to use _GetTextInside (and use inferior regexp matching today). - # Give opening punctuations to get the matching close-punctuations. + # Give opening punctuation to get the matching close-punctuation. matching_punctuation = {'(': ')', '{': '}', '[': ']'} closing_punctuation = set(dict.values(matching_punctuation)) @@ -5286,22 +5286,22 @@ def _GetTextInside(text, start_pattern): 'start_pattern must ends with an opening punctuation.') assert text[start_position - 1] in matching_punctuation, ( 'start_pattern must ends with an opening punctuation.') - # Stack of closing punctuations we expect to have in text after position. + # Stack of closing punctuation we expect to have in text after position. punctuation_stack = [matching_punctuation[text[start_position - 1]]] position = start_position while punctuation_stack and position < len(text): if text[position] == punctuation_stack[-1]: punctuation_stack.pop() elif text[position] in closing_punctuation: - # A closing punctuation without matching opening punctuations. + # A closing punctuation without matching opening punctuation. return None elif text[position] in matching_punctuation: punctuation_stack.append(matching_punctuation[text[position]]) position += 1 if punctuation_stack: - # Opening punctuations left without matching close-punctuations. + # Opening punctuation left without matching close-punctuation. return None - # punctuations match. + # punctuation match. return text[start_position:position - 1] diff --git a/samples/boost-sample/include/boost/math/octonion.hpp b/samples/boost-sample/include/boost/math/octonion.hpp index fba9aff..a6c1a67 100644 --- a/samples/boost-sample/include/boost/math/octonion.hpp +++ b/samples/boost-sample/include/boost/math/octonion.hpp @@ -925,7 +925,7 @@ namespace boost // There is quite a lot of repetition in the code below. This is intentional. // The last conditional block is the normal form, and the others merely -// consist of workarounds for various compiler deficiencies. Hopefuly, when +// consist of workarounds for various compiler deficiencies. Hopefully, when // more compilers are conformant and we can retire support for those that are // not, we will be able to remove the clutter. This is makes the situation // (painfully) explicit. @@ -3970,7 +3970,7 @@ namespace boost #undef BOOST_OCTONION_VALARRAY_LOADER - // Note: This is the Cayley norm, not the Euclidian norm... + // Note: This is the Cayley norm, not the Euclidean norm... template inline T norm(octonion const & o) diff --git a/samples/chromium-sample/src/chrome_content_renderer_client.cc b/samples/chromium-sample/src/chrome_content_renderer_client.cc index 04a7dbd..fe0d0ec 100644 --- a/samples/chromium-sample/src/chrome_content_renderer_client.cc +++ b/samples/chromium-sample/src/chrome_content_renderer_client.cc @@ -1194,12 +1194,12 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( #endif // BUILDFLAG(ENABLE_PLUGINS) // For NaCl content handling plugins, the NaCl manifest is stored in an -// additonal 'nacl' param associated with the MIME type. +// additional 'nacl' param associated with the MIME type. // static GURL ChromeContentRendererClient::GetNaClContentHandlerURL( const std::string& actual_mime_type, const content::WebPluginInfo& plugin) { - // Look for the manifest URL among the MIME type's additonal parameters. + // Look for the manifest URL among the MIME type's additional parameters. for (const auto& mime_type : plugin.mime_types) { if (mime_type.mime_type == actual_mime_type) { for (const auto& p : mime_type.additional_params) { diff --git a/samples/codelite-sample/src/pptable.cpp b/samples/codelite-sample/src/pptable.cpp index c11c811..62be675 100644 --- a/samples/codelite-sample/src/pptable.cpp +++ b/samples/codelite-sample/src/pptable.cpp @@ -155,7 +155,7 @@ void PPToken::processArgs(const wxString &argsList) { args = wxStringTokenize(argsList, wxT(","), wxTOKEN_STRTOK); - // replace all occurances of 'arg' with %1, %2 etc + // replace all occurrences of 'arg' with %1, %2 etc for(size_t i=0; isecond.fullname() << wxT("=") << replacement << wxT("\n"); diff --git a/samples/protobuf-sample/src/descriptor_unittest.cc b/samples/protobuf-sample/src/descriptor_unittest.cc index f937b9e..8a32002 100644 --- a/samples/protobuf-sample/src/descriptor_unittest.cc +++ b/samples/protobuf-sample/src/descriptor_unittest.cc @@ -419,7 +419,7 @@ TEST_F(FileDescriptorTest, FindExtensionByNumber) { } TEST_F(FileDescriptorTest, BuildAgain) { - // Test that if te call BuildFile again on the same input we get the same + // Test that if the call BuildFile again on the same input we get the same // FileDescriptor back. FileDescriptorProto file; foo_file_->CopyTo(&file); @@ -431,7 +431,7 @@ TEST_F(FileDescriptorTest, BuildAgain) { } TEST_F(FileDescriptorTest, BuildAgainWithSyntax) { - // Test that if te call BuildFile again on the same input we get the same + // Test that if the call BuildFile again on the same input we get the same // FileDescriptor back even if syntax param is specified. FileDescriptorProto proto_syntax2; proto_syntax2.set_name("foo_syntax2"); @@ -2251,7 +2251,7 @@ TEST_F(MiscTest, DefaultValues) { AddField(message_proto, "empty_string", 11, label, FD::TYPE_STRING) ->set_default_value(""); - // Add a second set of fields with implicit defalut values. + // Add a second set of fields with implicit default values. AddField(message_proto, "implicit_int32" , 21, label, FD::TYPE_INT32 ); AddField(message_proto, "implicit_int64" , 22, label, FD::TYPE_INT64 ); AddField(message_proto, "implicit_uint32", 23, label, FD::TYPE_UINT32); @@ -4647,7 +4647,7 @@ TEST_F(ValidationErrorTest, RepeatedMessageOption) { } TEST_F(ValidationErrorTest, ResolveUndefinedOption) { - // The following should produce an eror that baz.bar is resolved but not + // The following should produce an error that baz.bar is resolved but not // defined. // foo.proto: // package baz diff --git a/samples/v8-sample/src/interface-descriptors.h b/samples/v8-sample/src/interface-descriptors.h index b552ec9..269cda3 100644 --- a/samples/v8-sample/src/interface-descriptors.h +++ b/samples/v8-sample/src/interface-descriptors.h @@ -180,7 +180,7 @@ class V8_EXPORT_PRIVATE CallInterfaceDescriptorData { RegList allocatable_registers_ = 0; // |registers_params_| defines registers that are used for parameter passing. - // |machine_types_| defines machine types for resulting values and incomping + // |machine_types_| defines machine types for resulting values and incoming // parameters. // Both arrays are allocated dynamically by the InterfaceDescriptor and // freed on destruction. This is because static arrays cause creation of @@ -945,7 +945,7 @@ class BinaryOpDescriptor : public CallInterfaceDescriptor { DECLARE_DESCRIPTOR(BinaryOpDescriptor, CallInterfaceDescriptor) }; -// This desciptor is shared among String.p.charAt/charCodeAt/codePointAt +// This descriptor is shared among String.p.charAt/charCodeAt/codePointAt // as they all have the same interface. class StringAtDescriptor final : public CallInterfaceDescriptor { public: From 80da3c1ef37af017715dc1366fbda8263179bdeb Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Tue, 4 Mar 2025 18:52:25 -0500 Subject: [PATCH 04/63] IWYU: treat stdio.h the same way as cstdio (#319) Fixes #302 --------- Co-authored-by: Christian Clauss --- CHANGELOG.rst | 1 + cpplint.py | 13 ++++++++----- cpplint_unittest.py | 3 +++ samples/vlc-sample/simple.def | 3 +-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 49e31a1..50db299 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,6 +8,7 @@ Changelog Yet another overdue... hotfix. Sorry this took so long. * The false positive for indented function parameters in namespaces was eradicated. +* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/306) 2.0 (2024-10-06) ================ diff --git a/cpplint.py b/cpplint.py index 73427c6..7a8b8ab 100755 --- a/cpplint.py +++ b/cpplint.py @@ -6226,12 +6226,15 @@ def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error, for item in sublist]) # All the lines have been processed, report the errors found. - for required_header_unstripped in sorted(required, key=required.__getitem__): - template = required[required_header_unstripped][1] - if required_header_unstripped.strip('<>"') not in include_dict: - error(filename, required[required_header_unstripped][0], + for header in sorted(required, key=required.__getitem__): + template = required[header][1] + header_stripped = header.strip('<>"') + if (header_stripped not in include_dict + and not (header_stripped[0] == 'c' + and (header_stripped[1:] + '.h') in include_dict)): + error(filename, required[header][0], 'build/include_what_you_use', 4, - 'Add #include ' + required_header_unstripped + ' for ' + template) + 'Add #include ' + header + ' for ' + template) _RE_PATTERN_EXPLICIT_MAKEPAIR = re.compile(r'\bmake_pair\s*<') diff --git a/cpplint_unittest.py b/cpplint_unittest.py index d5f126d..08eb375 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -1123,6 +1123,9 @@ def testIncludeWhatYouUse(self): self.TestIncludeWhatYouUse( 'printf("hello world");', 'Add #include for printf [build/include_what_you_use] [4]') + self.TestIncludeWhatYouUse( + """#include + printf("hello world");""", '') # Avoid false positives w/ c-style include self.TestIncludeWhatYouUse( 'void a(const string &foobar);', 'Add #include for string [build/include_what_you_use] [4]') diff --git a/samples/vlc-sample/simple.def b/samples/vlc-sample/simple.def index 19c9563..174819e 100644 --- a/samples/vlc-sample/simple.def +++ b/samples/vlc-sample/simple.def @@ -4,7 +4,7 @@ src/* Done processing src/libvlc.c Done processing src/libvlc.h Done processing src/missing.c -Total errors found: 602 +Total errors found: 601 src/libvlc.c:41: Found C system header after other header. Should be: libvlc.h, c system, c++ system, other. [build/include_order] [4] src/libvlc.c:47: Found C system header after other header. Should be: libvlc.h, c system, c++ system, other. [build/include_order] [4] @@ -367,7 +367,6 @@ src/libvlc.c:627: Missing space before ( in if( [whitespace/parens] [5] src/libvlc.c:629: Extra space after ( in function call [whitespace/parens] [4] src/libvlc.c:629: Extra space before ) [whitespace/parens] [2] src/libvlc.c:640: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/libvlc.c:223: Add #include for fclose [build/include_what_you_use] [4] src/libvlc.h:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_VLC_SAMPLE_SRC_LIBVLC_H_ [build/header_guard] [5] src/libvlc.h:34: Extra space before ( in function call [whitespace/parens] [4] src/libvlc.h:35: Extra space before ( in function call [whitespace/parens] [4] From cba132cab1012e71882740482c29f71e967e9a93 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 4 Mar 2025 12:59:24 +0100 Subject: [PATCH 05/63] Add pre-commit --- .github/workflows/ci.yml | 10 +++++++++- .pre-commit-config.yaml | 25 +++++++++++++++++++++++++ pyproject.toml | 4 ++-- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b93ce3c..df07023 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,15 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: 3.x + - uses: pre-commit/action@v3.0.1 + build-test: runs-on: ${{ matrix.os }} strategy: @@ -17,7 +26,6 @@ jobs: python-version: ['3.8', 'pypy3.10', '3.12'] os: [ubuntu-latest, windows-latest] fail-fast: false - steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..d542b3e --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,25 @@ +# Learn more about this config here: https://pre-commit.com/ + +# To enable these pre-commit hooks run: +# `pipx install pre-commit` or `brew install pre-commit` +# Then in the project root directory run `pre-commit install` + +repos: + - repo: https://github.com/codespell-project/codespell + rev: v2.4.1 + hooks: + - id: codespell + args: + - --ignore-words-list=alse,ons + additional_dependencies: + - tomli + + - repo: https://github.com/tox-dev/pyproject-fmt + rev: v2.5.1 + hooks: + - id: pyproject-fmt + + - repo: https://github.com/abravalheri/validate-pyproject + rev: v0.23 + hooks: + - id: validate-pyproject diff --git a/pyproject.toml b/pyproject.toml index 29ae077..e4bb940 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] build-backend = "setuptools.build_meta:__legacy__" requires = [ - "setuptools", - "wheel", + "setuptools", + "wheel", ] From fe8ce9aa3554869c8b11982ba9a739061b297cae Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 6 Mar 2025 23:48:36 +0100 Subject: [PATCH 06/63] GitHub Actions: pipx run pre-commit run --all-files (#324) --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df07023..bf522c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: 3.x - - uses: pre-commit/action@v3.0.1 + - run: pipx run pre-commit run --all-files build-test: runs-on: ${{ matrix.os }} From 181d47f1883f7fe81af67ebfdc51911bec042c1a Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 7 Mar 2025 00:27:52 +0100 Subject: [PATCH 07/63] README.rst: Add instructions for pre-commit (#320) * https://pre-commit.com * https://pipx.pypa.io * https://docs.astral.sh/uv --------- Co-authored-by: Aaron Liu --- README.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.rst b/README.rst index 8d299b9..a515b48 100644 --- a/README.rst +++ b/README.rst @@ -55,6 +55,17 @@ For full usage instructions, run: $ cpplint --help +cpplint can also be run as a pre-commit hook by adding to `.pre-commit-config.yaml`: + +.. code-block:: yaml + + - repo: https://github.com/cpplint/cpplint + rev: 2.0.0 + hooks: + - id: cpplint + args: + - --filter=-whitespace/line_length,-whitespace/parens + Changes ======= From 755497f4e61048705f3c371297d0b90dac921f9b Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 7 Mar 2025 06:32:20 +0100 Subject: [PATCH 08/63] PEP 621: Migrate from setup.{py, cfg} to pyproject.toml (#315) https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html * https://peps.python.org/pep-0621 Migrate `setup.py` to `setup.cfg` using [setuptools-py2cfg](https://pypi.org/project/setuptools-py2cfg) plus manual modifications. Then migrate `setup.cfg` to `pyproject.toml` using [ini2toml](https://pypi.org/project/ini2toml) to do the file conversion and running [pyproject-fmt](https://pypi.org/project/pyproject-fmt) and then [validate-pyproject](https://github.com/abravalheri/validate-pyproject) to validate the results. ```yaml strategy: matrix: fail-fast: false # Python 3.8 is EOL. Also adapt tox.ini python-version: ['3.8', 'pypy3.11', '3.13'] # macOS on ARM, Ubuntu on x86, Windows on X86 os: [macos-latest, ubuntu-latest, windows-latest] ``` --- .github/workflows/ci.yml | 17 +++++---- cpplint.py | 2 +- dev-requirements | 5 --- pyproject.toml | 77 ++++++++++++++++++++++++++++++++++++++-- setup.cfg | 10 ------ setup.py | 48 ------------------------- test-requirements | 8 ----- tox.ini | 11 +----- 8 files changed, 84 insertions(+), 94 deletions(-) delete mode 100644 dev-requirements delete mode 100644 setup.cfg delete mode 100755 setup.py delete mode 100644 test-requirements diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf522c6..32fc77b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,12 @@ jobs: build-test: runs-on: ${{ matrix.os }} strategy: - matrix: - # Python 3.8 is the last non-EOL version. Also adapt tox.ini - python-version: ['3.8', 'pypy3.10', '3.12'] - os: [ubuntu-latest, windows-latest] fail-fast: false + matrix: + # Python 3.8 is EOL. Also adapt tox.ini + python-version: ['3.8', 'pypy3.11', '3.x'] + # macOS on ARM, Ubuntu on x86, Windows on X86 + os: [macos-latest, ubuntu-latest, windows-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -32,13 +33,11 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - architecture: x64 cache: 'pip' - cache-dependency-path: '**/test-requirements' + cache-dependency-path: 'pyproject.toml' - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install -e .[dev] - python -m pip install 'tox-gh-actions<4.0.0' + python -m pip install --editable .[dev] - name: Test with tox - run: tox + run: tox -e py diff --git a/cpplint.py b/cpplint.py index 7a8b8ab..0e658d2 100755 --- a/cpplint.py +++ b/cpplint.py @@ -44,7 +44,7 @@ import codecs import collections import copy -import getopt +import getopt # pylint: disable=deprecated-module import glob import itertools import math # for log diff --git a/dev-requirements b/dev-requirements deleted file mode 100644 index 62a36ea..0000000 --- a/dev-requirements +++ /dev/null @@ -1,5 +0,0 @@ -# requirements to run development steps - -flake8>=4.0.1 -pylint>=2.11.0 -setuptools diff --git a/pyproject.toml b/pyproject.toml index e4bb940..91f944a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,77 @@ [build-system] -build-backend = "setuptools.build_meta:__legacy__" -requires = [ +build-backend = "setuptools.build_meta" +requires = [ "setuptools>=61.2" ] + +[project] +name = "cpplint" +version = "2.0.0" +description = "Automated checker to ensure C++ files follow Google's style guide" +readme = "README.rst" +keywords = [ "c++", "lint", "python" ] +license = { text = "BSD-3-Clause" } +maintainers = [ { name = "cpplint Developers" } ] +requires-python = ">=3.8" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Intended Audience :: End Users/Desktop", + "License :: Freely Distributable", + "License :: OSI Approved :: BSD License", + "Natural Language :: English", + "Programming Language :: C++", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Topic :: Software Development :: Quality Assurance", +] +dependencies = [ ] + +optional-dependencies.dev = [ + "flake8>=4.0.1", + "parameterized", + "pylint>=2.11", + "pytest", + "pytest-cov", + "pytest-timeout", "setuptools", - "wheel", + "testfixtures", + "tox<5", +] +optional-dependencies.test = [ + "parameterized", + "pytest", + "pytest-cov", + "pytest-timeout", + "testfixtures", + "tox<5", +] +optional-dependencies.testing = [ + "parameterized", + "pytest", + "pytest-cov", + "pytest-timeout", + "testfixtures", + "tox<5", ] +urls.Download = "https://github.com/cpplint/cpplint" +urls.Homepage = "https://github.com/cpplint/cpplint" +scripts.cpplint = "cpplint:main" + +[tool.setuptools] +py-modules = [ "cpplint" ] +include-package-data = false + +[tool.pytest.ini_options] +python_files = [ "*test.py" ] +testpaths = [ "." ] +required_plugins = [ "pytest-cov", "pytest-timeout" ] +timeout = 60 +# fail if coverage is under 90% +addopts = "--color=yes --cov-fail-under=90 --cov=cpplint" + +[tool.aliases] +test = "pytest" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index eebbf0a..0000000 --- a/setup.cfg +++ /dev/null @@ -1,10 +0,0 @@ -[aliases] -test = pytest - -[tool:pytest] -python_files = *test.py -testpaths = . -required_plugins = pytest-cov pytest-timeout -timeout = 60 -# fail if coverage is under 90% -addopts = --color=yes --cov-fail-under=90 --cov=cpplint diff --git a/setup.py b/setup.py deleted file mode 100755 index 2325a71..0000000 --- a/setup.py +++ /dev/null @@ -1,48 +0,0 @@ -#! /usr/bin/env python -from setuptools import setup -import cpplint - -# some pip versions bark on comments -def read_without_comments(filename): - with open(filename) as f: - return [line for line in f.read().splitlines() if not len(line) == 0 and not line.startswith('#')] - -test_required = read_without_comments('test-requirements') - -setup(name='cpplint', - version=cpplint.__VERSION__, - py_modules=['cpplint'], - # generate platform specific start script - entry_points={ - 'console_scripts': [ - 'cpplint = cpplint:main' - ] - }, - install_requires=[], - url='https://github.com/cpplint/cpplint', - download_url='https://github.com/cpplint/cpplint', - keywords=['lint', 'python', 'c++'], - maintainer='cpplint Developers', - classifiers=['Development Status :: 5 - Production/Stable', - 'Environment :: Console', - 'Intended Audience :: End Users/Desktop', - 'License :: Freely Distributable', - 'License :: OSI Approved :: BSD License', - 'Natural Language :: English', - 'Programming Language :: Python :: 3 :: Only', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', - 'Programming Language :: C++', - 'Topic :: Software Development :: Quality Assurance'], - description='Automated checker to ensure C++ files follow Google\'s style guide', - long_description=open('README.rst').read(), - license='BSD-3-Clause', - tests_require=test_required, - # extras_require allow pip install .[dev] - extras_require={ - 'test': test_required, - 'dev': read_without_comments('dev-requirements') + test_required - }) diff --git a/test-requirements b/test-requirements deleted file mode 100644 index 9c9abb5..0000000 --- a/test-requirements +++ /dev/null @@ -1,8 +0,0 @@ -# requirements for testing steps -tox<5.0.0 - -pytest -pytest-cov -pytest-timeout -testfixtures -parameterized diff --git a/tox.ini b/tox.ini index d7e3e82..1fc6c00 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,7 @@ [tox] -envlist = py38, py39, py3.10, py311, py312, pypy3 +envlist = py38, py39, py3.10, py311, py312, py313, pypy3 skip_missing_interpreters = true -[gh-actions] -python = - 3.8: py38 - 3.9: py39 - 3.10: py310 - 3.11: py311 - 3.12: py312 - pypy3.10: pypy3 - [testenv] extras = dev From e4b43ac9ed23a99ffbba9ce498374b0c0bbf96f2 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 7 Mar 2025 11:53:06 +0100 Subject: [PATCH 09/63] README.rst: Use pipx to install cpplint from PyPI (#325) pip and pipx come from the same development team, but pipx allows us to remove all the confusing text about external managed environments. https://pipx.pypa.io --- README.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index a515b48..5d76bca 100644 --- a/README.rst +++ b/README.rst @@ -33,15 +33,11 @@ This fork aims to update cpplint to modern specifications, and be (somewhat) mor Installation ============ -To install cpplint from PyPI, run: +Use [`pipx`](https://pipx.pypa.io) to install cpplint from PyPI, run: .. code-block:: bash - $ pip install cpplint - -Externally managed environments -------------------------------- -If you get the "This environment is externally managed" error, try to search and install cpplint with your system's package manager (e.g. apt, rpm, pacman...). If it doesn't exist, you can either package cpplint for your distribution or repeat the steps above with the :code:`--break-system-packages` flag. + $ pipx install cpplint Usage ----- From ff42b70448b3c32cb5d790d759e69bbb37aff37f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 8 Mar 2025 07:01:38 +0100 Subject: [PATCH 10/63] Move flake8 from tox to pre-commit (#326) Migrate flake8 so it runs locally on developer machines before each commit and in GitHub Actions. --- .flake8 | 2 ++ .pre-commit-config.yaml | 5 +++++ cpplint_unittest.py | 3 ++- pyproject.toml | 1 - tox.ini | 1 - 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.flake8 b/.flake8 index 2b20931..ca2967e 100644 --- a/.flake8 +++ b/.flake8 @@ -28,6 +28,8 @@ ignore = E128, # unexpected indentation E116, + # continuation line unaligned for hanging indent + E131, # too many blank lines E303, # missing whitespace around arithmetic operator diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d542b3e..6043593 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,11 @@ repos: additional_dependencies: - tomli + - repo: https://github.com/pycqa/flake8 + rev: 7.1.2 + hooks: + - id: flake8 + - repo: https://github.com/tox-dev/pyproject-fmt rev: v2.5.1 hooks: diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 08eb375..c0a4010 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -231,6 +231,7 @@ def PerformIncludeWhatYouUse(self, code, filename='foo.h', io=codecs): # Perform lint and make sure one of the errors is what we want def TestLintContains(self, code, expected_message): self.assertTrue(expected_message in self.PerformSingleLineLint(code)) + def TestLintNotContains(self, code, expected_message): self.assertFalse(expected_message in self.PerformSingleLineLint(code)) @@ -1150,7 +1151,7 @@ def testIncludeWhatYouUse(self): """#include "base/foobar.h" boost::range::transform(input, std::back_inserter(output), square); """, - '') # Avoid false positives on transform in other namespaces. + '') # Avoid false positives on transform in other namespaces. self.TestIncludeWhatYouUse( """#include "base/foobar.h" bool foobar = std::min_element(a.begin(), a.end()); diff --git a/pyproject.toml b/pyproject.toml index 91f944a..b6236e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,6 @@ classifiers = [ dependencies = [ ] optional-dependencies.dev = [ - "flake8>=4.0.1", "parameterized", "pylint>=2.11", "pytest", diff --git a/tox.ini b/tox.ini index 1fc6c00..db55440 100644 --- a/tox.ini +++ b/tox.ini @@ -8,4 +8,3 @@ extras = dev commands = {envpython} -m pytest {posargs:} {envpython} -m pylint cpplint.py - {envpython} -m flake8 cpplint.py From 3a1a39c0b9454d8cfe8111536e68835fb051c176 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 8 Mar 2025 07:10:42 +0100 Subject: [PATCH 11/63] Add ruff to pre-commit (#327) # https://docs.astral.sh/ruff --- .pre-commit-config.yaml | 5 +++++ pyproject.toml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6043593..6919581 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,11 @@ repos: additional_dependencies: - tomli + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.9.9 + hooks: + - id: ruff + - repo: https://github.com/pycqa/flake8 rev: 7.1.2 hooks: diff --git a/pyproject.toml b/pyproject.toml index b6236e8..5bc3130 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -64,6 +64,9 @@ scripts.cpplint = "cpplint:main" py-modules = [ "cpplint" ] include-package-data = false +[tool.ruff] +lint.ignore = [ "E701" ] + [tool.pytest.ini_options] python_files = [ "*test.py" ] testpaths = [ "." ] From 0757ecf96c44d5e7811aa0301f680e79dc2ea974 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 7 Mar 2025 16:28:50 -0500 Subject: [PATCH 12/63] prepare for release 2.0.1 and update changelog * correct links for 2.0.1 changes * it's not january anymore aaron... * retroactively add some things that were included in 2.0 but not in its changgelog * bump version --- CHANGELOG.rst | 9 +++++---- cpplint.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 50db299..776179c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,22 +2,23 @@ Changelog ********* -2.0.1 (2025-01-??) +2.0.1 (2025-03-08) ================== Yet another overdue... hotfix. Sorry this took so long. -* The false positive for indented function parameters in namespaces was eradicated. -* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/306) +* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) +* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) 2.0 (2024-10-06) ================ A large long-overdue modernization of the codebase! -* Python 2 is no longer supported. Python 3.12 support was added along with fixed CI for 3.7 and 3.8, courtesy of @jayvdb +* Python 2 and 3.7 are no longer supported. Python 3.12 support was added along with fixed CI for 3.7 and 3.8, courtesy of @jayvdb * As a result of all this, setup.py's lint subcommand was removed. Please run the commands directly instead. * You can now specify blocks of code that exclude linting with NOLINTBEGIN and NOLINTEND, courtesy of @n3world (https://github.com/cpplint/cpplint/pull/213) +* The config filename can now be specified through `--config` thanks to @gedankenexperimenter (https://github.com/cpplint/cpplint/pull/198). Specifying a config file not under the current directory will be available in a future release. * The `--filter` option can now be only applied to a specific file or even a specific line through utilizing colons, e.g. `-filter=-whitespace:foo.h,+whitespace/braces:foo.h:418`. Courtesy of @PhilLab (https://github.com/cpplint/cpplint/pull/171) * NOLINT and NOLINTNEXTLINE comments now support a comma-separated list of categories, courtesy of @n3world (https://github.com/cpplint/cpplint/pull/220) * NOLINT and NOLINTNEXTLINE will now ignore categories known to be from clang-tidy thanks to @xatier (https://github.com/cpplint/cpplint/pull/231) diff --git a/cpplint.py b/cpplint.py index 0e658d2..769a1b9 100755 --- a/cpplint.py +++ b/cpplint.py @@ -59,7 +59,7 @@ # if empty, use defaults _valid_extensions = set([]) -__VERSION__ = '2.0.0' +__VERSION__ = '2.0.1' _USAGE = """ Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit|sed|gsed] From 4d731161223ac87c7bb4ec5a23ef1f87d15812f5 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sat, 8 Mar 2025 22:31:09 -0500 Subject: [PATCH 13/63] bump release date --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 776179c..e269e4b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,7 +2,7 @@ Changelog ********* -2.0.1 (2025-03-08) +2.0.1 (2025-03-09) ================== Yet another overdue... hotfix. Sorry this took so long. From 07aba9e3966c2ffa981ccfae75d4c1d2cf1d1310 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 9 Mar 2025 12:51:04 +0100 Subject: [PATCH 14/63] Python versions less than 3.8 are no longer supported. --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e269e4b..d62e33c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -15,7 +15,7 @@ Yet another overdue... hotfix. Sorry this took so long. A large long-overdue modernization of the codebase! -* Python 2 and 3.7 are no longer supported. Python 3.12 support was added along with fixed CI for 3.7 and 3.8, courtesy of @jayvdb +* Python versions less than 3.8 are no longer supported. Python 3.12 support was added along with fixed CI for 3.7 and 3.8, courtesy of @jayvdb * As a result of all this, setup.py's lint subcommand was removed. Please run the commands directly instead. * You can now specify blocks of code that exclude linting with NOLINTBEGIN and NOLINTEND, courtesy of @n3world (https://github.com/cpplint/cpplint/pull/213) * The config filename can now be specified through `--config` thanks to @gedankenexperimenter (https://github.com/cpplint/cpplint/pull/198). Specifying a config file not under the current directory will be available in a future release. From 03d56ce8cbca2dde249c47efcb22869c62e829f1 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 11 Mar 2025 09:54:33 +0100 Subject: [PATCH 15/63] Add more ruff lint rules (#328) ```yaml lint.select = [ "A", # flake8-builtins "AIR", # Airflow "ASYNC", # flake8-async "B", # flake8-bugbear "BLE", # flake8-blind-except "C90", # McCabe cyclomatic complexity "DJ", # flake8-django "DTZ", # flake8-datetimez "E", # pycodestyle "EM", # flake8-errmsg "EXE", # flake8-executable "F", # Pyflakes "FA", # flake8-future-annotations "FAST", # FastAPI "FBT", # flake8-boolean-trap "FIX", # flake8-fixme "FLY", # flynt "FURB", # refurb "G", # flake8-logging-format "I", # isort "ICN", # flake8-import-conventions "INP", # flake8-no-pep420 "INT", # flake8-gettext "ISC", # flake8-implicit-str-concat "LOG", # flake8-logging "NPY", # NumPy-specific rules "PD", # pandas-vet "PERF", # Perflint "PGH", # pygrep-hooks "PIE", # flake8-pie "PLC", # Pylint conventions "PLE", # Pylint errors "PYI", # flake8-pyi "RET", # flake8-return "RSE", # flake8-raise "SLOT", # flake8-slots "T10", # flake8-debugger "TC", # flake8-type-checking "TID", # flake8-tidy-imports "TRY", # tryceratops "W", # pycodestyle "YTT", # flake8-2020 ] ``` --- .pre-commit-config.yaml | 2 +- cpplint.py | 83 +++++++++++++++++++++++------------------ cpplint_clitest.py | 9 +++-- cpplint_unittest.py | 21 ++++++----- pyproject.toml | 78 +++++++++++++++++++++++++++++++++++++- 5 files changed, 140 insertions(+), 53 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6919581..9dc30df 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.9 + rev: v0.9.10 hooks: - id: ruff diff --git a/cpplint.py b/cpplint.py index 769a1b9..3848294 100755 --- a/cpplint.py +++ b/cpplint.py @@ -1407,9 +1407,9 @@ def AddFilters(self, filters): if clean_filt: self.filters.append(clean_filt) for filt in self.filters: - if not (filt.startswith('+') or filt.startswith('-')): - raise ValueError('Every filter in --filters must start with + or -' - f' ({filt} does not)') + if not filt.startswith(('+', '-')): + msg = f'Every filter in --filters must start with + or - ({filt} does not)' + raise ValueError(msg) def BackupFilters(self): """ Saves the current filter list to backup storage.""" @@ -1618,7 +1618,7 @@ def Check(self, error, filename, linenum): trigger = base_trigger * 2**_VerboseLevel() if self.lines_in_function > trigger: - error_level = int(math.log(self.lines_in_function / base_trigger, 2)) + error_level = int(math.log2(self.lines_in_function / base_trigger)) # 50 => 0, 100 => 1, 200 => 2, 400 => 3, 800 => 4, 1600 => 5, ... if error_level > 5: error_level = 5 @@ -1769,7 +1769,9 @@ def _ShouldPrintError(category, confidence, filename, linenum): if category_match and file_match and line_match: is_filtered = False else: - assert False # should have been checked for in SetFilter. + # should have been checked for in SetFilter. + msg = f'Invalid filter: {one_filter}' + raise ValueError(msg) if is_filtered: return False @@ -2357,7 +2359,8 @@ def CheckForCopyright(filename, lines, error): # We'll say it should occur by line 10. Don't forget there's a # placeholder line at the front. for line in range(1, min(len(lines), 11)): - if re.search(r'Copyright', lines[line], re.I): break + if re.search(r'Copyright', lines[line], re.IGNORECASE): + break else: # means no copyright line was found error(filename, 0, 'legal/copyright', 5, 'No copyright message found. ' @@ -2376,8 +2379,7 @@ def GetIndentLevel(line): indent = re.match(r'^( *)\S', line) if indent: return len(indent.group(1)) - else: - return 0 + return 0 def PathSplitToList(path): """Returns the path split into a list by the separator. @@ -3108,14 +3110,16 @@ def InTemplateArgumentList(self, clean_lines, linenum, pos): # These things do not look like template argument list: # class Suspect { # class Suspect x; } - if token in ('{', '}', ';'): return False + if token in ('{', '}', ';'): + return False # These things look like template argument list: # template # template # template # template - if token in ('>', '=', '[', ']', '.'): return True + if token in ('>', '=', '[', ']', '.'): + return True # Check if token is an unmatched '<'. # If not, move on to the next character. @@ -4912,8 +4916,7 @@ def GetLineWidth(line): width += 1 return width - else: - return len(line) + return len(line) def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, @@ -4985,9 +4988,7 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, # Check if the line is a header guard. is_header_guard = False if IsHeaderExtension(file_extension): - if (line.startswith(f'#ifndef {cppvar}') or - line.startswith(f'#define {cppvar}') or - line.startswith(f'#endif // {cppvar}')): + if line.startswith((f'#ifndef {cppvar}', f'#define {cppvar}', f'#endif // {cppvar}')): is_header_guard = True # #include lines and header guards can be long, since there's no clean way to # split them. @@ -5126,8 +5127,7 @@ def _ClassifyInclude(fileinfo, include, used_angle_brackets, include_order="defa return _CPP_SYS_HEADER if is_std_c_header: return _C_SYS_HEADER - else: - return _OTHER_SYS_HEADER + return _OTHER_SYS_HEADER # If the target file and the include we're checking share a # basename when we drop common extensions, and the include @@ -5277,7 +5277,7 @@ def _GetTextInside(text, start_pattern): closing_punctuation = set(dict.values(matching_punctuation)) # Find the position to start extracting text. - match = re.search(start_pattern, text, re.M) + match = re.search(start_pattern, text, re.MULTILINE) if not match: # start_pattern not found in text. return None start_position = match.end(0) @@ -5422,7 +5422,7 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension, match = re.match(r'([\w.\->()]+)$', printf_args) if match and match.group(1) != '__VA_ARGS__': function_name = re.search(r'\b((?:string)?printf)\s*\(', - line, re.I).group(1) + line, re.IGNORECASE).group(1) error(filename, linenum, 'runtime/printf', 4, 'Potential format string bug. Do' f' {function_name}("%s", {match.group(1)}) instead.') @@ -5458,17 +5458,25 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension, skip_next = False continue - if re.search(r'sizeof\(.+\)', tok): continue - if re.search(r'arraysize\(\w+\)', tok): continue + if re.search(r'sizeof\(.+\)', tok): + continue + if re.search(r'arraysize\(\w+\)', tok): + continue tok = tok.lstrip('(') tok = tok.rstrip(')') - if not tok: continue - if re.match(r'\d+', tok): continue - if re.match(r'0[xX][0-9a-fA-F]+', tok): continue - if re.match(r'k[A-Z0-9]\w*', tok): continue - if re.match(r'(.+::)?k[A-Z0-9]\w*', tok): continue - if re.match(r'(.+::)?[A-Z][A-Z0-9_]*', tok): continue + if not tok: + continue + if re.match(r'\d+', tok): + continue + if re.match(r'0[xX][0-9a-fA-F]+', tok): + continue + if re.match(r'k[A-Z0-9]\w*', tok): + continue + if re.match(r'(.+::)?k[A-Z0-9]\w*', tok): + continue + if re.match(r'(.+::)?[A-Z][A-Z0-9_]*', tok): + continue # A catch all for tricky sizeof cases, including 'sizeof expression', # 'sizeof(*type)', 'sizeof(const type)', 'sizeof(struct StructName)' # requires skipping the next token because we split on ' ' and '*'. @@ -5783,7 +5791,7 @@ def CheckForNonConstReference(filename, clean_lines, linenum, r')\s*\(') if re.search(allowed_functions, line): return - elif not re.search(r'\S+\([^)]*$', line): + if not re.search(r'\S+\([^)]*$', line): # Don't see an allowed function on this line. Actually we # didn't see any function name on this line, so this is likely a # multi-line parameter list. Try a bit harder to catch this case. @@ -5955,8 +5963,7 @@ def CheckCStyleCast(filename, clean_lines, linenum, cast_type, pattern, error): return False # operator++(int) and operator--(int) - if (context.endswith(' operator++') or context.endswith(' operator--') or - context.endswith('::operator++') or context.endswith('::operator--')): + if context.endswith((' operator++', ' operator--', '::operator++', '::operator--')): return False # A single unnamed argument for a function tends to look like old style cast. @@ -6273,7 +6280,8 @@ def CheckRedundantVirtual(filename, clean_lines, linenum, error): # Look for "virtual" on current line. line = clean_lines.elided[linenum] virtual = re.match(r'^(.*)(\bvirtual\b)(.*)$', line) - if not virtual: return + if not virtual: + return # Ignore "virtual" keywords that are near access-specifiers. These # are only used in class base-specifier and do not apply to member @@ -6285,7 +6293,8 @@ def CheckRedundantVirtual(filename, clean_lines, linenum, error): # Ignore the "virtual" keyword from virtual base classes. Usually # there is a column on the same line in these cases (virtual base # classes are rare in google3 because multiple inheritance is rare). - if re.match(r'^.*[^:]:[^:].*$', line): return + if re.match(r'^.*[^:]:[^:].*$', line): + return # Look for the next opening parenthesis. This is the start of the # parameter list (possibly on the next line shortly after virtual). @@ -6374,7 +6383,7 @@ def IsBlockInNameSpace(nesting_state, is_forward_declaration): if len(nesting_state.stack) >= 1: if isinstance(nesting_state.stack[-1], _NamespaceInfo): return True - elif (len(nesting_state.stack) > 1 and + if (len(nesting_state.stack) > 1 and isinstance(nesting_state.previous_stack_top, _NamespaceInfo) and isinstance(nesting_state.stack[-2], _NamespaceInfo)): return True @@ -6453,7 +6462,8 @@ def ProcessLine(filename, file_extension, clean_lines, line, nesting_state.Update(filename, clean_lines, line, error) CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line, error) - if nesting_state.InAsmBlock(): return + if nesting_state.InAsmBlock(): + return CheckForFunctionLengths(filename, clean_lines, line, function_state, error) CheckForMultilineCommentsAndStrings(filename, clean_lines, line, error) CheckStyle(filename, clean_lines, line, file_extension, nesting_state, error, cppvar) @@ -6895,9 +6905,8 @@ def _ParseFilterSelector(parameter): second_colon_pos = parameter.find(":", colon_pos + 1) if second_colon_pos == -1: return category, parameter[colon_pos + 1:], -1 - else: - return category, parameter[colon_pos + 1: second_colon_pos], \ - int(parameter[second_colon_pos + 1:]) + return category, parameter[colon_pos + 1: second_colon_pos], \ + int(parameter[second_colon_pos + 1:]) def _ExpandDirectories(filenames): """Searches a list of filenames and replaces directories in the list with diff --git a/cpplint_clitest.py b/cpplint_clitest.py index b23449a..d49d08c 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -33,11 +33,12 @@ import glob import os -import sys -import subprocess -import unittest import shutil +import subprocess +import sys import tempfile +import unittest + from pytest import mark from testfixtures import compare @@ -101,7 +102,7 @@ def setUpClass(cls): except Exception: try: cls.tearDownClass() - except Exception: + except Exception: # noqa: BLE001 pass raise diff --git a/cpplint_unittest.py b/cpplint_unittest.py index c0a4010..b6c6a2a 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -43,16 +43,17 @@ import sys import tempfile import unittest -from parameterized import parameterized + import pytest +from parameterized import parameterized import cpplint + def codecs_latin_encode(x): if sys.version_info < (3,): return x - else: - return codecs.latin_1_encode(x)[0] + return codecs.latin_1_encode(x)[0] # This class works as an error collector and replaces cpplint.Error # function for the unit tests. We also verify each category we see @@ -80,8 +81,7 @@ def __call__(self, filename, linenum, def Results(self): if len(self._errors) < 2: return ''.join(self._errors) # Most tests expect to have a string. - else: - return self._errors # Let's give a list if there is more than one. + return self._errors # Let's give a list if there is more than one. def ResultList(self): return self._errors @@ -115,7 +115,7 @@ class EnterableList(list): def __enter__(self): return self - def __exit__(self, type, value, tb): + def __exit__(self, type, value, tb): # noqa: A002 return self self.mock_file = EnterableList(mock_file) @@ -4283,8 +4283,8 @@ def testParseArguments(self): self.assertEqual(set(['hpp', 'h', 'cpp']), cpplint.GetAllExtensions()) finally: - sys.stdout == sys.__stdout__ - sys.stderr == sys.__stderr__ + sys.stdout = sys.__stdout__ + sys.stderr = sys.__stderr__ cpplint._cpplint_state.output_format = old_output_format cpplint._cpplint_state.verbose_level = old_verbose_level cpplint._cpplint_state.filters = old_filters @@ -4657,6 +4657,7 @@ def GetBuildHeaderGuardPreprocessorSymbol(self, file_path): error) if matched is not None: return matched.group(1) + return None def testBuildHeaderGuard(self): file_path = 'mydir/foo.h' @@ -5276,7 +5277,7 @@ def testBuildStorageClass(self): # Make sure that the declaration is logged if there's an error. # Seed generator with an integer for absolute reproducibility. random.seed(25) - for unused_i in range(10): + for _i in range(10): # Build up random list of non-storage-class declaration specs. other_decl_specs = [random.choice(qualifiers), random.choice(signs), random.choice(types)] @@ -5660,7 +5661,7 @@ def testRegression(self): def Format(includes): include_list = [] for item in includes: - if item.startswith('"') or item.startswith('<'): + if item.startswith(('"', '<')): include_list.append('#include %s\n' % item) else: include_list.append(item + '\n') diff --git a/pyproject.toml b/pyproject.toml index 5bc3130..c1e3f74 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,7 +65,83 @@ py-modules = [ "cpplint" ] include-package-data = false [tool.ruff] -lint.ignore = [ "E701" ] +target-version = "py38" + +line-length = 116 +lint.select = [ + "A", # flake8-builtins + "AIR", # Airflow + "ASYNC", # flake8-async + "B", # flake8-bugbear + "BLE", # flake8-blind-except + "C90", # McCabe cyclomatic complexity + "DJ", # flake8-django + "DTZ", # flake8-datetimez + "E", # pycodestyle + "EM", # flake8-errmsg + "EXE", # flake8-executable + "F", # Pyflakes + "FA", # flake8-future-annotations + "FAST", # FastAPI + "FBT", # flake8-boolean-trap + "FIX", # flake8-fixme + "FLY", # flynt + "FURB", # refurb + "G", # flake8-logging-format + "I", # isort + "ICN", # flake8-import-conventions + "INP", # flake8-no-pep420 + "INT", # flake8-gettext + "ISC", # flake8-implicit-str-concat + "LOG", # flake8-logging + "NPY", # NumPy-specific rules + "PD", # pandas-vet + "PERF", # Perflint + "PGH", # pygrep-hooks + "PIE", # flake8-pie + "PLC", # Pylint conventions + "PLE", # Pylint errors + "PYI", # flake8-pyi + "RET", # flake8-return + "RSE", # flake8-raise + "SLOT", # flake8-slots + "T10", # flake8-debugger + "TC", # flake8-type-checking + "TID", # flake8-tidy-imports + "TRY", # tryceratops + "W", # pycodestyle + "YTT", # flake8-2020 + # "ANN", # flake8-annotations + # "ARG", # flake8-unused-arguments + # "C4", # flake8-comprehensions + # "COM", # flake8-commas + # "CPY", # flake8-copyright + # "D", # pydocstyle + # "DOC", # pydoclint + # "ERA", # eradicate + # "N", # pep8-naming + # "PLR", # Pylint refactor + # "PLW", # Pylint warnings + # "PT", # flake8-pytest-style + # "PTH", # flake8-use-pathlib + # "Q", # flake8-quotes + # "RUF", # Ruff-specific rules + # "S", # flake8-bandit + # "SIM", # flake8-simplify + # "SLF", # flake8-self + # "T20", # flake8-print + # "TD", # flake8-todos + # "UP", # pyupgrade +] +lint.ignore = [ + "FBT003", # flake8-boolean-trap + "FIX002", # flake8-fixme + "ISC003", # flake8-implicit-str-concat + "PIE790", # Unnecessary `pass` statement +] +lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401" ] +lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002" ] +lint.mccabe.max-complexity = 29 [tool.pytest.ini_options] python_files = [ "*test.py" ] From cd26ae8c9a55d6e556f0ff53b51a02262f2faa07 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 7 Mar 2025 13:56:31 +0100 Subject: [PATCH 16/63] Ruff rules for comprehensions and performance --- cpplint.py | 68 ++++++++++++++++++++------------------------- cpplint_unittest.py | 26 ++++++++--------- pyproject.toml | 2 +- 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/cpplint.py b/cpplint.py index 3848294..362aaf2 100755 --- a/cpplint.py +++ b/cpplint.py @@ -57,7 +57,7 @@ import xml.etree.ElementTree # if empty, use defaults -_valid_extensions = set([]) +_valid_extensions = set() __VERSION__ = '2.0.1' @@ -826,7 +826,7 @@ ] # Replacement macros for CHECK/DCHECK/EXPECT_TRUE/EXPECT_FALSE -_CHECK_REPLACEMENT = dict([(macro_var, {}) for macro_var in _CHECK_MACROS]) +_CHECK_REPLACEMENT = {macro_var: {} for macro_var in _CHECK_MACROS} for op, replacement in [('==', 'EQ'), ('!=', 'NE'), ('>=', 'GE'), ('>', 'GT'), @@ -945,7 +945,7 @@ # Treat all headers starting with 'h' equally: .h, .hpp, .hxx etc. # This is set by --headers flag. -_hpp_headers = set([]) +_hpp_headers = set() class ErrorSuppressions: """Class to track all error suppressions for cpplint""" @@ -1038,13 +1038,12 @@ def GetHeaderExtensions(): return _hpp_headers if _valid_extensions: return {h for h in _valid_extensions if 'h' in h} - return set(['h', 'hh', 'hpp', 'hxx', 'h++', 'cuh']) + return {'h', 'hh', 'hpp', 'hxx', 'h++', 'cuh'} # The allowed extensions for file names # This is set by --extensions flag def GetAllExtensions(): - return GetHeaderExtensions().union(_valid_extensions or set( - ['c', 'cc', 'cpp', 'cxx', 'c++', 'cu'])) + return GetHeaderExtensions().union(_valid_extensions or {'c', 'cc', 'cpp', 'cxx', 'c++', 'cu'}) def ProcessExtensionsOption(val): global _valid_extensions @@ -1101,7 +1100,7 @@ def ProcessCategory(category): if categories in (None, '(*)'): # => "suppress all" ProcessCategory(None) elif categories.startswith('(') and categories.endswith(')'): - for category in set(map(lambda c: c.strip(), categories[1:-1].split(','))): + for category in {c.strip() for c in categories[1:-1].split(',')}: if category in _ERROR_CATEGORIES: ProcessCategory(category) elif any(c for c in _OTHER_NOLINT_CATEGORY_PREFIXES if category.startswith(c)): @@ -6073,13 +6072,12 @@ def ExpectingFunctionArgs(clean_lines, linenum): _re_pattern_headers_maybe_templates = [] for _header, _templates in _HEADERS_MAYBE_TEMPLATES: - for _template in _templates: - # Match max(..., ...), max(..., ...), but not foo->max, foo.max or - # 'type::max()'. - _re_pattern_headers_maybe_templates.append( - (re.compile(r'((\bstd::)|[^>.:])\b' + _template + r'(<.*?>)?\([^\)]'), - _template, - _header)) + # Match max(..., ...), max(..., ...), but not foo->max, foo.max or + # 'type::max()'. + _re_pattern_headers_maybe_templates.extend( + (re.compile(r'((\bstd::)|[^>.:])\b' + _template + r'(<.*?>)?\([^\)]'), + _template, + _header) for _template in _templates) # Map is often overloaded. Only check, if it is fully qualified. # Match 'std::map(...)', but not 'map(...)'' @@ -6091,29 +6089,26 @@ def ExpectingFunctionArgs(clean_lines, linenum): # Other scripts may reach in and modify this pattern. _re_pattern_templates = [] for _header, _templates in _HEADERS_CONTAINING_TEMPLATES: - for _template in _templates: - _re_pattern_templates.append( - (re.compile(r'((^|(^|\s|((^|\W)::))std::)|[^>.:]\b)' + _template + r'\s*\<'), - _template + '<>', - _header)) + _re_pattern_templates.extend( + (re.compile(r'((^|(^|\s|((^|\W)::))std::)|[^>.:]\b)' + _template + r'\s*\<'), + _template + '<>', + _header) for _template in _templates) _re_pattern_types_or_objs = [] for _header, _types_or_objs in _HEADERS_TYPES_OR_OBJS: - for _type_or_obj in _types_or_objs: - _re_pattern_types_or_objs.append( - (re.compile(r'\b' + _type_or_obj + r'\b'), - _type_or_obj, - _header)) + _re_pattern_types_or_objs.extend( + (re.compile(r'\b' + _type_or_obj + r'\b'), + _type_or_obj, + _header) for _type_or_obj in _types_or_objs) _re_pattern_functions = [] for _header, _functions in _HEADERS_FUNCTIONS: - for _function in _functions: - # Match printf(..., ...), but not foo->printf, foo.printf or - # 'type::printf()'. - _re_pattern_functions.append( - (re.compile(r'([^>.]|^)\b' + _function + r'\([^\)]'), - _function, - _header)) + # Match printf(..., ...), but not foo->printf, foo.printf or + # 'type::printf()'. + _re_pattern_functions.extend( + (re.compile(r'([^>.]|^)\b' + _function + r'\([^\)]'), + _function, + _header) for _function in _functions) def FilesBelongToSameModule(filename_cc, filename_h): """Check if these two filenames belong to the same module. @@ -6750,8 +6745,8 @@ def PrintUsage(message): Args: message: The optional error message. """ - sys.stderr.write(_USAGE % (sorted(list(GetAllExtensions())), - ','.join(sorted(list(GetAllExtensions()))), + sys.stderr.write(_USAGE % (sorted(GetAllExtensions()), + ','.join(sorted(GetAllExtensions())), sorted(GetHeaderExtensions()), ','.join(sorted(GetHeaderExtensions())))) @@ -6933,11 +6928,8 @@ def _ExpandDirectories(filenames): fullname = fullname[len('.' + os.path.sep):] expanded.add(fullname) - filtered = [] - for filename in expanded: - if os.path.splitext(filename)[1][1:] in GetAllExtensions(): - filtered.append(filename) - return filtered + return [filename for filename in expanded + if os.path.splitext(filename)[1][1:] in GetAllExtensions()] def _FilterExcludedFiles(fnames): """Filters out files listed in the --exclude command line switch. File paths diff --git a/cpplint_unittest.py b/cpplint_unittest.py index b6c6a2a..bf961e4 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -4260,27 +4260,27 @@ def testParseArguments(self): self.assertEqual(['foo.h'], cpplint.ParseArguments(['--linelength=120', 'foo.h'])) self.assertEqual(120, cpplint._line_length) - self.assertEqual(set(['h', 'hh', 'hpp', 'hxx', 'h++', 'cuh']), cpplint.GetHeaderExtensions()) # Default value + self.assertEqual({'h', 'hh', 'hpp', 'hxx', 'h++', 'cuh'}, cpplint.GetHeaderExtensions()) # Default value cpplint._hpp_headers = old_headers cpplint._valid_extensions = old_valid_extensions self.assertEqual(['foo.h'], cpplint.ParseArguments(['--headers=h', 'foo.h'])) - self.assertEqual(set(['h', 'c', 'cc', 'cpp', 'cxx', 'c++', 'cu']), cpplint.GetAllExtensions()) + self.assertEqual({'h', 'c', 'cc', 'cpp', 'cxx', 'c++', 'cu'}, cpplint.GetAllExtensions()) cpplint._hpp_headers = old_headers cpplint._valid_extensions = old_valid_extensions self.assertEqual(['foo.h'], cpplint.ParseArguments(['--extensions=hpp,cpp,cpp', 'foo.h'])) - self.assertEqual(set(['hpp', 'cpp']), cpplint.GetAllExtensions()) - self.assertEqual(set(['hpp']), cpplint.GetHeaderExtensions()) + self.assertEqual({'hpp', 'cpp'}, cpplint.GetAllExtensions()) + self.assertEqual({'hpp'}, cpplint.GetHeaderExtensions()) cpplint._hpp_headers = old_headers cpplint._valid_extensions = old_valid_extensions self.assertEqual(['foo.h'], cpplint.ParseArguments(['--extensions=cpp,cpp', '--headers=hpp,h', 'foo.h'])) - self.assertEqual(set(['hpp', 'h']), cpplint.GetHeaderExtensions()) - self.assertEqual(set(['hpp', 'h', 'cpp']), cpplint.GetAllExtensions()) + self.assertEqual({'hpp', 'h'}, cpplint.GetHeaderExtensions()) + self.assertEqual({'hpp', 'h', 'cpp'}, cpplint.GetAllExtensions()) finally: sys.stdout = sys.__stdout__ @@ -4330,8 +4330,8 @@ def testRecursiveExcludeInvalidFileExtension(self): finally: os.chdir(working_dir) shutil.rmtree(temp_dir) - cpplint._hpp_headers = set([]) - cpplint._valid_extensions = set([]) + cpplint._hpp_headers = set() + cpplint._valid_extensions = set() def testRecursiveExclude(self): working_dir = os.getcwd() @@ -4356,7 +4356,7 @@ def testRecursiveExclude(self): ] cpplint._excludes = None actual = cpplint.ParseArguments(['src']) - self.assertEqual(set(['src']), set(actual)) + self.assertEqual({'src'}, set(actual)) cpplint._excludes = None actual = cpplint.ParseArguments(['--recursive', 'src']) @@ -4374,11 +4374,11 @@ def testRecursiveExclude(self): '--exclude=src/two.cc', '--exclude=src/three.cc', 'src']) self.assertEqual(set(expected), set(actual)) - expected = set([ + expected = { os.path.join('src2', 'one.cc'), os.path.join('src2', 'two.cc'), os.path.join('src2', 'three.cc') - ]) + } cpplint._excludes = None actual = cpplint.ParseArguments(['--recursive', '--exclude=src', '.']) @@ -5629,8 +5629,8 @@ def testClassifyInclude(self): False)) def testTryDropCommonSuffixes(self): - cpplint._hpp_headers = set([]) - cpplint._valid_extensions = set([]) + cpplint._hpp_headers = set() + cpplint._valid_extensions = set() self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo-inl.h')) self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo-inl.hxx')) self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo-inl.h++')) diff --git a/pyproject.toml b/pyproject.toml index c1e3f74..a194c2b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -74,6 +74,7 @@ lint.select = [ "ASYNC", # flake8-async "B", # flake8-bugbear "BLE", # flake8-blind-except + "C4", # flake8-comprehensions "C90", # McCabe cyclomatic complexity "DJ", # flake8-django "DTZ", # flake8-datetimez @@ -113,7 +114,6 @@ lint.select = [ "YTT", # flake8-2020 # "ANN", # flake8-annotations # "ARG", # flake8-unused-arguments - # "C4", # flake8-comprehensions # "COM", # flake8-commas # "CPY", # flake8-copyright # "D", # pydocstyle From 776a72b83955180efaac126e452b842dbf97a4d3 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Tue, 11 Mar 2025 17:13:17 -0400 Subject: [PATCH 17/63] chore: add ruff stuff to changelog --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d62e33c..d22b664 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,7 @@ Yet another overdue... hotfix. Sorry this took so long. * The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) * build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* Ruff was ran on the project to improve performance and reader comprehension thanks to @cclauss. 2.0 (2024-10-06) ================ From 66c4c805ab4d8d9ad8615535b416f9be15c90d93 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 11 Mar 2025 23:00:21 +0100 Subject: [PATCH 18/63] Ruff rules PL for Pylint (#330) Add ruff rules PL for Pylint: https://docs.astral.sh/ruff/rules/#pylint-pl % `ruff check --select=PL` % `ruff check --select=PLR0 --preview` --- cpplint.py | 21 +++++++++------------ pyproject.toml | 12 ++++++++++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/cpplint.py b/cpplint.py index 362aaf2..c737dff 100755 --- a/cpplint.py +++ b/cpplint.py @@ -1619,8 +1619,7 @@ def Check(self, error, filename, linenum): if self.lines_in_function > trigger: error_level = int(math.log2(self.lines_in_function / base_trigger)) # 50 => 0, 100 => 1, 200 => 2, 400 => 3, 800 => 4, 1600 => 5, ... - if error_level > 5: - error_level = 5 + error_level = min(error_level, 5) error(filename, linenum, 'readability/fn_size', error_level, 'Small and focused functions are preferred:' f' {self.current_function} has {self.lines_in_function} non-comment lines' @@ -1758,8 +1757,8 @@ def _ShouldPrintError(category, confidence, filename, linenum): for one_filter in _Filters(): filter_cat, filter_file, filter_line = _ParseFilterSelector(one_filter[1:]) category_match = category.startswith(filter_cat) - file_match = filter_file == "" or filter_file == filename - line_match = filter_line == linenum or filter_line == -1 + file_match = filter_file in ("", filename) + line_match = filter_line in (linenum, -1) if one_filter.startswith('-'): if category_match and file_match and line_match: @@ -3343,7 +3342,7 @@ def Update(self, filename, clean_lines, linenum, error): if _MATCH_ASM.match(line): self.stack[-1].inline_asm = _BLOCK_ASM - elif token == ';' or token == ')': + elif token in {';', ')'}: # If we haven't seen an opening brace yet, but we already saw # a semicolon, this is probably a forward declaration. Pop # the stack for these. @@ -3673,8 +3672,7 @@ def CheckForFunctionLengths(filename, clean_lines, linenum, # If the name is all caps and underscores, figure it's a macro and # ignore it, unless it's TEST or TEST_F. function_name = match_result.group(1).split()[-1] - if function_name == 'TEST' or function_name == 'TEST_F' or ( - not re.match(r'[A-Z_]+$', function_name)): + if function_name in {'TEST', 'TEST_F'} or not re.match(r'[A-Z_]+$', function_name): starting_func = True if starting_func: @@ -3752,7 +3750,7 @@ def CheckComment(line, filename, linenum, next_line_start, error): middle_whitespace = match.group(3) # Comparisons made explicit for correctness # -- pylint: disable=g-explicit-bool-comparison - if middle_whitespace != ' ' and middle_whitespace != '': + if middle_whitespace not in {' ', ''}: error(filename, linenum, 'whitespace/todo', 2, 'TODO(my_username) should be followed by a space') @@ -4972,7 +4970,7 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, # (of lines ending in double quotes, commas, equals, or angle brackets) # because the rules for how to indent those are non-trivial. if (not re.search(r'[",=><] *$', prev) and - (initial_spaces == 1 or initial_spaces == 3) and + (initial_spaces in {1, 3}) and not re.match(scope_or_label_pattern, cleansed_line) and not (clean_lines.raw_lines[linenum] != line and re.match(r'^\s*""', line))): @@ -5137,8 +5135,7 @@ def _ClassifyInclude(fileinfo, include, used_angle_brackets, include_order="defa target_dir_pub = os.path.normpath(target_dir + '/../public') target_dir_pub = target_dir_pub.replace('\\', '/') if target_base == include_base and ( - include_dir == target_dir or - include_dir == target_dir_pub): + include_dir in (target_dir, target_dir_pub)): return _LIKELY_MY_HEADER # If the target and include share some initial basename @@ -6819,7 +6816,7 @@ def ParseArguments(args): output_format = val elif opt == '--quiet': quiet = True - elif opt == '--verbose' or opt == '--v': + elif opt in {'--verbose', '--v'}: verbosity = int(val) elif opt == '--filter': filters = val diff --git a/pyproject.toml b/pyproject.toml index a194c2b..30cf1a7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -139,9 +139,17 @@ lint.ignore = [ "ISC003", # flake8-implicit-str-concat "PIE790", # Unnecessary `pass` statement ] -lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401" ] -lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002" ] +lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401", "PLR5501", "PLW0603", "PLW2901" ] +lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "PLW0604" ] lint.mccabe.max-complexity = 29 +lint.pylint.allow-magic-value-types = [ "int", "str" ] +lint.pylint.max-args = 10 # Default is 5 +lint.pylint.max-bool-expr = 8 # Default is 5 +lint.pylint.max-branches = 30 # Default is 12 +lint.pylint.max-locals = 16 # Default is 15 +lint.pylint.max-public-methods = 130 # Default is 20 +lint.pylint.max-returns = 9 # Default is 9 +lint.pylint.max-statements = 74 # Default is 50 [tool.pytest.ini_options] python_files = [ "*test.py" ] From 4134927c5e906ab65ff20160f3945267ad2d0831 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 7 Mar 2025 15:57:27 -0500 Subject: [PATCH 19/63] update fields of pyproject.toml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * merge pylint config * make version dynamic * better list of maintainers and major authors * remove "test" extra which now just duplicates "dev" * remove weird duplicated "testing" extra * remove setuptools—a build-system.requires—from optional requirements * remove unneeded pytest alias * more and better keywords (this is PyPI, we don't need a "Python" keyword * shorter desc --- .pylintrc | 49 --------------------------- pyproject.toml | 91 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 66 insertions(+), 74 deletions(-) delete mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index 220215c..0000000 --- a/.pylintrc +++ /dev/null @@ -1,49 +0,0 @@ -[BASIC] -include-naming-hint=yes -method-rgx=[A-Z_][A-Za-z0-9]{2,49}$|__init__|__str__|__contains__ -function-rgx=[A-Z_][A-Za-z0-9]{2,49}$|main -const-rgx=[a-zA-Z_][A-Za-z0-9_]{2,49}$ -variable-rgx=[a-z_][a-z0-9_]{0,49}$ -argument-rgx=[a-z_][a-z0-9_]{0,49}$ -class-rgx=[A-Z_][a-zA-Z0-9]+$|basestring|unicode|long|xrange - -[MESSAGES CONTROL] -disable= - global-statement, - multiple-statements, - missing-docstring, - no-else-return, - no-self-use, - consider-merging-isinstance, - consider-using-min-builtin, - bad-continuation, - fixme, - bad-option-value, - anomalous-unicode-escape-in-string, - unused-argument, - useless-object-inheritance, - consider-using-dict-comprehension, - consider-using-in, - unnecessary-pass, - too-many-positional-arguments - -[REPORTS] -output-format=colorized -reports=no -score=no - -[FORMAT] -indent-string=' ' -indent-after-paren=4 -max-module-lines=10000 - -[DESIGN] -max-locals=25 -max-line-length=100 -max-attributes=10 -max-branches=30 -max-args=20 -max-statements=75 -max-returns=10 -min-public-methods=0 -max-bool-expr=10 diff --git a/pyproject.toml b/pyproject.toml index 30cf1a7..002a368 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,12 +4,21 @@ requires = [ "setuptools>=61.2" ] [project] name = "cpplint" -version = "2.0.0" -description = "Automated checker to ensure C++ files follow Google's style guide" +description = "Check C++ files configurably against Google's style guide" readme = "README.rst" -keywords = [ "c++", "lint", "python" ] +keywords = [ "c++", "cpp", "google style", "lint" ] license = { text = "BSD-3-Clause" } -maintainers = [ { name = "cpplint Developers" } ] +maintainers = [ + { name = "Aaron Liu", email = "aaronliu0130@gmail.com" }, + { name = "Christian Clauss", email = "cclauss@me.com" }, + { name = "John Vandenberg", email = "jayvdb@gmail.com" }, +] +authors = [ + { name = "Google Inc." }, + { name = "Thibault Kruse" }, + { name = "Andrew Davis", email = "theandrewdavis@gmail.com" }, + { name = "cpplint developers" }, +] requires-python = ">=3.8" classifiers = [ "Development Status :: 5 - Production/Stable", @@ -28,6 +37,7 @@ classifiers = [ "Programming Language :: Python :: 3.13", "Topic :: Software Development :: Quality Assurance", ] +dynamic = [ "version" ] dependencies = [ ] optional-dependencies.dev = [ @@ -36,33 +46,16 @@ optional-dependencies.dev = [ "pytest", "pytest-cov", "pytest-timeout", - "setuptools", - "testfixtures", - "tox<5", -] -optional-dependencies.test = [ - "parameterized", - "pytest", - "pytest-cov", - "pytest-timeout", "testfixtures", "tox<5", ] -optional-dependencies.testing = [ - "parameterized", - "pytest", - "pytest-cov", - "pytest-timeout", - "testfixtures", - "tox<5", -] -urls.Download = "https://github.com/cpplint/cpplint" urls.Homepage = "https://github.com/cpplint/cpplint" scripts.cpplint = "cpplint:main" [tool.setuptools] py-modules = [ "cpplint" ] include-package-data = false +dynamic.version = { attr = "cpplint.__VERSION__" } [tool.ruff] target-version = "py38" @@ -151,6 +144,57 @@ lint.pylint.max-public-methods = 130 # Default is 20 lint.pylint.max-returns = 9 # Default is 9 lint.pylint.max-statements = 74 # Default is 50 +[tool.pylint.basic] +include-naming-hint = true +method-rgx = "[A-Z_][A-Za-z0-9]{2,49}$|__init__|__str__|__contains__" +function-rgx = "[A-Z_][A-Za-z0-9]{2,49}$|main" +const-rgx = "[a-zA-Z_][A-Za-z0-9_]{2,49}$" +variable-rgx = "[a-z_][a-z0-9_]{0,49}$" +argument-rgx = "[a-z_][a-z0-9_]{0,49}$" +class-rgx = "[A-Z_][a-zA-Z0-9]+$|basestring|unicode|long|xrange" + +[tool.pylint.messages-control] +disable = [ + "global-statement", + "multiple-statements", + "missing-docstring", + "no-else-return", + "no-self-use", + "consider-merging-isinstance", + "consider-using-min-builtin", + "bad-continuation", + "fixme", + "bad-option-value", + "anomalous-unicode-escape-in-string", + "unused-argument", + "useless-object-inheritance", + "consider-using-dict-comprehension", + "consider-using-in", + "unnecessary-pass", + "too-many-positional-arguments", +] + +[tool.pylint.reports] +output-format = "colorized" +reports = false +score = false + +[tool.pylint.format] +indent-string = ' ' +indent-after-paren = 4 +max-module-lines = 10000 + +[tool.pylint.design] +max-locals = 25 +max-line-length = 100 +max-attributes = 10 +max-branches = 30 +max-args = 20 +max-statements = 75 +max-returns = 10 +min-public-methods = 0 +max-bool-expr = 10 + [tool.pytest.ini_options] python_files = [ "*test.py" ] testpaths = [ "." ] @@ -158,6 +202,3 @@ required_plugins = [ "pytest-cov", "pytest-timeout" ] timeout = 60 # fail if coverage is under 90% addopts = "--color=yes --cov-fail-under=90 --cov=cpplint" - -[tool.aliases] -test = "pytest" From e22cb361efced5dbaa31546032a65f821c867fe4 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sat, 8 Mar 2025 17:40:20 -0500 Subject: [PATCH 20/63] update CONTRIBUTING.rst fix a typo in the bulleted list remove specific python version --- CONTRIBUTING.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 4ff2e0f..fe310c8 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -7,7 +7,7 @@ Thanks for your interest in contributing to cpplint. Any kinds of contributions are welcome: Bug reports, Documentation, Patches. However, here are some contributions you probably shouldn't make: * Drastic reorganization - * Making the code conform to Google's Python style guidelines + * Making the code conform to Google's Python style guidelines * Features that could be regarded as a security vulnerability If you need some ideas, you may check out some of the tasks in our `issue tracker `_. @@ -22,9 +22,9 @@ For many tasks, it is okay to just develop using a single installed python versi 1. (Optional) Install `pyenv `_ to manage python versions 2. (Optional) Using pyenv, install the python versions used in testing:: - pyenv install 3.12.6 + pyenv install 3. # ... - pyenv local 3.12.6 ... + pyenv local 3. ... It may be okay to run and test python against locally installed libraries, but if you need to have a consistent build, it is recommended to manage your environment using virtualenv: `virtualenv `_, `virtualenvwrapper `_:: From 92244cbdd658542f85c8c89bc0b67eb5ef79e291 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sat, 1 Feb 2025 11:29:40 -0500 Subject: [PATCH 21/63] lint CLI tests --- cpplint_clitest.py | 118 +++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index d49d08c..9cfc513 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -39,50 +39,56 @@ import tempfile import unittest +from parameterized import parameterized from pytest import mark from testfixtures import compare BASE_CMD = sys.executable + ' ' + os.path.abspath('./cpplint.py ') -def RunShellCommand(cmd: str, args: str, cwd='.'): - """ - executes a command - :param cmd: A string to execute. - :param cwd: from which folder to run. + +def run_shell_command(cmd: str, args: str, cwd='.'): + """Executes a command + + Args: + cmd: A string to execute. + args: A string with arguments to the command. + cwd: from which folder to run. """ stdout_target = subprocess.PIPE stderr_target = subprocess.PIPE - proc = subprocess.Popen(cmd + ' ' + args, + with subprocess.Popen(cmd + ' ' + args, shell=True, cwd=cwd, stdout=stdout_target, - stderr=stderr_target) - out, err = proc.communicate() + stderr=stderr_target) as proc: + out, err = proc.communicate() # Make output system-agnostic, aka support Windows if os.sep == '\\': - # TODO: Support scenario with multiple folder inputs - win_path = (os.path.dirname(args.split(' ')[-1]) + '\\').encode() - good_path = win_path.replace(b'\\', b'/') - out, err = out.replace(win_path, good_path), err.replace(win_path, good_path) + args_paths = args.split(' ') + for path in args_paths: + win_path = (os.path.dirname(path) + '\\').encode() + good_path = win_path.replace(b'\\', b'/') + out, err = out.replace(win_path, good_path), err.replace(win_path, good_path) if os.linesep == '\r\n': out, err = out.replace(b'\r\n', b'\n'), err.replace(b'\r\n', b'\n') # print(err) # to get the output at time of test - return (proc.returncode, out, err) + return proc.returncode, out, err class UsageTest(unittest.TestCase): def testHelp(self): - (status, out, err) = RunShellCommand(BASE_CMD, '--help') + (status, out, err) = run_shell_command(BASE_CMD, '--help') self.assertEqual(0, status) self.assertEqual(b'', out) self.assertTrue(err.startswith(b'\nSyntax: cpplint')) -class TemporaryFolderClassSetup(object): + +class TemporaryFolderClassSetup(unittest.TestCase): """ Regression tests: The test starts a filetreewalker scanning for files name *.def Such files are expected to have as first line the argument @@ -108,7 +114,7 @@ def setUpClass(cls): @classmethod def tearDownClass(cls): - if (cls._root): + if cls._root: # pass shutil.rmtree(cls._root) @@ -121,39 +127,39 @@ def get_extra_command_args(self, cwd): """Override in subclass to add arguments to command""" return '' - def checkAllInFolder(self, foldername, expectedDefs): + def check_all_in_folder(self, folder_name, expected_defs): # uncomment to show complete diff # self.maxDiff = None count = 0 - for dirpath, _, fnames in os.walk(foldername): + for dirpath, _, fnames in os.walk(folder_name): for f in fnames: if f.endswith('.def'): count += 1 - self._checkDef(os.path.join(dirpath, f)) - self.assertEqual(count, expectedDefs) + self.check_def(os.path.join(dirpath, f)) + self.assertEqual(count, expected_defs) - def _checkDef(self, path): + def check_def(self, path): """runs command and compares to expected output from def file""" # self.maxDiff = None # to see full diff - with open(path, 'rb') as filehandle: - datalines = filehandle.readlines() - stdoutLines = int(datalines[2]) - filenames = datalines[0].decode('utf8').strip() + with open(path, 'rb') as file_handle: + data = file_handle.readlines() + stdout_lines = int(data[2]) + filenames = data[0].decode('utf8').strip() args, _, filenames = filenames.rpartition(" ") if '*' in filenames: rel_cwd = os.path.dirname(path) filenames = ' '.join( - filename[len(rel_cwd)+1:] + filename[len(rel_cwd) + 1:] for filename in glob.glob(rel_cwd + '/' + filenames) ) args += ' ' + filenames - self._runAndCheck(path, - args, - int(datalines[1]), - [line.decode('utf8').strip() for line in datalines[3:3 + stdoutLines]], - [line.decode('utf8').strip() for line in datalines[3 + stdoutLines:]]) + self._run_and_compare(path, args, int(data[1]), + [line.decode('utf8').strip() + for line in data[3:3 + stdout_lines]], + [line.decode('utf8').strip() + for line in data[3 + stdout_lines:]]) - def _runAndCheck( + def _run_and_compare( self, definition_file, args, @@ -165,8 +171,8 @@ def _runAndCheck( cmd = BASE_CMD + self.get_extra_command_args(rel_cwd) cwd = os.path.join(self._root, rel_cwd) # command to reproduce, do not forget first two lines have special meaning - print("\ncd " + cwd + " && " + cmd + ' ' + args + " 2> ") - (status, out, err) = RunShellCommand(cmd, args, cwd) + print("\ncd " + cwd + " && " + cmd + ' ' + args + " 2> ") + (status, out, err) = run_shell_command(cmd, args, cwd) self.assertEqual(expected_status, status, 'bad command status %s' % status) prefix = 'Failed check in %s comparing to %s for command: %s' % (cwd, definition_file, cmd) compare('\n'.join(expected_err), err.decode('utf8'), prefix=prefix, show_whitespace=True) @@ -177,29 +183,22 @@ class NoRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): """runs in a temporary folder (under /tmp in linux) without any .git/.hg/.svn file""" def get_extra_command_args(self, cwd): - return (' --repository %s ' % self._root) - - def testChromiumSample(self): - self.checkAllInFolder('./samples/chromium-sample', 1) - - def testVlcSample(self): - self.checkAllInFolder('./samples/vlc-sample', 1) - - def testSillySample(self): - self.checkAllInFolder('./samples/silly-sample', 5) - - def testBoostSample(self): - self.checkAllInFolder('./samples/boost-sample', 4) - + return f' --repository {self._root} ' + + def _test_name_func(fun, _, x): + del fun + return f'test{x.args[0].capitalize()}Sample-{x.args[1]}' + + @parameterized.expand([(folder, case[:-4]) + for folder in ['chromium', 'vlc', 'silly', + 'boost', 'protobuf', 'codelite', 'v8'] + for case in os.listdir(f'./samples/{folder}-sample') + if case.endswith('.def')], + name_func=_test_name_func) @mark.timeout(180) - def testProtobufSample(self): - self.checkAllInFolder('./samples/protobuf-sample', 1) - - def testCodeliteSample(self): - self.checkAllInFolder('./samples/codelite-sample', 1) + def testSamples(self, folder, case): + self.check_def(os.path.join(f'./samples/{folder}-sample', case + '.def')) - def testV8Sample(self): - self.checkAllInFolder('./samples/v8-sample', 1) class GitRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): """runs in a temporary folder with .git file""" @@ -210,7 +209,8 @@ def prepare_directory(cls, root): pass def testCodeliteSample(self): - self.checkAllInFolder('./samples/codelite-sample', 1) + self.check_all_in_folder('./samples/codelite-sample', 1) + class MercurialRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): """runs in a temporary folder with .hg file""" @@ -221,7 +221,8 @@ def prepare_directory(cls, root): pass def testCodeliteSample(self): - self.checkAllInFolder('./samples/codelite-sample', 1) + self.check_all_in_folder('./samples/codelite-sample', 1) + class SvnRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): """runs in a temporary folder with .svn file""" @@ -232,7 +233,8 @@ def prepare_directory(cls, root): pass def testCodeliteSample(self): - self.checkAllInFolder('./samples/codelite-sample', 1) + self.check_all_in_folder('./samples/codelite-sample', 1) + if __name__ == '__main__': unittest.main() From b976b14645fab856f0db56c536e69d865f66681f Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 3 Mar 2025 18:46:18 -0500 Subject: [PATCH 22/63] fix: revert Win32 slash replacement changes, use subprocess.run() Yep, I forgot the purpose of something I coded myself. subprocess.run() is Python's recommended replacement to popen that doesn't need context management --- cpplint_clitest.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 9cfc513..3da296c 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -54,24 +54,19 @@ def run_shell_command(cmd: str, args: str, cwd='.'): args: A string with arguments to the command. cwd: from which folder to run. """ - - stdout_target = subprocess.PIPE - stderr_target = subprocess.PIPE - - with subprocess.Popen(cmd + ' ' + args, - shell=True, - cwd=cwd, - stdout=stdout_target, - stderr=stderr_target) as proc: - out, err = proc.communicate() + cmd, args = cmd.split(), args.split() + proc = subprocess.run(cmd + args, cwd=cwd, capture_output=True) + out, err = proc.stdout, proc.stderr # Make output system-agnostic, aka support Windows if os.sep == '\\': - args_paths = args.split(' ') - for path in args_paths: - win_path = (os.path.dirname(path) + '\\').encode() - good_path = win_path.replace(b'\\', b'/') - out, err = out.replace(win_path, good_path), err.replace(win_path, good_path) + # TODO: Support scenario with multiple input names + # We currently only support the last arguments as the input name + # to prevent accidentally replacing sed tests. + # Fixing would likely need coding an internal "replace slashes" option for cpplint itself. + win_path = (os.path.dirname(args[-1]) + '\\').encode() + good_path = win_path.replace(b'\\', b'/') + out, err = out.replace(win_path, good_path), err.replace(win_path, good_path) if os.linesep == '\r\n': out, err = out.replace(b'\r\n', b'\n'), err.replace(b'\r\n', b'\n') From c0af6db2c9baccd8803874e5c84b031f8c77617c Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 8 Mar 2025 17:21:36 -0500 Subject: [PATCH 23/63] remove Python 2 keyword artifacts from pylint class-rgx --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 002a368..8eb77cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -151,7 +151,7 @@ function-rgx = "[A-Z_][A-Za-z0-9]{2,49}$|main" const-rgx = "[a-zA-Z_][A-Za-z0-9_]{2,49}$" variable-rgx = "[a-z_][a-z0-9_]{0,49}$" argument-rgx = "[a-z_][a-z0-9_]{0,49}$" -class-rgx = "[A-Z_][a-zA-Z0-9]+$|basestring|unicode|long|xrange" +class-rgx = "[A-Z_][a-zA-Z0-9]+$" [tool.pylint.messages-control] disable = [ From 94f5e443bfa80e576ded32585f0058d09a6a7fbc Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 9 Mar 2025 13:12:25 +0100 Subject: [PATCH 24/63] Add ruff format to pre-commit --- cpplint.py | 12745 ++++++++++++++++++++++-------------------- cpplint_clitest.py | 111 +- cpplint_unittest.py | 12607 +++++++++++++++++++++-------------------- 3 files changed, 13406 insertions(+), 12057 deletions(-) diff --git a/cpplint.py b/cpplint.py index c737dff..6556c97 100755 --- a/cpplint.py +++ b/cpplint.py @@ -59,7 +59,7 @@ # if empty, use defaults _valid_extensions = set() -__VERSION__ = '2.0.1' +__VERSION__ = "2.0.1" _USAGE = """ Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit|sed|gsed] @@ -293,513 +293,516 @@ # If you add a new error message with a new category, add it to the list # here! cpplint_unittest.py should tell you if you forget to do this. _ERROR_CATEGORIES = [ - 'build/c++11', - 'build/c++17', - 'build/deprecated', - 'build/endif_comment', - 'build/explicit_make_pair', - 'build/forward_decl', - 'build/header_guard', - 'build/include', - 'build/include_subdir', - 'build/include_alpha', - 'build/include_order', - 'build/include_what_you_use', - 'build/namespaces_headers', - 'build/namespaces_literals', - 'build/namespaces', - 'build/printf_format', - 'build/storage_class', - 'legal/copyright', - 'readability/alt_tokens', - 'readability/braces', - 'readability/casting', - 'readability/check', - 'readability/constructors', - 'readability/fn_size', - 'readability/inheritance', - 'readability/multiline_comment', - 'readability/multiline_string', - 'readability/namespace', - 'readability/nolint', - 'readability/nul', - 'readability/strings', - 'readability/todo', - 'readability/utf8', - 'runtime/arrays', - 'runtime/casting', - 'runtime/explicit', - 'runtime/int', - 'runtime/init', - 'runtime/invalid_increment', - 'runtime/member_string_references', - 'runtime/memset', - 'runtime/operator', - 'runtime/printf', - 'runtime/printf_format', - 'runtime/references', - 'runtime/string', - 'runtime/threadsafe_fn', - 'runtime/vlog', - 'whitespace/blank_line', - 'whitespace/braces', - 'whitespace/comma', - 'whitespace/comments', - 'whitespace/empty_conditional_body', - 'whitespace/empty_if_body', - 'whitespace/empty_loop_body', - 'whitespace/end_of_line', - 'whitespace/ending_newline', - 'whitespace/forcolon', - 'whitespace/indent', - 'whitespace/indent_namespace', - 'whitespace/line_length', - 'whitespace/newline', - 'whitespace/operators', - 'whitespace/parens', - 'whitespace/semicolon', - 'whitespace/tab', - 'whitespace/todo', - ] + "build/c++11", + "build/c++17", + "build/deprecated", + "build/endif_comment", + "build/explicit_make_pair", + "build/forward_decl", + "build/header_guard", + "build/include", + "build/include_subdir", + "build/include_alpha", + "build/include_order", + "build/include_what_you_use", + "build/namespaces_headers", + "build/namespaces_literals", + "build/namespaces", + "build/printf_format", + "build/storage_class", + "legal/copyright", + "readability/alt_tokens", + "readability/braces", + "readability/casting", + "readability/check", + "readability/constructors", + "readability/fn_size", + "readability/inheritance", + "readability/multiline_comment", + "readability/multiline_string", + "readability/namespace", + "readability/nolint", + "readability/nul", + "readability/strings", + "readability/todo", + "readability/utf8", + "runtime/arrays", + "runtime/casting", + "runtime/explicit", + "runtime/int", + "runtime/init", + "runtime/invalid_increment", + "runtime/member_string_references", + "runtime/memset", + "runtime/operator", + "runtime/printf", + "runtime/printf_format", + "runtime/references", + "runtime/string", + "runtime/threadsafe_fn", + "runtime/vlog", + "whitespace/blank_line", + "whitespace/braces", + "whitespace/comma", + "whitespace/comments", + "whitespace/empty_conditional_body", + "whitespace/empty_if_body", + "whitespace/empty_loop_body", + "whitespace/end_of_line", + "whitespace/ending_newline", + "whitespace/forcolon", + "whitespace/indent", + "whitespace/indent_namespace", + "whitespace/line_length", + "whitespace/newline", + "whitespace/operators", + "whitespace/parens", + "whitespace/semicolon", + "whitespace/tab", + "whitespace/todo", +] # keywords to use with --outputs which generate stdout for machine processing -_MACHINE_OUTPUTS = [ - 'junit', - 'sed', - 'gsed' -] +_MACHINE_OUTPUTS = ["junit", "sed", "gsed"] # These error categories are no longer enforced by cpplint, but for backwards- # compatibility they may still appear in NOLINT comments. _LEGACY_ERROR_CATEGORIES = [ - 'build/class', - 'readability/streams', - 'readability/function', - ] + "build/class", + "readability/streams", + "readability/function", +] # These prefixes for categories should be ignored since they relate to other # tools which also use the NOLINT syntax, e.g. clang-tidy. _OTHER_NOLINT_CATEGORY_PREFIXES = [ - 'clang-analyzer-', - 'abseil-', - 'altera-', - 'android-', - 'boost-', - 'bugprone-', - 'cert-', - 'concurrency-', - 'cppcoreguidelines-', - 'darwin-', - 'fuchsia-', - 'google-', - 'hicpp-', - 'linuxkernel-', - 'llvm-', - 'llvmlibc-', - 'misc-', - 'modernize-', - 'mpi-', - 'objc-', - 'openmp-', - 'performance-', - 'portability-', - 'readability-', - 'zircon-', - ] + "clang-analyzer-", + "abseil-", + "altera-", + "android-", + "boost-", + "bugprone-", + "cert-", + "concurrency-", + "cppcoreguidelines-", + "darwin-", + "fuchsia-", + "google-", + "hicpp-", + "linuxkernel-", + "llvm-", + "llvmlibc-", + "misc-", + "modernize-", + "mpi-", + "objc-", + "openmp-", + "performance-", + "portability-", + "readability-", + "zircon-", +] # The default state of the category filter. This is overridden by the --filter= # flag. By default all errors are on, so only add here categories that should be # off by default (i.e., categories that must be enabled by the --filter= flags). # All entries here should start with a '-' or '+', as in the --filter= flag. _DEFAULT_FILTERS = [ - '-build/include_alpha', - '-readability/fn_size', - ] + "-build/include_alpha", + "-readability/fn_size", +] # The default list of categories suppressed for C (not C++) files. _DEFAULT_C_SUPPRESSED_CATEGORIES = [ - 'readability/casting', - ] + "readability/casting", +] # The default list of categories suppressed for Linux Kernel files. _DEFAULT_KERNEL_SUPPRESSED_CATEGORIES = [ - 'whitespace/tab', - ] + "whitespace/tab", +] # We used to check for high-bit characters, but after much discussion we # decided those were OK, as long as they were in UTF-8 and didn't represent # hard-coded international strings, which belong in a separate i18n file. # C++ headers -_CPP_HEADERS = frozenset([ - # Legacy - 'algobase.h', - 'algo.h', - 'alloc.h', - 'builtinbuf.h', - 'bvector.h', - # 'complex.h', collides with System C header "complex.h" since C11 - 'defalloc.h', - 'deque.h', - 'editbuf.h', - 'fstream.h', - 'function.h', - 'hash_map', - 'hash_map.h', - 'hash_set', - 'hash_set.h', - 'hashtable.h', - 'heap.h', - 'indstream.h', - 'iomanip.h', - 'iostream.h', - 'istream.h', - 'iterator.h', - 'list.h', - 'map.h', - 'multimap.h', - 'multiset.h', - 'ostream.h', - 'pair.h', - 'parsestream.h', - 'pfstream.h', - 'procbuf.h', - 'pthread_alloc', - 'pthread_alloc.h', - 'rope', - 'rope.h', - 'ropeimpl.h', - 'set.h', - 'slist', - 'slist.h', - 'stack.h', - 'stdiostream.h', - 'stl_alloc.h', - 'stl_relops.h', - 'streambuf.h', - 'stream.h', - 'strfile.h', - 'strstream.h', - 'tempbuf.h', - 'tree.h', - 'type_traits.h', - 'vector.h', - # C++ library headers - 'algorithm', - 'array', - 'atomic', - 'bitset', - 'chrono', - 'codecvt', - 'complex', - 'condition_variable', - 'deque', - 'exception', - 'forward_list', - 'fstream', - 'functional', - 'future', - 'initializer_list', - 'iomanip', - 'ios', - 'iosfwd', - 'iostream', - 'istream', - 'iterator', - 'limits', - 'list', - 'locale', - 'map', - 'memory', - 'mutex', - 'new', - 'numeric', - 'ostream', - 'queue', - 'random', - 'ratio', - 'regex', - 'scoped_allocator', - 'set', - 'sstream', - 'stack', - 'stdexcept', - 'streambuf', - 'string', - 'strstream', - 'system_error', - 'thread', - 'tuple', - 'typeindex', - 'typeinfo', - 'type_traits', - 'unordered_map', - 'unordered_set', - 'utility', - 'valarray', - 'vector', - # C++14 headers - 'shared_mutex', - # C++17 headers - 'any', - 'charconv', - 'codecvt', - 'execution', - 'filesystem', - 'memory_resource', - 'optional', - 'string_view', - 'variant', - # C++20 headers - 'barrier', - 'bit', - 'compare', - 'concepts', - 'coroutine', - 'format', - 'latch', - 'numbers', - 'ranges', - 'semaphore', - 'source_location', - 'span', - 'stop_token', - 'syncstream', - 'version', - # C++23 headers - 'expected', - 'flat_map', - 'flat_set', - 'generator', - 'mdspan', - 'print', - 'spanstream', - 'stacktrace', - 'stdfloat', - # C++ headers for C library facilities - 'cassert', - 'ccomplex', - 'cctype', - 'cerrno', - 'cfenv', - 'cfloat', - 'cinttypes', - 'ciso646', - 'climits', - 'clocale', - 'cmath', - 'csetjmp', - 'csignal', - 'cstdalign', - 'cstdarg', - 'cstdbool', - 'cstddef', - 'cstdint', - 'cstdio', - 'cstdlib', - 'cstring', - 'ctgmath', - 'ctime', - 'cuchar', - 'cwchar', - 'cwctype', - ]) +_CPP_HEADERS = frozenset( + [ + # Legacy + "algobase.h", + "algo.h", + "alloc.h", + "builtinbuf.h", + "bvector.h", + # 'complex.h', collides with System C header "complex.h" since C11 + "defalloc.h", + "deque.h", + "editbuf.h", + "fstream.h", + "function.h", + "hash_map", + "hash_map.h", + "hash_set", + "hash_set.h", + "hashtable.h", + "heap.h", + "indstream.h", + "iomanip.h", + "iostream.h", + "istream.h", + "iterator.h", + "list.h", + "map.h", + "multimap.h", + "multiset.h", + "ostream.h", + "pair.h", + "parsestream.h", + "pfstream.h", + "procbuf.h", + "pthread_alloc", + "pthread_alloc.h", + "rope", + "rope.h", + "ropeimpl.h", + "set.h", + "slist", + "slist.h", + "stack.h", + "stdiostream.h", + "stl_alloc.h", + "stl_relops.h", + "streambuf.h", + "stream.h", + "strfile.h", + "strstream.h", + "tempbuf.h", + "tree.h", + "type_traits.h", + "vector.h", + # C++ library headers + "algorithm", + "array", + "atomic", + "bitset", + "chrono", + "codecvt", + "complex", + "condition_variable", + "deque", + "exception", + "forward_list", + "fstream", + "functional", + "future", + "initializer_list", + "iomanip", + "ios", + "iosfwd", + "iostream", + "istream", + "iterator", + "limits", + "list", + "locale", + "map", + "memory", + "mutex", + "new", + "numeric", + "ostream", + "queue", + "random", + "ratio", + "regex", + "scoped_allocator", + "set", + "sstream", + "stack", + "stdexcept", + "streambuf", + "string", + "strstream", + "system_error", + "thread", + "tuple", + "typeindex", + "typeinfo", + "type_traits", + "unordered_map", + "unordered_set", + "utility", + "valarray", + "vector", + # C++14 headers + "shared_mutex", + # C++17 headers + "any", + "charconv", + "codecvt", + "execution", + "filesystem", + "memory_resource", + "optional", + "string_view", + "variant", + # C++20 headers + "barrier", + "bit", + "compare", + "concepts", + "coroutine", + "format", + "latch", + "numbers", + "ranges", + "semaphore", + "source_location", + "span", + "stop_token", + "syncstream", + "version", + # C++23 headers + "expected", + "flat_map", + "flat_set", + "generator", + "mdspan", + "print", + "spanstream", + "stacktrace", + "stdfloat", + # C++ headers for C library facilities + "cassert", + "ccomplex", + "cctype", + "cerrno", + "cfenv", + "cfloat", + "cinttypes", + "ciso646", + "climits", + "clocale", + "cmath", + "csetjmp", + "csignal", + "cstdalign", + "cstdarg", + "cstdbool", + "cstddef", + "cstdint", + "cstdio", + "cstdlib", + "cstring", + "ctgmath", + "ctime", + "cuchar", + "cwchar", + "cwctype", + ] +) # C headers -_C_HEADERS = frozenset([ - # System C headers - 'assert.h', - 'complex.h', - 'ctype.h', - 'errno.h', - 'fenv.h', - 'float.h', - 'inttypes.h', - 'iso646.h', - 'limits.h', - 'locale.h', - 'math.h', - 'setjmp.h', - 'signal.h', - 'stdalign.h', - 'stdarg.h', - 'stdatomic.h', - 'stdbool.h', - 'stddef.h', - 'stdint.h', - 'stdio.h', - 'stdlib.h', - 'stdnoreturn.h', - 'string.h', - 'tgmath.h', - 'threads.h', - 'time.h', - 'uchar.h', - 'wchar.h', - 'wctype.h', - # C23 headers - 'stdbit.h', - 'stdckdint.h', - # additional POSIX C headers - 'aio.h', - 'arpa/inet.h', - 'cpio.h', - 'dirent.h', - 'dlfcn.h', - 'fcntl.h', - 'fmtmsg.h', - 'fnmatch.h', - 'ftw.h', - 'glob.h', - 'grp.h', - 'iconv.h', - 'langinfo.h', - 'libgen.h', - 'monetary.h', - 'mqueue.h', - 'ndbm.h', - 'net/if.h', - 'netdb.h', - 'netinet/in.h', - 'netinet/tcp.h', - 'nl_types.h', - 'poll.h', - 'pthread.h', - 'pwd.h', - 'regex.h', - 'sched.h', - 'search.h', - 'semaphore.h', - 'setjmp.h', - 'signal.h', - 'spawn.h', - 'strings.h', - 'stropts.h', - 'syslog.h', - 'tar.h', - 'termios.h', - 'trace.h', - 'ulimit.h', - 'unistd.h', - 'utime.h', - 'utmpx.h', - 'wordexp.h', - # additional GNUlib headers - 'a.out.h', - 'aliases.h', - 'alloca.h', - 'ar.h', - 'argp.h', - 'argz.h', - 'byteswap.h', - 'crypt.h', - 'endian.h', - 'envz.h', - 'err.h', - 'error.h', - 'execinfo.h', - 'fpu_control.h', - 'fstab.h', - 'fts.h', - 'getopt.h', - 'gshadow.h', - 'ieee754.h', - 'ifaddrs.h', - 'libintl.h', - 'mcheck.h', - 'mntent.h', - 'obstack.h', - 'paths.h', - 'printf.h', - 'pty.h', - 'resolv.h', - 'shadow.h', - 'sysexits.h', - 'ttyent.h', - # Additional linux glibc headers - 'dlfcn.h', - 'elf.h', - 'features.h', - 'gconv.h', - 'gnu-versions.h', - 'lastlog.h', - 'libio.h', - 'link.h', - 'malloc.h', - 'memory.h', - 'netash/ash.h', - 'netatalk/at.h', - 'netax25/ax25.h', - 'neteconet/ec.h', - 'netipx/ipx.h', - 'netiucv/iucv.h', - 'netpacket/packet.h', - 'netrom/netrom.h', - 'netrose/rose.h', - 'nfs/nfs.h', - 'nl_types.h', - 'nss.h', - 're_comp.h', - 'regexp.h', - 'sched.h', - 'sgtty.h', - 'stab.h', - 'stdc-predef.h', - 'stdio_ext.h', - 'syscall.h', - 'termio.h', - 'thread_db.h', - 'ucontext.h', - 'ustat.h', - 'utmp.h', - 'values.h', - 'wait.h', - 'xlocale.h', - # Hardware specific headers - 'arm_neon.h', - 'emmintrin.h', - 'xmmintin.h', - ]) +_C_HEADERS = frozenset( + [ + # System C headers + "assert.h", + "complex.h", + "ctype.h", + "errno.h", + "fenv.h", + "float.h", + "inttypes.h", + "iso646.h", + "limits.h", + "locale.h", + "math.h", + "setjmp.h", + "signal.h", + "stdalign.h", + "stdarg.h", + "stdatomic.h", + "stdbool.h", + "stddef.h", + "stdint.h", + "stdio.h", + "stdlib.h", + "stdnoreturn.h", + "string.h", + "tgmath.h", + "threads.h", + "time.h", + "uchar.h", + "wchar.h", + "wctype.h", + # C23 headers + "stdbit.h", + "stdckdint.h", + # additional POSIX C headers + "aio.h", + "arpa/inet.h", + "cpio.h", + "dirent.h", + "dlfcn.h", + "fcntl.h", + "fmtmsg.h", + "fnmatch.h", + "ftw.h", + "glob.h", + "grp.h", + "iconv.h", + "langinfo.h", + "libgen.h", + "monetary.h", + "mqueue.h", + "ndbm.h", + "net/if.h", + "netdb.h", + "netinet/in.h", + "netinet/tcp.h", + "nl_types.h", + "poll.h", + "pthread.h", + "pwd.h", + "regex.h", + "sched.h", + "search.h", + "semaphore.h", + "setjmp.h", + "signal.h", + "spawn.h", + "strings.h", + "stropts.h", + "syslog.h", + "tar.h", + "termios.h", + "trace.h", + "ulimit.h", + "unistd.h", + "utime.h", + "utmpx.h", + "wordexp.h", + # additional GNUlib headers + "a.out.h", + "aliases.h", + "alloca.h", + "ar.h", + "argp.h", + "argz.h", + "byteswap.h", + "crypt.h", + "endian.h", + "envz.h", + "err.h", + "error.h", + "execinfo.h", + "fpu_control.h", + "fstab.h", + "fts.h", + "getopt.h", + "gshadow.h", + "ieee754.h", + "ifaddrs.h", + "libintl.h", + "mcheck.h", + "mntent.h", + "obstack.h", + "paths.h", + "printf.h", + "pty.h", + "resolv.h", + "shadow.h", + "sysexits.h", + "ttyent.h", + # Additional linux glibc headers + "dlfcn.h", + "elf.h", + "features.h", + "gconv.h", + "gnu-versions.h", + "lastlog.h", + "libio.h", + "link.h", + "malloc.h", + "memory.h", + "netash/ash.h", + "netatalk/at.h", + "netax25/ax25.h", + "neteconet/ec.h", + "netipx/ipx.h", + "netiucv/iucv.h", + "netpacket/packet.h", + "netrom/netrom.h", + "netrose/rose.h", + "nfs/nfs.h", + "nl_types.h", + "nss.h", + "re_comp.h", + "regexp.h", + "sched.h", + "sgtty.h", + "stab.h", + "stdc-predef.h", + "stdio_ext.h", + "syscall.h", + "termio.h", + "thread_db.h", + "ucontext.h", + "ustat.h", + "utmp.h", + "values.h", + "wait.h", + "xlocale.h", + # Hardware specific headers + "arm_neon.h", + "emmintrin.h", + "xmmintin.h", + ] +) # Folders of C libraries so commonly used in C++, # that they have parity with standard C libraries. -C_STANDARD_HEADER_FOLDERS = frozenset([ - # standard C library - "sys", - # glibc for linux - "arpa", - "asm-generic", - "bits", - "gnu", - "net", - "netinet", - "protocols", - "rpc", - "rpcsvc", - "scsi", - # linux kernel header - "drm", - "linux", - "misc", - "mtd", - "rdma", - "sound", - "video", - "xen", - ]) +C_STANDARD_HEADER_FOLDERS = frozenset( + [ + # standard C library + "sys", + # glibc for linux + "arpa", + "asm-generic", + "bits", + "gnu", + "net", + "netinet", + "protocols", + "rpc", + "rpcsvc", + "scsi", + # linux kernel header + "drm", + "linux", + "misc", + "mtd", + "rdma", + "sound", + "video", + "xen", + ] +) # Type names _TYPES = re.compile( - r'^(?:' + r"^(?:" # [dcl.type.simple] - r'(char(16_t|32_t)?)|wchar_t|' - r'bool|short|int|long|signed|unsigned|float|double|' + r"(char(16_t|32_t)?)|wchar_t|" + r"bool|short|int|long|signed|unsigned|float|double|" # [support.types] - r'(ptrdiff_t|size_t|max_align_t|nullptr_t)|' + r"(ptrdiff_t|size_t|max_align_t|nullptr_t)|" # [cstdint.syn] - r'(u?int(_fast|_least)?(8|16|32|64)_t)|' - r'(u?int(max|ptr)_t)|' - r')$') + r"(u?int(_fast|_least)?(8|16|32|64)_t)|" + r"(u?int(max|ptr)_t)|" + r")$" +) # These headers are excluded from [build/include] and [build/include_order] @@ -807,40 +810,52 @@ # - Anything not following google file name conventions (containing an # uppercase character, such as Python.h or nsStringAPI.h, for example). # - Lua headers. -_THIRD_PARTY_HEADERS_PATTERN = re.compile( - r'^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$') +_THIRD_PARTY_HEADERS_PATTERN = re.compile(r"^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$") # Pattern for matching FileInfo.BaseName() against test file name -_test_suffixes = ['_test', '_regtest', '_unittest'] -_TEST_FILE_SUFFIX = '(' + '|'.join(_test_suffixes) + r')$' +_test_suffixes = ["_test", "_regtest", "_unittest"] +_TEST_FILE_SUFFIX = "(" + "|".join(_test_suffixes) + r")$" # Pattern that matches only complete whitespace, possibly across multiple lines. -_EMPTY_CONDITIONAL_BODY_PATTERN = re.compile(r'^\s*$', re.DOTALL) +_EMPTY_CONDITIONAL_BODY_PATTERN = re.compile(r"^\s*$", re.DOTALL) # Assertion macros. These are defined in base/logging.h and # testing/base/public/gunit.h. _CHECK_MACROS = [ - 'DCHECK', 'CHECK', - 'EXPECT_TRUE', 'ASSERT_TRUE', - 'EXPECT_FALSE', 'ASSERT_FALSE', - ] + "DCHECK", + "CHECK", + "EXPECT_TRUE", + "ASSERT_TRUE", + "EXPECT_FALSE", + "ASSERT_FALSE", +] # Replacement macros for CHECK/DCHECK/EXPECT_TRUE/EXPECT_FALSE _CHECK_REPLACEMENT = {macro_var: {} for macro_var in _CHECK_MACROS} -for op, replacement in [('==', 'EQ'), ('!=', 'NE'), - ('>=', 'GE'), ('>', 'GT'), - ('<=', 'LE'), ('<', 'LT')]: - _CHECK_REPLACEMENT['DCHECK'][op] = f'DCHECK_{replacement}' - _CHECK_REPLACEMENT['CHECK'][op] = f'CHECK_{replacement}' - _CHECK_REPLACEMENT['EXPECT_TRUE'][op] = f'EXPECT_{replacement}' - _CHECK_REPLACEMENT['ASSERT_TRUE'][op] = f'ASSERT_{replacement}' - -for op, inv_replacement in [('==', 'NE'), ('!=', 'EQ'), - ('>=', 'LT'), ('>', 'LE'), - ('<=', 'GT'), ('<', 'GE')]: - _CHECK_REPLACEMENT['EXPECT_FALSE'][op] = f'EXPECT_{inv_replacement}' - _CHECK_REPLACEMENT['ASSERT_FALSE'][op] = f'ASSERT_{inv_replacement}' +for op, replacement in [ + ("==", "EQ"), + ("!=", "NE"), + (">=", "GE"), + (">", "GT"), + ("<=", "LE"), + ("<", "LT"), +]: + _CHECK_REPLACEMENT["DCHECK"][op] = f"DCHECK_{replacement}" + _CHECK_REPLACEMENT["CHECK"][op] = f"CHECK_{replacement}" + _CHECK_REPLACEMENT["EXPECT_TRUE"][op] = f"EXPECT_{replacement}" + _CHECK_REPLACEMENT["ASSERT_TRUE"][op] = f"ASSERT_{replacement}" + +for op, inv_replacement in [ + ("==", "NE"), + ("!=", "EQ"), + (">=", "LT"), + (">", "LE"), + ("<=", "GT"), + ("<", "GE"), +]: + _CHECK_REPLACEMENT["EXPECT_FALSE"][op] = f"EXPECT_{inv_replacement}" + _CHECK_REPLACEMENT["ASSERT_FALSE"][op] = f"ASSERT_{inv_replacement}" # Alternative tokens and their replacements. For full list, see section 2.5 # Alternative tokens [lex.digraph] in the C++ standard. @@ -848,18 +863,18 @@ # Digraphs (such as '%:') are not included here since it's a mess to # match those on a word boundary. _ALT_TOKEN_REPLACEMENT = { - 'and': '&&', - 'bitor': '|', - 'or': '||', - 'xor': '^', - 'compl': '~', - 'bitand': '&', - 'and_eq': '&=', - 'or_eq': '|=', - 'xor_eq': '^=', - 'not': '!', - 'not_eq': '!=' - } + "and": "&&", + "bitor": "|", + "or": "||", + "xor": "^", + "compl": "~", + "bitand": "&", + "and_eq": "&=", + "or_eq": "|=", + "xor_eq": "^=", + "not": "!", + "not_eq": "!=", +} # Compile regular expression that matches all the above keywords. The "[ =()]" # bit is meant to avoid matching these keywords outside of boolean expressions. @@ -867,7 +882,8 @@ # False positives include C-style multi-line comments and multi-line strings # but those have always been troublesome for cpplint. _ALT_TOKEN_REPLACEMENT_PATTERN = re.compile( - r'([ =()])(' + ('|'.join(_ALT_TOKEN_REPLACEMENT.keys())) + r')([ (]|$)') + r"([ =()])(" + ("|".join(_ALT_TOKEN_REPLACEMENT.keys())) + r")([ (]|$)" +) # These constants define types of headers for use with @@ -880,37 +896,41 @@ _OTHER_HEADER = 6 # These constants define the current inline assembly state -_NO_ASM = 0 # Outside of inline assembly block -_INSIDE_ASM = 1 # Inside inline assembly block -_END_ASM = 2 # Last line of inline assembly block -_BLOCK_ASM = 3 # The whole block is an inline assembly block +_NO_ASM = 0 # Outside of inline assembly block +_INSIDE_ASM = 1 # Inside inline assembly block +_END_ASM = 2 # Last line of inline assembly block +_BLOCK_ASM = 3 # The whole block is an inline assembly block # Match start of assembly blocks -_MATCH_ASM = re.compile(r'^\s*(?:asm|_asm|__asm|__asm__)' - r'(?:\s+(volatile|__volatile__))?' - r'\s*[{(]') +_MATCH_ASM = re.compile( + r"^\s*(?:asm|_asm|__asm|__asm__)" + r"(?:\s+(volatile|__volatile__))?" + r"\s*[{(]" +) # Match strings that indicate we're working on a C (not C++) file. -_SEARCH_C_FILE = re.compile(r'\b(?:LINT_C_FILE|' - r'vim?:\s*.*(\s*|:)filetype=c(\s*|:|$))') +_SEARCH_C_FILE = re.compile( + r"\b(?:LINT_C_FILE|" + r"vim?:\s*.*(\s*|:)filetype=c(\s*|:|$))" +) # Match string that indicates we're working on a Linux Kernel file. -_SEARCH_KERNEL_FILE = re.compile(r'\b(?:LINT_KERNEL_FILE)') +_SEARCH_KERNEL_FILE = re.compile(r"\b(?:LINT_KERNEL_FILE)") # Commands for sed to fix the problem _SED_FIXUPS = { - 'Remove spaces around =': r's/ = /=/', - 'Remove spaces around !=': r's/ != /!=/', - 'Remove space before ( in if (': r's/if (/if(/', - 'Remove space before ( in for (': r's/for (/for(/', - 'Remove space before ( in while (': r's/while (/while(/', - 'Remove space before ( in switch (': r's/switch (/switch(/', - 'Should have a space between // and comment': r's/\/\//\/\/ /', - 'Missing space before {': r's/\([^ ]\){/\1 {/', - 'Tab found, replace by spaces': r's/\t/ /g', - 'Line ends in whitespace. Consider deleting these extra spaces.': r's/\s*$//', - 'You don\'t need a ; after a }': r's/};/}/', - 'Missing space after ,': r's/,\([^ ]\)/, \1/g', + "Remove spaces around =": r"s/ = /=/", + "Remove spaces around !=": r"s/ != /!=/", + "Remove space before ( in if (": r"s/if (/if(/", + "Remove space before ( in for (": r"s/for (/for(/", + "Remove space before ( in while (": r"s/while (/while(/", + "Remove space before ( in switch (": r"s/switch (/switch(/", + "Should have a space between // and comment": r"s/\/\//\/\/ /", + "Missing space before {": r"s/\([^ ]\){/\1 {/", + "Tab found, replace by spaces": r"s/\t/ /g", + "Line ends in whitespace. Consider deleting these extra spaces.": r"s/\s*$//", + "You don't need a ; after a }": r"s/};/}/", + "Missing space after ,": r"s/,\([^ ]\)/, \1/g", } # {str, set(int)}: a map from error categories to sets of linenumbers @@ -947,886 +967,943 @@ # This is set by --headers flag. _hpp_headers = set() + class ErrorSuppressions: - """Class to track all error suppressions for cpplint""" - - class LineRange: - """Class to represent a range of line numbers for which an error is suppressed""" - def __init__(self, begin, end): - self.begin = begin - self.end = end - - def __str__(self): - return f'[{self.begin}-{self.end}]' - - def __contains__(self, obj): - return self.begin <= obj <= self.end - - def ContainsRange(self, other): - return self.begin <= other.begin and self.end >= other.end - - def __init__(self): - self._suppressions = collections.defaultdict(list) - self._open_block_suppression = None - - def _AddSuppression(self, category, line_range): - suppressed = self._suppressions[category] - if not (suppressed and suppressed[-1].ContainsRange(line_range)): - suppressed.append(line_range) - - def GetOpenBlockStart(self): - """:return: The start of the current open block or `-1` if there is not an open block""" - return self._open_block_suppression.begin if self._open_block_suppression else -1 - - def AddGlobalSuppression(self, category): - """Add a suppression for `category` which is suppressed for the whole file""" - self._AddSuppression(category, self.LineRange(0, math.inf)) - - def AddLineSuppression(self, category, linenum): - """Add a suppression for `category` which is suppressed only on `linenum`""" - self._AddSuppression(category, self.LineRange(linenum, linenum)) - - def StartBlockSuppression(self, category, linenum): - """Start a suppression block for `category` on `linenum`. inclusive""" - if self._open_block_suppression is None: - self._open_block_suppression = self.LineRange(linenum, math.inf) - self._AddSuppression(category, self._open_block_suppression) - - def EndBlockSuppression(self, linenum): - """End the current block suppression on `linenum`. inclusive""" - if self._open_block_suppression: - self._open_block_suppression.end = linenum - self._open_block_suppression = None - - def IsSuppressed(self, category, linenum): - """:return: `True` if `category` is suppressed for `linenum`""" - suppressed = self._suppressions[category] + self._suppressions[None] - return any(linenum in lr for lr in suppressed) - - def HasOpenBlock(self): - """:return: `True` if a block suppression was started but not ended""" - return self._open_block_suppression is not None - - def Clear(self): - """Clear all current error suppressions""" - self._suppressions.clear() - self._open_block_suppression = None + """Class to track all error suppressions for cpplint""" + + class LineRange: + """Class to represent a range of line numbers for which an error is suppressed""" + + def __init__(self, begin, end): + self.begin = begin + self.end = end + + def __str__(self): + return f"[{self.begin}-{self.end}]" + + def __contains__(self, obj): + return self.begin <= obj <= self.end + + def ContainsRange(self, other): + return self.begin <= other.begin and self.end >= other.end + + def __init__(self): + self._suppressions = collections.defaultdict(list) + self._open_block_suppression = None + + def _AddSuppression(self, category, line_range): + suppressed = self._suppressions[category] + if not (suppressed and suppressed[-1].ContainsRange(line_range)): + suppressed.append(line_range) + + def GetOpenBlockStart(self): + """:return: The start of the current open block or `-1` if there is not an open block""" + return self._open_block_suppression.begin if self._open_block_suppression else -1 + + def AddGlobalSuppression(self, category): + """Add a suppression for `category` which is suppressed for the whole file""" + self._AddSuppression(category, self.LineRange(0, math.inf)) + + def AddLineSuppression(self, category, linenum): + """Add a suppression for `category` which is suppressed only on `linenum`""" + self._AddSuppression(category, self.LineRange(linenum, linenum)) + + def StartBlockSuppression(self, category, linenum): + """Start a suppression block for `category` on `linenum`. inclusive""" + if self._open_block_suppression is None: + self._open_block_suppression = self.LineRange(linenum, math.inf) + self._AddSuppression(category, self._open_block_suppression) + + def EndBlockSuppression(self, linenum): + """End the current block suppression on `linenum`. inclusive""" + if self._open_block_suppression: + self._open_block_suppression.end = linenum + self._open_block_suppression = None + + def IsSuppressed(self, category, linenum): + """:return: `True` if `category` is suppressed for `linenum`""" + suppressed = self._suppressions[category] + self._suppressions[None] + return any(linenum in lr for lr in suppressed) + + def HasOpenBlock(self): + """:return: `True` if a block suppression was started but not ended""" + return self._open_block_suppression is not None + + def Clear(self): + """Clear all current error suppressions""" + self._suppressions.clear() + self._open_block_suppression = None + _error_suppressions = ErrorSuppressions() + def ProcessHppHeadersOption(val): - global _hpp_headers - try: - _hpp_headers = {ext.strip() for ext in val.split(',')} - except ValueError: - PrintUsage('Header extensions must be comma separated list.') + global _hpp_headers + try: + _hpp_headers = {ext.strip() for ext in val.split(",")} + except ValueError: + PrintUsage("Header extensions must be comma separated list.") + def ProcessIncludeOrderOption(val): - if val is None or val == "default": - pass - elif val == "standardcfirst": - global _include_order - _include_order = val - else: - PrintUsage('Invalid includeorder value %s. Expected default|standardcfirst') + if val is None or val == "default": + pass + elif val == "standardcfirst": + global _include_order + _include_order = val + else: + PrintUsage("Invalid includeorder value %s. Expected default|standardcfirst") + def IsHeaderExtension(file_extension): - return file_extension in GetHeaderExtensions() + return file_extension in GetHeaderExtensions() + def GetHeaderExtensions(): - if _hpp_headers: - return _hpp_headers - if _valid_extensions: - return {h for h in _valid_extensions if 'h' in h} - return {'h', 'hh', 'hpp', 'hxx', 'h++', 'cuh'} + if _hpp_headers: + return _hpp_headers + if _valid_extensions: + return {h for h in _valid_extensions if "h" in h} + return {"h", "hh", "hpp", "hxx", "h++", "cuh"} + # The allowed extensions for file names # This is set by --extensions flag def GetAllExtensions(): - return GetHeaderExtensions().union(_valid_extensions or {'c', 'cc', 'cpp', 'cxx', 'c++', 'cu'}) - -def ProcessExtensionsOption(val): - global _valid_extensions - try: - extensions = [ext.strip() for ext in val.split(',')] - _valid_extensions = set(extensions) - except ValueError: - PrintUsage('Extensions should be a comma-separated list of values;' - 'for example: extensions=hpp,cpp\n' - f'This could not be parsed: "{val}"') - -def GetNonHeaderExtensions(): - return GetAllExtensions().difference(GetHeaderExtensions()) - -def ParseNolintSuppressions(filename, raw_line, linenum, error): - """Updates the global list of line error-suppressions. - - Parses any NOLINT comments on the current line, updating the global - error_suppressions store. Reports an error if the NOLINT comment - was malformed. - - Args: - filename: str, the name of the input file. - raw_line: str, the line of input text, with comments. - linenum: int, the number of the current line. - error: function, an error handler. - """ - matched = re.search(r'\bNOLINT(NEXTLINE|BEGIN|END)?\b(\([^)]+\))?', raw_line) - if matched: - no_lint_type = matched.group(1) - if no_lint_type == 'NEXTLINE': - def ProcessCategory(category): - _error_suppressions.AddLineSuppression(category, linenum + 1) - elif no_lint_type == 'BEGIN': - if _error_suppressions.HasOpenBlock(): - error(filename, linenum, 'readability/nolint', 5, - f'NONLINT block already defined on line {_error_suppressions.GetOpenBlockStart()}') - - def ProcessCategory(category): - _error_suppressions.StartBlockSuppression(category, linenum) - elif no_lint_type == 'END': - if not _error_suppressions.HasOpenBlock(): - error(filename, linenum, 'readability/nolint', 5, 'Not in a NOLINT block') - - def ProcessCategory(category): - if category is not None: - error(filename, linenum, 'readability/nolint', 5, - f'NOLINT categories not supported in block END: {category}') - _error_suppressions.EndBlockSuppression(linenum) - else: - def ProcessCategory(category): - _error_suppressions.AddLineSuppression(category, linenum) - categories = matched.group(2) - if categories in (None, '(*)'): # => "suppress all" - ProcessCategory(None) - elif categories.startswith('(') and categories.endswith(')'): - for category in {c.strip() for c in categories[1:-1].split(',')}: - if category in _ERROR_CATEGORIES: - ProcessCategory(category) - elif any(c for c in _OTHER_NOLINT_CATEGORY_PREFIXES if category.startswith(c)): - # Ignore any categories from other tools. - pass - elif category not in _LEGACY_ERROR_CATEGORIES: - error(filename, linenum, 'readability/nolint', 5, - f'Unknown NOLINT error category: {category}') + return GetHeaderExtensions().union(_valid_extensions or {"c", "cc", "cpp", "cxx", "c++", "cu"}) -def ProcessGlobalSuppresions(lines): - """Deprecated; use ProcessGlobalSuppressions.""" - ProcessGlobalSuppressions(lines) -def ProcessGlobalSuppressions(lines): - """Updates the list of global error suppressions. +def ProcessExtensionsOption(val): + global _valid_extensions + try: + extensions = [ext.strip() for ext in val.split(",")] + _valid_extensions = set(extensions) + except ValueError: + PrintUsage( + "Extensions should be a comma-separated list of values;" + "for example: extensions=hpp,cpp\n" + f'This could not be parsed: "{val}"' + ) - Parses any lint directives in the file that have global effect. - Args: - lines: An array of strings, each representing a line of the file, with the - last element being empty if the file is terminated with a newline. - """ - for line in lines: - if _SEARCH_C_FILE.search(line): - for category in _DEFAULT_C_SUPPRESSED_CATEGORIES: - _error_suppressions.AddGlobalSuppression(category) - if _SEARCH_KERNEL_FILE.search(line): - for category in _DEFAULT_KERNEL_SUPPRESSED_CATEGORIES: - _error_suppressions.AddGlobalSuppression(category) +def GetNonHeaderExtensions(): + return GetAllExtensions().difference(GetHeaderExtensions()) -def ResetNolintSuppressions(): - """Resets the set of NOLINT suppressions to empty.""" - _error_suppressions.Clear() +def ParseNolintSuppressions(filename, raw_line, linenum, error): + """Updates the global list of line error-suppressions. + Parses any NOLINT comments on the current line, updating the global + error_suppressions store. Reports an error if the NOLINT comment + was malformed. -def IsErrorSuppressedByNolint(category, linenum): - """Returns true if the specified error category is suppressed on this line. + Args: + filename: str, the name of the input file. + raw_line: str, the line of input text, with comments. + linenum: int, the number of the current line. + error: function, an error handler. + """ + matched = re.search(r"\bNOLINT(NEXTLINE|BEGIN|END)?\b(\([^)]+\))?", raw_line) + if matched: + no_lint_type = matched.group(1) + if no_lint_type == "NEXTLINE": + + def ProcessCategory(category): + _error_suppressions.AddLineSuppression(category, linenum + 1) + elif no_lint_type == "BEGIN": + if _error_suppressions.HasOpenBlock(): + error( + filename, + linenum, + "readability/nolint", + 5, + ( + "NONLINT block already defined on line " + f"{_error_suppressions.GetOpenBlockStart()}" + ), + ) + + def ProcessCategory(category): + _error_suppressions.StartBlockSuppression(category, linenum) + elif no_lint_type == "END": + if not _error_suppressions.HasOpenBlock(): + error(filename, linenum, "readability/nolint", 5, "Not in a NOLINT block") + + def ProcessCategory(category): + if category is not None: + error( + filename, + linenum, + "readability/nolint", + 5, + f"NOLINT categories not supported in block END: {category}", + ) + _error_suppressions.EndBlockSuppression(linenum) + else: - Consults the global error_suppressions map populated by - ParseNolintSuppressions/ProcessGlobalSuppressions/ResetNolintSuppressions. + def ProcessCategory(category): + _error_suppressions.AddLineSuppression(category, linenum) + + categories = matched.group(2) + if categories in (None, "(*)"): # => "suppress all" + ProcessCategory(None) + elif categories.startswith("(") and categories.endswith(")"): + for category in {c.strip() for c in categories[1:-1].split(",")}: + if category in _ERROR_CATEGORIES: + ProcessCategory(category) + elif any(c for c in _OTHER_NOLINT_CATEGORY_PREFIXES if category.startswith(c)): + # Ignore any categories from other tools. + pass + elif category not in _LEGACY_ERROR_CATEGORIES: + error( + filename, + linenum, + "readability/nolint", + 5, + f"Unknown NOLINT error category: {category}", + ) - Args: - category: str, the category of the error. - linenum: int, the current line number. - Returns: - bool, True iff the error should be suppressed due to a NOLINT comment, - block suppression or global suppression. - """ - return _error_suppressions.IsSuppressed(category, linenum) +def ProcessGlobalSuppresions(lines): + """Deprecated; use ProcessGlobalSuppressions.""" + ProcessGlobalSuppressions(lines) -def _IsSourceExtension(s): - """File extension (excluding dot) matches a source file extension.""" - return s in GetNonHeaderExtensions() +def ProcessGlobalSuppressions(lines): + """Updates the list of global error suppressions. -class _IncludeState(object): - """Tracks line numbers for includes, and the order in which includes appear. - - include_list contains list of lists of (header, line number) pairs. - It's a lists of lists rather than just one flat list to make it - easier to update across preprocessor boundaries. - - Call CheckNextIncludeOrder() once for each header in the file, passing - in the type constants defined above. Calls in an illegal order will - raise an _IncludeError with an appropriate error message. - - """ - # self._section will move monotonically through this set. If it ever - # needs to move backwards, CheckNextIncludeOrder will raise an error. - _INITIAL_SECTION = 0 - _MY_H_SECTION = 1 - _C_SECTION = 2 - _CPP_SECTION = 3 - _OTHER_SYS_SECTION = 4 - _OTHER_H_SECTION = 5 - - _TYPE_NAMES = { - _C_SYS_HEADER: 'C system header', - _CPP_SYS_HEADER: 'C++ system header', - _OTHER_SYS_HEADER: 'other system header', - _LIKELY_MY_HEADER: 'header this file implements', - _POSSIBLE_MY_HEADER: 'header this file may implement', - _OTHER_HEADER: 'other header', - } - _SECTION_NAMES = { - _INITIAL_SECTION: "... nothing. (This can't be an error.)", - _MY_H_SECTION: 'a header this file implements', - _C_SECTION: 'C system header', - _CPP_SECTION: 'C++ system header', - _OTHER_SYS_SECTION: 'other system header', - _OTHER_H_SECTION: 'other header', - } - - def __init__(self): - self.include_list = [[]] - self._section = None - self._last_header = None - self.ResetSection('') - - def FindHeader(self, header): - """Check if a header has already been included. + Parses any lint directives in the file that have global effect. Args: - header: header to check. - Returns: - Line number of previous occurrence, or -1 if the header has not - been seen before. + lines: An array of strings, each representing a line of the file, with the + last element being empty if the file is terminated with a newline. """ - for section_list in self.include_list: - for f in section_list: - if f[0] == header: - return f[1] - return -1 - - def ResetSection(self, directive): - """Reset section checking for preprocessor directive. + for line in lines: + if _SEARCH_C_FILE.search(line): + for category in _DEFAULT_C_SUPPRESSED_CATEGORIES: + _error_suppressions.AddGlobalSuppression(category) + if _SEARCH_KERNEL_FILE.search(line): + for category in _DEFAULT_KERNEL_SUPPRESSED_CATEGORIES: + _error_suppressions.AddGlobalSuppression(category) - Args: - directive: preprocessor directive (e.g. "if", "else"). - """ - # The name of the current section. - self._section = self._INITIAL_SECTION - # The path of last found header. - self._last_header = '' - # Update list of includes. Note that we never pop from the - # include list. - if directive in ('if', 'ifdef', 'ifndef'): - self.include_list.append([]) - elif directive in ('else', 'elif'): - self.include_list[-1] = [] +def ResetNolintSuppressions(): + """Resets the set of NOLINT suppressions to empty.""" + _error_suppressions.Clear() - def SetLastHeader(self, header_path): - self._last_header = header_path - def CanonicalizeAlphabeticalOrder(self, header_path): - """Returns a path canonicalized for alphabetical comparison. +def IsErrorSuppressedByNolint(category, linenum): + """Returns true if the specified error category is suppressed on this line. - - replaces "-" with "_" so they both cmp the same. - - removes '-inl' since we don't require them to be after the main header. - - lowercase everything, just in case. + Consults the global error_suppressions map populated by + ParseNolintSuppressions/ProcessGlobalSuppressions/ResetNolintSuppressions. Args: - header_path: Path to be canonicalized. - + category: str, the category of the error. + linenum: int, the current line number. Returns: - Canonicalized path. + bool, True iff the error should be suppressed due to a NOLINT comment, + block suppression or global suppression. """ - return header_path.replace('-inl.h', '.h').replace('-', '_').lower() - - def IsInAlphabeticalOrder(self, clean_lines, linenum, header_path): - """Check if a header is in alphabetical order with the previous header. + return _error_suppressions.IsSuppressed(category, linenum) - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - header_path: Canonicalized header to be checked. - Returns: - Returns true if the header is in alphabetical order. - """ - # If previous section is different from current section, _last_header will - # be reset to empty string, so it's always less than current header. - # - # If previous line was a blank line, assume that the headers are - # intentionally sorted the way they are. - if (self._last_header > header_path and - re.match(r'^\s*#\s*include\b', clean_lines.elided[linenum - 1])): - return False - return True +def _IsSourceExtension(s): + """File extension (excluding dot) matches a source file extension.""" + return s in GetNonHeaderExtensions() - def CheckNextIncludeOrder(self, header_type): - """Returns a non-empty error message if the next header is out of order. - This function also updates the internal state to be ready to check - the next include. +class _IncludeState(object): + """Tracks line numbers for includes, and the order in which includes appear. - Args: - header_type: One of the _XXX_HEADER constants defined above. + include_list contains list of lists of (header, line number) pairs. + It's a lists of lists rather than just one flat list to make it + easier to update across preprocessor boundaries. - Returns: - The empty string if the header is in the right order, or an - error message describing what's wrong. + Call CheckNextIncludeOrder() once for each header in the file, passing + in the type constants defined above. Calls in an illegal order will + raise an _IncludeError with an appropriate error message. """ - error_message = (f'Found {self._TYPE_NAMES[header_type]}' - f' after {self._SECTION_NAMES[self._section]}') - - last_section = self._section - - if header_type == _C_SYS_HEADER: - if self._section <= self._C_SECTION: - self._section = self._C_SECTION - else: - self._last_header = '' - return error_message - elif header_type == _CPP_SYS_HEADER: - if self._section <= self._CPP_SECTION: - self._section = self._CPP_SECTION - else: - self._last_header = '' - return error_message - elif header_type == _OTHER_SYS_HEADER: - if self._section <= self._OTHER_SYS_SECTION: - self._section = self._OTHER_SYS_SECTION - else: - self._last_header = '' - return error_message - elif header_type == _LIKELY_MY_HEADER: - if self._section <= self._MY_H_SECTION: - self._section = self._MY_H_SECTION - else: - self._section = self._OTHER_H_SECTION - elif header_type == _POSSIBLE_MY_HEADER: - if self._section <= self._MY_H_SECTION: - self._section = self._MY_H_SECTION - else: - # This will always be the fallback because we're not sure - # enough that the header is associated with this file. - self._section = self._OTHER_H_SECTION - else: - assert header_type == _OTHER_HEADER - self._section = self._OTHER_H_SECTION - - if last_section != self._section: - self._last_header = '' - - return '' + # self._section will move monotonically through this set. If it ever + # needs to move backwards, CheckNextIncludeOrder will raise an error. + _INITIAL_SECTION = 0 + _MY_H_SECTION = 1 + _C_SECTION = 2 + _CPP_SECTION = 3 + _OTHER_SYS_SECTION = 4 + _OTHER_H_SECTION = 5 + + _TYPE_NAMES = { + _C_SYS_HEADER: "C system header", + _CPP_SYS_HEADER: "C++ system header", + _OTHER_SYS_HEADER: "other system header", + _LIKELY_MY_HEADER: "header this file implements", + _POSSIBLE_MY_HEADER: "header this file may implement", + _OTHER_HEADER: "other header", + } + _SECTION_NAMES = { + _INITIAL_SECTION: "... nothing. (This can't be an error.)", + _MY_H_SECTION: "a header this file implements", + _C_SECTION: "C system header", + _CPP_SECTION: "C++ system header", + _OTHER_SYS_SECTION: "other system header", + _OTHER_H_SECTION: "other header", + } -class _CppLintState(object): - """Maintains module-wide state..""" - - def __init__(self): - self.verbose_level = 1 # global setting. - self.error_count = 0 # global count of reported errors - # filters to apply when emitting error messages - self.filters = _DEFAULT_FILTERS[:] - # backup of filter list. Used to restore the state after each file. - self._filters_backup = self.filters[:] - self.counting = 'total' # In what way are we counting errors? - self.errors_by_category = {} # string to int dict storing error counts - self.quiet = False # Suppress non-error messages? - - # output format: - # "emacs" - format that emacs can parse (default) - # "eclipse" - format that eclipse can parse - # "vs7" - format that Microsoft Visual Studio 7 can parse - # "junit" - format that Jenkins, Bamboo, etc can parse - # "sed" - returns a gnu sed command to fix the problem - # "gsed" - like sed, but names the command gsed, e.g. for macOS homebrew users - self.output_format = 'emacs' - - # For JUnit output, save errors and failures until the end so that they - # can be written into the XML - self._junit_errors = [] - self._junit_failures = [] - - def SetOutputFormat(self, output_format): - """Sets the output format for errors.""" - self.output_format = output_format - - def SetQuiet(self, quiet): - """Sets the module's quiet settings, and returns the previous setting.""" - last_quiet = self.quiet - self.quiet = quiet - return last_quiet - - def SetVerboseLevel(self, level): - """Sets the module's verbosity, and returns the previous setting.""" - last_verbose_level = self.verbose_level - self.verbose_level = level - return last_verbose_level + def __init__(self): + self.include_list = [[]] + self._section = None + self._last_header = None + self.ResetSection("") + + def FindHeader(self, header): + """Check if a header has already been included. + + Args: + header: header to check. + Returns: + Line number of previous occurrence, or -1 if the header has not + been seen before. + """ + for section_list in self.include_list: + for f in section_list: + if f[0] == header: + return f[1] + return -1 + + def ResetSection(self, directive): + """Reset section checking for preprocessor directive. + + Args: + directive: preprocessor directive (e.g. "if", "else"). + """ + # The name of the current section. + self._section = self._INITIAL_SECTION + # The path of last found header. + self._last_header = "" + + # Update list of includes. Note that we never pop from the + # include list. + if directive in ("if", "ifdef", "ifndef"): + self.include_list.append([]) + elif directive in ("else", "elif"): + self.include_list[-1] = [] + + def SetLastHeader(self, header_path): + self._last_header = header_path + + def CanonicalizeAlphabeticalOrder(self, header_path): + """Returns a path canonicalized for alphabetical comparison. + + - replaces "-" with "_" so they both cmp the same. + - removes '-inl' since we don't require them to be after the main header. + - lowercase everything, just in case. + + Args: + header_path: Path to be canonicalized. + + Returns: + Canonicalized path. + """ + return header_path.replace("-inl.h", ".h").replace("-", "_").lower() + + def IsInAlphabeticalOrder(self, clean_lines, linenum, header_path): + """Check if a header is in alphabetical order with the previous header. + + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + header_path: Canonicalized header to be checked. + + Returns: + Returns true if the header is in alphabetical order. + """ + # If previous section is different from current section, _last_header will + # be reset to empty string, so it's always less than current header. + # + # If previous line was a blank line, assume that the headers are + # intentionally sorted the way they are. + if self._last_header > header_path and re.match( + r"^\s*#\s*include\b", clean_lines.elided[linenum - 1] + ): + return False + return True - def SetCountingStyle(self, counting_style): - """Sets the module's counting options.""" - self.counting = counting_style + def CheckNextIncludeOrder(self, header_type): + """Returns a non-empty error message if the next header is out of order. + + This function also updates the internal state to be ready to check + the next include. + + Args: + header_type: One of the _XXX_HEADER constants defined above. + + Returns: + The empty string if the header is in the right order, or an + error message describing what's wrong. + + """ + error_message = ( + f"Found {self._TYPE_NAMES[header_type]} after {self._SECTION_NAMES[self._section]}" + ) + + last_section = self._section + + if header_type == _C_SYS_HEADER: + if self._section <= self._C_SECTION: + self._section = self._C_SECTION + else: + self._last_header = "" + return error_message + elif header_type == _CPP_SYS_HEADER: + if self._section <= self._CPP_SECTION: + self._section = self._CPP_SECTION + else: + self._last_header = "" + return error_message + elif header_type == _OTHER_SYS_HEADER: + if self._section <= self._OTHER_SYS_SECTION: + self._section = self._OTHER_SYS_SECTION + else: + self._last_header = "" + return error_message + elif header_type == _LIKELY_MY_HEADER: + if self._section <= self._MY_H_SECTION: + self._section = self._MY_H_SECTION + else: + self._section = self._OTHER_H_SECTION + elif header_type == _POSSIBLE_MY_HEADER: + if self._section <= self._MY_H_SECTION: + self._section = self._MY_H_SECTION + else: + # This will always be the fallback because we're not sure + # enough that the header is associated with this file. + self._section = self._OTHER_H_SECTION + else: + assert header_type == _OTHER_HEADER + self._section = self._OTHER_H_SECTION - def SetFilters(self, filters): - """Sets the error-message filters. + if last_section != self._section: + self._last_header = "" - These filters are applied when deciding whether to emit a given - error message. + return "" - Args: - filters: A string of comma-separated filters (eg "+whitespace/indent"). - Each filter should start with + or -; else we die. - Raises: - ValueError: The comma-separated filters did not all start with '+' or '-'. - E.g. "-,+whitespace,-whitespace/indent,whitespace/badfilter" - """ - # Default filters always have less priority than the flag ones. - self.filters = _DEFAULT_FILTERS[:] - self.AddFilters(filters) - - def AddFilters(self, filters): - """ Adds more filters to the existing list of error-message filters. """ - for filt in filters.split(','): - clean_filt = filt.strip() - if clean_filt: - self.filters.append(clean_filt) - for filt in self.filters: - if not filt.startswith(('+', '-')): - msg = f'Every filter in --filters must start with + or - ({filt} does not)' - raise ValueError(msg) - - def BackupFilters(self): - """ Saves the current filter list to backup storage.""" - self._filters_backup = self.filters[:] - - def RestoreFilters(self): - """ Restores filters previously backed up.""" - self.filters = self._filters_backup[:] - - def ResetErrorCounts(self): - """Sets the module's error statistic back to zero.""" - self.error_count = 0 - self.errors_by_category = {} - - def IncrementErrorCount(self, category): - """Bumps the module's error statistic.""" - self.error_count += 1 - if self.counting in ('toplevel', 'detailed'): - if self.counting != 'detailed': - category = category.split('/')[0] - if category not in self.errors_by_category: - self.errors_by_category[category] = 0 - self.errors_by_category[category] += 1 - - def PrintErrorCounts(self): - """Print a summary of errors by category, and the total.""" - for category, count in sorted(dict.items(self.errors_by_category)): - self.PrintInfo(f'Category \'{category}\' errors found: {count}\n') - if self.error_count > 0: - self.PrintInfo(f'Total errors found: {self.error_count}\n') - - def PrintInfo(self, message): - # _quiet does not represent --quiet flag. - # Hide infos from stdout to keep stdout pure for machine consumption - if not _quiet and self.output_format not in _MACHINE_OUTPUTS: - sys.stdout.write(message) - - def PrintError(self, message): - if self.output_format == 'junit': - self._junit_errors.append(message) - else: - sys.stderr.write(message) +class _CppLintState(object): + """Maintains module-wide state..""" + + def __init__(self): + self.verbose_level = 1 # global setting. + self.error_count = 0 # global count of reported errors + # filters to apply when emitting error messages + self.filters = _DEFAULT_FILTERS[:] + # backup of filter list. Used to restore the state after each file. + self._filters_backup = self.filters[:] + self.counting = "total" # In what way are we counting errors? + self.errors_by_category = {} # string to int dict storing error counts + self.quiet = False # Suppress non-error messages? + + # output format: + # "emacs" - format that emacs can parse (default) + # "eclipse" - format that eclipse can parse + # "vs7" - format that Microsoft Visual Studio 7 can parse + # "junit" - format that Jenkins, Bamboo, etc can parse + # "sed" - returns a gnu sed command to fix the problem + # "gsed" - like sed, but names the command gsed, e.g. for macOS homebrew users + self.output_format = "emacs" + + # For JUnit output, save errors and failures until the end so that they + # can be written into the XML + self._junit_errors = [] + self._junit_failures = [] + + def SetOutputFormat(self, output_format): + """Sets the output format for errors.""" + self.output_format = output_format + + def SetQuiet(self, quiet): + """Sets the module's quiet settings, and returns the previous setting.""" + last_quiet = self.quiet + self.quiet = quiet + return last_quiet + + def SetVerboseLevel(self, level): + """Sets the module's verbosity, and returns the previous setting.""" + last_verbose_level = self.verbose_level + self.verbose_level = level + return last_verbose_level + + def SetCountingStyle(self, counting_style): + """Sets the module's counting options.""" + self.counting = counting_style + + def SetFilters(self, filters): + """Sets the error-message filters. + + These filters are applied when deciding whether to emit a given + error message. + + Args: + filters: A string of comma-separated filters (eg "+whitespace/indent"). + Each filter should start with + or -; else we die. + + Raises: + ValueError: The comma-separated filters did not all start with '+' or '-'. + E.g. "-,+whitespace,-whitespace/indent,whitespace/badfilter" + """ + # Default filters always have less priority than the flag ones. + self.filters = _DEFAULT_FILTERS[:] + self.AddFilters(filters) + + def AddFilters(self, filters): + """Adds more filters to the existing list of error-message filters.""" + for filt in filters.split(","): + clean_filt = filt.strip() + if clean_filt: + self.filters.append(clean_filt) + for filt in self.filters: + if not filt.startswith(("+", "-")): + msg = f"Every filter in --filters must start with + or - ({filt} does not)" + raise ValueError(msg) + + def BackupFilters(self): + """Saves the current filter list to backup storage.""" + self._filters_backup = self.filters[:] + + def RestoreFilters(self): + """Restores filters previously backed up.""" + self.filters = self._filters_backup[:] + + def ResetErrorCounts(self): + """Sets the module's error statistic back to zero.""" + self.error_count = 0 + self.errors_by_category = {} + + def IncrementErrorCount(self, category): + """Bumps the module's error statistic.""" + self.error_count += 1 + if self.counting in ("toplevel", "detailed"): + if self.counting != "detailed": + category = category.split("/")[0] + if category not in self.errors_by_category: + self.errors_by_category[category] = 0 + self.errors_by_category[category] += 1 + + def PrintErrorCounts(self): + """Print a summary of errors by category, and the total.""" + for category, count in sorted(dict.items(self.errors_by_category)): + self.PrintInfo(f"Category '{category}' errors found: {count}\n") + if self.error_count > 0: + self.PrintInfo(f"Total errors found: {self.error_count}\n") + + def PrintInfo(self, message): + # _quiet does not represent --quiet flag. + # Hide infos from stdout to keep stdout pure for machine consumption + if not _quiet and self.output_format not in _MACHINE_OUTPUTS: + sys.stdout.write(message) + + def PrintError(self, message): + if self.output_format == "junit": + self._junit_errors.append(message) + else: + sys.stderr.write(message) - def AddJUnitFailure(self, filename, linenum, message, category, confidence): - self._junit_failures.append((filename, linenum, message, category, - confidence)) + def AddJUnitFailure(self, filename, linenum, message, category, confidence): + self._junit_failures.append((filename, linenum, message, category, confidence)) - def FormatJUnitXML(self): - num_errors = len(self._junit_errors) - num_failures = len(self._junit_failures) + def FormatJUnitXML(self): + num_errors = len(self._junit_errors) + num_failures = len(self._junit_failures) - testsuite = xml.etree.ElementTree.Element('testsuite') - testsuite.attrib['errors'] = str(num_errors) - testsuite.attrib['failures'] = str(num_failures) - testsuite.attrib['name'] = 'cpplint' + testsuite = xml.etree.ElementTree.Element("testsuite") + testsuite.attrib["errors"] = str(num_errors) + testsuite.attrib["failures"] = str(num_failures) + testsuite.attrib["name"] = "cpplint" - if num_errors == 0 and num_failures == 0: - testsuite.attrib['tests'] = str(1) - xml.etree.ElementTree.SubElement(testsuite, 'testcase', name='passed') + if num_errors == 0 and num_failures == 0: + testsuite.attrib["tests"] = str(1) + xml.etree.ElementTree.SubElement(testsuite, "testcase", name="passed") - else: - testsuite.attrib['tests'] = str(num_errors + num_failures) - if num_errors > 0: - testcase = xml.etree.ElementTree.SubElement(testsuite, 'testcase') - testcase.attrib['name'] = 'errors' - error = xml.etree.ElementTree.SubElement(testcase, 'error') - error.text = '\n'.join(self._junit_errors) - if num_failures > 0: - # Group failures by file - failed_file_order = [] - failures_by_file = {} - for failure in self._junit_failures: - failed_file = failure[0] - if failed_file not in failed_file_order: - failed_file_order.append(failed_file) - failures_by_file[failed_file] = [] - failures_by_file[failed_file].append(failure) - # Create a testcase for each file - for failed_file in failed_file_order: - failures = failures_by_file[failed_file] - testcase = xml.etree.ElementTree.SubElement(testsuite, 'testcase') - testcase.attrib['name'] = failed_file - failure = xml.etree.ElementTree.SubElement(testcase, 'failure') - template = '{0}: {1} [{2}] [{3}]' - texts = [template.format(f[1], f[2], f[3], f[4]) for f in failures] - failure.text = '\n'.join(texts) - - xml_decl = '\n' - return xml_decl + xml.etree.ElementTree.tostring(testsuite, 'utf-8').decode('utf-8') + else: + testsuite.attrib["tests"] = str(num_errors + num_failures) + if num_errors > 0: + testcase = xml.etree.ElementTree.SubElement(testsuite, "testcase") + testcase.attrib["name"] = "errors" + error = xml.etree.ElementTree.SubElement(testcase, "error") + error.text = "\n".join(self._junit_errors) + if num_failures > 0: + # Group failures by file + failed_file_order = [] + failures_by_file = {} + for failure in self._junit_failures: + failed_file = failure[0] + if failed_file not in failed_file_order: + failed_file_order.append(failed_file) + failures_by_file[failed_file] = [] + failures_by_file[failed_file].append(failure) + # Create a testcase for each file + for failed_file in failed_file_order: + failures = failures_by_file[failed_file] + testcase = xml.etree.ElementTree.SubElement(testsuite, "testcase") + testcase.attrib["name"] = failed_file + failure = xml.etree.ElementTree.SubElement(testcase, "failure") + template = "{0}: {1} [{2}] [{3}]" + texts = [template.format(f[1], f[2], f[3], f[4]) for f in failures] + failure.text = "\n".join(texts) + + xml_decl = '\n' + return xml_decl + xml.etree.ElementTree.tostring(testsuite, "utf-8").decode("utf-8") _cpplint_state = _CppLintState() def _OutputFormat(): - """Gets the module's output format.""" - return _cpplint_state.output_format + """Gets the module's output format.""" + return _cpplint_state.output_format def _SetOutputFormat(output_format): - """Sets the module's output format.""" - _cpplint_state.SetOutputFormat(output_format) + """Sets the module's output format.""" + _cpplint_state.SetOutputFormat(output_format) + def _Quiet(): - """Return's the module's quiet setting.""" - return _cpplint_state.quiet + """Return's the module's quiet setting.""" + return _cpplint_state.quiet + def _SetQuiet(quiet): - """Set the module's quiet status, and return previous setting.""" - return _cpplint_state.SetQuiet(quiet) + """Set the module's quiet status, and return previous setting.""" + return _cpplint_state.SetQuiet(quiet) def _VerboseLevel(): - """Returns the module's verbosity setting.""" - return _cpplint_state.verbose_level + """Returns the module's verbosity setting.""" + return _cpplint_state.verbose_level def _SetVerboseLevel(level): - """Sets the module's verbosity, and returns the previous setting.""" - return _cpplint_state.SetVerboseLevel(level) + """Sets the module's verbosity, and returns the previous setting.""" + return _cpplint_state.SetVerboseLevel(level) def _SetCountingStyle(level): - """Sets the module's counting options.""" - _cpplint_state.SetCountingStyle(level) + """Sets the module's counting options.""" + _cpplint_state.SetCountingStyle(level) def _Filters(): - """Returns the module's list of output filters, as a list.""" - return _cpplint_state.filters + """Returns the module's list of output filters, as a list.""" + return _cpplint_state.filters def _SetFilters(filters): - """Sets the module's error-message filters. - - These filters are applied when deciding whether to emit a given - error message. - - Args: - filters: A string of comma-separated filters (eg "whitespace/indent"). - Each filter should start with + or -; else we die. - """ - _cpplint_state.SetFilters(filters) - -def _AddFilters(filters): - """Adds more filter overrides. - - Unlike _SetFilters, this function does not reset the current list of filters - available. - - Args: - filters: A string of comma-separated filters (eg "whitespace/indent"). - Each filter should start with + or -; else we die. - """ - _cpplint_state.AddFilters(filters) - -def _BackupFilters(): - """ Saves the current filter list to backup storage.""" - _cpplint_state.BackupFilters() - -def _RestoreFilters(): - """ Restores filters previously backed up.""" - _cpplint_state.RestoreFilters() - -class _FunctionState(object): - """Tracks current function name and the number of lines in its body.""" - - _NORMAL_TRIGGER = 250 # for --v=0, 500 for --v=1, etc. - _TEST_TRIGGER = 400 # about 50% more than _NORMAL_TRIGGER. - - def __init__(self): - self.in_a_function = False - self.lines_in_function = 0 - self.current_function = '' + """Sets the module's error-message filters. - def Begin(self, function_name): - """Start analyzing function body. + These filters are applied when deciding whether to emit a given + error message. Args: - function_name: The name of the function being tracked. + filters: A string of comma-separated filters (eg "whitespace/indent"). + Each filter should start with + or -; else we die. """ - self.in_a_function = True - self.lines_in_function = 0 - self.current_function = function_name + _cpplint_state.SetFilters(filters) + - def Count(self): - """Count line in current function body.""" - if self.in_a_function: - self.lines_in_function += 1 +def _AddFilters(filters): + """Adds more filter overrides. - def Check(self, error, filename, linenum): - """Report if too many lines in function body. + Unlike _SetFilters, this function does not reset the current list of filters + available. Args: - error: The function to call with any errors found. - filename: The name of the current file. - linenum: The number of the line to check. + filters: A string of comma-separated filters (eg "whitespace/indent"). + Each filter should start with + or -; else we die. """ - if not self.in_a_function: - return - - if re.match(r'T(EST|est)', self.current_function): - base_trigger = self._TEST_TRIGGER - else: - base_trigger = self._NORMAL_TRIGGER - trigger = base_trigger * 2**_VerboseLevel() + _cpplint_state.AddFilters(filters) - if self.lines_in_function > trigger: - error_level = int(math.log2(self.lines_in_function / base_trigger)) - # 50 => 0, 100 => 1, 200 => 2, 400 => 3, 800 => 4, 1600 => 5, ... - error_level = min(error_level, 5) - error(filename, linenum, 'readability/fn_size', error_level, - 'Small and focused functions are preferred:' - f' {self.current_function} has {self.lines_in_function} non-comment lines' - f' (error triggered by exceeding {trigger} lines).') - def End(self): - """Stop analyzing function body.""" - self.in_a_function = False +def _BackupFilters(): + """Saves the current filter list to backup storage.""" + _cpplint_state.BackupFilters() -class _IncludeError(Exception): - """Indicates a problem with the include order in a file.""" - pass +def _RestoreFilters(): + """Restores filters previously backed up.""" + _cpplint_state.RestoreFilters() -class FileInfo(object): - """Provides utility functions for filenames. +class _FunctionState(object): + """Tracks current function name and the number of lines in its body.""" + + _NORMAL_TRIGGER = 250 # for --v=0, 500 for --v=1, etc. + _TEST_TRIGGER = 400 # about 50% more than _NORMAL_TRIGGER. + + def __init__(self): + self.in_a_function = False + self.lines_in_function = 0 + self.current_function = "" + + def Begin(self, function_name): + """Start analyzing function body. + + Args: + function_name: The name of the function being tracked. + """ + self.in_a_function = True + self.lines_in_function = 0 + self.current_function = function_name + + def Count(self): + """Count line in current function body.""" + if self.in_a_function: + self.lines_in_function += 1 + + def Check(self, error, filename, linenum): + """Report if too many lines in function body. + + Args: + error: The function to call with any errors found. + filename: The name of the current file. + linenum: The number of the line to check. + """ + if not self.in_a_function: + return + + if re.match(r"T(EST|est)", self.current_function): + base_trigger = self._TEST_TRIGGER + else: + base_trigger = self._NORMAL_TRIGGER + trigger = base_trigger * 2 ** _VerboseLevel() + + if self.lines_in_function > trigger: + error_level = int(math.log2(self.lines_in_function / base_trigger)) + # 50 => 0, 100 => 1, 200 => 2, 400 => 3, 800 => 4, 1600 => 5, ... + error_level = min(error_level, 5) + error( + filename, + linenum, + "readability/fn_size", + error_level, + "Small and focused functions are preferred:" + f" {self.current_function} has {self.lines_in_function} non-comment lines" + f" (error triggered by exceeding {trigger} lines).", + ) + + def End(self): + """Stop analyzing function body.""" + self.in_a_function = False - FileInfo provides easy access to the components of a file's path - relative to the project root. - """ - def __init__(self, filename): - self._filename = filename +class _IncludeError(Exception): + """Indicates a problem with the include order in a file.""" - def FullName(self): - """Make Windows paths like Unix.""" - return os.path.abspath(self._filename).replace('\\', '/') + pass - def RepositoryName(self): - r"""FullName after removing the local path to the repository. - If we have a real absolute path name here we can try to do something smart: - detecting the root of the checkout and truncating /path/to/checkout from - the name so that we get header guards that don't include things like - "C:\\Documents and Settings\\..." or "/home/username/..." in them and thus - people on different computers who have checked the source out to different - locations won't see bogus errors. - """ - fullname = self.FullName() - - if os.path.exists(fullname): - project_dir = os.path.dirname(fullname) - - # If the user specified a repository path, it exists, and the file is - # contained in it, use the specified repository path - if _repository: - repo = FileInfo(_repository).FullName() - root_dir = project_dir - while os.path.exists(root_dir): - # allow case insensitive compare on Windows - if os.path.normcase(root_dir) == os.path.normcase(repo): - return os.path.relpath(fullname, root_dir).replace('\\', '/') - one_up_dir = os.path.dirname(root_dir) - if one_up_dir == root_dir: - break - root_dir = one_up_dir - - if os.path.exists(os.path.join(project_dir, ".svn")): - # If there's a .svn file in the current directory, we recursively look - # up the directory tree for the top of the SVN checkout - root_dir = project_dir - one_up_dir = os.path.dirname(root_dir) - while os.path.exists(os.path.join(one_up_dir, ".svn")): - root_dir = os.path.dirname(root_dir) - one_up_dir = os.path.dirname(one_up_dir) - - prefix = os.path.commonprefix([root_dir, project_dir]) - return fullname[len(prefix) + 1:] - - # Not SVN <= 1.6? Try to find a git, hg, or svn top level directory by - # searching up from the current path. - root_dir = current_dir = os.path.dirname(fullname) - while current_dir != os.path.dirname(current_dir): - if (os.path.exists(os.path.join(current_dir, ".git")) or - os.path.exists(os.path.join(current_dir, ".hg")) or - os.path.exists(os.path.join(current_dir, ".svn"))): - root_dir = current_dir - break - current_dir = os.path.dirname(current_dir) - - if (os.path.exists(os.path.join(root_dir, ".git")) or - os.path.exists(os.path.join(root_dir, ".hg")) or - os.path.exists(os.path.join(root_dir, ".svn"))): - prefix = os.path.commonprefix([root_dir, project_dir]) - return fullname[len(prefix) + 1:] - - # Don't know what to do; header guard warnings may be wrong... - return fullname - - def Split(self): - """Splits the file into the directory, basename, and extension. - - For 'chrome/browser/browser.cc', Split() would - return ('chrome/browser', 'browser', '.cc') +class FileInfo(object): + """Provides utility functions for filenames. - Returns: - A tuple of (directory, basename, extension). + FileInfo provides easy access to the components of a file's path + relative to the project root. """ - googlename = self.RepositoryName() - project, rest = os.path.split(googlename) - return (project,) + os.path.splitext(rest) - - def BaseName(self): - """File base name - text after the final slash, before the final period.""" - return self.Split()[1] + def __init__(self, filename): + self._filename = filename + + def FullName(self): + """Make Windows paths like Unix.""" + return os.path.abspath(self._filename).replace("\\", "/") + + def RepositoryName(self): + r"""FullName after removing the local path to the repository. + + If we have a real absolute path name here we can try to do something smart: + detecting the root of the checkout and truncating /path/to/checkout from + the name so that we get header guards that don't include things like + "C:\\Documents and Settings\\..." or "/home/username/..." in them and thus + people on different computers who have checked the source out to different + locations won't see bogus errors. + """ + fullname = self.FullName() + + if os.path.exists(fullname): + project_dir = os.path.dirname(fullname) + + # If the user specified a repository path, it exists, and the file is + # contained in it, use the specified repository path + if _repository: + repo = FileInfo(_repository).FullName() + root_dir = project_dir + while os.path.exists(root_dir): + # allow case insensitive compare on Windows + if os.path.normcase(root_dir) == os.path.normcase(repo): + return os.path.relpath(fullname, root_dir).replace("\\", "/") + one_up_dir = os.path.dirname(root_dir) + if one_up_dir == root_dir: + break + root_dir = one_up_dir + + if os.path.exists(os.path.join(project_dir, ".svn")): + # If there's a .svn file in the current directory, we recursively look + # up the directory tree for the top of the SVN checkout + root_dir = project_dir + one_up_dir = os.path.dirname(root_dir) + while os.path.exists(os.path.join(one_up_dir, ".svn")): + root_dir = os.path.dirname(root_dir) + one_up_dir = os.path.dirname(one_up_dir) + + prefix = os.path.commonprefix([root_dir, project_dir]) + return fullname[len(prefix) + 1 :] + + # Not SVN <= 1.6? Try to find a git, hg, or svn top level directory by + # searching up from the current path. + root_dir = current_dir = os.path.dirname(fullname) + while current_dir != os.path.dirname(current_dir): + if ( + os.path.exists(os.path.join(current_dir, ".git")) + or os.path.exists(os.path.join(current_dir, ".hg")) + or os.path.exists(os.path.join(current_dir, ".svn")) + ): + root_dir = current_dir + break + current_dir = os.path.dirname(current_dir) + + if ( + os.path.exists(os.path.join(root_dir, ".git")) + or os.path.exists(os.path.join(root_dir, ".hg")) + or os.path.exists(os.path.join(root_dir, ".svn")) + ): + prefix = os.path.commonprefix([root_dir, project_dir]) + return fullname[len(prefix) + 1 :] + + # Don't know what to do; header guard warnings may be wrong... + return fullname + + def Split(self): + """Splits the file into the directory, basename, and extension. + + For 'chrome/browser/browser.cc', Split() would + return ('chrome/browser', 'browser', '.cc') + + Returns: + A tuple of (directory, basename, extension). + """ + + googlename = self.RepositoryName() + project, rest = os.path.split(googlename) + return (project,) + os.path.splitext(rest) + + def BaseName(self): + """File base name - text after the final slash, before the final period.""" + return self.Split()[1] + + def Extension(self): + """File extension - text following the final period, includes that period.""" + return self.Split()[2] + + def NoExtension(self): + """File has no source file extension.""" + return "/".join(self.Split()[0:2]) + + def IsSource(self): + """File has a source file extension.""" + return _IsSourceExtension(self.Extension()[1:]) - def Extension(self): - """File extension - text following the final period, includes that period.""" - return self.Split()[2] - def NoExtension(self): - """File has no source file extension.""" - return '/'.join(self.Split()[0:2]) +def _ShouldPrintError(category, confidence, filename, linenum): + """If confidence >= verbose, category passes filter and is not suppressed.""" - def IsSource(self): - """File has a source file extension.""" - return _IsSourceExtension(self.Extension()[1:]) + # There are three ways we might decide not to print an error message: + # a "NOLINT(category)" comment appears in the source, + # the verbosity level isn't high enough, or the filters filter it out. + if IsErrorSuppressedByNolint(category, linenum): + return False + if confidence < _cpplint_state.verbose_level: + return False -def _ShouldPrintError(category, confidence, filename, linenum): - """If confidence >= verbose, category passes filter and is not suppressed.""" + is_filtered = False + for one_filter in _Filters(): + filter_cat, filter_file, filter_line = _ParseFilterSelector(one_filter[1:]) + category_match = category.startswith(filter_cat) + file_match = filter_file in ("", filename) + line_match = filter_line in (linenum, -1) + + if one_filter.startswith("-"): + if category_match and file_match and line_match: + is_filtered = True + elif one_filter.startswith("+"): + if category_match and file_match and line_match: + is_filtered = False + else: + # should have been checked for in SetFilter. + msg = f"Invalid filter: {one_filter}" + raise ValueError(msg) + if is_filtered: + return False - # There are three ways we might decide not to print an error message: - # a "NOLINT(category)" comment appears in the source, - # the verbosity level isn't high enough, or the filters filter it out. - if IsErrorSuppressedByNolint(category, linenum): - return False + return True - if confidence < _cpplint_state.verbose_level: - return False - is_filtered = False - for one_filter in _Filters(): - filter_cat, filter_file, filter_line = _ParseFilterSelector(one_filter[1:]) - category_match = category.startswith(filter_cat) - file_match = filter_file in ("", filename) - line_match = filter_line in (linenum, -1) - - if one_filter.startswith('-'): - if category_match and file_match and line_match: - is_filtered = True - elif one_filter.startswith('+'): - if category_match and file_match and line_match: - is_filtered = False - else: - # should have been checked for in SetFilter. - msg = f'Invalid filter: {one_filter}' - raise ValueError(msg) - if is_filtered: - return False +def Error(filename, linenum, category, confidence, message): + """Logs the fact we've found a lint error. - return True + We log where the error was found, and also our confidence in the error, + that is, how certain we are this is a legitimate style regression, and + not a misidentification or a use that's sometimes justified. + False positives can be suppressed by the use of "NOLINT(category)" + comments, NOLINTNEXTLINE or in blocks started by NOLINTBEGIN. These + are parsed into _error_suppressions. -def Error(filename, linenum, category, confidence, message): - """Logs the fact we've found a lint error. - - We log where the error was found, and also our confidence in the error, - that is, how certain we are this is a legitimate style regression, and - not a misidentification or a use that's sometimes justified. - - False positives can be suppressed by the use of "NOLINT(category)" - comments, NOLINTNEXTLINE or in blocks started by NOLINTBEGIN. These - are parsed into _error_suppressions. - - Args: - filename: The name of the file containing the error. - linenum: The number of the line containing the error. - category: A string used to describe the "category" this bug - falls under: "whitespace", say, or "runtime". Categories - may have a hierarchy separated by slashes: "whitespace/indent". - confidence: A number from 1-5 representing a confidence score for - the error, with 5 meaning that we are certain of the problem, - and 1 meaning that it could be a legitimate construct. - message: The error message. - """ - if _ShouldPrintError(category, confidence, filename, linenum): - _cpplint_state.IncrementErrorCount(category) - if _cpplint_state.output_format == 'vs7': - _cpplint_state.PrintError(f'{filename}({linenum}): error cpplint:' - f' [{category}] {message} [{confidence}]\n') - elif _cpplint_state.output_format == 'eclipse': - sys.stderr.write(f'{filename}:{linenum}: warning:' - f' {message} [{category}] [{confidence}]\n') - elif _cpplint_state.output_format == 'junit': - _cpplint_state.AddJUnitFailure(filename, linenum, message, category, confidence) - elif _cpplint_state.output_format in ['sed', 'gsed']: - if message in _SED_FIXUPS: - sys.stdout.write(f"{_cpplint_state.output_format} -i" - f" '{linenum}{_SED_FIXUPS[message]}' {filename}" - f" # {message} [{category}] [{confidence}]\n") - else: - sys.stderr.write(f'# {filename}:{linenum}: ' - f' "{message}" [{category}] [{confidence}]\n') - else: - final_message = (f'{filename}:{linenum}: ' - f' {message} [{category}] [{confidence}]\n') - sys.stderr.write(final_message) + Args: + filename: The name of the file containing the error. + linenum: The number of the line containing the error. + category: A string used to describe the "category" this bug + falls under: "whitespace", say, or "runtime". Categories + may have a hierarchy separated by slashes: "whitespace/indent". + confidence: A number from 1-5 representing a confidence score for + the error, with 5 meaning that we are certain of the problem, + and 1 meaning that it could be a legitimate construct. + message: The error message. + """ + if _ShouldPrintError(category, confidence, filename, linenum): + _cpplint_state.IncrementErrorCount(category) + if _cpplint_state.output_format == "vs7": + _cpplint_state.PrintError( + f"{filename}({linenum}): error cpplint: [{category}] {message} [{confidence}]\n" + ) + elif _cpplint_state.output_format == "eclipse": + sys.stderr.write( + f"{filename}:{linenum}: warning: {message} [{category}] [{confidence}]\n" + ) + elif _cpplint_state.output_format == "junit": + _cpplint_state.AddJUnitFailure(filename, linenum, message, category, confidence) + elif _cpplint_state.output_format in ["sed", "gsed"]: + if message in _SED_FIXUPS: + sys.stdout.write( + f"{_cpplint_state.output_format} -i" + f" '{linenum}{_SED_FIXUPS[message]}' {filename}" + f" # {message} [{category}] [{confidence}]\n" + ) + else: + sys.stderr.write( + f'# {filename}:{linenum}: "{message}" [{category}] [{confidence}]\n' + ) + else: + final_message = f"{filename}:{linenum}: {message} [{category}] [{confidence}]\n" + sys.stderr.write(final_message) # Matches standard C++ escape sequences per 2.13.2.3 of the C++ standard. -_RE_PATTERN_CLEANSE_LINE_ESCAPES = re.compile( - r'\\([abfnrtv?"\\\']|\d+|x[0-9a-fA-F]+)') +_RE_PATTERN_CLEANSE_LINE_ESCAPES = re.compile(r'\\([abfnrtv?"\\\']|\d+|x[0-9a-fA-F]+)') # Match a single C style comment on the same line. -_RE_PATTERN_C_COMMENTS = r'/\*(?:[^*]|\*(?!/))*\*/' +_RE_PATTERN_C_COMMENTS = r"/\*(?:[^*]|\*(?!/))*\*/" # Matches multi-line C style comments. # This RE is a little bit more complicated than one might expect, because we # have to take care of space removals tools so we can handle comments inside @@ -1836,864 +1913,932 @@ def Error(filename, linenum, category, confidence, message): # if this doesn't work we try on left side but only if there's a non-character # on the right. _RE_PATTERN_CLEANSE_LINE_C_COMMENTS = re.compile( - r'(\s*' + _RE_PATTERN_C_COMMENTS + r'\s*$|' + - _RE_PATTERN_C_COMMENTS + r'\s+|' + - r'\s+' + _RE_PATTERN_C_COMMENTS + r'(?=\W)|' + - _RE_PATTERN_C_COMMENTS + r')') + r"(\s*" + + _RE_PATTERN_C_COMMENTS + + r"\s*$|" + + _RE_PATTERN_C_COMMENTS + + r"\s+|" + + r"\s+" + + _RE_PATTERN_C_COMMENTS + + r"(?=\W)|" + + _RE_PATTERN_C_COMMENTS + + r")" +) def IsCppString(line): - """Does line terminate so, that the next symbol is in string constant. + """Does line terminate so, that the next symbol is in string constant. - This function does not consider single-line nor multi-line comments. + This function does not consider single-line nor multi-line comments. - Args: - line: is a partial line of code starting from the 0..n. + Args: + line: is a partial line of code starting from the 0..n. - Returns: - True, if next character appended to 'line' is inside a - string constant. - """ + Returns: + True, if next character appended to 'line' is inside a + string constant. + """ - line = line.replace(r'\\', 'XX') # after this, \\" does not match to \" - return ((line.count('"') - line.count(r'\"') - line.count("'\"'")) & 1) == 1 + line = line.replace(r"\\", "XX") # after this, \\" does not match to \" + return ((line.count('"') - line.count(r"\"") - line.count("'\"'")) & 1) == 1 def CleanseRawStrings(raw_lines): - """Removes C++11 raw strings from lines. - - Before: - static const char kData[] = R"( - multi-line string - )"; - - After: - static const char kData[] = "" - (replaced by blank line) - ""; - - Args: - raw_lines: list of raw lines. - - Returns: - list of lines with C++11 raw strings replaced by empty strings. - """ - - delimiter = None - lines_without_raw_strings = [] - for line in raw_lines: - if delimiter: - # Inside a raw string, look for the end - end = line.find(delimiter) - if end >= 0: - # Found the end of the string, match leading space for this - # line and resume copying the original lines, and also insert - # a "" on the last line. - leading_space = re.match(r'^(\s*)\S', line) - line = leading_space.group(1) + '""' + line[end + len(delimiter):] - delimiter = None - else: - # Haven't found the end yet, append a blank line. - line = '""' - - # Look for beginning of a raw string, and replace them with - # empty strings. This is done in a loop to handle multiple raw - # strings on the same line. - while delimiter is None: - # Look for beginning of a raw string. - # See 2.14.15 [lex.string] for syntax. - # - # Once we have matched a raw string, we check the prefix of the - # line to make sure that the line is not part of a single line - # comment. It's done this way because we remove raw strings - # before removing comments as opposed to removing comments - # before removing raw strings. This is because there are some - # cpplint checks that requires the comments to be preserved, but - # we don't want to check comments that are inside raw strings. - matched = re.match(r'^(.*?)\b(?:R|u8R|uR|UR|LR)"([^\s\\()]*)\((.*)$', line) - if (matched and - not re.match(r'^([^\'"]|\'(\\.|[^\'])*\'|"(\\.|[^"])*")*//', - matched.group(1))): - delimiter = ')' + matched.group(2) + '"' - - end = matched.group(3).find(delimiter) - if end >= 0: - # Raw string ended on same line - line = (matched.group(1) + '""' + - matched.group(3)[end + len(delimiter):]) - delimiter = None - else: - # Start of a multi-line raw string - line = matched.group(1) + '""' - else: - break + """Removes C++11 raw strings from lines. + + Before: + static const char kData[] = R"( + multi-line string + )"; + + After: + static const char kData[] = "" + (replaced by blank line) + ""; - lines_without_raw_strings.append(line) + Args: + raw_lines: list of raw lines. + + Returns: + list of lines with C++11 raw strings replaced by empty strings. + """ - # TODO(unknown): if delimiter is not None here, we might want to - # emit a warning for unterminated string. - return lines_without_raw_strings + delimiter = None + lines_without_raw_strings = [] + for line in raw_lines: + if delimiter: + # Inside a raw string, look for the end + end = line.find(delimiter) + if end >= 0: + # Found the end of the string, match leading space for this + # line and resume copying the original lines, and also insert + # a "" on the last line. + leading_space = re.match(r"^(\s*)\S", line) + line = leading_space.group(1) + '""' + line[end + len(delimiter) :] + delimiter = None + else: + # Haven't found the end yet, append a blank line. + line = '""' + + # Look for beginning of a raw string, and replace them with + # empty strings. This is done in a loop to handle multiple raw + # strings on the same line. + while delimiter is None: + # Look for beginning of a raw string. + # See 2.14.15 [lex.string] for syntax. + # + # Once we have matched a raw string, we check the prefix of the + # line to make sure that the line is not part of a single line + # comment. It's done this way because we remove raw strings + # before removing comments as opposed to removing comments + # before removing raw strings. This is because there are some + # cpplint checks that requires the comments to be preserved, but + # we don't want to check comments that are inside raw strings. + matched = re.match(r'^(.*?)\b(?:R|u8R|uR|UR|LR)"([^\s\\()]*)\((.*)$', line) + if matched and not re.match( + r'^([^\'"]|\'(\\.|[^\'])*\'|"(\\.|[^"])*")*//', matched.group(1) + ): + delimiter = ")" + matched.group(2) + '"' + + end = matched.group(3).find(delimiter) + if end >= 0: + # Raw string ended on same line + line = matched.group(1) + '""' + matched.group(3)[end + len(delimiter) :] + delimiter = None + else: + # Start of a multi-line raw string + line = matched.group(1) + '""' + else: + break + + lines_without_raw_strings.append(line) + + # TODO(unknown): if delimiter is not None here, we might want to + # emit a warning for unterminated string. + return lines_without_raw_strings def FindNextMultiLineCommentStart(lines, lineix): - """Find the beginning marker for a multiline comment.""" - while lineix < len(lines): - if lines[lineix].strip().startswith('/*'): - # Only return this marker if the comment goes beyond this line - if lines[lineix].strip().find('*/', 2) < 0: - return lineix - lineix += 1 - return len(lines) + """Find the beginning marker for a multiline comment.""" + while lineix < len(lines): + if lines[lineix].strip().startswith("/*"): + # Only return this marker if the comment goes beyond this line + if lines[lineix].strip().find("*/", 2) < 0: + return lineix + lineix += 1 + return len(lines) def FindNextMultiLineCommentEnd(lines, lineix): - """We are inside a comment, find the end marker.""" - while lineix < len(lines): - if lines[lineix].strip().endswith('*/'): - return lineix - lineix += 1 - return len(lines) + """We are inside a comment, find the end marker.""" + while lineix < len(lines): + if lines[lineix].strip().endswith("*/"): + return lineix + lineix += 1 + return len(lines) def RemoveMultiLineCommentsFromRange(lines, begin, end): - """Clears a range of lines for multi-line comments.""" - # Having // comments makes the lines non-empty, so we will not get - # unnecessary blank line warnings later in the code. - for i in range(begin, end): - lines[i] = '/**/' + """Clears a range of lines for multi-line comments.""" + # Having // comments makes the lines non-empty, so we will not get + # unnecessary blank line warnings later in the code. + for i in range(begin, end): + lines[i] = "/**/" def RemoveMultiLineComments(filename, lines, error): - """Removes multiline (c-style) comments from lines.""" - lineix = 0 - while lineix < len(lines): - lineix_begin = FindNextMultiLineCommentStart(lines, lineix) - if lineix_begin >= len(lines): - return - lineix_end = FindNextMultiLineCommentEnd(lines, lineix_begin) - if lineix_end >= len(lines): - error(filename, lineix_begin + 1, 'readability/multiline_comment', 5, - 'Could not find end of multi-line comment') - return - RemoveMultiLineCommentsFromRange(lines, lineix_begin, lineix_end + 1) - lineix = lineix_end + 1 + """Removes multiline (c-style) comments from lines.""" + lineix = 0 + while lineix < len(lines): + lineix_begin = FindNextMultiLineCommentStart(lines, lineix) + if lineix_begin >= len(lines): + return + lineix_end = FindNextMultiLineCommentEnd(lines, lineix_begin) + if lineix_end >= len(lines): + error( + filename, + lineix_begin + 1, + "readability/multiline_comment", + 5, + "Could not find end of multi-line comment", + ) + return + RemoveMultiLineCommentsFromRange(lines, lineix_begin, lineix_end + 1) + lineix = lineix_end + 1 def CleanseComments(line): - """Removes //-comments and single-line C-style /* */ comments. + """Removes //-comments and single-line C-style /* */ comments. - Args: - line: A line of C++ source. + Args: + line: A line of C++ source. - Returns: - The line with single-line comments removed. - """ - commentpos = line.find('//') - if commentpos != -1 and not IsCppString(line[:commentpos]): - line = line[:commentpos].rstrip() - # get rid of /* ... */ - return _RE_PATTERN_CLEANSE_LINE_C_COMMENTS.sub('', line) + Returns: + The line with single-line comments removed. + """ + commentpos = line.find("//") + if commentpos != -1 and not IsCppString(line[:commentpos]): + line = line[:commentpos].rstrip() + # get rid of /* ... */ + return _RE_PATTERN_CLEANSE_LINE_C_COMMENTS.sub("", line) def ReplaceAlternateTokens(line): - """Replace any alternate token by its original counterpart. + """Replace any alternate token by its original counterpart. - In order to comply with the google rule stating that unary operators should - never be followed by a space, an exception is made for the 'not' and 'compl' - alternate tokens. For these, any trailing space is removed during the - conversion. + In order to comply with the google rule stating that unary operators should + never be followed by a space, an exception is made for the 'not' and 'compl' + alternate tokens. For these, any trailing space is removed during the + conversion. - Args: - line: The line being processed. + Args: + line: The line being processed. - Returns: - The line with alternate tokens replaced. - """ - for match in _ALT_TOKEN_REPLACEMENT_PATTERN.finditer(line): - token = _ALT_TOKEN_REPLACEMENT[match.group(2)] - tail = '' if match.group(2) in ['not', 'compl'] and match.group(3) == ' ' \ - else r'\3' - line = re.sub(match.re, rf'\1{token}{tail}', line, count=1) - return line + Returns: + The line with alternate tokens replaced. + """ + for match in _ALT_TOKEN_REPLACEMENT_PATTERN.finditer(line): + token = _ALT_TOKEN_REPLACEMENT[match.group(2)] + tail = "" if match.group(2) in ["not", "compl"] and match.group(3) == " " else r"\3" + line = re.sub(match.re, rf"\1{token}{tail}", line, count=1) + return line class CleansedLines(object): - """Holds 4 copies of all lines with different preprocessing applied to them. - - 1) elided member contains lines without strings and comments. - 2) lines member contains lines without comments. - 3) raw_lines member contains all the lines without processing. - 4) lines_without_raw_strings member is same as raw_lines, but with C++11 raw - strings removed. - All these members are of , and of the same length. - """ - - def __init__(self, lines): - if '-readability/alt_tokens' in _cpplint_state.filters: - for i, line in enumerate(lines): - lines[i] = ReplaceAlternateTokens(line) - self.elided = [] - self.lines = [] - self.raw_lines = lines - self.num_lines = len(lines) - self.lines_without_raw_strings = CleanseRawStrings(lines) - for line in self.lines_without_raw_strings: - self.lines.append(CleanseComments(line)) - elided = self._CollapseStrings(line) - self.elided.append(CleanseComments(elided)) - - def NumLines(self): - """Returns the number of lines represented.""" - return self.num_lines - - @staticmethod - def _CollapseStrings(elided): - """Collapses strings and chars on a line to simple "" or '' blocks. - - We nix strings first so we're not fooled by text like '"http://"' + """Holds 4 copies of all lines with different preprocessing applied to them. + + 1) elided member contains lines without strings and comments. + 2) lines member contains lines without comments. + 3) raw_lines member contains all the lines without processing. + 4) lines_without_raw_strings member is same as raw_lines, but with C++11 raw + strings removed. + All these members are of , and of the same length. + """ + + def __init__(self, lines): + if "-readability/alt_tokens" in _cpplint_state.filters: + for i, line in enumerate(lines): + lines[i] = ReplaceAlternateTokens(line) + self.elided = [] + self.lines = [] + self.raw_lines = lines + self.num_lines = len(lines) + self.lines_without_raw_strings = CleanseRawStrings(lines) + for line in self.lines_without_raw_strings: + self.lines.append(CleanseComments(line)) + elided = self._CollapseStrings(line) + self.elided.append(CleanseComments(elided)) + + def NumLines(self): + """Returns the number of lines represented.""" + return self.num_lines + + @staticmethod + def _CollapseStrings(elided): + """Collapses strings and chars on a line to simple "" or '' blocks. + + We nix strings first so we're not fooled by text like '"http://"' + + Args: + elided: The line being processed. + + Returns: + The line with collapsed strings. + """ + if _RE_PATTERN_INCLUDE.match(elided): + return elided + + # Remove escaped characters first to make quote/single quote collapsing + # basic. Things that look like escaped characters shouldn't occur + # outside of strings and chars. + elided = _RE_PATTERN_CLEANSE_LINE_ESCAPES.sub("", elided) + + # Replace quoted strings and digit separators. Both single quotes + # and double quotes are processed in the same loop, otherwise + # nested quotes wouldn't work. + collapsed = "" + while True: + # Find the first quote character + match = re.match(r'^([^\'"]*)([\'"])(.*)$', elided) + if not match: + collapsed += elided + break + head, quote, tail = match.groups() + + if quote == '"': + # Collapse double quoted strings + second_quote = tail.find('"') + if second_quote >= 0: + collapsed += head + '""' + elided = tail[second_quote + 1 :] + else: + # Unmatched double quote, don't bother processing the rest + # of the line since this is probably a multiline string. + collapsed += elided + break + else: + # Found single quote, check nearby text to eliminate digit separators. + # + # There is no special handling for floating point here, because + # the integer/fractional/exponent parts would all be parsed + # correctly as long as there are digits on both sides of the + # separator. So we are fine as long as we don't see something + # like "0.'3" (gcc 4.9.0 will not allow this literal). + if re.search(r"\b(?:0[bBxX]?|[1-9])[0-9a-fA-F]*$", head): + match_literal = re.match(r"^((?:\'?[0-9a-zA-Z_])*)(.*)$", "'" + tail) + collapsed += head + match_literal.group(1).replace("'", "") + elided = match_literal.group(2) + else: + second_quote = tail.find("'") + if second_quote >= 0: + collapsed += head + "''" + elided = tail[second_quote + 1 :] + else: + # Unmatched single quote + collapsed += elided + break + + return collapsed + + +def FindEndOfExpressionInLine(line, startpos, stack): + """Find the position just after the end of current parenthesized expression. Args: - elided: The line being processed. + line: a CleansedLines line. + startpos: start searching at this position. + stack: nesting stack at startpos. Returns: - The line with collapsed strings. + On finding matching end: (index just after matching end, None) + On finding an unclosed expression: (-1, None) + Otherwise: (-1, new stack at end of this line) """ - if _RE_PATTERN_INCLUDE.match(elided): - return elided - - # Remove escaped characters first to make quote/single quote collapsing - # basic. Things that look like escaped characters shouldn't occur - # outside of strings and chars. - elided = _RE_PATTERN_CLEANSE_LINE_ESCAPES.sub('', elided) - - # Replace quoted strings and digit separators. Both single quotes - # and double quotes are processed in the same loop, otherwise - # nested quotes wouldn't work. - collapsed = '' - while True: - # Find the first quote character - match = re.match(r'^([^\'"]*)([\'"])(.*)$', elided) - if not match: - collapsed += elided - break - head, quote, tail = match.groups() - - if quote == '"': - # Collapse double quoted strings - second_quote = tail.find('"') - if second_quote >= 0: - collapsed += head + '""' - elided = tail[second_quote + 1:] - else: - # Unmatched double quote, don't bother processing the rest - # of the line since this is probably a multiline string. - collapsed += elided - break - else: - # Found single quote, check nearby text to eliminate digit separators. - # - # There is no special handling for floating point here, because - # the integer/fractional/exponent parts would all be parsed - # correctly as long as there are digits on both sides of the - # separator. So we are fine as long as we don't see something - # like "0.'3" (gcc 4.9.0 will not allow this literal). - if re.search(r'\b(?:0[bBxX]?|[1-9])[0-9a-fA-F]*$', head): - match_literal = re.match(r'^((?:\'?[0-9a-zA-Z_])*)(.*)$', "'" + tail) - collapsed += head + match_literal.group(1).replace("'", '') - elided = match_literal.group(2) - else: - second_quote = tail.find('\'') - if second_quote >= 0: - collapsed += head + "''" - elided = tail[second_quote + 1:] - else: - # Unmatched single quote - collapsed += elided - break + for i in range(startpos, len(line)): + char = line[i] + if char in "([{": + # Found start of parenthesized expression, push to expression stack + stack.append(char) + elif char == "<": + # Found potential start of template argument list + if i > 0 and line[i - 1] == "<": + # Left shift operator + if stack and stack[-1] == "<": + stack.pop() + if not stack: + return (-1, None) + elif i > 0 and re.search(r"\boperator\s*$", line[0:i]): + # operator<, don't add to stack + continue + else: + # Tentative start of template argument list + stack.append("<") + elif char in ")]}": + # Found end of parenthesized expression. + # + # If we are currently expecting a matching '>', the pending '<' + # must have been an operator. Remove them from expression stack. + while stack and stack[-1] == "<": + stack.pop() + if not stack: + return (-1, None) + if ( + (stack[-1] == "(" and char == ")") + or (stack[-1] == "[" and char == "]") + or (stack[-1] == "{" and char == "}") + ): + stack.pop() + if not stack: + return (i + 1, None) + else: + # Mismatched parentheses + return (-1, None) + elif char == ">": + # Found potential end of template argument list. + + # Ignore "->" and operator functions + if i > 0 and (line[i - 1] == "-" or re.search(r"\boperator\s*$", line[0 : i - 1])): + continue + + # Pop the stack if there is a matching '<'. Otherwise, ignore + # this '>' since it must be an operator. + if stack: + if stack[-1] == "<": + stack.pop() + if not stack: + return (i + 1, None) + elif char == ";": + # Found something that look like end of statements. If we are currently + # expecting a '>', the matching '<' must have been an operator, since + # template argument list should not contain statements. + while stack and stack[-1] == "<": + stack.pop() + if not stack: + return (-1, None) + + # Did not find end of expression or unbalanced parentheses on this line + return (-1, stack) - return collapsed +def CloseExpression(clean_lines, linenum, pos): + """If input points to ( or { or [ or <, finds the position that closes it. -def FindEndOfExpressionInLine(line, startpos, stack): - """Find the position just after the end of current parenthesized expression. - - Args: - line: a CleansedLines line. - startpos: start searching at this position. - stack: nesting stack at startpos. - - Returns: - On finding matching end: (index just after matching end, None) - On finding an unclosed expression: (-1, None) - Otherwise: (-1, new stack at end of this line) - """ - for i in range(startpos, len(line)): - char = line[i] - if char in '([{': - # Found start of parenthesized expression, push to expression stack - stack.append(char) - elif char == '<': - # Found potential start of template argument list - if i > 0 and line[i - 1] == '<': - # Left shift operator - if stack and stack[-1] == '<': - stack.pop() - if not stack: - return (-1, None) - elif i > 0 and re.search(r'\boperator\s*$', line[0:i]): - # operator<, don't add to stack - continue - else: - # Tentative start of template argument list - stack.append('<') - elif char in ')]}': - # Found end of parenthesized expression. - # - # If we are currently expecting a matching '>', the pending '<' - # must have been an operator. Remove them from expression stack. - while stack and stack[-1] == '<': - stack.pop() - if not stack: - return (-1, None) - if ((stack[-1] == '(' and char == ')') or - (stack[-1] == '[' and char == ']') or - (stack[-1] == '{' and char == '}')): - stack.pop() - if not stack: - return (i + 1, None) - else: - # Mismatched parentheses - return (-1, None) - elif char == '>': - # Found potential end of template argument list. - - # Ignore "->" and operator functions - if (i > 0 and - (line[i - 1] == '-' or re.search(r'\boperator\s*$', line[0:i - 1]))): - continue - - # Pop the stack if there is a matching '<'. Otherwise, ignore - # this '>' since it must be an operator. - if stack: - if stack[-1] == '<': - stack.pop() - if not stack: - return (i + 1, None) - elif char == ';': - # Found something that look like end of statements. If we are currently - # expecting a '>', the matching '<' must have been an operator, since - # template argument list should not contain statements. - while stack and stack[-1] == '<': - stack.pop() - if not stack: - return (-1, None) - - # Did not find end of expression or unbalanced parentheses on this line - return (-1, stack) + If lines[linenum][pos] points to a '(' or '{' or '[' or '<', finds the + linenum/pos that correspond to the closing of the expression. + TODO(unknown): cpplint spends a fair bit of time matching parentheses. + Ideally we would want to index all opening and closing parentheses once + and have CloseExpression be just a simple lookup, but due to preprocessor + tricks, this is not so easy. -def CloseExpression(clean_lines, linenum, pos): - """If input points to ( or { or [ or <, finds the position that closes it. - - If lines[linenum][pos] points to a '(' or '{' or '[' or '<', finds the - linenum/pos that correspond to the closing of the expression. - - TODO(unknown): cpplint spends a fair bit of time matching parentheses. - Ideally we would want to index all opening and closing parentheses once - and have CloseExpression be just a simple lookup, but due to preprocessor - tricks, this is not so easy. - - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - pos: A position on the line. - - Returns: - A tuple (line, linenum, pos) pointer *past* the closing brace, or - (line, len(lines), -1) if we never find a close. Note we ignore - strings and comments when matching; and the line we return is the - 'cleansed' line at linenum. - """ - - line = clean_lines.elided[linenum] - if (line[pos] not in '({[<') or re.match(r'<[<=]', line[pos:]): - return (line, clean_lines.NumLines(), -1) + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + pos: A position on the line. - # Check first line - (end_pos, stack) = FindEndOfExpressionInLine(line, pos, []) - if end_pos > -1: - return (line, linenum, end_pos) + Returns: + A tuple (line, linenum, pos) pointer *past* the closing brace, or + (line, len(lines), -1) if we never find a close. Note we ignore + strings and comments when matching; and the line we return is the + 'cleansed' line at linenum. + """ - # Continue scanning forward - while stack and linenum < clean_lines.NumLines() - 1: - linenum += 1 line = clean_lines.elided[linenum] - (end_pos, stack) = FindEndOfExpressionInLine(line, 0, stack) + if (line[pos] not in "({[<") or re.match(r"<[<=]", line[pos:]): + return (line, clean_lines.NumLines(), -1) + + # Check first line + (end_pos, stack) = FindEndOfExpressionInLine(line, pos, []) if end_pos > -1: - return (line, linenum, end_pos) + return (line, linenum, end_pos) + + # Continue scanning forward + while stack and linenum < clean_lines.NumLines() - 1: + linenum += 1 + line = clean_lines.elided[linenum] + (end_pos, stack) = FindEndOfExpressionInLine(line, 0, stack) + if end_pos > -1: + return (line, linenum, end_pos) - # Did not find end of expression before end of file, give up - return (line, clean_lines.NumLines(), -1) + # Did not find end of expression before end of file, give up + return (line, clean_lines.NumLines(), -1) def FindStartOfExpressionInLine(line, endpos, stack): - """Find position at the matching start of current expression. - - This is almost the reverse of FindEndOfExpressionInLine, but note - that the input position and returned position differs by 1. - - Args: - line: a CleansedLines line. - endpos: start searching at this position. - stack: nesting stack at endpos. - - Returns: - On finding matching start: (index at matching start, None) - On finding an unclosed expression: (-1, None) - Otherwise: (-1, new stack at beginning of this line) - """ - i = endpos - while i >= 0: - char = line[i] - if char in ')]}': - # Found end of expression, push to expression stack - stack.append(char) - elif char == '>': - # Found potential end of template argument list. - # - # Ignore it if it's a "->" or ">=" or "operator>" - if (i > 0 and - (line[i - 1] == '-' or - re.match(r'\s>=\s', line[i - 1:]) or - re.search(r'\boperator\s*$', line[0:i]))): - i -= 1 - else: - stack.append('>') - elif char == '<': - # Found potential start of template argument list - if i > 0 and line[i - 1] == '<': - # Left shift operator + """Find position at the matching start of current expression. + + This is almost the reverse of FindEndOfExpressionInLine, but note + that the input position and returned position differs by 1. + + Args: + line: a CleansedLines line. + endpos: start searching at this position. + stack: nesting stack at endpos. + + Returns: + On finding matching start: (index at matching start, None) + On finding an unclosed expression: (-1, None) + Otherwise: (-1, new stack at beginning of this line) + """ + i = endpos + while i >= 0: + char = line[i] + if char in ")]}": + # Found end of expression, push to expression stack + stack.append(char) + elif char == ">": + # Found potential end of template argument list. + # + # Ignore it if it's a "->" or ">=" or "operator>" + if i > 0 and ( + line[i - 1] == "-" + or re.match(r"\s>=\s", line[i - 1 :]) + or re.search(r"\boperator\s*$", line[0:i]) + ): + i -= 1 + else: + stack.append(">") + elif char == "<": + # Found potential start of template argument list + if i > 0 and line[i - 1] == "<": + # Left shift operator + i -= 1 + else: + # If there is a matching '>', we can pop the expression stack. + # Otherwise, ignore this '<' since it must be an operator. + if stack and stack[-1] == ">": + stack.pop() + if not stack: + return (i, None) + elif char in "([{": + # Found start of expression. + # + # If there are any unmatched '>' on the stack, they must be + # operators. Remove those. + while stack and stack[-1] == ">": + stack.pop() + if not stack: + return (-1, None) + if ( + (char == "(" and stack[-1] == ")") + or (char == "[" and stack[-1] == "]") + or (char == "{" and stack[-1] == "}") + ): + stack.pop() + if not stack: + return (i, None) + else: + # Mismatched parentheses + return (-1, None) + elif char == ";": + # Found something that look like end of statements. If we are currently + # expecting a '<', the matching '>' must have been an operator, since + # template argument list should not contain statements. + while stack and stack[-1] == ">": + stack.pop() + if not stack: + return (-1, None) + i -= 1 - else: - # If there is a matching '>', we can pop the expression stack. - # Otherwise, ignore this '<' since it must be an operator. - if stack and stack[-1] == '>': - stack.pop() - if not stack: - return (i, None) - elif char in '([{': - # Found start of expression. - # - # If there are any unmatched '>' on the stack, they must be - # operators. Remove those. - while stack and stack[-1] == '>': - stack.pop() - if not stack: - return (-1, None) - if ((char == '(' and stack[-1] == ')') or - (char == '[' and stack[-1] == ']') or - (char == '{' and stack[-1] == '}')): - stack.pop() - if not stack: - return (i, None) - else: - # Mismatched parentheses - return (-1, None) - elif char == ';': - # Found something that look like end of statements. If we are currently - # expecting a '<', the matching '>' must have been an operator, since - # template argument list should not contain statements. - while stack and stack[-1] == '>': - stack.pop() - if not stack: - return (-1, None) - - i -= 1 - - return (-1, stack) + + return (-1, stack) def ReverseCloseExpression(clean_lines, linenum, pos): - """If input points to ) or } or ] or >, finds the position that opens it. - - If lines[linenum][pos] points to a ')' or '}' or ']' or '>', finds the - linenum/pos that correspond to the opening of the expression. - - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - pos: A position on the line. - - Returns: - A tuple (line, linenum, pos) pointer *at* the opening brace, or - (line, 0, -1) if we never find the matching opening brace. Note - we ignore strings and comments when matching; and the line we - return is the 'cleansed' line at linenum. - """ - line = clean_lines.elided[linenum] - if line[pos] not in ')}]>': - return (line, 0, -1) + """If input points to ) or } or ] or >, finds the position that opens it. + + If lines[linenum][pos] points to a ')' or '}' or ']' or '>', finds the + linenum/pos that correspond to the opening of the expression. - # Check last line - (start_pos, stack) = FindStartOfExpressionInLine(line, pos, []) - if start_pos > -1: - return (line, linenum, start_pos) + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + pos: A position on the line. - # Continue scanning backward - while stack and linenum > 0: - linenum -= 1 + Returns: + A tuple (line, linenum, pos) pointer *at* the opening brace, or + (line, 0, -1) if we never find the matching opening brace. Note + we ignore strings and comments when matching; and the line we + return is the 'cleansed' line at linenum. + """ line = clean_lines.elided[linenum] - (start_pos, stack) = FindStartOfExpressionInLine(line, len(line) - 1, stack) + if line[pos] not in ")}]>": + return (line, 0, -1) + + # Check last line + (start_pos, stack) = FindStartOfExpressionInLine(line, pos, []) if start_pos > -1: - return (line, linenum, start_pos) + return (line, linenum, start_pos) - # Did not find start of expression before beginning of file, give up - return (line, 0, -1) + # Continue scanning backward + while stack and linenum > 0: + linenum -= 1 + line = clean_lines.elided[linenum] + (start_pos, stack) = FindStartOfExpressionInLine(line, len(line) - 1, stack) + if start_pos > -1: + return (line, linenum, start_pos) + + # Did not find start of expression before beginning of file, give up + return (line, 0, -1) def CheckForCopyright(filename, lines, error): - """Logs an error if no Copyright message appears at the top of the file.""" + """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 - # placeholder line at the front. - for line in range(1, min(len(lines), 11)): - if re.search(r'Copyright', lines[line], re.IGNORECASE): - break - else: # means no copyright line was found - error(filename, 0, 'legal/copyright', 5, - 'No copyright message found. ' - 'You should have a line: "Copyright [year] "') + # We'll say it should occur by line 10. Don't forget there's a + # placeholder line at the front. + for line in range(1, min(len(lines), 11)): + if re.search(r"Copyright", lines[line], re.IGNORECASE): + break + else: # means no copyright line was found + error( + filename, + 0, + "legal/copyright", + 5, + "No copyright message found. " + 'You should have a line: "Copyright [year] "', + ) def GetIndentLevel(line): - """Return the number of leading spaces in line. + """Return the number of leading spaces in line. + + Args: + line: A string to check. - Args: - line: A string to check. + Returns: + An integer count of leading spaces, possibly zero. + """ + indent = re.match(r"^( *)\S", line) + if indent: + return len(indent.group(1)) + return 0 - Returns: - An integer count of leading spaces, possibly zero. - """ - indent = re.match(r'^( *)\S', line) - if indent: - return len(indent.group(1)) - return 0 def PathSplitToList(path): - """Returns the path split into a list by the separator. - - Args: - path: An absolute or relative path (e.g. '/a/b/c/' or '../a') - - Returns: - A list of path components (e.g. ['a', 'b', 'c]). - """ - lst = [] - while True: - (head, tail) = os.path.split(path) - if head == path: # absolute paths end - lst.append(head) - break - if tail == path: # relative paths end - lst.append(tail) - break - - path = head - lst.append(tail) - - lst.reverse() - return lst + """Returns the path split into a list by the separator. -def GetHeaderGuardCPPVariable(filename): - """Returns the CPP variable that should be used as a header guard. + Args: + path: An absolute or relative path (e.g. '/a/b/c/' or '../a') - Args: - filename: The name of a C++ header file. + Returns: + A list of path components (e.g. ['a', 'b', 'c]). + """ + lst = [] + while True: + (head, tail) = os.path.split(path) + if head == path: # absolute paths end + lst.append(head) + break + if tail == path: # relative paths end + lst.append(tail) + break - Returns: - The CPP variable that should be used as a header guard in the - named file. + path = head + lst.append(tail) - """ + lst.reverse() + return lst - # Restores original filename in case that cpplint is invoked from Emacs's - # flymake. - filename = re.sub(r'_flymake\.h$', '.h', filename) - filename = re.sub(r'/\.flymake/([^/]*)$', r'/\1', filename) - # Replace 'c++' with 'cpp'. - filename = filename.replace('C++', 'cpp').replace('c++', 'cpp') - fileinfo = FileInfo(filename) - file_path_from_root = fileinfo.RepositoryName() +def GetHeaderGuardCPPVariable(filename): + """Returns the CPP variable that should be used as a header guard. - def FixupPathFromRoot(): - if _root_debug: - sys.stderr.write(f"\n_root fixup, _root = '{_root}'," - f" repository name = '{fileinfo.RepositoryName()}'\n") + Args: + filename: The name of a C++ header file. - # Process the file path with the --root flag if it was set. - if not _root: - if _root_debug: - sys.stderr.write("_root unspecified\n") - return file_path_from_root + Returns: + The CPP variable that should be used as a header guard in the + named file. - def StripListPrefix(lst, prefix): - # f(['x', 'y'], ['w, z']) -> None (not a valid prefix) - if lst[:len(prefix)] != prefix: - return None - # f(['a, 'b', 'c', 'd'], ['a', 'b']) -> ['c', 'd'] - return lst[(len(prefix)):] + """ - # root behavior: - # --root=subdir , lstrips subdir from the header guard - maybe_path = StripListPrefix(PathSplitToList(file_path_from_root), - PathSplitToList(_root)) + # Restores original filename in case that cpplint is invoked from Emacs's + # flymake. + filename = re.sub(r"_flymake\.h$", ".h", filename) + filename = re.sub(r"/\.flymake/([^/]*)$", r"/\1", filename) + # Replace 'c++' with 'cpp'. + filename = filename.replace("C++", "cpp").replace("c++", "cpp") - if _root_debug: - sys.stderr.write(("_root lstrip (maybe_path=%s, file_path_from_root=%s," + - " _root=%s)\n") % (maybe_path, file_path_from_root, _root)) + fileinfo = FileInfo(filename) + file_path_from_root = fileinfo.RepositoryName() - if maybe_path: - return os.path.join(*maybe_path) + def FixupPathFromRoot(): + if _root_debug: + sys.stderr.write( + f"\n_root fixup, _root = '{_root}'," + f" repository name = '{fileinfo.RepositoryName()}'\n" + ) - # --root=.. , will prepend the outer directory to the header guard - full_path = fileinfo.FullName() - # adapt slashes for windows - root_abspath = os.path.abspath(_root).replace('\\', '/') + # Process the file path with the --root flag if it was set. + if not _root: + if _root_debug: + sys.stderr.write("_root unspecified\n") + return file_path_from_root - maybe_path = StripListPrefix(PathSplitToList(full_path), - PathSplitToList(root_abspath)) + def StripListPrefix(lst, prefix): + # f(['x', 'y'], ['w, z']) -> None (not a valid prefix) + if lst[: len(prefix)] != prefix: + return None + # f(['a, 'b', 'c', 'd'], ['a', 'b']) -> ['c', 'd'] + return lst[(len(prefix)) :] - if _root_debug: - sys.stderr.write(("_root prepend (maybe_path=%s, full_path=%s, " + - "root_abspath=%s)\n") % (maybe_path, full_path, root_abspath)) + # root behavior: + # --root=subdir , lstrips subdir from the header guard + maybe_path = StripListPrefix(PathSplitToList(file_path_from_root), PathSplitToList(_root)) - if maybe_path: - return os.path.join(*maybe_path) + if _root_debug: + sys.stderr.write( + ("_root lstrip (maybe_path=%s, file_path_from_root=%s," + " _root=%s)\n") + % (maybe_path, file_path_from_root, _root) + ) - if _root_debug: - sys.stderr.write(f"_root ignore, returning {file_path_from_root}\n") + if maybe_path: + return os.path.join(*maybe_path) - # --root=FAKE_DIR is ignored - return file_path_from_root + # --root=.. , will prepend the outer directory to the header guard + full_path = fileinfo.FullName() + # adapt slashes for windows + root_abspath = os.path.abspath(_root).replace("\\", "/") - file_path_from_root = FixupPathFromRoot() - return re.sub(r'[^a-zA-Z0-9]', '_', file_path_from_root).upper() + '_' + maybe_path = StripListPrefix(PathSplitToList(full_path), PathSplitToList(root_abspath)) + if _root_debug: + sys.stderr.write( + ("_root prepend (maybe_path=%s, full_path=%s, " + "root_abspath=%s)\n") + % (maybe_path, full_path, root_abspath) + ) -def CheckForHeaderGuard(filename, clean_lines, error, cppvar): - """Checks that the file contains a header guard. - - Logs an error if no #ifndef header guard is present. For other - headers, checks that the full pathname is used. - - Args: - filename: The name of the C++ header file. - clean_lines: A CleansedLines instance containing the file. - error: The function to call with any errors found. - """ - - # Don't check for header guards if there are error suppression - # comments somewhere in this file. - # - # Because this is silencing a warning for a nonexistent line, we - # only support the very specific NOLINT(build/header_guard) syntax, - # and not the general NOLINT or NOLINT(*) syntax. - raw_lines = clean_lines.lines_without_raw_strings - for i in raw_lines: - if re.search(r'//\s*NOLINT\(build/header_guard\)', i): - return - - # Allow pragma once instead of header guards - for i in raw_lines: - if re.search(r'^\s*#pragma\s+once', i): - return - - ifndef = '' - ifndef_linenum = 0 - define = '' - endif = '' - endif_linenum = 0 - for linenum, line in enumerate(raw_lines): - linesplit = line.split() - if len(linesplit) >= 2: - # find the first occurrence of #ifndef and #define, save arg - if not ifndef and linesplit[0] == '#ifndef': - # set ifndef to the header guard presented on the #ifndef line. - ifndef = linesplit[1] - ifndef_linenum = linenum - if not define and linesplit[0] == '#define': - define = linesplit[1] - # find the last occurrence of #endif, save entire line - if line.startswith('#endif'): - endif = line - endif_linenum = linenum - - if not ifndef or not define or ifndef != define: - error(filename, 0, 'build/header_guard', 5, - f'No #ifndef header guard found, suggested CPP variable is: {cppvar}') - return - - # The guard should be PATH_FILE_H_, but we also allow PATH_FILE_H__ - # for backward compatibility. - if ifndef != cppvar: - error_level = 0 - if ifndef != cppvar + '_': - error_level = 5 - - ParseNolintSuppressions(filename, raw_lines[ifndef_linenum], ifndef_linenum, - error) - error(filename, ifndef_linenum, 'build/header_guard', error_level, - f'#ifndef header guard has wrong style, please use: {cppvar}') - - # Check for "//" comments on endif line. - ParseNolintSuppressions(filename, raw_lines[endif_linenum], endif_linenum, - error) - match = re.match(r'#endif\s*//\s*' + cppvar + r'(_)?\b', endif) - if match: - if match.group(1) == '_': - # Issue low severity warning for deprecated double trailing underscore - error(filename, endif_linenum, 'build/header_guard', 0, - f'#endif line should be "#endif // {cppvar}"') - return - - # Didn't find the corresponding "//" comment. If this file does not - # contain any "//" comments at all, it could be that the compiler - # only wants "/**/" comments, look for those instead. - no_single_line_comments = True - for i in range(1, len(raw_lines) - 1): - line = raw_lines[i] - if re.match(r'^(?:(?:\'(?:\.|[^\'])*\')|(?:"(?:\.|[^"])*")|[^\'"])*//', line): - no_single_line_comments = False - break - - if no_single_line_comments: - match = re.match(r'#endif\s*/\*\s*' + cppvar + r'(_)?\s*\*/', endif) - if match: - if match.group(1) == '_': - # Low severity warning for double trailing underscore - error(filename, endif_linenum, 'build/header_guard', 0, - f'#endif line should be "#endif /* {cppvar} */"') - return + if maybe_path: + return os.path.join(*maybe_path) - # Didn't find anything - error(filename, endif_linenum, 'build/header_guard', 5, - f'#endif line should be "#endif // {cppvar}"') + if _root_debug: + sys.stderr.write(f"_root ignore, returning {file_path_from_root}\n") + # --root=FAKE_DIR is ignored + return file_path_from_root -def CheckHeaderFileIncluded(filename, include_state, error): - """Logs an error if a source file does not include its header.""" - - # Do not check test files - fileinfo = FileInfo(filename) - if re.search(_TEST_FILE_SUFFIX, fileinfo.BaseName()): - return - - first_include = message = None - basefilename = filename[0:len(filename) - len(fileinfo.Extension())] - for ext in GetHeaderExtensions(): - headerfile = basefilename + '.' + ext - if not os.path.exists(headerfile): - continue - headername = FileInfo(headerfile).RepositoryName() - include_uses_unix_dir_aliases = False - for section_list in include_state.include_list: - for f in section_list: - include_text = f[0] - if "./" in include_text: - include_uses_unix_dir_aliases = True - if headername in include_text or include_text in headername: - return - if not first_include: - first_include = f[1] - - message = f'{fileinfo.RepositoryName()} should include its header file {headername}' - if include_uses_unix_dir_aliases: - message += ". Relative paths like . and .. are not allowed." - - if message: - error(filename, first_include, 'build/include', 5, message) + file_path_from_root = FixupPathFromRoot() + return re.sub(r"[^a-zA-Z0-9]", "_", file_path_from_root).upper() + "_" -def CheckForBadCharacters(filename, lines, error): - """Logs an error for each line containing bad characters. +def CheckForHeaderGuard(filename, clean_lines, error, cppvar): + """Checks that the file contains a header guard. - Two kinds of bad characters: + Logs an error if no #ifndef header guard is present. For other + headers, checks that the full pathname is used. - 1. Unicode replacement characters: These indicate that either the file - contained invalid UTF-8 (likely) or Unicode replacement characters (which - it shouldn't). Note that it's possible for this to throw off line - numbering if the invalid UTF-8 occurred adjacent to a newline. + Args: + filename: The name of the C++ header file. + clean_lines: A CleansedLines instance containing the file. + error: The function to call with any errors found. + """ - 2. NUL bytes. These are problematic for some tools. + # Don't check for header guards if there are error suppression + # comments somewhere in this file. + # + # Because this is silencing a warning for a nonexistent line, we + # only support the very specific NOLINT(build/header_guard) syntax, + # and not the general NOLINT or NOLINT(*) syntax. + raw_lines = clean_lines.lines_without_raw_strings + for i in raw_lines: + if re.search(r"//\s*NOLINT\(build/header_guard\)", i): + return + + # Allow pragma once instead of header guards + for i in raw_lines: + if re.search(r"^\s*#pragma\s+once", i): + return + + ifndef = "" + ifndef_linenum = 0 + define = "" + endif = "" + endif_linenum = 0 + for linenum, line in enumerate(raw_lines): + linesplit = line.split() + if len(linesplit) >= 2: + # find the first occurrence of #ifndef and #define, save arg + if not ifndef and linesplit[0] == "#ifndef": + # set ifndef to the header guard presented on the #ifndef line. + ifndef = linesplit[1] + ifndef_linenum = linenum + if not define and linesplit[0] == "#define": + define = linesplit[1] + # find the last occurrence of #endif, save entire line + if line.startswith("#endif"): + endif = line + endif_linenum = linenum + + if not ifndef or not define or ifndef != define: + error( + filename, + 0, + "build/header_guard", + 5, + f"No #ifndef header guard found, suggested CPP variable is: {cppvar}", + ) + return - Args: - filename: The name of the current file. - lines: An array of strings, each representing a line of the file. - error: The function to call with any errors found. - """ - for linenum, line in enumerate(lines): - if '\ufffd' in line: - error(filename, linenum, 'readability/utf8', 5, - 'Line contains invalid UTF-8 (or Unicode replacement character).') - if '\0' in line: - error(filename, linenum, 'readability/nul', 5, 'Line contains NUL byte.') + # The guard should be PATH_FILE_H_, but we also allow PATH_FILE_H__ + # for backward compatibility. + if ifndef != cppvar: + error_level = 0 + if ifndef != cppvar + "_": + error_level = 5 + + ParseNolintSuppressions(filename, raw_lines[ifndef_linenum], ifndef_linenum, error) + error( + filename, + ifndef_linenum, + "build/header_guard", + error_level, + f"#ifndef header guard has wrong style, please use: {cppvar}", + ) + + # Check for "//" comments on endif line. + ParseNolintSuppressions(filename, raw_lines[endif_linenum], endif_linenum, error) + match = re.match(r"#endif\s*//\s*" + cppvar + r"(_)?\b", endif) + if match: + if match.group(1) == "_": + # Issue low severity warning for deprecated double trailing underscore + error( + filename, + endif_linenum, + "build/header_guard", + 0, + f'#endif line should be "#endif // {cppvar}"', + ) + return + + # Didn't find the corresponding "//" comment. If this file does not + # contain any "//" comments at all, it could be that the compiler + # only wants "/**/" comments, look for those instead. + no_single_line_comments = True + for i in range(1, len(raw_lines) - 1): + line = raw_lines[i] + if re.match(r'^(?:(?:\'(?:\.|[^\'])*\')|(?:"(?:\.|[^"])*")|[^\'"])*//', line): + no_single_line_comments = False + break + + if no_single_line_comments: + match = re.match(r"#endif\s*/\*\s*" + cppvar + r"(_)?\s*\*/", endif) + if match: + if match.group(1) == "_": + # Low severity warning for double trailing underscore + error( + filename, + endif_linenum, + "build/header_guard", + 0, + f'#endif line should be "#endif /* {cppvar} */"', + ) + return + + # Didn't find anything + error( + filename, + endif_linenum, + "build/header_guard", + 5, + f'#endif line should be "#endif // {cppvar}"', + ) + + +def CheckHeaderFileIncluded(filename, include_state, error): + """Logs an error if a source file does not include its header.""" + + # Do not check test files + fileinfo = FileInfo(filename) + if re.search(_TEST_FILE_SUFFIX, fileinfo.BaseName()): + return + + first_include = message = None + basefilename = filename[0 : len(filename) - len(fileinfo.Extension())] + for ext in GetHeaderExtensions(): + headerfile = basefilename + "." + ext + if not os.path.exists(headerfile): + continue + headername = FileInfo(headerfile).RepositoryName() + include_uses_unix_dir_aliases = False + for section_list in include_state.include_list: + for f in section_list: + include_text = f[0] + if "./" in include_text: + include_uses_unix_dir_aliases = True + if headername in include_text or include_text in headername: + return + if not first_include: + first_include = f[1] + + message = f"{fileinfo.RepositoryName()} should include its header file {headername}" + if include_uses_unix_dir_aliases: + message += ". Relative paths like . and .. are not allowed." + + if message: + error(filename, first_include, "build/include", 5, message) + + +def CheckForBadCharacters(filename, lines, error): + """Logs an error for each line containing bad characters. + + Two kinds of bad characters: + + 1. Unicode replacement characters: These indicate that either the file + contained invalid UTF-8 (likely) or Unicode replacement characters (which + it shouldn't). Note that it's possible for this to throw off line + numbering if the invalid UTF-8 occurred adjacent to a newline. + + 2. NUL bytes. These are problematic for some tools. + + Args: + filename: The name of the current file. + lines: An array of strings, each representing a line of the file. + error: The function to call with any errors found. + """ + for linenum, line in enumerate(lines): + if "\ufffd" in line: + error( + filename, + linenum, + "readability/utf8", + 5, + "Line contains invalid UTF-8 (or Unicode replacement character).", + ) + if "\0" in line: + error(filename, linenum, "readability/nul", 5, "Line contains NUL byte.") def CheckForNewlineAtEOF(filename, lines, error): - """Logs an error if there is no newline char at the end of the file. + """Logs an error if there is no newline char at the end of the file. - Args: - filename: The name of the current file. - lines: An array of strings, each representing a line of the file. - error: The function to call with any errors found. - """ + Args: + filename: The name of the current file. + lines: An array of strings, each representing a line of the file. + error: The function to call with any errors found. + """ - # The array lines() was created by adding two newlines to the - # original file (go figure), then splitting on \n. - # To verify that the file ends in \n, we just have to make sure the - # last-but-two element of lines() exists and is empty. - if len(lines) < 3 or lines[-2]: - error(filename, len(lines) - 2, 'whitespace/ending_newline', 5, - 'Could not find a newline character at the end of the file.') + # The array lines() was created by adding two newlines to the + # original file (go figure), then splitting on \n. + # To verify that the file ends in \n, we just have to make sure the + # last-but-two element of lines() exists and is empty. + if len(lines) < 3 or lines[-2]: + error( + filename, + len(lines) - 2, + "whitespace/ending_newline", + 5, + "Could not find a newline character at the end of the file.", + ) def CheckForMultilineCommentsAndStrings(filename, clean_lines, linenum, error): - """Logs an error if we see /* ... */ or "..." that extend past one line. - - /* ... */ comments are legit inside macros, for one line. - Otherwise, we prefer // comments, so it's ok to warn about the - other. Likewise, it's ok for strings to extend across multiple - lines, as long as a line continuation character (backslash) - terminates each line. Although not currently prohibited by the C++ - style guide, it's ugly and unnecessary. We don't do well with either - in this lint program, so we warn about both. - - 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] - - # Remove all \\ (escaped backslashes) from the line. They are OK, and the - # second (escaped) slash may trigger later \" detection erroneously. - line = line.replace('\\\\', '') - - if line.count('/*') > line.count('*/'): - error(filename, linenum, 'readability/multiline_comment', 5, - 'Complex multi-line /*...*/-style comment found. ' - 'Lint may give bogus warnings. ' - 'Consider replacing these with //-style comments, ' - 'with #if 0...#endif, ' - 'or with more clearly structured multi-line comments.') - - if (line.count('"') - line.count('\\"')) % 2: - error(filename, linenum, 'readability/multiline_string', 5, - 'Multi-line string ("...") found. This lint script doesn\'t ' - 'do well with such strings, and may give bogus warnings. ' - 'Use C++11 raw strings or concatenation instead.') + """Logs an error if we see /* ... */ or "..." that extend past one line. + + /* ... */ comments are legit inside macros, for one line. + Otherwise, we prefer // comments, so it's ok to warn about the + other. Likewise, it's ok for strings to extend across multiple + lines, as long as a line continuation character (backslash) + terminates each line. Although not currently prohibited by the C++ + style guide, it's ugly and unnecessary. We don't do well with either + in this lint program, so we warn about both. + + 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] + + # Remove all \\ (escaped backslashes) from the line. They are OK, and the + # second (escaped) slash may trigger later \" detection erroneously. + line = line.replace("\\\\", "") + + if line.count("/*") > line.count("*/"): + error( + filename, + linenum, + "readability/multiline_comment", + 5, + "Complex multi-line /*...*/-style comment found. " + "Lint may give bogus warnings. " + "Consider replacing these with //-style comments, " + "with #if 0...#endif, " + "or with more clearly structured multi-line comments.", + ) + + if (line.count('"') - line.count('\\"')) % 2: + error( + filename, + linenum, + "readability/multiline_string", + 5, + 'Multi-line string ("...") found. This lint script doesn\'t ' + "do well with such strings, and may give bogus warnings. " + "Use C++11 raw strings or concatenation instead.", + ) # (non-threadsafe name, thread-safe alternative, validation pattern) @@ -2708,495 +2853,953 @@ def CheckForMultilineCommentsAndStrings(filename, clean_lines, linenum, error): # in some expression context on the same line by matching on some # operator before the function name. This eliminates constructors and # member function calls. -_UNSAFE_FUNC_PREFIX = r'(?:[-+*/=%^&|(<]\s*|>\s+)' +_UNSAFE_FUNC_PREFIX = r"(?:[-+*/=%^&|(<]\s*|>\s+)" _THREADING_LIST = ( - ('asctime(', 'asctime_r(', _UNSAFE_FUNC_PREFIX + r'asctime\([^)]+\)'), - ('ctime(', 'ctime_r(', _UNSAFE_FUNC_PREFIX + r'ctime\([^)]+\)'), - ('getgrgid(', 'getgrgid_r(', _UNSAFE_FUNC_PREFIX + r'getgrgid\([^)]+\)'), - ('getgrnam(', 'getgrnam_r(', _UNSAFE_FUNC_PREFIX + r'getgrnam\([^)]+\)'), - ('getlogin(', 'getlogin_r(', _UNSAFE_FUNC_PREFIX + r'getlogin\(\)'), - ('getpwnam(', 'getpwnam_r(', _UNSAFE_FUNC_PREFIX + r'getpwnam\([^)]+\)'), - ('getpwuid(', 'getpwuid_r(', _UNSAFE_FUNC_PREFIX + r'getpwuid\([^)]+\)'), - ('gmtime(', 'gmtime_r(', _UNSAFE_FUNC_PREFIX + r'gmtime\([^)]+\)'), - ('localtime(', 'localtime_r(', _UNSAFE_FUNC_PREFIX + r'localtime\([^)]+\)'), - ('rand(', 'rand_r(', _UNSAFE_FUNC_PREFIX + r'rand\(\)'), - ('strtok(', 'strtok_r(', - _UNSAFE_FUNC_PREFIX + r'strtok\([^)]+\)'), - ('ttyname(', 'ttyname_r(', _UNSAFE_FUNC_PREFIX + r'ttyname\([^)]+\)'), - ) + ("asctime(", "asctime_r(", _UNSAFE_FUNC_PREFIX + r"asctime\([^)]+\)"), + ("ctime(", "ctime_r(", _UNSAFE_FUNC_PREFIX + r"ctime\([^)]+\)"), + ("getgrgid(", "getgrgid_r(", _UNSAFE_FUNC_PREFIX + r"getgrgid\([^)]+\)"), + ("getgrnam(", "getgrnam_r(", _UNSAFE_FUNC_PREFIX + r"getgrnam\([^)]+\)"), + ("getlogin(", "getlogin_r(", _UNSAFE_FUNC_PREFIX + r"getlogin\(\)"), + ("getpwnam(", "getpwnam_r(", _UNSAFE_FUNC_PREFIX + r"getpwnam\([^)]+\)"), + ("getpwuid(", "getpwuid_r(", _UNSAFE_FUNC_PREFIX + r"getpwuid\([^)]+\)"), + ("gmtime(", "gmtime_r(", _UNSAFE_FUNC_PREFIX + r"gmtime\([^)]+\)"), + ("localtime(", "localtime_r(", _UNSAFE_FUNC_PREFIX + r"localtime\([^)]+\)"), + ("rand(", "rand_r(", _UNSAFE_FUNC_PREFIX + r"rand\(\)"), + ("strtok(", "strtok_r(", _UNSAFE_FUNC_PREFIX + r"strtok\([^)]+\)"), + ("ttyname(", "ttyname_r(", _UNSAFE_FUNC_PREFIX + r"ttyname\([^)]+\)"), +) def CheckPosixThreading(filename, clean_lines, linenum, error): - """Checks for calls to thread-unsafe functions. - - Much code has been originally written without consideration of - multi-threading. Also, engineers are relying on their old experience; - they have learned posix before threading extensions were added. These - tests guide the engineers to use thread-safe functions (when using - posix directly). - - 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] - for single_thread_func, multithread_safe_func, pattern in _THREADING_LIST: - # Additional pattern matching check to confirm that this is the - # function we are looking for - if re.search(pattern, line): - error(filename, linenum, 'runtime/threadsafe_fn', 2, - 'Consider using ' + multithread_safe_func + - '...) instead of ' + single_thread_func + - '...) for improved thread safety.') + """Checks for calls to thread-unsafe functions. + + Much code has been originally written without consideration of + multi-threading. Also, engineers are relying on their old experience; + they have learned posix before threading extensions were added. These + tests guide the engineers to use thread-safe functions (when using + posix directly). + + 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] + for single_thread_func, multithread_safe_func, pattern in _THREADING_LIST: + # Additional pattern matching check to confirm that this is the + # function we are looking for + if re.search(pattern, line): + error( + filename, + linenum, + "runtime/threadsafe_fn", + 2, + "Consider using " + + multithread_safe_func + + "...) instead of " + + single_thread_func + + "...) for improved thread safety.", + ) def CheckVlogArguments(filename, clean_lines, linenum, error): - """Checks that VLOG() is only used for defining a logging level. - - For example, VLOG(2) is correct. VLOG(INFO), VLOG(WARNING), VLOG(ERROR), and - VLOG(FATAL) are not. - - 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] - if re.search(r'\bVLOG\((INFO|ERROR|WARNING|DFATAL|FATAL)\)', line): - error(filename, linenum, 'runtime/vlog', 5, - 'VLOG() should be used with numeric verbosity level. ' - 'Use LOG() if you want symbolic severity levels.') + """Checks that VLOG() is only used for defining a logging level. + + For example, VLOG(2) is correct. VLOG(INFO), VLOG(WARNING), VLOG(ERROR), and + VLOG(FATAL) are not. + + 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] + if re.search(r"\bVLOG\((INFO|ERROR|WARNING|DFATAL|FATAL)\)", line): + error( + filename, + linenum, + "runtime/vlog", + 5, + "VLOG() should be used with numeric verbosity level. " + "Use LOG() if you want symbolic severity levels.", + ) + # Matches invalid increment: *count++, which moves pointer instead of # incrementing a value. -_RE_PATTERN_INVALID_INCREMENT = re.compile( - r'^\s*\*\w+(\+\+|--);') +_RE_PATTERN_INVALID_INCREMENT = re.compile(r"^\s*\*\w+(\+\+|--);") def CheckInvalidIncrement(filename, clean_lines, linenum, error): - """Checks for invalid increment *count++. - - For example following function: - void increment_counter(int* count) { - *count++; - } - is invalid, because it effectively does count++, moving pointer, and should - be replaced with ++*count, (*count)++ or *count += 1. - - 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] - if _RE_PATTERN_INVALID_INCREMENT.match(line): - error(filename, linenum, 'runtime/invalid_increment', 5, - 'Changing pointer instead of value (or unused value of operator*).') + """Checks for invalid increment *count++. + + For example following function: + void increment_counter(int* count) { + *count++; + } + is invalid, because it effectively does count++, moving pointer, and should + be replaced with ++*count, (*count)++ or *count += 1. + + 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] + if _RE_PATTERN_INVALID_INCREMENT.match(line): + error( + filename, + linenum, + "runtime/invalid_increment", + 5, + "Changing pointer instead of value (or unused value of operator*).", + ) def IsMacroDefinition(clean_lines, linenum): - if re.search(r'^#define', clean_lines[linenum]): - return True + if re.search(r"^#define", clean_lines[linenum]): + return True - if linenum > 0 and re.search(r'\\$', clean_lines[linenum - 1]): - return True + if linenum > 0 and re.search(r"\\$", clean_lines[linenum - 1]): + return True - return False + return False def IsForwardClassDeclaration(clean_lines, linenum): - return re.match(r'^\s*(\btemplate\b)*.*class\s+\w+;\s*$', clean_lines[linenum]) + return re.match(r"^\s*(\btemplate\b)*.*class\s+\w+;\s*$", clean_lines[linenum]) class _BlockInfo(object): - """Stores information about a generic block of code.""" - - def __init__(self, linenum, seen_open_brace): - self.starting_linenum = linenum - self.seen_open_brace = seen_open_brace - self.open_parentheses = 0 - self.inline_asm = _NO_ASM - self.check_namespace_indentation = False - - def CheckBegin(self, filename, clean_lines, linenum, error): - """Run checks that applies to text up to the opening brace. - - This is mostly for checking the text after the class identifier - and the "{", usually where the base class is specified. For other - blocks, there isn't much to check, so we always pass. - - 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. - """ - pass + """Stores information about a generic block of code.""" + + def __init__(self, linenum, seen_open_brace): + self.starting_linenum = linenum + self.seen_open_brace = seen_open_brace + self.open_parentheses = 0 + self.inline_asm = _NO_ASM + self.check_namespace_indentation = False + + def CheckBegin(self, filename, clean_lines, linenum, error): + """Run checks that applies to text up to the opening brace. + + This is mostly for checking the text after the class identifier + and the "{", usually where the base class is specified. For other + blocks, there isn't much to check, so we always pass. + + 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. + """ + pass - def CheckEnd(self, filename, clean_lines, linenum, error): - """Run checks that applies to text after the closing brace. + def CheckEnd(self, filename, clean_lines, linenum, error): + """Run checks that applies to text after the closing brace. - This is mostly used for checking end of namespace comments. + This is mostly used for checking end of namespace comments. - 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. - """ - pass + 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. + """ + pass - def IsBlockInfo(self): - """Returns true if this block is a _BlockInfo. + def IsBlockInfo(self): + """Returns true if this block is a _BlockInfo. - This is convenient for verifying that an object is an instance of - a _BlockInfo, but not an instance of any of the derived classes. + This is convenient for verifying that an object is an instance of + a _BlockInfo, but not an instance of any of the derived classes. - Returns: - True for this class, False for derived classes. - """ - return self.__class__ == _BlockInfo + Returns: + True for this class, False for derived classes. + """ + return self.__class__ == _BlockInfo class _ExternCInfo(_BlockInfo): - """Stores information about an 'extern "C"' block.""" + """Stores information about an 'extern "C"' block.""" - def __init__(self, linenum): - _BlockInfo.__init__(self, linenum, True) + def __init__(self, linenum): + _BlockInfo.__init__(self, linenum, True) class _ClassInfo(_BlockInfo): - """Stores information about a class.""" - - def __init__(self, name, class_or_struct, clean_lines, linenum): - _BlockInfo.__init__(self, linenum, False) - self.name = name - self.is_derived = False - self.check_namespace_indentation = True - if class_or_struct == 'struct': - self.access = 'public' - self.is_struct = True - else: - self.access = 'private' - self.is_struct = False + """Stores information about a class.""" + + def __init__(self, name, class_or_struct, clean_lines, linenum): + _BlockInfo.__init__(self, linenum, False) + self.name = name + self.is_derived = False + self.check_namespace_indentation = True + if class_or_struct == "struct": + self.access = "public" + self.is_struct = True + else: + self.access = "private" + self.is_struct = False - # Remember initial indentation level for this class. Using raw_lines here - # instead of elided to account for leading comments. - self.class_indent = GetIndentLevel(clean_lines.raw_lines[linenum]) + # Remember initial indentation level for this class. Using raw_lines here + # instead of elided to account for leading comments. + self.class_indent = GetIndentLevel(clean_lines.raw_lines[linenum]) - # Try to find the end of the class. This will be confused by things like: - # class A { - # } *x = { ... - # - # But it's still good enough for CheckSectionSpacing. - self.last_line = 0 - depth = 0 - for i in range(linenum, clean_lines.NumLines()): - line = clean_lines.elided[i] - depth += line.count('{') - line.count('}') - if not depth: - self.last_line = i - break - - def CheckBegin(self, filename, clean_lines, linenum, error): - # Look for a bare ':' - if re.search('(^|[^:]):($|[^:])', clean_lines.elided[linenum]): - self.is_derived = True - - def CheckEnd(self, filename, clean_lines, linenum, error): - # If there is a DISALLOW macro, it should appear near the end of - # the class. - seen_last_thing_in_class = False - for i in range(linenum - 1, self.starting_linenum, -1): - match = re.search( - r'\b(DISALLOW_COPY_AND_ASSIGN|DISALLOW_IMPLICIT_CONSTRUCTORS)\(' + - self.name + r'\)', - clean_lines.elided[i]) - if match: - if seen_last_thing_in_class: - error(filename, i, 'readability/constructors', 3, - match.group(1) + ' should be the last thing in the class') - break - - if not re.match(r'^\s*$', clean_lines.elided[i]): - seen_last_thing_in_class = True - - # Check that closing brace is aligned with beginning of the class. - # Only do this if the closing brace is indented by only whitespaces. - # This means we will not check single-line class definitions. - indent = re.match(r'^( *)\}', clean_lines.elided[linenum]) - if indent and len(indent.group(1)) != self.class_indent: - if self.is_struct: - parent = 'struct ' + self.name - else: - parent = 'class ' + self.name - error(filename, linenum, 'whitespace/indent', 3, - f'Closing brace should be aligned with beginning of {parent}') + # Try to find the end of the class. This will be confused by things like: + # class A { + # } *x = { ... + # + # But it's still good enough for CheckSectionSpacing. + self.last_line = 0 + depth = 0 + for i in range(linenum, clean_lines.NumLines()): + line = clean_lines.elided[i] + depth += line.count("{") - line.count("}") + if not depth: + self.last_line = i + break + + def CheckBegin(self, filename, clean_lines, linenum, error): + # Look for a bare ':' + if re.search("(^|[^:]):($|[^:])", clean_lines.elided[linenum]): + self.is_derived = True + + def CheckEnd(self, filename, clean_lines, linenum, error): + # If there is a DISALLOW macro, it should appear near the end of + # the class. + seen_last_thing_in_class = False + for i in range(linenum - 1, self.starting_linenum, -1): + match = re.search( + r"\b(DISALLOW_COPY_AND_ASSIGN|DISALLOW_IMPLICIT_CONSTRUCTORS)\(" + + self.name + + r"\)", + clean_lines.elided[i], + ) + if match: + if seen_last_thing_in_class: + error( + filename, + i, + "readability/constructors", + 3, + match.group(1) + " should be the last thing in the class", + ) + break + + if not re.match(r"^\s*$", clean_lines.elided[i]): + seen_last_thing_in_class = True + + # Check that closing brace is aligned with beginning of the class. + # Only do this if the closing brace is indented by only whitespaces. + # This means we will not check single-line class definitions. + indent = re.match(r"^( *)\}", clean_lines.elided[linenum]) + if indent and len(indent.group(1)) != self.class_indent: + if self.is_struct: + parent = "struct " + self.name + else: + parent = "class " + self.name + error( + filename, + linenum, + "whitespace/indent", + 3, + f"Closing brace should be aligned with beginning of {parent}", + ) class _NamespaceInfo(_BlockInfo): - """Stores information about a namespace.""" + """Stores information about a namespace.""" - def __init__(self, name, linenum): - _BlockInfo.__init__(self, linenum, False) - self.name = name or '' - self.check_namespace_indentation = True + def __init__(self, name, linenum): + _BlockInfo.__init__(self, linenum, False) + self.name = name or "" + self.check_namespace_indentation = True - def CheckEnd(self, filename, clean_lines, linenum, error): - """Check end of namespace comments.""" - line = clean_lines.raw_lines[linenum] + def CheckEnd(self, filename, clean_lines, linenum, error): + """Check end of namespace comments.""" + line = clean_lines.raw_lines[linenum] - # Check how many lines is enclosed in this namespace. Don't issue - # warning for missing namespace comments if there aren't enough - # lines. However, do apply checks if there is already an end of - # namespace comment and it's incorrect. - # - # TODO(unknown): We always want to check end of namespace comments - # if a namespace is large, but sometimes we also want to apply the - # check if a short namespace contained nontrivial things (something - # other than forward declarations). There is currently no logic on - # deciding what these nontrivial things are, so this check is - # triggered by namespace size only, which works most of the time. - if (linenum - self.starting_linenum < 10 - and not re.match(r'^\s*};*\s*(//|/\*).*\bnamespace\b', line)): - return - - # Look for matching comment at end of namespace. - # - # Note that we accept C style "/* */" comments for terminating - # namespaces, so that code that terminate namespaces inside - # preprocessor macros can be cpplint clean. - # - # We also accept stuff like "// end of namespace ." with the - # period at the end. - # - # Besides these, we don't accept anything else, otherwise we might - # get false negatives when existing comment is a substring of the - # expected namespace. - if self.name: - # Named namespace - if not re.match((r'^\s*};*\s*(//|/\*).*\bnamespace\s+' + - re.escape(self.name) + r'[\*/\.\\\s]*$'), - line): - error(filename, linenum, 'readability/namespace', 5, - f'Namespace should be terminated with "// namespace {self.name}"') - else: - # Anonymous namespace - if not re.match(r'^\s*};*\s*(//|/\*).*\bnamespace[\*/\.\\\s]*$', line): - # If "// namespace anonymous" or "// anonymous namespace (more text)", - # mention "// anonymous namespace" as an acceptable form - if re.match(r'^\s*}.*\b(namespace anonymous|anonymous namespace)\b', line): - error(filename, linenum, 'readability/namespace', 5, - 'Anonymous namespace should be terminated with "// namespace"' - ' or "// anonymous namespace"') + # Check how many lines is enclosed in this namespace. Don't issue + # warning for missing namespace comments if there aren't enough + # lines. However, do apply checks if there is already an end of + # namespace comment and it's incorrect. + # + # TODO(unknown): We always want to check end of namespace comments + # if a namespace is large, but sometimes we also want to apply the + # check if a short namespace contained nontrivial things (something + # other than forward declarations). There is currently no logic on + # deciding what these nontrivial things are, so this check is + # triggered by namespace size only, which works most of the time. + if linenum - self.starting_linenum < 10 and not re.match( + r"^\s*};*\s*(//|/\*).*\bnamespace\b", line + ): + return + + # Look for matching comment at end of namespace. + # + # Note that we accept C style "/* */" comments for terminating + # namespaces, so that code that terminate namespaces inside + # preprocessor macros can be cpplint clean. + # + # We also accept stuff like "// end of namespace ." with the + # period at the end. + # + # Besides these, we don't accept anything else, otherwise we might + # get false negatives when existing comment is a substring of the + # expected namespace. + if self.name: + # Named namespace + if not re.match( + (r"^\s*};*\s*(//|/\*).*\bnamespace\s+" + re.escape(self.name) + r"[\*/\.\\\s]*$"), + line, + ): + error( + filename, + linenum, + "readability/namespace", + 5, + f'Namespace should be terminated with "// namespace {self.name}"', + ) else: - error(filename, linenum, 'readability/namespace', 5, - 'Anonymous namespace should be terminated with "// namespace"') + # Anonymous namespace + if not re.match(r"^\s*};*\s*(//|/\*).*\bnamespace[\*/\.\\\s]*$", line): + # If "// namespace anonymous" or "// anonymous namespace (more text)", + # mention "// anonymous namespace" as an acceptable form + if re.match(r"^\s*}.*\b(namespace anonymous|anonymous namespace)\b", line): + error( + filename, + linenum, + "readability/namespace", + 5, + 'Anonymous namespace should be terminated with "// namespace"' + ' or "// anonymous namespace"', + ) + else: + error( + filename, + linenum, + "readability/namespace", + 5, + 'Anonymous namespace should be terminated with "// namespace"', + ) class _PreprocessorInfo(object): - """Stores checkpoints of nesting stacks when #if/#else is seen.""" + """Stores checkpoints of nesting stacks when #if/#else is seen.""" - def __init__(self, stack_before_if): - # The entire nesting stack before #if - self.stack_before_if = stack_before_if + def __init__(self, stack_before_if): + # The entire nesting stack before #if + self.stack_before_if = stack_before_if - # The entire nesting stack up to #else - self.stack_before_else = [] + # The entire nesting stack up to #else + self.stack_before_else = [] - # Whether we have already seen #else or #elif - self.seen_else = False + # Whether we have already seen #else or #elif + self.seen_else = False class NestingState(object): - """Holds states related to parsing braces.""" - - def __init__(self): - # Stack for tracking all braces. An object is pushed whenever we - # see a "{", and popped when we see a "}". Only 3 types of - # objects are possible: - # - _ClassInfo: a class or struct. - # - _NamespaceInfo: a namespace. - # - _BlockInfo: some other type of block. - self.stack = [] - - # Top of the previous stack before each Update(). - # - # Because the nesting_stack is updated at the end of each line, we - # had to do some convoluted checks to find out what is the current - # scope at the beginning of the line. This check is simplified by - # saving the previous top of nesting stack. - # - # We could save the full stack, but we only need the top. Copying - # the full nesting stack would slow down cpplint by ~10%. - self.previous_stack_top = [] - - # The number of open parentheses in the previous stack top before the last update. - # Used to prevent false indentation detection when e.g. a function parameter is indented. - # We can't use previous_stack_top, a shallow copy whose open_parentheses value is updated. - self.previous_open_parentheses = 0 - - # Stack of _PreprocessorInfo objects. - self.pp_stack = [] - - def SeenOpenBrace(self): - """Check if we have seen the opening brace for the innermost block. - - Returns: - True if we have seen the opening brace, False if the innermost - block is still expecting an opening brace. - """ - return (not self.stack) or self.stack[-1].seen_open_brace - - def InNamespaceBody(self): - """Check if we are currently one level inside a namespace body. + """Holds states related to parsing braces.""" + + def __init__(self): + # Stack for tracking all braces. An object is pushed whenever we + # see a "{", and popped when we see a "}". Only 3 types of + # objects are possible: + # - _ClassInfo: a class or struct. + # - _NamespaceInfo: a namespace. + # - _BlockInfo: some other type of block. + self.stack = [] + + # Top of the previous stack before each Update(). + # + # Because the nesting_stack is updated at the end of each line, we + # had to do some convoluted checks to find out what is the current + # scope at the beginning of the line. This check is simplified by + # saving the previous top of nesting stack. + # + # We could save the full stack, but we only need the top. Copying + # the full nesting stack would slow down cpplint by ~10%. + self.previous_stack_top = [] + + # The number of open parentheses in the previous stack top before the last update. + # Used to prevent false indentation detection when e.g. a function parameter is indented. + # We can't use previous_stack_top, a shallow copy whose open_parentheses value is updated. + self.previous_open_parentheses = 0 + + # Stack of _PreprocessorInfo objects. + self.pp_stack = [] + + def SeenOpenBrace(self): + """Check if we have seen the opening brace for the innermost block. + + Returns: + True if we have seen the opening brace, False if the innermost + block is still expecting an opening brace. + """ + return (not self.stack) or self.stack[-1].seen_open_brace + + def InNamespaceBody(self): + """Check if we are currently one level inside a namespace body. + + Returns: + True if top of the stack is a namespace block, False otherwise. + """ + return self.stack and isinstance(self.stack[-1], _NamespaceInfo) + + def InExternC(self): + """Check if we are currently one level inside an 'extern "C"' block. + + Returns: + True if top of the stack is an extern block, False otherwise. + """ + return self.stack and isinstance(self.stack[-1], _ExternCInfo) + + def InClassDeclaration(self): + """Check if we are currently one level inside a class or struct declaration. + + Returns: + True if top of the stack is a class/struct, False otherwise. + """ + return self.stack and isinstance(self.stack[-1], _ClassInfo) + + def InAsmBlock(self): + """Check if we are currently one level inside an inline ASM block. + + Returns: + True if the top of the stack is a block containing inline ASM. + """ + return self.stack and self.stack[-1].inline_asm != _NO_ASM + + def InTemplateArgumentList(self, clean_lines, linenum, pos): + """Check if current position is inside template argument list. + + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + pos: position just after the suspected template argument. + Returns: + True if (linenum, pos) is inside template arguments. + """ + while linenum < clean_lines.NumLines(): + # Find the earliest character that might indicate a template argument + line = clean_lines.elided[linenum] + match = re.match(r"^[^{};=\[\]\.<>]*(.)", line[pos:]) + if not match: + linenum += 1 + pos = 0 + continue + token = match.group(1) + pos += len(match.group(0)) + + # These things do not look like template argument list: + # class Suspect { + # class Suspect x; } + if token in ("{", "}", ";"): + return False - Returns: - True if top of the stack is a namespace block, False otherwise. - """ - return self.stack and isinstance(self.stack[-1], _NamespaceInfo) + # These things look like template argument list: + # template + # template + # template + # template + if token in (">", "=", "[", "]", "."): + return True + + # Check if token is an unmatched '<'. + # If not, move on to the next character. + if token != "<": + pos += 1 + if pos >= len(line): + linenum += 1 + pos = 0 + continue + + # We can't be sure if we just find a single '<', and need to + # find the matching '>'. + (_, end_line, end_pos) = CloseExpression(clean_lines, linenum, pos - 1) + if end_pos < 0: + # Not sure if template argument list or syntax error in file + return False + linenum = end_line + pos = end_pos + return False - def InExternC(self): - """Check if we are currently one level inside an 'extern "C"' block. + def UpdatePreprocessor(self, line): + """Update preprocessor stack. + + We need to handle preprocessors due to classes like this: + #ifdef SWIG + struct ResultDetailsPageElementExtensionPoint { + #else + struct ResultDetailsPageElementExtensionPoint : public Extension { + #endif + + We make the following assumptions (good enough for most files): + - Preprocessor condition evaluates to true from #if up to first + #else/#elif/#endif. + + - Preprocessor condition evaluates to false from #else/#elif up + to #endif. We still perform lint checks on these lines, but + these do not affect nesting stack. + + Args: + line: current line to check. + """ + if re.match(r"^\s*#\s*(if|ifdef|ifndef)\b", line): + # Beginning of #if block, save the nesting stack here. The saved + # stack will allow us to restore the parsing state in the #else case. + self.pp_stack.append(_PreprocessorInfo(copy.deepcopy(self.stack))) + elif re.match(r"^\s*#\s*(else|elif)\b", line): + # Beginning of #else block + if self.pp_stack: + if not self.pp_stack[-1].seen_else: + # This is the first #else or #elif block. Remember the + # whole nesting stack up to this point. This is what we + # keep after the #endif. + self.pp_stack[-1].seen_else = True + self.pp_stack[-1].stack_before_else = copy.deepcopy(self.stack) + + # Restore the stack to how it was before the #if + self.stack = copy.deepcopy(self.pp_stack[-1].stack_before_if) + else: + # TODO(unknown): unexpected #else, issue warning? + pass + elif re.match(r"^\s*#\s*endif\b", line): + # End of #if or #else blocks. + if self.pp_stack: + # If we saw an #else, we will need to restore the nesting + # stack to its former state before the #else, otherwise we + # will just continue from where we left off. + if self.pp_stack[-1].seen_else: + # Here we can just use a shallow copy since we are the last + # reference to it. + self.stack = self.pp_stack[-1].stack_before_else + # Drop the corresponding #if + self.pp_stack.pop() + else: + # TODO(unknown): unexpected #endif, issue warning? + pass + + # TODO(unknown): Update() is too long, but we will refactor later. + def Update(self, filename, clean_lines, linenum, error): + """Update nesting state with current line. + + 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] + + # Remember top of the previous nesting stack. + # + # The stack is always pushed/popped and not modified in place, so + # we can just do a shallow copy instead of copy.deepcopy. Using + # deepcopy would slow down cpplint by ~28%. + if self.stack: + self.previous_stack_top = self.stack[-1] + self.previous_open_parentheses = self.stack[-1].open_parentheses + else: + self.previous_stack_top = None - Returns: - True if top of the stack is an extern block, False otherwise. - """ - return self.stack and isinstance(self.stack[-1], _ExternCInfo) + # Update pp_stack + self.UpdatePreprocessor(line) - def InClassDeclaration(self): - """Check if we are currently one level inside a class or struct declaration. + # Count parentheses. This is to avoid adding struct arguments to + # the nesting stack. + if self.stack: + inner_block = self.stack[-1] + depth_change = line.count("(") - line.count(")") + inner_block.open_parentheses += depth_change + + # Also check if we are starting or ending an inline assembly block. + if inner_block.inline_asm in (_NO_ASM, _END_ASM): + if ( + depth_change != 0 + and inner_block.open_parentheses == 1 + and _MATCH_ASM.match(line) + ): + # Enter assembly block + inner_block.inline_asm = _INSIDE_ASM + else: + # Not entering assembly block. If previous line was _END_ASM, + # we will now shift to _NO_ASM state. + inner_block.inline_asm = _NO_ASM + elif inner_block.inline_asm == _INSIDE_ASM and inner_block.open_parentheses == 0: + # Exit assembly block + inner_block.inline_asm = _END_ASM + + # Consume namespace declaration at the beginning of the line. Do + # this in a loop so that we catch same line declarations like this: + # namespace proto2 { namespace bridge { class MessageSet; } } + while True: + # Match start of namespace. The "\b\s*" below catches namespace + # declarations even if it weren't followed by a whitespace, this + # is so that we don't confuse our namespace checker. The + # missing spaces will be flagged by CheckSpacing. + namespace_decl_match = re.match(r"^\s*namespace\b\s*([:\w]+)?(.*)$", line) + if not namespace_decl_match: + break + + new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum) + self.stack.append(new_namespace) + + line = namespace_decl_match.group(2) + if line.find("{") != -1: + new_namespace.seen_open_brace = True + line = line[line.find("{") + 1 :] + + # Look for a class declaration in whatever is left of the line + # after parsing namespaces. The regexp accounts for decorated classes + # such as in: + # class LOCKABLE API Object { + # }; + class_decl_match = re.match( + r"^(\s*(?:template\s*<[\w\s<>,:=]*>\s*)?" + r"(class|struct)\s+(?:[a-zA-Z0-9_]+\s+)*(\w+(?:::\w+)*))" + r"(.*)$", + line, + ) + if class_decl_match and (not self.stack or self.stack[-1].open_parentheses == 0): + # We do not want to accept classes that are actually template arguments: + # template , + # template class Ignore3> + # void Function() {}; + # + # To avoid template argument cases, we scan forward and look for + # an unmatched '>'. If we see one, assume we are inside a + # template argument list. + end_declaration = len(class_decl_match.group(1)) + if not self.InTemplateArgumentList(clean_lines, linenum, end_declaration): + self.stack.append( + _ClassInfo( + class_decl_match.group(3), class_decl_match.group(2), clean_lines, linenum + ) + ) + line = class_decl_match.group(4) + + # If we have not yet seen the opening brace for the innermost block, + # run checks here. + if not self.SeenOpenBrace(): + self.stack[-1].CheckBegin(filename, clean_lines, linenum, error) + + # Update access control if we are inside a class/struct + if self.stack and isinstance(self.stack[-1], _ClassInfo): + classinfo = self.stack[-1] + access_match = re.match( + r"^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?" + r":(?:[^:]|$)", + line, + ) + if access_match: + classinfo.access = access_match.group(2) + + # Check that access keywords are indented +1 space. Skip this + # check if the keywords are not preceded by whitespaces. + indent = access_match.group(1) + if len(indent) != classinfo.class_indent + 1 and re.match(r"^\s*$", indent): + if classinfo.is_struct: + parent = "struct " + classinfo.name + else: + parent = "class " + classinfo.name + slots = "" + if access_match.group(3): + slots = access_match.group(3) + error( + filename, + linenum, + "whitespace/indent", + 3, + f"{access_match.group(2)}{slots}:" + f" should be indented +1 space inside {parent}", + ) + + # Consume braces or semicolons from what's left of the line + while True: + # Match first brace, semicolon, or closed parenthesis. + matched = re.match(r"^[^{;)}]*([{;)}])(.*)$", line) + if not matched: + break + + token = matched.group(1) + if token == "{": + # If namespace or class hasn't seen a opening brace yet, mark + # namespace/class head as complete. Push a new block onto the + # stack otherwise. + if not self.SeenOpenBrace(): + self.stack[-1].seen_open_brace = True + elif re.match(r'^extern\s*"[^"]*"\s*\{', line): + self.stack.append(_ExternCInfo(linenum)) + else: + self.stack.append(_BlockInfo(linenum, True)) + if _MATCH_ASM.match(line): + self.stack[-1].inline_asm = _BLOCK_ASM + + elif token in {";", ")"}: + # If we haven't seen an opening brace yet, but we already saw + # a semicolon, this is probably a forward declaration. Pop + # the stack for these. + # + # Similarly, if we haven't seen an opening brace yet, but we + # already saw a closing parenthesis, then these are probably + # function arguments with extra "class" or "struct" keywords. + # Also pop these stack for these. + if not self.SeenOpenBrace(): + self.stack.pop() + else: # token == '}' + # Perform end of block checks and pop the stack. + if self.stack: + self.stack[-1].CheckEnd(filename, clean_lines, linenum, error) + self.stack.pop() + line = matched.group(2) + + def InnermostClass(self): + """Get class info on the top of the stack. + + Returns: + A _ClassInfo object if we are inside a class, or None otherwise. + """ + for i in range(len(self.stack), 0, -1): + classinfo = self.stack[i - 1] + if isinstance(classinfo, _ClassInfo): + return classinfo + return None - Returns: - True if top of the stack is a class/struct, False otherwise. - """ - return self.stack and isinstance(self.stack[-1], _ClassInfo) - def InAsmBlock(self): - """Check if we are currently one level inside an inline ASM block. +def CheckForNonStandardConstructs(filename, clean_lines, linenum, nesting_state, error): + r"""Logs an error if we see certain non-ANSI constructs ignored by gcc-2. - Returns: - True if the top of the stack is a block containing inline ASM. - """ - return self.stack and self.stack[-1].inline_asm != _NO_ASM + Complain about several constructs which gcc-2 accepts, but which are + not standard C++. Warning about these in lint is one way to ease the + transition to new compilers. + - put storage class first (e.g. "static const" instead of "const static"). + - "%lld" instead of %qd" in printf-type functions. + - "%1$d" is non-standard in printf-type functions. + - "\%" is an undefined character escape sequence. + - text after #endif is not allowed. + - invalid inner-style forward declaration. + - >? and ?= and ]*(.)', line[pos:]) - if not match: - linenum += 1 - pos = 0 - continue - token = match.group(1) - pos += len(match.group(0)) - - # These things do not look like template argument list: - # class Suspect { - # class Suspect x; } - if token in ('{', '}', ';'): - return False - - # These things look like template argument list: - # template - # template - # template - # template - if token in ('>', '=', '[', ']', '.'): - return True - # Check if token is an unmatched '<'. - # If not, move on to the next character. - if token != '<': - pos += 1 - if pos >= len(line): - linenum += 1 - pos = 0 - continue - - # We can't be sure if we just find a single '<', and need to - # find the matching '>'. - (_, end_line, end_pos) = CloseExpression(clean_lines, linenum, pos - 1) - if end_pos < 0: - # Not sure if template argument list or syntax error in file - return False - linenum = end_line - pos = end_pos - return False + # Remove comments from the line, but leave in strings for now. + line = clean_lines.lines[linenum] + + if re.search(r'printf\s*\(.*".*%[-+ ]?\d*q', line): + error( + filename, + linenum, + "runtime/printf_format", + 3, + "%q in format strings is deprecated. Use %ll instead.", + ) + + if re.search(r'printf\s*\(.*".*%\d+\$', line): + error( + filename, + linenum, + "runtime/printf_format", + 2, + "%N$ formats are unconventional. Try rewriting to avoid them.", + ) + + # Remove escaped backslashes before looking for undefined escapes. + line = line.replace("\\\\", "") + + if re.search(r'("|\').*\\(%|\[|\(|{)', line): + error( + filename, + linenum, + "build/printf_format", + 3, + "%, [, (, and { are undefined character escapes. Unescape them.", + ) + + # For the rest, work with both comments and strings removed. + line = clean_lines.elided[linenum] - def UpdatePreprocessor(self, line): - """Update preprocessor stack. + if re.search( + r"\b(const|volatile|void|char|short|int|long" + r"|float|double|signed|unsigned" + r"|schar|u?int8_t|u?int16_t|u?int32_t|u?int64_t)" + r"\s+(register|static|extern|typedef)\b", + line, + ): + error( + filename, + linenum, + "build/storage_class", + 5, + "Storage-class specifier (static, extern, typedef, etc) should be " + "at the beginning of the declaration.", + ) + + if re.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 re.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.", + ) + + if re.search(r"(\w+|[+-]?\d+(\.\d*)?)\s*(<|>)\?=?\s*(\w+|[+-]?\d+)(\.\d*)?", line): + error( + filename, + linenum, + "build/deprecated", + 3, + ">? and ))?' + # r'\s*const\s*' + type_name + '\s*&\s*\w+\s*;' + error( + filename, + linenum, + "runtime/member_string_references", + 2, + "const string& members are dangerous. It is much better to use " + "alternatives, such as pointers or simple constants.", + ) + + # Everything else in this function operates on class declarations. + # Return early if the top of the nesting stack is not a class, or if + # the class head is not completed yet. + classinfo = nesting_state.InnermostClass() + if not classinfo or not classinfo.seen_open_brace: + return - We need to handle preprocessors due to classes like this: - #ifdef SWIG - struct ResultDetailsPageElementExtensionPoint { - #else - struct ResultDetailsPageElementExtensionPoint : public Extension { - #endif + # The class may have been declared with namespace or classname qualifiers. + # The constructor and destructor will not have those qualifiers. + base_classname = classinfo.name.split("::")[-1] + + # Look for single-argument constructors that aren't marked explicit. + # Technically a valid construct, but against style. + explicit_constructor_match = re.match( + r"\s+(?:(?:inline|constexpr)\s+)*(explicit\s+)?" + rf"(?:(?:inline|constexpr)\s+)*{re.escape(base_classname)}\s*" + r"\(((?:[^()]|\([^()]*\))*)\)", + line, + ) - We make the following assumptions (good enough for most files): - - Preprocessor condition evaluates to true from #if up to first - #else/#elif/#endif. + if explicit_constructor_match: + is_marked_explicit = explicit_constructor_match.group(1) - - Preprocessor condition evaluates to false from #else/#elif up - to #endif. We still perform lint checks on these lines, but - these do not affect nesting stack. + if not explicit_constructor_match.group(2): + constructor_args = [] + else: + constructor_args = explicit_constructor_match.group(2).split(",") + + # collapse arguments so that commas in template parameter lists and function + # argument parameter lists don't split arguments in two + i = 0 + while i < len(constructor_args): + constructor_arg = constructor_args[i] + while constructor_arg.count("<") > constructor_arg.count(">") or constructor_arg.count( + "(" + ) > constructor_arg.count(")"): + constructor_arg += "," + constructor_args[i + 1] + del constructor_args[i + 1] + constructor_args[i] = constructor_arg + i += 1 + + variadic_args = [arg for arg in constructor_args if "&&..." in arg] + defaulted_args = [arg for arg in constructor_args if "=" in arg] + noarg_constructor = ( + not constructor_args # empty arg list + or + # 'void' arg specifier + (len(constructor_args) == 1 and constructor_args[0].strip() == "void") + ) + onearg_constructor = ( + ( + len(constructor_args) == 1 # exactly one arg + and not noarg_constructor + ) + or + # all but at most one arg defaulted + ( + len(constructor_args) >= 1 + and not noarg_constructor + and len(defaulted_args) >= len(constructor_args) - 1 + ) + or + # variadic arguments with zero or one argument + (len(constructor_args) <= 2 and len(variadic_args) >= 1) + ) + initializer_list_constructor = bool( + onearg_constructor + and re.search(r"\bstd\s*::\s*initializer_list\b", constructor_args[0]) + ) + copy_constructor = bool( + onearg_constructor + and re.match( + r"((const\s+(volatile\s+)?)?|(volatile\s+(const\s+)?))?" + rf"{re.escape(base_classname)}(\s*<[^>]*>)?(\s+const)?\s*(?:<\w+>\s*)?&", + constructor_args[0].strip(), + ) + ) + + if ( + not is_marked_explicit + and onearg_constructor + and not initializer_list_constructor + and not copy_constructor + ): + if defaulted_args or variadic_args: + error( + filename, + linenum, + "runtime/explicit", + 4, + "Constructors callable with one argument should be marked explicit.", + ) + else: + error( + filename, + linenum, + "runtime/explicit", + 4, + "Single-parameter constructors should be marked explicit.", + ) - Args: - line: current line to check. - """ - if re.match(r'^\s*#\s*(if|ifdef|ifndef)\b', line): - # Beginning of #if block, save the nesting stack here. The saved - # stack will allow us to restore the parsing state in the #else case. - self.pp_stack.append(_PreprocessorInfo(copy.deepcopy(self.stack))) - elif re.match(r'^\s*#\s*(else|elif)\b', line): - # Beginning of #else block - if self.pp_stack: - if not self.pp_stack[-1].seen_else: - # This is the first #else or #elif block. Remember the - # whole nesting stack up to this point. This is what we - # keep after the #endif. - self.pp_stack[-1].seen_else = True - self.pp_stack[-1].stack_before_else = copy.deepcopy(self.stack) - - # Restore the stack to how it was before the #if - self.stack = copy.deepcopy(self.pp_stack[-1].stack_before_if) - else: - # TODO(unknown): unexpected #else, issue warning? - pass - elif re.match(r'^\s*#\s*endif\b', line): - # End of #if or #else blocks. - if self.pp_stack: - # If we saw an #else, we will need to restore the nesting - # stack to its former state before the #else, otherwise we - # will just continue from where we left off. - if self.pp_stack[-1].seen_else: - # Here we can just use a shallow copy since we are the last - # reference to it. - self.stack = self.pp_stack[-1].stack_before_else - # Drop the corresponding #if - self.pp_stack.pop() - else: - # TODO(unknown): unexpected #endif, issue warning? - pass - # TODO(unknown): Update() is too long, but we will refactor later. - def Update(self, filename, clean_lines, linenum, error): - """Update nesting state with current line. +def CheckSpacingForFunctionCall(filename, clean_lines, linenum, error): + """Checks for the correctness of various spacing around function calls. Args: filename: The name of the current file. @@ -3206,1838 +3809,1696 @@ def Update(self, filename, clean_lines, linenum, error): """ line = clean_lines.elided[linenum] - # Remember top of the previous nesting stack. - # - # The stack is always pushed/popped and not modified in place, so - # we can just do a shallow copy instead of copy.deepcopy. Using - # deepcopy would slow down cpplint by ~28%. - if self.stack: - self.previous_stack_top = self.stack[-1] - self.previous_open_parentheses = self.stack[-1].open_parentheses - else: - self.previous_stack_top = None - - # Update pp_stack - self.UpdatePreprocessor(line) - - # Count parentheses. This is to avoid adding struct arguments to - # the nesting stack. - if self.stack: - inner_block = self.stack[-1] - depth_change = line.count('(') - line.count(')') - inner_block.open_parentheses += depth_change - - # Also check if we are starting or ending an inline assembly block. - if inner_block.inline_asm in (_NO_ASM, _END_ASM): - if (depth_change != 0 and - inner_block.open_parentheses == 1 and - _MATCH_ASM.match(line)): - # Enter assembly block - inner_block.inline_asm = _INSIDE_ASM - else: - # Not entering assembly block. If previous line was _END_ASM, - # we will now shift to _NO_ASM state. - inner_block.inline_asm = _NO_ASM - elif (inner_block.inline_asm == _INSIDE_ASM and - inner_block.open_parentheses == 0): - # Exit assembly block - inner_block.inline_asm = _END_ASM - - # Consume namespace declaration at the beginning of the line. Do - # this in a loop so that we catch same line declarations like this: - # namespace proto2 { namespace bridge { class MessageSet; } } - while True: - # Match start of namespace. The "\b\s*" below catches namespace - # declarations even if it weren't followed by a whitespace, this - # is so that we don't confuse our namespace checker. The - # missing spaces will be flagged by CheckSpacing. - namespace_decl_match = re.match(r'^\s*namespace\b\s*([:\w]+)?(.*)$', line) - if not namespace_decl_match: - break - - new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum) - self.stack.append(new_namespace) - - line = namespace_decl_match.group(2) - if line.find('{') != -1: - new_namespace.seen_open_brace = True - line = line[line.find('{') + 1:] - - # Look for a class declaration in whatever is left of the line - # after parsing namespaces. The regexp accounts for decorated classes - # such as in: - # class LOCKABLE API Object { - # }; - class_decl_match = re.match( - r'^(\s*(?:template\s*<[\w\s<>,:=]*>\s*)?' - r'(class|struct)\s+(?:[a-zA-Z0-9_]+\s+)*(\w+(?:::\w+)*))' - r'(.*)$', line) - if (class_decl_match and - (not self.stack or self.stack[-1].open_parentheses == 0)): - # We do not want to accept classes that are actually template arguments: - # template , - # template class Ignore3> - # void Function() {}; - # - # To avoid template argument cases, we scan forward and look for - # an unmatched '>'. If we see one, assume we are inside a - # template argument list. - end_declaration = len(class_decl_match.group(1)) - if not self.InTemplateArgumentList(clean_lines, linenum, end_declaration): - self.stack.append(_ClassInfo( - class_decl_match.group(3), class_decl_match.group(2), - clean_lines, linenum)) - line = class_decl_match.group(4) - - # If we have not yet seen the opening brace for the innermost block, - # run checks here. - if not self.SeenOpenBrace(): - self.stack[-1].CheckBegin(filename, clean_lines, linenum, error) - - # Update access control if we are inside a class/struct - if self.stack and isinstance(self.stack[-1], _ClassInfo): - classinfo = self.stack[-1] - access_match = re.match( - r'^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?' - r':(?:[^:]|$)', - line) - if access_match: - classinfo.access = access_match.group(2) - - # Check that access keywords are indented +1 space. Skip this - # check if the keywords are not preceded by whitespaces. - indent = access_match.group(1) - if (len(indent) != classinfo.class_indent + 1 and - re.match(r'^\s*$', indent)): - if classinfo.is_struct: - parent = 'struct ' + classinfo.name - else: - parent = 'class ' + classinfo.name - slots = '' - if access_match.group(3): - slots = access_match.group(3) - error(filename, linenum, 'whitespace/indent', 3, - f'{access_match.group(2)}{slots}:' - f' should be indented +1 space inside {parent}') - - # Consume braces or semicolons from what's left of the line - while True: - # Match first brace, semicolon, or closed parenthesis. - matched = re.match(r'^[^{;)}]*([{;)}])(.*)$', line) - if not matched: - break - - token = matched.group(1) - if token == '{': - # If namespace or class hasn't seen a opening brace yet, mark - # namespace/class head as complete. Push a new block onto the - # stack otherwise. - if not self.SeenOpenBrace(): - self.stack[-1].seen_open_brace = True - elif re.match(r'^extern\s*"[^"]*"\s*\{', line): - self.stack.append(_ExternCInfo(linenum)) - else: - self.stack.append(_BlockInfo(linenum, True)) - if _MATCH_ASM.match(line): - self.stack[-1].inline_asm = _BLOCK_ASM - - elif token in {';', ')'}: - # If we haven't seen an opening brace yet, but we already saw - # a semicolon, this is probably a forward declaration. Pop - # the stack for these. - # - # Similarly, if we haven't seen an opening brace yet, but we - # already saw a closing parenthesis, then these are probably - # function arguments with extra "class" or "struct" keywords. - # Also pop these stack for these. - if not self.SeenOpenBrace(): - self.stack.pop() - else: # token == '}' - # Perform end of block checks and pop the stack. - if self.stack: - self.stack[-1].CheckEnd(filename, clean_lines, linenum, error) - self.stack.pop() - line = matched.group(2) - - def InnermostClass(self): - """Get class info on the top of the stack. - - Returns: - A _ClassInfo object if we are inside a class, or None otherwise. - """ - for i in range(len(self.stack), 0, -1): - classinfo = self.stack[i - 1] - if isinstance(classinfo, _ClassInfo): - return classinfo - return None - -def CheckForNonStandardConstructs(filename, clean_lines, linenum, - nesting_state, error): - r"""Logs an error if we see certain non-ANSI constructs ignored by gcc-2. - - Complain about several constructs which gcc-2 accepts, but which are - not standard C++. Warning about these in lint is one way to ease the - transition to new compilers. - - put storage class first (e.g. "static const" instead of "const static"). - - "%lld" instead of %qd" in printf-type functions. - - "%1$d" is non-standard in printf-type functions. - - "\%" is an undefined character escape sequence. - - text after #endif is not allowed. - - invalid inner-style forward declaration. - - >? and ?= and )\?=?\s*(\w+|[+-]?\d+)(\.\d*)?', - line): - error(filename, linenum, 'build/deprecated', 3, - '>? and ))?' - # r'\s*const\s*' + type_name + '\s*&\s*\w+\s*;' - error(filename, linenum, 'runtime/member_string_references', 2, - 'const string& members are dangerous. It is much better to use ' - 'alternatives, such as pointers or simple constants.') - - # Everything else in this function operates on class declarations. - # Return early if the top of the nesting stack is not a class, or if - # the class head is not completed yet. - classinfo = nesting_state.InnermostClass() - if not classinfo or not classinfo.seen_open_brace: - return - - # The class may have been declared with namespace or classname qualifiers. - # The constructor and destructor will not have those qualifiers. - base_classname = classinfo.name.split('::')[-1] - - # Look for single-argument constructors that aren't marked explicit. - # Technically a valid construct, but against style. - explicit_constructor_match = re.match( - r'\s+(?:(?:inline|constexpr)\s+)*(explicit\s+)?' - rf'(?:(?:inline|constexpr)\s+)*{re.escape(base_classname)}\s*' - r'\(((?:[^()]|\([^()]*\))*)\)', line) - - if explicit_constructor_match: - is_marked_explicit = explicit_constructor_match.group(1) - - if not explicit_constructor_match.group(2): - constructor_args = [] - else: - constructor_args = explicit_constructor_match.group(2).split(',') - - # collapse arguments so that commas in template parameter lists and function - # argument parameter lists don't split arguments in two - i = 0 - while i < len(constructor_args): - constructor_arg = constructor_args[i] - while (constructor_arg.count('<') > constructor_arg.count('>') or - constructor_arg.count('(') > constructor_arg.count(')')): - constructor_arg += ',' + constructor_args[i + 1] - del constructor_args[i + 1] - constructor_args[i] = constructor_arg - i += 1 - - variadic_args = [arg for arg in constructor_args if '&&...' in arg] - defaulted_args = [arg for arg in constructor_args if '=' in arg] - noarg_constructor = (not constructor_args or # empty arg list - # 'void' arg specifier - (len(constructor_args) == 1 and - constructor_args[0].strip() == 'void')) - onearg_constructor = ((len(constructor_args) == 1 and # exactly one arg - not noarg_constructor) or - # all but at most one arg defaulted - (len(constructor_args) >= 1 and - not noarg_constructor and - len(defaulted_args) >= len(constructor_args) - 1) or - # variadic arguments with zero or one argument - (len(constructor_args) <= 2 and - len(variadic_args) >= 1)) - initializer_list_constructor = bool( - onearg_constructor and - re.search(r'\bstd\s*::\s*initializer_list\b', constructor_args[0])) - copy_constructor = bool( - onearg_constructor and - re.match(r'((const\s+(volatile\s+)?)?|(volatile\s+(const\s+)?))?' - rf'{re.escape(base_classname)}(\s*<[^>]*>)?(\s+const)?\s*(?:<\w+>\s*)?&', - constructor_args[0].strip()) - ) + # Since function calls often occur inside if/for/while/switch + # expressions - which have their own, more liberal conventions - we + # first see if we should be looking inside such an expression for a + # function call, to which we can apply more strict standards. + fncall = line # if there's no control flow construct, look at whole line + for pattern in ( + r"\bif\s*\((.*)\)\s*{", + r"\bfor\s*\((.*)\)\s*{", + r"\bwhile\s*\((.*)\)\s*[{;]", + r"\bswitch\s*\((.*)\)\s*{", + ): + match = re.search(pattern, line) + if match: + fncall = match.group(1) # look inside the parens for function calls + break - if (not is_marked_explicit and - onearg_constructor and - not initializer_list_constructor and - not copy_constructor): - if defaulted_args or variadic_args: - error(filename, linenum, 'runtime/explicit', 4, - 'Constructors callable with one argument ' - 'should be marked explicit.') - else: - error(filename, linenum, 'runtime/explicit', 4, - 'Single-parameter constructors should be marked explicit.') + # Except in if/for/while/switch, there should never be space + # immediately inside parens (eg "f( 3, 4 )"). We make an exception + # for nested parens ( (a+b) + c ). Likewise, there should never be + # a space before a ( when it's a function argument. I assume it's a + # function argument when the char before the whitespace is legal in + # a function name (alnum + _) and we're not starting a macro. Also ignore + # pointers and references to arrays and functions coz they're too tricky: + # we use a very simple way to recognize these: + # " (something)(maybe-something)" or + # " (something)(maybe-something," or + # " (something)[something]" + # Note that we assume the contents of [] to be short enough that + # they'll never need to wrap. + if ( # Ignore control structures. + not re.search(r"\b(if|elif|for|while|switch|return|new|delete|catch|sizeof)\b", fncall) + and + # Ignore pointers/references to functions. + not re.search(r" \([^)]+\)\([^)]*(\)|,$)", fncall) + and + # Ignore pointers/references to arrays. + not re.search(r" \([^)]+\)\[[^\]]+\]", fncall) + ): + if re.search(r"\w\s*\(\s(?!\s*\\$)", fncall): # a ( used for a fn call + error(filename, linenum, "whitespace/parens", 4, "Extra space after ( in function call") + elif re.search(r"\(\s+(?!(\s*\\)|\()", fncall): + error(filename, linenum, "whitespace/parens", 2, "Extra space after (") + if ( + re.search(r"\w\s+\(", fncall) + and not re.search(r"_{0,2}asm_{0,2}\s+_{0,2}volatile_{0,2}\s+\(", fncall) + and not re.search(r"#\s*define|typedef|using\s+\w+\s*=", fncall) + and not re.search(r"\w\s+\((\w+::)*\*\w+\)\(", fncall) + and not re.search(r"\bcase\s+\(", fncall) + ): + # TODO(unknown): Space after an operator function seem to be a common + # error, silence those for now by restricting them to highest verbosity. + if re.search(r"\boperator_*\b", line): + error( + filename, + linenum, + "whitespace/parens", + 0, + "Extra space before ( in function call", + ) + else: + error( + filename, + linenum, + "whitespace/parens", + 4, + "Extra space before ( in function call", + ) + # If the ) is followed only by a newline or a { + newline, assume it's + # part of a control statement (if/while/etc), and don't complain + if re.search(r"[^)]\s+\)\s*[^{\s]", fncall): + # If the closing parenthesis is preceded by only whitespaces, + # try to give a more descriptive error message. + if re.search(r"^\s+\)", fncall): + error( + filename, + linenum, + "whitespace/parens", + 2, + "Closing ) should be moved to the previous line", + ) + else: + error(filename, linenum, "whitespace/parens", 2, "Extra space before )") -def CheckSpacingForFunctionCall(filename, clean_lines, linenum, error): - """Checks for the correctness of various spacing around function calls. - - 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] - - # Since function calls often occur inside if/for/while/switch - # expressions - which have their own, more liberal conventions - we - # first see if we should be looking inside such an expression for a - # function call, to which we can apply more strict standards. - fncall = line # if there's no control flow construct, look at whole line - for pattern in (r'\bif\s*\((.*)\)\s*{', - r'\bfor\s*\((.*)\)\s*{', - r'\bwhile\s*\((.*)\)\s*[{;]', - r'\bswitch\s*\((.*)\)\s*{'): - match = re.search(pattern, line) - if match: - fncall = match.group(1) # look inside the parens for function calls - break - - # Except in if/for/while/switch, there should never be space - # immediately inside parens (eg "f( 3, 4 )"). We make an exception - # for nested parens ( (a+b) + c ). Likewise, there should never be - # a space before a ( when it's a function argument. I assume it's a - # function argument when the char before the whitespace is legal in - # a function name (alnum + _) and we're not starting a macro. Also ignore - # pointers and references to arrays and functions coz they're too tricky: - # we use a very simple way to recognize these: - # " (something)(maybe-something)" or - # " (something)(maybe-something," or - # " (something)[something]" - # Note that we assume the contents of [] to be short enough that - # they'll never need to wrap. - if ( # Ignore control structures. - not re.search(r'\b(if|elif|for|while|switch|return|new|delete|catch|sizeof)\b', - fncall) and - # Ignore pointers/references to functions. - not re.search(r' \([^)]+\)\([^)]*(\)|,$)', fncall) and - # Ignore pointers/references to arrays. - not re.search(r' \([^)]+\)\[[^\]]+\]', fncall)): - if re.search(r'\w\s*\(\s(?!\s*\\$)', fncall): # a ( used for a fn call - error(filename, linenum, 'whitespace/parens', 4, - 'Extra space after ( in function call') - elif re.search(r'\(\s+(?!(\s*\\)|\()', fncall): - error(filename, linenum, 'whitespace/parens', 2, - 'Extra space after (') - if (re.search(r'\w\s+\(', fncall) and - not re.search(r'_{0,2}asm_{0,2}\s+_{0,2}volatile_{0,2}\s+\(', fncall) and - not re.search(r'#\s*define|typedef|using\s+\w+\s*=', fncall) and - not re.search(r'\w\s+\((\w+::)*\*\w+\)\(', fncall) and - not re.search(r'\bcase\s+\(', fncall)): - # TODO(unknown): Space after an operator function seem to be a common - # error, silence those for now by restricting them to highest verbosity. - if re.search(r'\boperator_*\b', line): - error(filename, linenum, 'whitespace/parens', 0, - 'Extra space before ( in function call') - else: - error(filename, linenum, 'whitespace/parens', 4, - 'Extra space before ( in function call') - # If the ) is followed only by a newline or a { + newline, assume it's - # part of a control statement (if/while/etc), and don't complain - if re.search(r'[^)]\s+\)\s*[^{\s]', fncall): - # If the closing parenthesis is preceded by only whitespaces, - # try to give a more descriptive error message. - if re.search(r'^\s+\)', fncall): - error(filename, linenum, 'whitespace/parens', 2, - 'Closing ) should be moved to the previous line') - else: - error(filename, linenum, 'whitespace/parens', 2, - 'Extra space before )') +def IsBlankLine(line): + """Returns true if the given line is blank. + We consider a line to be blank if the line is empty or consists of + only white spaces. -def IsBlankLine(line): - """Returns true if the given line is blank. - - We consider a line to be blank if the line is empty or consists of - only white spaces. - - Args: - line: A line of a string. - - Returns: - True, if the given line is blank. - """ - return not line or line.isspace() - - -def CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line, - error): - is_namespace_indent_item = ( - len(nesting_state.stack) >= 1 and - (isinstance(nesting_state.stack[-1], _NamespaceInfo) or - (isinstance(nesting_state.previous_stack_top, _NamespaceInfo))) - ) - - if ShouldCheckNamespaceIndentation(nesting_state, is_namespace_indent_item, - clean_lines.elided, line): - CheckItemIndentationInNamespace(filename, clean_lines.elided, - line, error) - - -def CheckForFunctionLengths(filename, clean_lines, linenum, - function_state, error): - """Reports for long function bodies. - - For an overview why this is done, see: - https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Write_Short_Functions - - Uses a simplistic algorithm assuming other style guidelines - (especially spacing) are followed. - Only checks unindented functions, so class members are unchecked. - Trivial bodies are unchecked, so constructors with huge initializer lists - may be missed. - Blank/comment lines are not counted so as to avoid encouraging the removal - of vertical space and comments just to get through a lint check. - NOLINT *on the last line of a function* disables this check. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - function_state: Current function name and lines in body so far. - error: The function to call with any errors found. - """ - lines = clean_lines.lines - line = lines[linenum] - joined_line = '' - - starting_func = False - regexp = r'(\w(\w|::|\*|\&|\s)*)\(' # decls * & space::name( ... - match_result = re.match(regexp, line) - if match_result: - # If the name is all caps and underscores, figure it's a macro and - # ignore it, unless it's TEST or TEST_F. - function_name = match_result.group(1).split()[-1] - if function_name in {'TEST', 'TEST_F'} or not re.match(r'[A-Z_]+$', function_name): - starting_func = True - - if starting_func: - body_found = False - for start_linenum in range(linenum, clean_lines.NumLines()): - start_line = lines[start_linenum] - joined_line += ' ' + start_line.lstrip() - if re.search(r'(;|})', start_line): # Declarations and trivial functions - body_found = True - break # ... ignore - if re.search(r'{', start_line): - body_found = True - function = re.search(r'((\w|:)*)\(', line).group(1) - if re.match(r'TEST', function): # Handle TEST... macros - parameter_regexp = re.search(r'(\(.*\))', joined_line) - if parameter_regexp: # Ignore bad syntax - function += parameter_regexp.group(1) - else: - function += '()' - function_state.Begin(function) - break - if not body_found: - # No body for the function (or evidence of a non-function) was found. - error(filename, linenum, 'readability/fn_size', 5, - 'Lint failed to find start of function body.') - elif re.match(r'^\}\s*$', line): # function end - function_state.Check(error, filename, linenum) - function_state.End() - elif not re.match(r'^\s*$', line): - function_state.Count() # Count non-blank/non-comment lines. + Args: + line: A line of a string. + Returns: + True, if the given line is blank. + """ + return not line or line.isspace() -_RE_PATTERN_TODO = re.compile(r'^//(\s*)TODO(\(.+?\))?:?(\s|$)?') +def CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line, error): + is_namespace_indent_item = len(nesting_state.stack) >= 1 and ( + isinstance(nesting_state.stack[-1], _NamespaceInfo) + or (isinstance(nesting_state.previous_stack_top, _NamespaceInfo)) + ) -def CheckComment(line, filename, linenum, next_line_start, error): - """Checks for common mistakes in comments. - - Args: - line: The line in question. - filename: The name of the current file. - linenum: The number of the line to check. - next_line_start: The first non-whitespace column of the next line. - error: The function to call with any errors found. - """ - commentpos = line.find('//') - if commentpos != -1: - # Check if the // may be in quotes. If so, ignore it - if re.sub(r'\\.', '', line[0:commentpos]).count('"') % 2 == 0: - # Allow one space for new scopes, two spaces otherwise: - if (not (re.match(r'^.*{ *//', line) and next_line_start == commentpos) and - ((commentpos >= 1 and - line[commentpos-1] not in string.whitespace) or - (commentpos >= 2 and - line[commentpos-2] not in string.whitespace))): - error(filename, linenum, 'whitespace/comments', 2, - 'At least two spaces is best between code and comments') - - # Checks for common mistakes in TODO comments. - comment = line[commentpos:] - match = _RE_PATTERN_TODO.match(comment) - if match: - # One whitespace is correct; zero whitespace is handled elsewhere. - leading_whitespace = match.group(1) - if len(leading_whitespace) > 1: - error(filename, linenum, 'whitespace/todo', 2, - 'Too many spaces before TODO') - - username = match.group(2) - if not username: - error(filename, linenum, 'readability/todo', 2, - 'Missing username in TODO; it should look like ' - '"// TODO(my_username): Stuff."') - - middle_whitespace = match.group(3) - # Comparisons made explicit for correctness - # -- pylint: disable=g-explicit-bool-comparison - if middle_whitespace not in {' ', ''}: - error(filename, linenum, 'whitespace/todo', 2, - 'TODO(my_username) should be followed by a space') - - # If the comment contains an alphanumeric character, there - # should be a space somewhere between it and the // unless - # it's a /// or //! Doxygen comment. - if (re.match(r'//[^ ]*\w', comment) and - not re.match(r'(///|//\!)(\s+|$)', comment)): - error(filename, linenum, 'whitespace/comments', 4, - 'Should have a space between // and comment') + if ShouldCheckNamespaceIndentation( + nesting_state, is_namespace_indent_item, clean_lines.elided, line + ): + CheckItemIndentationInNamespace(filename, clean_lines.elided, line, error) -def CheckSpacing(filename, clean_lines, linenum, nesting_state, error): - """Checks for the correctness of various spacing issues in the code. - - Things we check for: spaces around operators, spaces after - if/for/while/switch, no spaces around parens in function calls, two - spaces between code and comment, don't start a block with a blank - line, don't end a function with a blank line, don't add a blank line - after public/protected/private, don't have too many blank lines in a row. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - nesting_state: A NestingState instance which maintains information about - the current stack of nested blocks being parsed. - error: The function to call with any errors found. - """ - - # Don't use "elided" lines here, otherwise we can't check commented lines. - # Don't want to use "raw" either, because we don't want to check inside C++11 - # raw strings, - raw = clean_lines.lines_without_raw_strings - line = raw[linenum] - - # Before nixing comments, check if the line is blank for no good - # reason. This includes the first line after a block is opened, and - # blank lines at the end of a function (ie, right before a line like '}' - # - # Skip all the blank line checks if we are immediately inside a - # namespace body. In other words, don't issue blank line warnings - # for this block: - # namespace { - # - # } - # - # A warning about missing end of namespace comments will be issued instead. - # - # Also skip blank line checks for 'extern "C"' blocks, which are formatted - # like namespaces. - if (IsBlankLine(line) and - not nesting_state.InNamespaceBody() and - not nesting_state.InExternC()): - elided = clean_lines.elided - prev_line = elided[linenum - 1] - prevbrace = prev_line.rfind('{') - # TODO(unknown): Don't complain if line before blank line, and line after, - # both start with alnums and are indented the same amount. - # This ignores whitespace at the start of a namespace block - # because those are not usually indented. - if prevbrace != -1 and prev_line[prevbrace:].find('}') == -1: - # OK, we have a blank line at the start of a code block. Before we - # complain, we check if it is an exception to the rule: The previous - # non-empty line has the parameters of a function header that are indented - # 4 spaces (because they did not fit in a 80 column line when placed on - # the same line as the function name). We also check for the case where - # the previous line is indented 6 spaces, which may happen when the - # initializers of a constructor do not fit into a 80 column line. - exception = False - if re.match(r' {6}\w', prev_line): # Initializer list? - # We are looking for the opening column of initializer list, which - # should be indented 4 spaces to cause 6 space indentation afterwards. - search_position = linenum-2 - while (search_position >= 0 - and re.match(r' {6}\w', elided[search_position])): - search_position -= 1 - exception = (search_position >= 0 - and elided[search_position][:5] == ' :') - else: - # Search for the function arguments or an initializer list. We use a - # simple heuristic here: If the line is indented 4 spaces; and we have a - # closing paren, without the opening paren, followed by an opening brace - # or colon (for initializer lists) we assume that it is the last line of - # a function header. If we have a colon indented 4 spaces, it is an - # initializer list. - exception = (re.match(r' {4}\w[^\(]*\)\s*(const\s*)?(\{\s*$|:)', - prev_line) - or re.match(r' {4}:', prev_line)) - - if not exception: - error(filename, linenum, 'whitespace/blank_line', 2, - 'Redundant blank line at the start of a code block ' - 'should be deleted.') - # Ignore blank lines at the end of a block in a long if-else - # chain, like this: - # if (condition1) { - # // Something followed by a blank line - # - # } else if (condition2) { - # // Something else - # } - if linenum + 1 < clean_lines.NumLines(): - next_line = raw[linenum + 1] - if (next_line - and re.match(r'\s*}', next_line) - and next_line.find('} else ') == -1): - error(filename, linenum, 'whitespace/blank_line', 3, - 'Redundant blank line at the end of a code block ' - 'should be deleted.') - - matched = re.match(r'\s*(public|protected|private):', prev_line) - if matched: - error(filename, linenum, 'whitespace/blank_line', 3, - f'Do not leave a blank line after "{matched.group(1)}:"') - - # Next, check comments - next_line_start = 0 - if linenum + 1 < clean_lines.NumLines(): - next_line = raw[linenum + 1] - next_line_start = len(next_line) - len(next_line.lstrip()) - CheckComment(line, filename, linenum, next_line_start, error) - - # get rid of comments and strings - line = clean_lines.elided[linenum] - - # You shouldn't have spaces before your brackets, except for C++11 attributes - # or maybe after 'delete []', 'return []() {};', or 'auto [abc, ...] = ...;'. - if (re.search(r'\w\s+\[(?!\[)', line) and - not re.search(r'(?:auto&?|delete|return)\s+\[', line)): - error(filename, linenum, 'whitespace/braces', 5, - 'Extra space before [') - - # In range-based for, we wanted spaces before and after the colon, but - # not around "::" tokens that might appear. - if (re.search(r'for *\(.*[^:]:[^: ]', line) or - re.search(r'for *\(.*[^: ]:[^:]', line)): - error(filename, linenum, 'whitespace/forcolon', 2, - 'Missing space around colon in range-based for loop') +def CheckForFunctionLengths(filename, clean_lines, linenum, function_state, error): + """Reports for long function bodies. + For an overview why this is done, see: + https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Write_Short_Functions -def CheckOperatorSpacing(filename, clean_lines, linenum, error): - """Checks for horizontal spacing around operators. - - 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] - - # Don't try to do spacing checks for operator methods. Do this by - # replacing the troublesome characters with something else, - # preserving column position for all other characters. - # - # The replacement is done repeatedly to avoid false positives from - # operators that call operators. - while True: - match = re.match(r'^(.*\boperator\b)(\S+)(\s*\(.*)$', line) - if match: - line = match.group(1) + ('_' * len(match.group(2))) + match.group(3) - else: - break - - # We allow no-spaces around = within an if: "if ( (a=Foo()) == 0 )". - # Otherwise not. Note we only check for non-spaces on *both* sides; - # sometimes people put non-spaces on one side when aligning ='s among - # many lines (not that this is behavior that I approve of...) - if ((re.search(r'[\w.]=', line) or - re.search(r'=[\w.]', line)) - and not re.search(r'\b(if|while|for) ', line) - # Operators taken from [lex.operators] in C++11 standard. - and not re.search(r'(>=|<=|==|!=|&=|\^=|\|=|\+=|\*=|\/=|\%=)', line) - and not re.search(r'operator=', line)): - error(filename, linenum, 'whitespace/operators', 4, - 'Missing spaces around =') - - # It's ok not to have spaces around binary operators like + - * /, but if - # there's too little whitespace, we get concerned. It's hard to tell, - # though, so we punt on this one for now. TODO. - - # You should always have whitespace around binary operators. - # - # Check <= and >= first to avoid false positives with < and >, then - # check non-include lines for spacing around < and >. - # - # If the operator is followed by a comma, assume it's be used in a - # macro context and don't do any checks. This avoids false - # positives. - # - # Note that && is not included here. This is because there are too - # many false positives due to RValue references. - match = re.search(r'[^<>=!\s](==|!=|<=|>=|\|\|)[^<>=!\s,;\)]', line) - if match: - # TODO: support alternate operators - error(filename, linenum, 'whitespace/operators', 3, - f'Missing spaces around {match.group(1)}') - elif not re.match(r'#.*include', line): - # Look for < that is not surrounded by spaces. This is only - # triggered if both sides are missing spaces, even though - # technically should should flag if at least one side is missing a - # space. This is done to avoid some false positives with shifts. - match = re.match(r'^(.*[^\s<])<[^\s=<,]', line) - if match: - (_, _, end_pos) = CloseExpression( - clean_lines, linenum, len(match.group(1))) - if end_pos <= -1: - error(filename, linenum, 'whitespace/operators', 3, - 'Missing spaces around <') - - # Look for > that is not surrounded by spaces. Similar to the - # above, we only trigger if both sides are missing spaces to avoid - # false positives with shifts. - match = re.match(r'^(.*[^-\s>])>[^\s=>,]', line) - if match: - (_, _, start_pos) = ReverseCloseExpression( - clean_lines, linenum, len(match.group(1))) - if start_pos <= -1: - error(filename, linenum, 'whitespace/operators', 3, - 'Missing spaces around >') - - # We allow no-spaces around << when used like this: 10<<20, but - # not otherwise (particularly, not when used as streams) - # - # We also allow operators following an opening parenthesis, since - # those tend to be macros that deal with operators. - match = re.search(r'(operator|[^\s(<])(?:L|UL|LL|ULL|l|ul|ll|ull)?<<([^\s,=<])', line) - if (match and not (match.group(1).isdigit() and match.group(2).isdigit()) and - not (match.group(1) == 'operator' and match.group(2) == ';')): - error(filename, linenum, 'whitespace/operators', 3, - 'Missing spaces around <<') - - # We allow no-spaces around >> for almost anything. This is because - # C++11 allows ">>" to close nested templates, which accounts for - # most cases when ">>" is not followed by a space. - # - # We still warn on ">>" followed by alpha character, because that is - # likely due to ">>" being used for right shifts, e.g.: - # value >> alpha - # - # When ">>" is used to close templates, the alphanumeric letter that - # follows would be part of an identifier, and there should still be - # a space separating the template type and the identifier. - # type> alpha - match = re.search(r'>>[a-zA-Z_]', line) - if match: - error(filename, linenum, 'whitespace/operators', 3, - 'Missing spaces around >>') - - # There shouldn't be space around unary operators - match = re.search(r'(!\s|~\s|[\s]--[\s;]|[\s]\+\+[\s;])', line) - if match: - error(filename, linenum, 'whitespace/operators', 4, - f'Extra space for operator {match.group(1)}') + Uses a simplistic algorithm assuming other style guidelines + (especially spacing) are followed. + Only checks unindented functions, so class members are unchecked. + Trivial bodies are unchecked, so constructors with huge initializer lists + may be missed. + Blank/comment lines are not counted so as to avoid encouraging the removal + of vertical space and comments just to get through a lint check. + NOLINT *on the last line of a function* disables this check. + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + function_state: Current function name and lines in body so far. + error: The function to call with any errors found. + """ + lines = clean_lines.lines + line = lines[linenum] + joined_line = "" + + starting_func = False + regexp = r"(\w(\w|::|\*|\&|\s)*)\(" # decls * & space::name( ... + match_result = re.match(regexp, line) + if match_result: + # If the name is all caps and underscores, figure it's a macro and + # ignore it, unless it's TEST or TEST_F. + function_name = match_result.group(1).split()[-1] + if function_name in {"TEST", "TEST_F"} or not re.match(r"[A-Z_]+$", function_name): + starting_func = True + + if starting_func: + body_found = False + for start_linenum in range(linenum, clean_lines.NumLines()): + start_line = lines[start_linenum] + joined_line += " " + start_line.lstrip() + if re.search(r"(;|})", start_line): # Declarations and trivial functions + body_found = True + break # ... ignore + if re.search(r"{", start_line): + body_found = True + function = re.search(r"((\w|:)*)\(", line).group(1) + if re.match(r"TEST", function): # Handle TEST... macros + parameter_regexp = re.search(r"(\(.*\))", joined_line) + if parameter_regexp: # Ignore bad syntax + function += parameter_regexp.group(1) + else: + function += "()" + function_state.Begin(function) + break + if not body_found: + # No body for the function (or evidence of a non-function) was found. + error( + filename, + linenum, + "readability/fn_size", + 5, + "Lint failed to find start of function body.", + ) + elif re.match(r"^\}\s*$", line): # function end + function_state.Check(error, filename, linenum) + function_state.End() + elif not re.match(r"^\s*$", line): + function_state.Count() # Count non-blank/non-comment lines. + + +_RE_PATTERN_TODO = re.compile(r"^//(\s*)TODO(\(.+?\))?:?(\s|$)?") -def CheckParenthesisSpacing(filename, clean_lines, linenum, error): - """Checks for horizontal spacing around parentheses. - - 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] - - # No spaces after an if, while, switch, or for - match = re.search(r' (if\(|for\(|while\(|switch\()', line) - if match: - error(filename, linenum, 'whitespace/parens', 5, - f'Missing space before ( in {match.group(1)}') - - # For if/for/while/switch, the left and right parens should be - # consistent about how many spaces are inside the parens, and - # there should either be zero or one spaces inside the parens. - # We don't want: "if ( foo)" or "if ( foo )". - # Exception: "for ( ; foo; bar)" and "for (foo; bar; )" are allowed. - match = re.search(r'\b(if|for|while|switch)\s*' - r'\(([ ]*)(.).*[^ ]+([ ]*)\)\s*{\s*$', - line) - if match: - if len(match.group(2)) != len(match.group(4)): - if not (match.group(3) == ';' and - len(match.group(2)) == 1 + len(match.group(4)) or - not match.group(2) and re.search(r'\bfor\s*\(.*; \)', line)): - error(filename, linenum, 'whitespace/parens', 5, - f'Mismatching spaces inside () in {match.group(1)}') - if len(match.group(2)) not in [0, 1]: - error(filename, linenum, 'whitespace/parens', 5, - f'Should have zero or one spaces inside ( and ) in {match.group(1)}') +def CheckComment(line, filename, linenum, next_line_start, error): + """Checks for common mistakes in comments. -def CheckCommaSpacing(filename, clean_lines, linenum, error): - """Checks for horizontal spacing near commas and semicolons. - - 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. - """ - raw = clean_lines.lines_without_raw_strings - line = clean_lines.elided[linenum] - - # You should always have a space after a comma (either as fn arg or operator) - # - # This does not apply when the non-space character following the - # comma is another comma, since the only time when that happens is - # for empty macro arguments. - # - # We run this check in two passes: first pass on elided lines to - # verify that lines contain missing whitespaces, second pass on raw - # lines to confirm that those missing whitespaces are not due to - # elided comments. - match = re.search(r',[^,\s]', re.sub(r'\b__VA_OPT__\s*\(,\)', '', - re.sub(r'\boperator\s*,\s*\(', 'F(', line))) - if (match and re.search(r',[^,\s]', raw[linenum])): - error(filename, linenum, 'whitespace/comma', 3, - 'Missing space after ,') - - # You should always have a space after a semicolon - # except for few corner cases - # TODO(unknown): clarify if 'if (1) { return 1;}' is requires one more - # space after ; - if re.search(r';[^\s};\\)/]', line): - error(filename, linenum, 'whitespace/semicolon', 3, - 'Missing space after ;') + Args: + line: The line in question. + filename: The name of the current file. + linenum: The number of the line to check. + next_line_start: The first non-whitespace column of the next line. + error: The function to call with any errors found. + """ + commentpos = line.find("//") + if commentpos != -1: + # Check if the // may be in quotes. If so, ignore it + if re.sub(r"\\.", "", line[0:commentpos]).count('"') % 2 == 0: + # Allow one space for new scopes, two spaces otherwise: + if not (re.match(r"^.*{ *//", line) and next_line_start == commentpos) and ( + (commentpos >= 1 and line[commentpos - 1] not in string.whitespace) + or (commentpos >= 2 and line[commentpos - 2] not in string.whitespace) + ): + error( + filename, + linenum, + "whitespace/comments", + 2, + "At least two spaces is best between code and comments", + ) + + # Checks for common mistakes in TODO comments. + comment = line[commentpos:] + match = _RE_PATTERN_TODO.match(comment) + if match: + # One whitespace is correct; zero whitespace is handled elsewhere. + leading_whitespace = match.group(1) + if len(leading_whitespace) > 1: + error(filename, linenum, "whitespace/todo", 2, "Too many spaces before TODO") + + username = match.group(2) + if not username: + error( + filename, + linenum, + "readability/todo", + 2, + "Missing username in TODO; it should look like " + '"// TODO(my_username): Stuff."', + ) + + middle_whitespace = match.group(3) + # Comparisons made explicit for correctness + # -- pylint: disable=g-explicit-bool-comparison + if middle_whitespace not in {" ", ""}: + error( + filename, + linenum, + "whitespace/todo", + 2, + "TODO(my_username) should be followed by a space", + ) + + # If the comment contains an alphanumeric character, there + # should be a space somewhere between it and the // unless + # it's a /// or //! Doxygen comment. + if re.match(r"//[^ ]*\w", comment) and not re.match(r"(///|//\!)(\s+|$)", comment): + error( + filename, + linenum, + "whitespace/comments", + 4, + "Should have a space between // and comment", + ) -def _IsType(clean_lines, nesting_state, expr): - """Check if expression looks like a type name, returns true if so. - - Args: - clean_lines: A CleansedLines instance containing the file. - nesting_state: A NestingState instance which maintains information about - the current stack of nested blocks being parsed. - expr: The expression to check. - Returns: - True, if token looks like a type. - """ - # Keep only the last token in the expression - last_word = re.match(r'^.*(\b\S+)$', expr) - if last_word: - token = last_word.group(1) - else: - token = expr - - # Match native types and stdint types - if _TYPES.match(token): - return True +def CheckSpacing(filename, clean_lines, linenum, nesting_state, error): + """Checks for the correctness of various spacing issues in the code. - # Try a bit harder to match templated types. Walk up the nesting - # stack until we find something that resembles a typename - # declaration for what we are looking for. - typename_pattern = (r'\b(?:typename|class|struct)\s+' + re.escape(token) + - r'\b') - block_index = len(nesting_state.stack) - 1 - while block_index >= 0: - if isinstance(nesting_state.stack[block_index], _NamespaceInfo): - return False - - # Found where the opening brace is. We want to scan from this - # line up to the beginning of the function, minus a few lines. - # template - # class C - # : public ... { // start scanning here - last_line = nesting_state.stack[block_index].starting_linenum - - next_block_start = 0 - if block_index > 0: - next_block_start = nesting_state.stack[block_index - 1].starting_linenum - first_line = last_line - while first_line >= next_block_start: - if clean_lines.elided[first_line].find('template') >= 0: - break - first_line -= 1 - if first_line < next_block_start: - # Didn't find any "template" keyword before reaching the next block, - # there are probably no template things to check for this block - block_index -= 1 - continue - - # Look for typename in the specified range - for i in range(first_line, last_line + 1, 1): - if re.search(typename_pattern, clean_lines.elided[i]): - return True - block_index -= 1 + Things we check for: spaces around operators, spaces after + if/for/while/switch, no spaces around parens in function calls, two + spaces between code and comment, don't start a block with a blank + line, don't end a function with a blank line, don't add a blank line + after public/protected/private, don't have too many blank lines in a row. - return False + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + nesting_state: A NestingState instance which maintains information about + the current stack of nested blocks being parsed. + error: The function to call with any errors found. + """ + # Don't use "elided" lines here, otherwise we can't check commented lines. + # Don't want to use "raw" either, because we don't want to check inside C++11 + # raw strings, + raw = clean_lines.lines_without_raw_strings + line = raw[linenum] -def CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error): - """Checks for horizontal spacing near commas. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - nesting_state: A NestingState instance which maintains information about - the current stack of nested blocks being parsed. - error: The function to call with any errors found. - """ - line = clean_lines.elided[linenum] - - # Except after an opening paren, or after another opening brace (in case of - # an initializer list, for instance), you should have spaces before your - # braces when they are delimiting blocks, classes, namespaces etc. - # And since you should never have braces at the beginning of a line, - # this is an easy test. Except that braces used for initialization don't - # follow the same rule; we often don't want spaces before those. - match = re.match(r'^(.*[^ ({>]){', line) - - if match: - # Try a bit harder to check for brace initialization. This - # happens in one of the following forms: - # Constructor() : initializer_list_{} { ... } - # Constructor{}.MemberFunction() - # Type variable{}; - # FunctionCall(type{}, ...); - # LastArgument(..., type{}); - # LOG(INFO) << type{} << " ..."; - # map_of_type[{...}] = ...; - # ternary = expr ? new type{} : nullptr; - # OuterTemplate{}> + # Before nixing comments, check if the line is blank for no good + # reason. This includes the first line after a block is opened, and + # blank lines at the end of a function (ie, right before a line like '}' # - # We check for the character following the closing brace, and - # silence the warning if it's one of those listed above, i.e. - # "{.;,)<>]:". + # Skip all the blank line checks if we are immediately inside a + # namespace body. In other words, don't issue blank line warnings + # for this block: + # namespace { # - # To account for nested initializer list, we allow any number of - # closing braces up to "{;,)<". We can't simply silence the - # warning on first sight of closing brace, because that would - # cause false negatives for things that are not initializer lists. - # Silence this: But not this: - # Outer{ if (...) { - # Inner{...} if (...){ // Missing space before { - # }; } + # } # - # There is a false negative with this approach if people inserted - # spurious semicolons, e.g. "if (cond){};", but we will catch the - # spurious semicolon with a separate check. - leading_text = match.group(1) - (endline, endlinenum, endpos) = CloseExpression( - clean_lines, linenum, len(match.group(1))) - trailing_text = '' - if endpos > -1: - trailing_text = endline[endpos:] - for offset in range(endlinenum + 1, - min(endlinenum + 3, clean_lines.NumLines() - 1)): - trailing_text += clean_lines.elided[offset] - # We also suppress warnings for `uint64_t{expression}` etc., as the style - # guide recommends brace initialization for integral types to avoid - # overflow/truncation. - if (not re.match(r'^[\s}]*[{.;,)<>\]:]', trailing_text) - and not _IsType(clean_lines, nesting_state, leading_text)): - error(filename, linenum, 'whitespace/braces', 5, - 'Missing space before {') - - # Make sure '} else {' has spaces. - if re.search(r'}else', line): - error(filename, linenum, 'whitespace/braces', 5, - 'Missing space before else') - - # You shouldn't have a space before a semicolon at the end of the line. - # There's a special case for "for" since the style guide allows space before - # the semicolon there. - if re.search(r':\s*;\s*$', line): - error(filename, linenum, 'whitespace/semicolon', 5, - 'Semicolon defining empty statement. Use {} instead.') - elif re.search(r'^\s*;\s*$', line): - error(filename, linenum, 'whitespace/semicolon', 5, - 'Line contains only semicolon. If this should be an empty statement, ' - 'use {} instead.') - elif (re.search(r'\s+;\s*$', line) and - not re.search(r'\bfor\b', line)): - error(filename, linenum, 'whitespace/semicolon', 5, - 'Extra space before last semicolon. If this should be an empty ' - 'statement, use {} instead.') - - -def IsDecltype(clean_lines, linenum, column): - """Check if the token ending on (linenum, column) is decltype(). - - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: the number of the line to check. - column: end column of the token to check. - Returns: - True if this token is decltype() expression, False otherwise. - """ - (text, _, start_col) = ReverseCloseExpression(clean_lines, linenum, column) - if start_col < 0: - return False - if re.search(r'\bdecltype\s*$', text[0:start_col]): - return True - return False - -def CheckSectionSpacing(filename, clean_lines, class_info, linenum, error): - """Checks for additional blank line issues related to sections. - - Currently the only thing checked here is blank line before protected/private. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - class_info: A _ClassInfo objects. - linenum: The number of the line to check. - error: The function to call with any errors found. - """ - # Skip checks if the class is small, where small means 25 lines or less. - # 25 lines seems like a good cutoff since that's the usual height of - # terminals, and any class that can't fit in one screen can't really - # be considered "small". - # - # Also skip checks if we are on the first line. This accounts for - # classes that look like - # class Foo { public: ... }; - # - # If we didn't find the end of the class, last_line would be zero, - # and the check will be skipped by the first condition. - if (class_info.last_line - class_info.starting_linenum <= 24 or - linenum <= class_info.starting_linenum): - return - - matched = re.match(r'\s*(public|protected|private):', clean_lines.lines[linenum]) - if matched: - # Issue warning if the line before public/protected/private was - # not a blank line, but don't do this if the previous line contains - # "class" or "struct". This can happen two ways: - # - We are at the beginning of the class. - # - We are forward-declaring an inner class that is semantically - # private, but needed to be public for implementation reasons. - # Also ignores cases where the previous line ends with a backslash as can be - # common when defining classes in C macros. - prev_line = clean_lines.lines[linenum - 1] - if (not IsBlankLine(prev_line) and - not re.search(r'\b(class|struct)\b', prev_line) and - not re.search(r'\\$', prev_line)): - # Try a bit harder to find the beginning of the class. This is to - # account for multi-line base-specifier lists, e.g.: - # class Derived - # : public Base { - end_class_head = class_info.starting_linenum - for i in range(class_info.starting_linenum, linenum): - if re.search(r'\{\s*$', clean_lines.lines[i]): - end_class_head = i - break - if end_class_head < linenum - 1: - error(filename, linenum, 'whitespace/blank_line', 3, - f'"{matched.group(1)}:" should be preceded by a blank line') - + # A warning about missing end of namespace comments will be issued instead. + # + # Also skip blank line checks for 'extern "C"' blocks, which are formatted + # like namespaces. + if IsBlankLine(line) and not nesting_state.InNamespaceBody() and not nesting_state.InExternC(): + elided = clean_lines.elided + prev_line = elided[linenum - 1] + prevbrace = prev_line.rfind("{") + # TODO(unknown): Don't complain if line before blank line, and line after, + # both start with alnums and are indented the same amount. + # This ignores whitespace at the start of a namespace block + # because those are not usually indented. + if prevbrace != -1 and prev_line[prevbrace:].find("}") == -1: + # OK, we have a blank line at the start of a code block. Before we + # complain, we check if it is an exception to the rule: The previous + # non-empty line has the parameters of a function header that are indented + # 4 spaces (because they did not fit in a 80 column line when placed on + # the same line as the function name). We also check for the case where + # the previous line is indented 6 spaces, which may happen when the + # initializers of a constructor do not fit into a 80 column line. + exception = False + if re.match(r" {6}\w", prev_line): # Initializer list? + # We are looking for the opening column of initializer list, which + # should be indented 4 spaces to cause 6 space indentation afterwards. + search_position = linenum - 2 + while search_position >= 0 and re.match(r" {6}\w", elided[search_position]): + search_position -= 1 + exception = search_position >= 0 and elided[search_position][:5] == " :" + else: + # Search for the function arguments or an initializer list. We use a + # simple heuristic here: If the line is indented 4 spaces; and we have a + # closing paren, without the opening paren, followed by an opening brace + # or colon (for initializer lists) we assume that it is the last line of + # a function header. If we have a colon indented 4 spaces, it is an + # initializer list. + exception = re.match( + r" {4}\w[^\(]*\)\s*(const\s*)?(\{\s*$|:)", prev_line + ) or re.match(r" {4}:", prev_line) + + if not exception: + error( + filename, + linenum, + "whitespace/blank_line", + 2, + "Redundant blank line at the start of a code block should be deleted.", + ) + # Ignore blank lines at the end of a block in a long if-else + # chain, like this: + # if (condition1) { + # // Something followed by a blank line + # + # } else if (condition2) { + # // Something else + # } + if linenum + 1 < clean_lines.NumLines(): + next_line = raw[linenum + 1] + if next_line and re.match(r"\s*}", next_line) and next_line.find("} else ") == -1: + error( + filename, + linenum, + "whitespace/blank_line", + 3, + "Redundant blank line at the end of a code block should be deleted.", + ) + + matched = re.match(r"\s*(public|protected|private):", prev_line) + if matched: + error( + filename, + linenum, + "whitespace/blank_line", + 3, + f'Do not leave a blank line after "{matched.group(1)}:"', + ) + + # Next, check comments + next_line_start = 0 + if linenum + 1 < clean_lines.NumLines(): + next_line = raw[linenum + 1] + next_line_start = len(next_line) - len(next_line.lstrip()) + CheckComment(line, filename, linenum, next_line_start, error) -def GetPreviousNonBlankLine(clean_lines, linenum): - """Return the most recent non-blank line and its line number. + # get rid of comments and strings + line = clean_lines.elided[linenum] - Args: - clean_lines: A CleansedLines instance containing the file contents. - linenum: The number of the line to check. + # You shouldn't have spaces before your brackets, except for C++11 attributes + # or maybe after 'delete []', 'return []() {};', or 'auto [abc, ...] = ...;'. + if re.search(r"\w\s+\[(?!\[)", line) and not re.search(r"(?:auto&?|delete|return)\s+\[", line): + error(filename, linenum, "whitespace/braces", 5, "Extra space before [") - Returns: - A tuple with two elements. The first element is the contents of the last - non-blank line before the current line, or the empty string if this is the - first non-blank line. The second is the line number of that line, or -1 - if this is the first non-blank line. - """ + # In range-based for, we wanted spaces before and after the colon, but + # not around "::" tokens that might appear. + if re.search(r"for *\(.*[^:]:[^: ]", line) or re.search(r"for *\(.*[^: ]:[^:]", line): + error( + filename, + linenum, + "whitespace/forcolon", + 2, + "Missing space around colon in range-based for loop", + ) - prevlinenum = linenum - 1 - while prevlinenum >= 0: - prevline = clean_lines.elided[prevlinenum] - if not IsBlankLine(prevline): # if not a blank line... - return (prevline, prevlinenum) - prevlinenum -= 1 - return ('', -1) +def CheckOperatorSpacing(filename, clean_lines, linenum, error): + """Checks for horizontal spacing around operators. -def CheckBraces(filename, clean_lines, linenum, error): - """Looks for misplaced braces (e.g. at the end of line). - - 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] # get rid of comments and strings - - if re.match(r'\s*{\s*$', line): - # We allow an open brace to start a line in the case where someone is using - # braces in a block to explicitly create a new scope, which is commonly used - # to control the lifetime of stack-allocated variables. Braces are also - # used for brace initializers inside function calls. We don't detect this - # perfectly: we just don't complain if the last non-whitespace character on - # the previous non-blank line is ',', ';', ':', '(', '{', or '}', or if the - # previous line starts a preprocessor block. We also allow a brace on the - # following line if it is part of an array initialization and would not fit - # within the 80 character limit of the preceding line. - prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0] - if (not re.search(r'[,;:}{(]\s*$', prevline) and - not re.match(r'\s*#', prevline) and - not (GetLineWidth(prevline) > _line_length - 2 and '[]' in prevline)): - error(filename, linenum, 'whitespace/braces', 4, - '{ should almost always be at the end of the previous line') - - # An else clause should be on the same line as the preceding closing brace. - if last_wrong := re.match(r'\s*else\b\s*(?:if\b|\{|$)', line): - prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0] - if re.match(r'\s*}\s*$', prevline): - error(filename, linenum, 'whitespace/newline', 4, - 'An else should appear on the same line as the preceding }') - else: - last_wrong = False - - # If braces come on one side of an else, they should be on both. - # However, we have to worry about "else if" that spans multiple lines! - if re.search(r'else if\s*\(', line): # could be multi-line if - brace_on_left = bool(re.search(r'}\s*else if\s*\(', line)) - # find the ( after the if - pos = line.find('else if') - pos = line.find('(', pos) - if pos > 0: - (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos) - brace_on_right = endline[endpos:].find('{') != -1 - if brace_on_left != brace_on_right: # must be brace after if - error(filename, linenum, 'readability/braces', 5, - 'If an else has a brace on one side, it should have it on both') - # Prevent detection if statement has { and we detected an improper newline after } - elif re.search(r'}\s*else[^{]*$', line) or (re.match(r'[^}]*else\s*{', line) and not last_wrong): - error(filename, linenum, 'readability/braces', 5, - 'If an else has a brace on one side, it should have it on both') - - # No control clauses with braces should have its contents on the same line - # Exclude } which will be covered by empty-block detect - # Exclude ; which may be used by while in a do-while - if keyword := re.search( - r'\b(else if|if|while|for|switch)' # These have parens - r'\s*\(.*\)\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\};]', line): - error(filename, linenum, 'whitespace/newline', 5, - f'Controlled statements inside brackets of {keyword.group(1)} clause' - ' should be on a separate line') - elif keyword := re.search( - r'\b(else|do|try)' # These don't have parens - r'\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\}]', line): - error(filename, linenum, 'whitespace/newline', 5, - f'Controlled statements inside brackets of {keyword.group(1)} clause' - ' should be on a separate line') - - # TODO: Err on if...else and do...while statements without braces; - # style guide has changed since the below comment was written - - # Check single-line if/else bodies. The style guide says 'curly braces are not - # required for single-line statements'. We additionally allow multi-line, - # single statements, but we reject anything with more than one semicolon in - # it. This means that the first semicolon after the if should be at the end of - # its line, and the line after that should have an indent level equal to or - # lower than the if. We also check for ambiguous if/else nesting without - # braces. - if_else_match = re.search(r'\b(if\s*(|constexpr)\s*\(|else\b)', line) - if if_else_match and not re.match(r'\s*#', line): - if_indent = GetIndentLevel(line) - endline, endlinenum, endpos = line, linenum, if_else_match.end() - if_match = re.search(r'\bif\s*(|constexpr)\s*\(', line) - if if_match: - # This could be a multiline if condition, so find the end first. - pos = if_match.end() - 1 - (endline, endlinenum, endpos) = CloseExpression(clean_lines, linenum, pos) - # Check for an opening brace, either directly after the if or on the next - # line. If found, this isn't a single-statement conditional. - if (not re.match(r'\s*(?:\[\[(?:un)?likely\]\]\s*)?{', endline[endpos:]) - and not (re.match(r'\s*$', endline[endpos:]) - and endlinenum < (len(clean_lines.elided) - 1) - and re.match(r'\s*{', clean_lines.elided[endlinenum + 1]))): - while (endlinenum < len(clean_lines.elided) - and ';' not in clean_lines.elided[endlinenum][endpos:]): - endlinenum += 1 - endpos = 0 - if endlinenum < len(clean_lines.elided): - endline = clean_lines.elided[endlinenum] - # We allow a mix of whitespace and closing braces (e.g. for one-liner - # methods) and a single \ after the semicolon (for macros) - endpos = endline.find(';') - if not re.match(r';[\s}]*(\\?)$', endline[endpos:]): - # Semicolon isn't the last character, there's something trailing. - # Output a warning if the semicolon is not contained inside - # a lambda expression. - if not re.match(r'^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}]*\}\s*\)*[;,]\s*$', - endline): - error(filename, linenum, 'readability/braces', 4, - 'If/else bodies with multiple statements require braces') - elif endlinenum < len(clean_lines.elided) - 1: - # Make sure the next line is dedented - next_line = clean_lines.elided[endlinenum + 1] - next_indent = GetIndentLevel(next_line) - # With ambiguous nested if statements, this will error out on the - # if that *doesn't* match the else, regardless of whether it's the - # inner one or outer one. - if (if_match and re.match(r'\s*else\b', next_line) - and next_indent != if_indent): - error(filename, linenum, 'readability/braces', 4, - 'Else clause should be indented at the same level as if. ' - 'Ambiguous nested if/else chains require braces.') - elif next_indent > if_indent: - error(filename, linenum, 'readability/braces', 4, - 'If/else bodies with multiple statements require braces') + 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] + # Don't try to do spacing checks for operator methods. Do this by + # replacing the troublesome characters with something else, + # preserving column position for all other characters. + # + # The replacement is done repeatedly to avoid false positives from + # operators that call operators. + while True: + match = re.match(r"^(.*\boperator\b)(\S+)(\s*\(.*)$", line) + if match: + line = match.group(1) + ("_" * len(match.group(2))) + match.group(3) + else: + break -def CheckTrailingSemicolon(filename, clean_lines, linenum, error): - """Looks for redundant trailing semicolon. - - 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] - - # Block bodies should not be followed by a semicolon. Due to C++11 - # brace initialization, there are more places where semicolons are - # required than not, so we explicitly list the allowed rules rather - # than listing the disallowed ones. These are the places where "};" - # should be replaced by just "}": - # 1. Some flavor of block following closing parenthesis: - # for (;;) {}; - # while (...) {}; - # switch (...) {}; - # Function(...) {}; - # if (...) {}; - # if (...) else if (...) {}; - # - # 2. else block: - # if (...) else {}; - # - # 3. const member function: - # Function(...) const {}; - # - # 4. Block following some statement: - # x = 42; - # {}; - # - # 5. Block at the beginning of a function: - # Function(...) { - # {}; - # } - # - # Note that naively checking for the preceding "{" will also match - # braces inside multi-dimensional arrays, but this is fine since - # that expression will not contain semicolons. - # - # 6. Block following another block: - # while (true) {} - # {}; - # - # 7. End of namespaces: - # namespace {}; - # - # These semicolons seems far more common than other kinds of - # redundant semicolons, possibly due to people converting classes - # to namespaces. For now we do not warn for this case. - # - # Try matching case 1 first. - match = re.match(r'^(.*\)\s*)\{', line) - if match: - # Matched closing parenthesis (case 1). Check the token before the - # matching opening parenthesis, and don't warn if it looks like a - # macro. This avoids these false positives: - # - macro that defines a base class - # - multi-line macro that defines a base class - # - macro that defines the whole class-head + # We allow no-spaces around = within an if: "if ( (a=Foo()) == 0 )". + # Otherwise not. Note we only check for non-spaces on *both* sides; + # sometimes people put non-spaces on one side when aligning ='s among + # many lines (not that this is behavior that I approve of...) + if ( + (re.search(r"[\w.]=", line) or re.search(r"=[\w.]", line)) + and not re.search(r"\b(if|while|for) ", line) + # Operators taken from [lex.operators] in C++11 standard. + and not re.search(r"(>=|<=|==|!=|&=|\^=|\|=|\+=|\*=|\/=|\%=)", line) + and not re.search(r"operator=", line) + ): + error(filename, linenum, "whitespace/operators", 4, "Missing spaces around =") + + # It's ok not to have spaces around binary operators like + - * /, but if + # there's too little whitespace, we get concerned. It's hard to tell, + # though, so we punt on this one for now. TODO. + + # You should always have whitespace around binary operators. # - # But we still issue warnings for macros that we know are safe to - # warn, specifically: - # - TEST, TEST_F, TEST_P, MATCHER, MATCHER_P - # - TYPED_TEST - # - INTERFACE_DEF - # - EXCLUSIVE_LOCKS_REQUIRED, SHARED_LOCKS_REQUIRED, LOCKS_EXCLUDED: + # Check <= and >= first to avoid false positives with < and >, then + # check non-include lines for spacing around < and >. # - # We implement a list of safe macros instead of a list of - # unsafe macros, even though the latter appears less frequently in - # google code and would have been easier to implement. This is because - # the downside for getting the allowed checks wrong means some extra - # semicolons, while the downside for getting disallowed checks wrong - # would result in compile errors. + # If the operator is followed by a comma, assume it's be used in a + # macro context and don't do any checks. This avoids false + # positives. # - # In addition to macros, we also don't want to warn on - # - Compound literals - # - Lambdas - # - alignas specifier with anonymous structs - # - decltype - # - concepts (requires expression) - closing_brace_pos = match.group(1).rfind(')') - opening_parenthesis = ReverseCloseExpression( - clean_lines, linenum, closing_brace_pos) - if opening_parenthesis[2] > -1: - line_prefix = opening_parenthesis[0][0:opening_parenthesis[2]] - macro = re.search(r'\b([A-Z_][A-Z0-9_]*)\s*$', line_prefix) - func = re.match(r'^(.*\])\s*$', line_prefix) - if ((macro and - macro.group(1) not in ( - 'TEST', 'TEST_F', 'MATCHER', 'MATCHER_P', 'TYPED_TEST', - 'EXCLUSIVE_LOCKS_REQUIRED', 'SHARED_LOCKS_REQUIRED', - 'LOCKS_EXCLUDED', 'INTERFACE_DEF')) or - (func and not re.search(r'\boperator\s*\[\s*\]', func.group(1))) or - re.search(r'\b(?:struct|union)\s+alignas\s*$', line_prefix) or - re.search(r'\bdecltype$', line_prefix) or - re.search(r'\brequires.*$', line_prefix) or - re.search(r'\s+=\s*$', line_prefix)): - match = None - if (match and - opening_parenthesis[1] > 1 and - re.search(r'\]\s*$', clean_lines.elided[opening_parenthesis[1] - 1])): - # Multi-line lambda-expression - match = None - - else: - # Try matching cases 2-3. - match = re.match(r'^(.*(?:else|\)\s*const)\s*)\{', line) - if not match: - # Try matching cases 4-6. These are always matched on separate lines. - # - # Note that we can't simply concatenate the previous line to the - # current line and do a single match, otherwise we may output - # duplicate warnings for the blank line case: - # if (cond) { - # // blank line - # } - prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0] - if prevline and re.search(r'[;{}]\s*$', prevline): - match = re.match(r'^(\s*)\{', line) - - # Check matching closing brace - if match: - (endline, endlinenum, endpos) = CloseExpression( - clean_lines, linenum, len(match.group(1))) - if endpos > -1 and re.match(r'^\s*;', endline[endpos:]): - # Current {} pair is eligible for semicolon check, and we have found - # the redundant semicolon, output warning here. - # - # Note: because we are scanning forward for opening braces, and - # outputting warnings for the matching closing brace, if there are - # nested blocks with trailing semicolons, we will get the error - # messages in reversed order. - - # We need to check the line forward for NOLINT - raw_lines = clean_lines.raw_lines - ParseNolintSuppressions(filename, raw_lines[endlinenum-1], endlinenum-1, - error) - ParseNolintSuppressions(filename, raw_lines[endlinenum], endlinenum, - error) - - error(filename, endlinenum, 'readability/braces', 4, - "You don't need a ; after a }") + # Note that && is not included here. This is because there are too + # many false positives due to RValue references. + match = re.search(r"[^<>=!\s](==|!=|<=|>=|\|\|)[^<>=!\s,;\)]", line) + if match: + # TODO: support alternate operators + error( + filename, linenum, "whitespace/operators", 3, f"Missing spaces around {match.group(1)}" + ) + elif not re.match(r"#.*include", line): + # Look for < that is not surrounded by spaces. This is only + # triggered if both sides are missing spaces, even though + # technically should should flag if at least one side is missing a + # space. This is done to avoid some false positives with shifts. + match = re.match(r"^(.*[^\s<])<[^\s=<,]", line) + if match: + (_, _, end_pos) = CloseExpression(clean_lines, linenum, len(match.group(1))) + if end_pos <= -1: + error(filename, linenum, "whitespace/operators", 3, "Missing spaces around <") + + # Look for > that is not surrounded by spaces. Similar to the + # above, we only trigger if both sides are missing spaces to avoid + # false positives with shifts. + match = re.match(r"^(.*[^-\s>])>[^\s=>,]", line) + if match: + (_, _, start_pos) = ReverseCloseExpression(clean_lines, linenum, len(match.group(1))) + if start_pos <= -1: + error(filename, linenum, "whitespace/operators", 3, "Missing spaces around >") + + # We allow no-spaces around << when used like this: 10<<20, but + # not otherwise (particularly, not when used as streams) + # + # We also allow operators following an opening parenthesis, since + # those tend to be macros that deal with operators. + match = re.search(r"(operator|[^\s(<])(?:L|UL|LL|ULL|l|ul|ll|ull)?<<([^\s,=<])", line) + if ( + match + and not (match.group(1).isdigit() and match.group(2).isdigit()) + and not (match.group(1) == "operator" and match.group(2) == ";") + ): + error(filename, linenum, "whitespace/operators", 3, "Missing spaces around <<") + + # We allow no-spaces around >> for almost anything. This is because + # C++11 allows ">>" to close nested templates, which accounts for + # most cases when ">>" is not followed by a space. + # + # We still warn on ">>" followed by alpha character, because that is + # likely due to ">>" being used for right shifts, e.g.: + # value >> alpha + # + # When ">>" is used to close templates, the alphanumeric letter that + # follows would be part of an identifier, and there should still be + # a space separating the template type and the identifier. + # type> alpha + match = re.search(r">>[a-zA-Z_]", line) + if match: + error(filename, linenum, "whitespace/operators", 3, "Missing spaces around >>") + # There shouldn't be space around unary operators + match = re.search(r"(!\s|~\s|[\s]--[\s;]|[\s]\+\+[\s;])", line) + if match: + error( + filename, + linenum, + "whitespace/operators", + 4, + f"Extra space for operator {match.group(1)}", + ) -def CheckEmptyBlockBody(filename, clean_lines, linenum, error): - """Look for empty loop/conditional body with only a single semicolon. - - 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. - """ - - # Search for loop keywords at the beginning of the line. Because only - # whitespaces are allowed before the keywords, this will also ignore most - # do-while-loops, since those lines should start with closing brace. - # - # We also check "if" blocks here, since an empty conditional block - # is likely an error. - line = clean_lines.elided[linenum] - matched = re.match(r'\s*(for|while|if)\s*\(', line) - if matched: - # Find the end of the conditional expression. - (end_line, end_linenum, end_pos) = CloseExpression( - clean_lines, linenum, line.find('(')) - - # Output warning if what follows the condition expression is a semicolon. - # No warning for all other cases, including whitespace or newline, since we - # have a separate check for semicolons preceded by whitespace. - if end_pos >= 0 and re.match(r';', end_line[end_pos:]): - if matched.group(1) == 'if': - error(filename, end_linenum, 'whitespace/empty_conditional_body', 5, - 'Empty conditional bodies should use {}') - else: - error(filename, end_linenum, 'whitespace/empty_loop_body', 5, - 'Empty loop bodies should use {} or continue') - - # Check for if statements that have completely empty bodies (no comments) - # and no else clauses. - if end_pos >= 0 and matched.group(1) == 'if': - # Find the position of the opening { for the if statement. - # Return without logging an error if it has no brackets. - opening_linenum = end_linenum - opening_line_fragment = end_line[end_pos:] - # Loop until EOF or find anything that's not whitespace or opening {. - while not re.search(r'^\s*\{', opening_line_fragment): - if re.search(r'^(?!\s*$)', opening_line_fragment): - # Conditional has no brackets. - return - opening_linenum += 1 - if opening_linenum == len(clean_lines.elided): - # Couldn't find conditional's opening { or any code before EOF. - return - opening_line_fragment = clean_lines.elided[opening_linenum] - # Set opening_line (opening_line_fragment may not be entire opening line). - opening_line = clean_lines.elided[opening_linenum] - - # Find the position of the closing }. - opening_pos = opening_line_fragment.find('{') - if opening_linenum == end_linenum: - # We need to make opening_pos relative to the start of the entire line. - opening_pos += end_pos - (closing_line, closing_linenum, closing_pos) = CloseExpression( - clean_lines, opening_linenum, opening_pos) - if closing_pos < 0: - return - # Now construct the body of the conditional. This consists of the portion - # of the opening line after the {, all lines until the closing line, - # and the portion of the closing line before the }. - if (clean_lines.raw_lines[opening_linenum] != - CleanseComments(clean_lines.raw_lines[opening_linenum])): - # Opening line ends with a comment, so conditional isn't empty. - return - if closing_linenum > opening_linenum: - # Opening line after the {. Ignore comments here since we checked above. - bodylist = list(opening_line[opening_pos+1:]) - # All lines until closing line, excluding closing line, with comments. - bodylist.extend(clean_lines.raw_lines[opening_linenum+1:closing_linenum]) - # Closing line before the }. Won't (and can't) have comments. - bodylist.append(clean_lines.elided[closing_linenum][:closing_pos-1]) - body = '\n'.join(bodylist) - else: - # If statement has brackets and fits on a single line. - body = opening_line[opening_pos+1:closing_pos-1] - - # Check if the body is empty - if not _EMPTY_CONDITIONAL_BODY_PATTERN.search(body): +def CheckParenthesisSpacing(filename, clean_lines, linenum, error): + """Checks for horizontal spacing around parentheses. + + 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] + + # No spaces after an if, while, switch, or for + match = re.search(r" (if\(|for\(|while\(|switch\()", line) + if match: + error( + filename, linenum, "whitespace/parens", 5, f"Missing space before ( in {match.group(1)}" + ) + + # For if/for/while/switch, the left and right parens should be + # consistent about how many spaces are inside the parens, and + # there should either be zero or one spaces inside the parens. + # We don't want: "if ( foo)" or "if ( foo )". + # Exception: "for ( ; foo; bar)" and "for (foo; bar; )" are allowed. + match = re.search( + r"\b(if|for|while|switch)\s*" + r"\(([ ]*)(.).*[^ ]+([ ]*)\)\s*{\s*$", + line, + ) + if match: + if len(match.group(2)) != len(match.group(4)): + if not ( + match.group(3) == ";" + and len(match.group(2)) == 1 + len(match.group(4)) + or not match.group(2) + and re.search(r"\bfor\s*\(.*; \)", line) + ): + error( + filename, + linenum, + "whitespace/parens", + 5, + f"Mismatching spaces inside () in {match.group(1)}", + ) + if len(match.group(2)) not in [0, 1]: + error( + filename, + linenum, + "whitespace/parens", + 5, + f"Should have zero or one spaces inside ( and ) in {match.group(1)}", + ) + + +def CheckCommaSpacing(filename, clean_lines, linenum, error): + """Checks for horizontal spacing near commas and semicolons. + + 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. + """ + raw = clean_lines.lines_without_raw_strings + line = clean_lines.elided[linenum] + + # You should always have a space after a comma (either as fn arg or operator) + # + # This does not apply when the non-space character following the + # comma is another comma, since the only time when that happens is + # for empty macro arguments. + # + # We run this check in two passes: first pass on elided lines to + # verify that lines contain missing whitespaces, second pass on raw + # lines to confirm that those missing whitespaces are not due to + # elided comments. + match = re.search( + r",[^,\s]", re.sub(r"\b__VA_OPT__\s*\(,\)", "", re.sub(r"\boperator\s*,\s*\(", "F(", line)) + ) + if match and re.search(r",[^,\s]", raw[linenum]): + error(filename, linenum, "whitespace/comma", 3, "Missing space after ,") + + # You should always have a space after a semicolon + # except for few corner cases + # TODO(unknown): clarify if 'if (1) { return 1;}' is requires one more + # space after ; + if re.search(r";[^\s};\\)/]", line): + error(filename, linenum, "whitespace/semicolon", 3, "Missing space after ;") + + +def _IsType(clean_lines, nesting_state, expr): + """Check if expression looks like a type name, returns true if so. + + Args: + clean_lines: A CleansedLines instance containing the file. + nesting_state: A NestingState instance which maintains information about + the current stack of nested blocks being parsed. + expr: The expression to check. + Returns: + True, if token looks like a type. + """ + # Keep only the last token in the expression + last_word = re.match(r"^.*(\b\S+)$", expr) + if last_word: + token = last_word.group(1) + else: + token = expr + + # Match native types and stdint types + if _TYPES.match(token): + return True + + # Try a bit harder to match templated types. Walk up the nesting + # stack until we find something that resembles a typename + # declaration for what we are looking for. + typename_pattern = r"\b(?:typename|class|struct)\s+" + re.escape(token) + r"\b" + block_index = len(nesting_state.stack) - 1 + while block_index >= 0: + if isinstance(nesting_state.stack[block_index], _NamespaceInfo): + return False + + # Found where the opening brace is. We want to scan from this + # line up to the beginning of the function, minus a few lines. + # template + # class C + # : public ... { // start scanning here + last_line = nesting_state.stack[block_index].starting_linenum + + next_block_start = 0 + if block_index > 0: + next_block_start = nesting_state.stack[block_index - 1].starting_linenum + first_line = last_line + while first_line >= next_block_start: + if clean_lines.elided[first_line].find("template") >= 0: + break + first_line -= 1 + if first_line < next_block_start: + # Didn't find any "template" keyword before reaching the next block, + # there are probably no template things to check for this block + block_index -= 1 + continue + + # Look for typename in the specified range + for i in range(first_line, last_line + 1, 1): + if re.search(typename_pattern, clean_lines.elided[i]): + return True + block_index -= 1 + + return False + + +def CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error): + """Checks for horizontal spacing near commas. + + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + nesting_state: A NestingState instance which maintains information about + the current stack of nested blocks being parsed. + error: The function to call with any errors found. + """ + line = clean_lines.elided[linenum] + + # Except after an opening paren, or after another opening brace (in case of + # an initializer list, for instance), you should have spaces before your + # braces when they are delimiting blocks, classes, namespaces etc. + # And since you should never have braces at the beginning of a line, + # this is an easy test. Except that braces used for initialization don't + # follow the same rule; we often don't want spaces before those. + match = re.match(r"^(.*[^ ({>]){", line) + + if match: + # Try a bit harder to check for brace initialization. This + # happens in one of the following forms: + # Constructor() : initializer_list_{} { ... } + # Constructor{}.MemberFunction() + # Type variable{}; + # FunctionCall(type{}, ...); + # LastArgument(..., type{}); + # LOG(INFO) << type{} << " ..."; + # map_of_type[{...}] = ...; + # ternary = expr ? new type{} : nullptr; + # OuterTemplate{}> + # + # We check for the character following the closing brace, and + # silence the warning if it's one of those listed above, i.e. + # "{.;,)<>]:". + # + # To account for nested initializer list, we allow any number of + # closing braces up to "{;,)<". We can't simply silence the + # warning on first sight of closing brace, because that would + # cause false negatives for things that are not initializer lists. + # Silence this: But not this: + # Outer{ if (...) { + # Inner{...} if (...){ // Missing space before { + # }; } + # + # There is a false negative with this approach if people inserted + # spurious semicolons, e.g. "if (cond){};", but we will catch the + # spurious semicolon with a separate check. + leading_text = match.group(1) + (endline, endlinenum, endpos) = CloseExpression(clean_lines, linenum, len(match.group(1))) + trailing_text = "" + if endpos > -1: + trailing_text = endline[endpos:] + for offset in range(endlinenum + 1, min(endlinenum + 3, clean_lines.NumLines() - 1)): + trailing_text += clean_lines.elided[offset] + # We also suppress warnings for `uint64_t{expression}` etc., as the style + # guide recommends brace initialization for integral types to avoid + # overflow/truncation. + if not re.match(r"^[\s}]*[{.;,)<>\]:]", trailing_text) and not _IsType( + clean_lines, nesting_state, leading_text + ): + error(filename, linenum, "whitespace/braces", 5, "Missing space before {") + + # Make sure '} else {' has spaces. + if re.search(r"}else", line): + error(filename, linenum, "whitespace/braces", 5, "Missing space before else") + + # You shouldn't have a space before a semicolon at the end of the line. + # There's a special case for "for" since the style guide allows space before + # the semicolon there. + if re.search(r":\s*;\s*$", line): + error( + filename, + linenum, + "whitespace/semicolon", + 5, + "Semicolon defining empty statement. Use {} instead.", + ) + elif re.search(r"^\s*;\s*$", line): + error( + filename, + linenum, + "whitespace/semicolon", + 5, + "Line contains only semicolon. If this should be an empty statement, use {} instead.", + ) + elif re.search(r"\s+;\s*$", line) and not re.search(r"\bfor\b", line): + error( + filename, + linenum, + "whitespace/semicolon", + 5, + "Extra space before last semicolon. If this should be an empty " + "statement, use {} instead.", + ) + + +def IsDecltype(clean_lines, linenum, column): + """Check if the token ending on (linenum, column) is decltype(). + + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: the number of the line to check. + column: end column of the token to check. + Returns: + True if this token is decltype() expression, False otherwise. + """ + (text, _, start_col) = ReverseCloseExpression(clean_lines, linenum, column) + if start_col < 0: + return False + if re.search(r"\bdecltype\s*$", text[0:start_col]): + return True + return False + + +def CheckSectionSpacing(filename, clean_lines, class_info, linenum, error): + """Checks for additional blank line issues related to sections. + + Currently the only thing checked here is blank line before protected/private. + + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + class_info: A _ClassInfo objects. + linenum: The number of the line to check. + error: The function to call with any errors found. + """ + # Skip checks if the class is small, where small means 25 lines or less. + # 25 lines seems like a good cutoff since that's the usual height of + # terminals, and any class that can't fit in one screen can't really + # be considered "small". + # + # Also skip checks if we are on the first line. This accounts for + # classes that look like + # class Foo { public: ... }; + # + # If we didn't find the end of the class, last_line would be zero, + # and the check will be skipped by the first condition. + if ( + class_info.last_line - class_info.starting_linenum <= 24 + or linenum <= class_info.starting_linenum + ): return - # The body is empty. Now make sure there's not an else clause. - current_linenum = closing_linenum - current_line_fragment = closing_line[closing_pos:] - # Loop until EOF or find anything that's not whitespace or else clause. - while re.search(r'^\s*$|^(?=\s*else)', current_line_fragment): - if re.search(r'^(?=\s*else)', current_line_fragment): - # Found an else clause, so don't log an error. - return - current_linenum += 1 - if current_linenum == len(clean_lines.elided): - break - current_line_fragment = clean_lines.elided[current_linenum] - - # The body is empty and there's no else clause until EOF or other code. - error(filename, end_linenum, 'whitespace/empty_if_body', 4, - ('If statement had no body and no else clause')) + + matched = re.match(r"\s*(public|protected|private):", clean_lines.lines[linenum]) + if matched: + # Issue warning if the line before public/protected/private was + # not a blank line, but don't do this if the previous line contains + # "class" or "struct". This can happen two ways: + # - We are at the beginning of the class. + # - We are forward-declaring an inner class that is semantically + # private, but needed to be public for implementation reasons. + # Also ignores cases where the previous line ends with a backslash as can be + # common when defining classes in C macros. + prev_line = clean_lines.lines[linenum - 1] + if ( + not IsBlankLine(prev_line) + and not re.search(r"\b(class|struct)\b", prev_line) + and not re.search(r"\\$", prev_line) + ): + # Try a bit harder to find the beginning of the class. This is to + # account for multi-line base-specifier lists, e.g.: + # class Derived + # : public Base { + end_class_head = class_info.starting_linenum + for i in range(class_info.starting_linenum, linenum): + if re.search(r"\{\s*$", clean_lines.lines[i]): + end_class_head = i + break + if end_class_head < linenum - 1: + error( + filename, + linenum, + "whitespace/blank_line", + 3, + f'"{matched.group(1)}:" should be preceded by a blank line', + ) + + +def GetPreviousNonBlankLine(clean_lines, linenum): + """Return the most recent non-blank line and its line number. + + Args: + clean_lines: A CleansedLines instance containing the file contents. + linenum: The number of the line to check. + + Returns: + A tuple with two elements. The first element is the contents of the last + non-blank line before the current line, or the empty string if this is the + first non-blank line. The second is the line number of that line, or -1 + if this is the first non-blank line. + """ + + prevlinenum = linenum - 1 + while prevlinenum >= 0: + prevline = clean_lines.elided[prevlinenum] + if not IsBlankLine(prevline): # if not a blank line... + return (prevline, prevlinenum) + prevlinenum -= 1 + return ("", -1) + + +def CheckBraces(filename, clean_lines, linenum, error): + """Looks for misplaced braces (e.g. at the end of line). + + 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] # get rid of comments and strings + + if re.match(r"\s*{\s*$", line): + # We allow an open brace to start a line in the case where someone is using + # braces in a block to explicitly create a new scope, which is commonly used + # to control the lifetime of stack-allocated variables. Braces are also + # used for brace initializers inside function calls. We don't detect this + # perfectly: we just don't complain if the last non-whitespace character on + # the previous non-blank line is ',', ';', ':', '(', '{', or '}', or if the + # previous line starts a preprocessor block. We also allow a brace on the + # following line if it is part of an array initialization and would not fit + # within the 80 character limit of the preceding line. + prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0] + if ( + not re.search(r"[,;:}{(]\s*$", prevline) + and not re.match(r"\s*#", prevline) + and not (GetLineWidth(prevline) > _line_length - 2 and "[]" in prevline) + ): + error( + filename, + linenum, + "whitespace/braces", + 4, + "{ should almost always be at the end of the previous line", + ) + + # An else clause should be on the same line as the preceding closing brace. + if last_wrong := re.match(r"\s*else\b\s*(?:if\b|\{|$)", line): + prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0] + if re.match(r"\s*}\s*$", prevline): + error( + filename, + linenum, + "whitespace/newline", + 4, + "An else should appear on the same line as the preceding }", + ) + else: + last_wrong = False + + # If braces come on one side of an else, they should be on both. + # However, we have to worry about "else if" that spans multiple lines! + if re.search(r"else if\s*\(", line): # could be multi-line if + brace_on_left = bool(re.search(r"}\s*else if\s*\(", line)) + # find the ( after the if + pos = line.find("else if") + pos = line.find("(", pos) + if pos > 0: + (endline, _, endpos) = CloseExpression(clean_lines, linenum, pos) + brace_on_right = endline[endpos:].find("{") != -1 + if brace_on_left != brace_on_right: # must be brace after if + error( + filename, + linenum, + "readability/braces", + 5, + "If an else has a brace on one side, it should have it on both", + ) + # Prevent detection if statement has { and we detected an improper newline after } + elif re.search(r"}\s*else[^{]*$", line) or ( + re.match(r"[^}]*else\s*{", line) and not last_wrong + ): + error( + filename, + linenum, + "readability/braces", + 5, + "If an else has a brace on one side, it should have it on both", + ) + + # No control clauses with braces should have its contents on the same line + # Exclude } which will be covered by empty-block detect + # Exclude ; which may be used by while in a do-while + if keyword := re.search( + r"\b(else if|if|while|for|switch)" # These have parens + r"\s*\(.*\)\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\};]", + line, + ): + error( + filename, + linenum, + "whitespace/newline", + 5, + f"Controlled statements inside brackets of {keyword.group(1)} clause" + " should be on a separate line", + ) + elif keyword := re.search( + r"\b(else|do|try)" # These don't have parens + r"\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\}]", + line, + ): + error( + filename, + linenum, + "whitespace/newline", + 5, + f"Controlled statements inside brackets of {keyword.group(1)} clause" + " should be on a separate line", + ) + + # TODO: Err on if...else and do...while statements without braces; + # style guide has changed since the below comment was written + + # Check single-line if/else bodies. The style guide says 'curly braces are not + # required for single-line statements'. We additionally allow multi-line, + # single statements, but we reject anything with more than one semicolon in + # it. This means that the first semicolon after the if should be at the end of + # its line, and the line after that should have an indent level equal to or + # lower than the if. We also check for ambiguous if/else nesting without + # braces. + if_else_match = re.search(r"\b(if\s*(|constexpr)\s*\(|else\b)", line) + if if_else_match and not re.match(r"\s*#", line): + if_indent = GetIndentLevel(line) + endline, endlinenum, endpos = line, linenum, if_else_match.end() + if_match = re.search(r"\bif\s*(|constexpr)\s*\(", line) + if if_match: + # This could be a multiline if condition, so find the end first. + pos = if_match.end() - 1 + (endline, endlinenum, endpos) = CloseExpression(clean_lines, linenum, pos) + # Check for an opening brace, either directly after the if or on the next + # line. If found, this isn't a single-statement conditional. + if not re.match(r"\s*(?:\[\[(?:un)?likely\]\]\s*)?{", endline[endpos:]) and not ( + re.match(r"\s*$", endline[endpos:]) + and endlinenum < (len(clean_lines.elided) - 1) + and re.match(r"\s*{", clean_lines.elided[endlinenum + 1]) + ): + while ( + endlinenum < len(clean_lines.elided) + and ";" not in clean_lines.elided[endlinenum][endpos:] + ): + endlinenum += 1 + endpos = 0 + if endlinenum < len(clean_lines.elided): + endline = clean_lines.elided[endlinenum] + # We allow a mix of whitespace and closing braces (e.g. for one-liner + # methods) and a single \ after the semicolon (for macros) + endpos = endline.find(";") + if not re.match(r";[\s}]*(\\?)$", endline[endpos:]): + # Semicolon isn't the last character, there's something trailing. + # Output a warning if the semicolon is not contained inside + # a lambda expression. + if not re.match(r"^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}]*\}\s*\)*[;,]\s*$", endline): + error( + filename, + linenum, + "readability/braces", + 4, + "If/else bodies with multiple statements require braces", + ) + elif endlinenum < len(clean_lines.elided) - 1: + # Make sure the next line is dedented + next_line = clean_lines.elided[endlinenum + 1] + next_indent = GetIndentLevel(next_line) + # With ambiguous nested if statements, this will error out on the + # if that *doesn't* match the else, regardless of whether it's the + # inner one or outer one. + if if_match and re.match(r"\s*else\b", next_line) and next_indent != if_indent: + error( + filename, + linenum, + "readability/braces", + 4, + "Else clause should be indented at the same level as if. " + "Ambiguous nested if/else chains require braces.", + ) + elif next_indent > if_indent: + error( + filename, + linenum, + "readability/braces", + 4, + "If/else bodies with multiple statements require braces", + ) + + +def CheckTrailingSemicolon(filename, clean_lines, linenum, error): + """Looks for redundant trailing semicolon. + + 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] + + # Block bodies should not be followed by a semicolon. Due to C++11 + # brace initialization, there are more places where semicolons are + # required than not, so we explicitly list the allowed rules rather + # than listing the disallowed ones. These are the places where "};" + # should be replaced by just "}": + # 1. Some flavor of block following closing parenthesis: + # for (;;) {}; + # while (...) {}; + # switch (...) {}; + # Function(...) {}; + # if (...) {}; + # if (...) else if (...) {}; + # + # 2. else block: + # if (...) else {}; + # + # 3. const member function: + # Function(...) const {}; + # + # 4. Block following some statement: + # x = 42; + # {}; + # + # 5. Block at the beginning of a function: + # Function(...) { + # {}; + # } + # + # Note that naively checking for the preceding "{" will also match + # braces inside multi-dimensional arrays, but this is fine since + # that expression will not contain semicolons. + # + # 6. Block following another block: + # while (true) {} + # {}; + # + # 7. End of namespaces: + # namespace {}; + # + # These semicolons seems far more common than other kinds of + # redundant semicolons, possibly due to people converting classes + # to namespaces. For now we do not warn for this case. + # + # Try matching case 1 first. + match = re.match(r"^(.*\)\s*)\{", line) + if match: + # Matched closing parenthesis (case 1). Check the token before the + # matching opening parenthesis, and don't warn if it looks like a + # macro. This avoids these false positives: + # - macro that defines a base class + # - multi-line macro that defines a base class + # - macro that defines the whole class-head + # + # But we still issue warnings for macros that we know are safe to + # warn, specifically: + # - TEST, TEST_F, TEST_P, MATCHER, MATCHER_P + # - TYPED_TEST + # - INTERFACE_DEF + # - EXCLUSIVE_LOCKS_REQUIRED, SHARED_LOCKS_REQUIRED, LOCKS_EXCLUDED: + # + # We implement a list of safe macros instead of a list of + # unsafe macros, even though the latter appears less frequently in + # google code and would have been easier to implement. This is because + # the downside for getting the allowed checks wrong means some extra + # semicolons, while the downside for getting disallowed checks wrong + # would result in compile errors. + # + # In addition to macros, we also don't want to warn on + # - Compound literals + # - Lambdas + # - alignas specifier with anonymous structs + # - decltype + # - concepts (requires expression) + closing_brace_pos = match.group(1).rfind(")") + opening_parenthesis = ReverseCloseExpression(clean_lines, linenum, closing_brace_pos) + if opening_parenthesis[2] > -1: + line_prefix = opening_parenthesis[0][0 : opening_parenthesis[2]] + macro = re.search(r"\b([A-Z_][A-Z0-9_]*)\s*$", line_prefix) + func = re.match(r"^(.*\])\s*$", line_prefix) + if ( + ( + macro + and macro.group(1) + not in ( + "TEST", + "TEST_F", + "MATCHER", + "MATCHER_P", + "TYPED_TEST", + "EXCLUSIVE_LOCKS_REQUIRED", + "SHARED_LOCKS_REQUIRED", + "LOCKS_EXCLUDED", + "INTERFACE_DEF", + ) + ) + or (func and not re.search(r"\boperator\s*\[\s*\]", func.group(1))) + or re.search(r"\b(?:struct|union)\s+alignas\s*$", line_prefix) + or re.search(r"\bdecltype$", line_prefix) + or re.search(r"\brequires.*$", line_prefix) + or re.search(r"\s+=\s*$", line_prefix) + ): + match = None + if ( + match + and opening_parenthesis[1] > 1 + and re.search(r"\]\s*$", clean_lines.elided[opening_parenthesis[1] - 1]) + ): + # Multi-line lambda-expression + match = None + + else: + # Try matching cases 2-3. + match = re.match(r"^(.*(?:else|\)\s*const)\s*)\{", line) + if not match: + # Try matching cases 4-6. These are always matched on separate lines. + # + # Note that we can't simply concatenate the previous line to the + # current line and do a single match, otherwise we may output + # duplicate warnings for the blank line case: + # if (cond) { + # // blank line + # } + prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0] + if prevline and re.search(r"[;{}]\s*$", prevline): + match = re.match(r"^(\s*)\{", line) + + # Check matching closing brace + if match: + (endline, endlinenum, endpos) = CloseExpression(clean_lines, linenum, len(match.group(1))) + if endpos > -1 and re.match(r"^\s*;", endline[endpos:]): + # Current {} pair is eligible for semicolon check, and we have found + # the redundant semicolon, output warning here. + # + # Note: because we are scanning forward for opening braces, and + # outputting warnings for the matching closing brace, if there are + # nested blocks with trailing semicolons, we will get the error + # messages in reversed order. + + # We need to check the line forward for NOLINT + raw_lines = clean_lines.raw_lines + ParseNolintSuppressions(filename, raw_lines[endlinenum - 1], endlinenum - 1, error) + ParseNolintSuppressions(filename, raw_lines[endlinenum], endlinenum, error) + + error(filename, endlinenum, "readability/braces", 4, "You don't need a ; after a }") + + +def CheckEmptyBlockBody(filename, clean_lines, linenum, error): + """Look for empty loop/conditional body with only a single semicolon. + + 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. + """ + + # Search for loop keywords at the beginning of the line. Because only + # whitespaces are allowed before the keywords, this will also ignore most + # do-while-loops, since those lines should start with closing brace. + # + # We also check "if" blocks here, since an empty conditional block + # is likely an error. + line = clean_lines.elided[linenum] + matched = re.match(r"\s*(for|while|if)\s*\(", line) + if matched: + # Find the end of the conditional expression. + (end_line, end_linenum, end_pos) = CloseExpression(clean_lines, linenum, line.find("(")) + + # Output warning if what follows the condition expression is a semicolon. + # No warning for all other cases, including whitespace or newline, since we + # have a separate check for semicolons preceded by whitespace. + if end_pos >= 0 and re.match(r";", end_line[end_pos:]): + if matched.group(1) == "if": + error( + filename, + end_linenum, + "whitespace/empty_conditional_body", + 5, + "Empty conditional bodies should use {}", + ) + else: + error( + filename, + end_linenum, + "whitespace/empty_loop_body", + 5, + "Empty loop bodies should use {} or continue", + ) + + # Check for if statements that have completely empty bodies (no comments) + # and no else clauses. + if end_pos >= 0 and matched.group(1) == "if": + # Find the position of the opening { for the if statement. + # Return without logging an error if it has no brackets. + opening_linenum = end_linenum + opening_line_fragment = end_line[end_pos:] + # Loop until EOF or find anything that's not whitespace or opening {. + while not re.search(r"^\s*\{", opening_line_fragment): + if re.search(r"^(?!\s*$)", opening_line_fragment): + # Conditional has no brackets. + return + opening_linenum += 1 + if opening_linenum == len(clean_lines.elided): + # Couldn't find conditional's opening { or any code before EOF. + return + opening_line_fragment = clean_lines.elided[opening_linenum] + # Set opening_line (opening_line_fragment may not be entire opening line). + opening_line = clean_lines.elided[opening_linenum] + + # Find the position of the closing }. + opening_pos = opening_line_fragment.find("{") + if opening_linenum == end_linenum: + # We need to make opening_pos relative to the start of the entire line. + opening_pos += end_pos + (closing_line, closing_linenum, closing_pos) = CloseExpression( + clean_lines, opening_linenum, opening_pos + ) + if closing_pos < 0: + return + + # Now construct the body of the conditional. This consists of the portion + # of the opening line after the {, all lines until the closing line, + # and the portion of the closing line before the }. + if clean_lines.raw_lines[opening_linenum] != CleanseComments( + clean_lines.raw_lines[opening_linenum] + ): + # Opening line ends with a comment, so conditional isn't empty. + return + if closing_linenum > opening_linenum: + # Opening line after the {. Ignore comments here since we checked above. + bodylist = list(opening_line[opening_pos + 1 :]) + # All lines until closing line, excluding closing line, with comments. + bodylist.extend(clean_lines.raw_lines[opening_linenum + 1 : closing_linenum]) + # Closing line before the }. Won't (and can't) have comments. + bodylist.append(clean_lines.elided[closing_linenum][: closing_pos - 1]) + body = "\n".join(bodylist) + else: + # If statement has brackets and fits on a single line. + body = opening_line[opening_pos + 1 : closing_pos - 1] + + # Check if the body is empty + if not _EMPTY_CONDITIONAL_BODY_PATTERN.search(body): + return + # The body is empty. Now make sure there's not an else clause. + current_linenum = closing_linenum + current_line_fragment = closing_line[closing_pos:] + # Loop until EOF or find anything that's not whitespace or else clause. + while re.search(r"^\s*$|^(?=\s*else)", current_line_fragment): + if re.search(r"^(?=\s*else)", current_line_fragment): + # Found an else clause, so don't log an error. + return + current_linenum += 1 + if current_linenum == len(clean_lines.elided): + break + current_line_fragment = clean_lines.elided[current_linenum] + + # The body is empty and there's no else clause until EOF or other code. + error( + filename, + end_linenum, + "whitespace/empty_if_body", + 4, + ("If statement had no body and no else clause"), + ) def FindCheckMacro(line): - """Find a replaceable CHECK-like macro. - - Args: - line: line to search on. - Returns: - (macro name, start position), or (None, -1) if no replaceable - macro is found. - """ - for macro in _CHECK_MACROS: - i = line.find(macro) - if i >= 0: - # Find opening parenthesis. Do a regular expression match here - # to make sure that we are matching the expected CHECK macro, as - # opposed to some other macro that happens to contain the CHECK - # substring. - matched = re.match(r'^(.*\b' + macro + r'\s*)\(', line) - if not matched: - continue - return (macro, len(matched.group(1))) - return (None, -1) + """Find a replaceable CHECK-like macro. + + Args: + line: line to search on. + Returns: + (macro name, start position), or (None, -1) if no replaceable + macro is found. + """ + for macro in _CHECK_MACROS: + i = line.find(macro) + if i >= 0: + # Find opening parenthesis. Do a regular expression match here + # to make sure that we are matching the expected CHECK macro, as + # opposed to some other macro that happens to contain the CHECK + # substring. + matched = re.match(r"^(.*\b" + macro + r"\s*)\(", line) + if not matched: + continue + return (macro, len(matched.group(1))) + return (None, -1) def CheckCheck(filename, clean_lines, linenum, error): - """Checks the use of CHECK and EXPECT macros. - - 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. - """ - - # Decide the set of replacement macros that should be suggested - lines = clean_lines.elided - (check_macro, start_pos) = FindCheckMacro(lines[linenum]) - if not check_macro: - return - - # Find end of the boolean expression by matching parentheses - (last_line, end_line, end_pos) = CloseExpression( - clean_lines, linenum, start_pos) - if end_pos < 0: - return - - # If the check macro is followed by something other than a - # semicolon, assume users will log their own custom error messages - # and don't suggest any replacements. - if not re.match(r'\s*;', last_line[end_pos:]): - return - - if linenum == end_line: - expression = lines[linenum][start_pos + 1:end_pos - 1] - else: - expression = lines[linenum][start_pos + 1:] - for i in range(linenum + 1, end_line): - expression += lines[i] - expression += last_line[0:end_pos - 1] - - # Parse expression so that we can take parentheses into account. - # This avoids false positives for inputs like "CHECK((a < 4) == b)", - # which is not replaceable by CHECK_LE. - lhs = '' - rhs = '' - operator = None - while expression: - matched = re.match(r'^\s*(<<|<<=|>>|>>=|->\*|->|&&|\|\||' - r'==|!=|>=|>|<=|<|\()(.*)$', expression) - if matched: - token = matched.group(1) - if token == '(': - # Parenthesized operand - expression = matched.group(2) - (end, _) = FindEndOfExpressionInLine(expression, 0, ['(']) - if end < 0: - return # Unmatched parenthesis - lhs += '(' + expression[0:end] - expression = expression[end:] - elif token in ('&&', '||'): - # Logical and/or operators. This means the expression - # contains more than one term, for example: - # CHECK(42 < a && a < b); - # - # These are not replaceable with CHECK_LE, so bail out early. + """Checks the use of CHECK and EXPECT macros. + + 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. + """ + + # Decide the set of replacement macros that should be suggested + lines = clean_lines.elided + (check_macro, start_pos) = FindCheckMacro(lines[linenum]) + if not check_macro: + return + + # Find end of the boolean expression by matching parentheses + (last_line, end_line, end_pos) = CloseExpression(clean_lines, linenum, start_pos) + if end_pos < 0: + return + + # If the check macro is followed by something other than a + # semicolon, assume users will log their own custom error messages + # and don't suggest any replacements. + if not re.match(r"\s*;", last_line[end_pos:]): return - elif token in ('<<', '<<=', '>>', '>>=', '->*', '->'): - # Non-relational operator - lhs += token - expression = matched.group(2) - else: - # Relational operator - operator = token - rhs = matched.group(2) - break + + if linenum == end_line: + expression = lines[linenum][start_pos + 1 : end_pos - 1] else: - # Unparenthesized operand. Instead of appending to lhs one character - # at a time, we do another regular expression match to consume several - # characters at once if possible. Trivial benchmark shows that this - # is more efficient when the operands are longer than a single - # character, which is generally the case. - matched = re.match(r'^([^-=!<>()&|]+)(.*)$', expression) - if not matched: - matched = re.match(r'^(\s*\S)(.*)$', expression) - if not matched: - break - lhs += matched.group(1) - expression = matched.group(2) - - # Only apply checks if we got all parts of the boolean expression - if not (lhs and operator and rhs): - return - - # Check that rhs do not contain logical operators. We already know - # that lhs is fine since the loop above parses out && and ||. - if rhs.find('&&') > -1 or rhs.find('||') > -1: - return - - # At least one of the operands must be a constant literal. This is - # to avoid suggesting replacements for unprintable things like - # CHECK(variable != iterator) - # - # The following pattern matches decimal, hex integers, strings, and - # characters (in that order). - lhs = lhs.strip() - rhs = rhs.strip() - match_constant = r'^([-+]?(\d+|0[xX][0-9a-fA-F]+)[lLuU]{0,3}|".*"|\'.*\')$' - if re.match(match_constant, lhs) or re.match(match_constant, rhs): - # Note: since we know both lhs and rhs, we can provide a more - # descriptive error message like: - # Consider using CHECK_EQ(x, 42) instead of CHECK(x == 42) - # Instead of: - # Consider using CHECK_EQ instead of CHECK(a == b) + expression = lines[linenum][start_pos + 1 :] + for i in range(linenum + 1, end_line): + expression += lines[i] + expression += last_line[0 : end_pos - 1] + + # Parse expression so that we can take parentheses into account. + # This avoids false positives for inputs like "CHECK((a < 4) == b)", + # which is not replaceable by CHECK_LE. + lhs = "" + rhs = "" + operator = None + while expression: + matched = re.match( + r"^\s*(<<|<<=|>>|>>=|->\*|->|&&|\|\||" + r"==|!=|>=|>|<=|<|\()(.*)$", + expression, + ) + if matched: + token = matched.group(1) + if token == "(": + # Parenthesized operand + expression = matched.group(2) + (end, _) = FindEndOfExpressionInLine(expression, 0, ["("]) + if end < 0: + return # Unmatched parenthesis + lhs += "(" + expression[0:end] + expression = expression[end:] + elif token in ("&&", "||"): + # Logical and/or operators. This means the expression + # contains more than one term, for example: + # CHECK(42 < a && a < b); + # + # These are not replaceable with CHECK_LE, so bail out early. + return + elif token in ("<<", "<<=", ">>", ">>=", "->*", "->"): + # Non-relational operator + lhs += token + expression = matched.group(2) + else: + # Relational operator + operator = token + rhs = matched.group(2) + break + else: + # Unparenthesized operand. Instead of appending to lhs one character + # at a time, we do another regular expression match to consume several + # characters at once if possible. Trivial benchmark shows that this + # is more efficient when the operands are longer than a single + # character, which is generally the case. + matched = re.match(r"^([^-=!<>()&|]+)(.*)$", expression) + if not matched: + matched = re.match(r"^(\s*\S)(.*)$", expression) + if not matched: + break + lhs += matched.group(1) + expression = matched.group(2) + + # Only apply checks if we got all parts of the boolean expression + if not (lhs and operator and rhs): + return + + # Check that rhs do not contain logical operators. We already know + # that lhs is fine since the loop above parses out && and ||. + if rhs.find("&&") > -1 or rhs.find("||") > -1: + return + + # At least one of the operands must be a constant literal. This is + # to avoid suggesting replacements for unprintable things like + # CHECK(variable != iterator) # - # We are still keeping the less descriptive message because if lhs - # or rhs gets long, the error message might become unreadable. - error(filename, linenum, 'readability/check', 2, - f'Consider using {_CHECK_REPLACEMENT[check_macro][operator]}' - f' instead of {check_macro}(a {operator} b)') + # The following pattern matches decimal, hex integers, strings, and + # characters (in that order). + lhs = lhs.strip() + rhs = rhs.strip() + match_constant = r'^([-+]?(\d+|0[xX][0-9a-fA-F]+)[lLuU]{0,3}|".*"|\'.*\')$' + if re.match(match_constant, lhs) or re.match(match_constant, rhs): + # Note: since we know both lhs and rhs, we can provide a more + # descriptive error message like: + # Consider using CHECK_EQ(x, 42) instead of CHECK(x == 42) + # Instead of: + # Consider using CHECK_EQ instead of CHECK(a == b) + # + # We are still keeping the less descriptive message because if lhs + # or rhs gets long, the error message might become unreadable. + error( + filename, + linenum, + "readability/check", + 2, + f"Consider using {_CHECK_REPLACEMENT[check_macro][operator]}" + f" instead of {check_macro}(a {operator} b)", + ) def CheckAltTokens(filename, clean_lines, linenum, error): - """Check alternative keywords being used in boolean expressions. - - 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 - if re.match(r'^\s*#', line): - return - - # Last ditch effort to avoid multi-line comments. This will not help - # if the comment started before the current line or ended after the - # current line, but it catches most of the false positives. At least, - # it provides a way to workaround this warning for people who use - # multi-line comments in preprocessor macros. - # - # TODO(unknown): remove this once cpplint has better support for - # multi-line comments. - if line.find('/*') >= 0 or line.find('*/') >= 0: - return - - for match in _ALT_TOKEN_REPLACEMENT_PATTERN.finditer(line): - error(filename, linenum, 'readability/alt_tokens', 2, - f'Use operator {_ALT_TOKEN_REPLACEMENT[match.group(2)]}' - f' instead of {match.group(2)}') + """Check alternative keywords being used in boolean expressions. + + 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 + if re.match(r"^\s*#", line): + return + + # Last ditch effort to avoid multi-line comments. This will not help + # if the comment started before the current line or ended after the + # current line, but it catches most of the false positives. At least, + # it provides a way to workaround this warning for people who use + # multi-line comments in preprocessor macros. + # + # TODO(unknown): remove this once cpplint has better support for + # multi-line comments. + if line.find("/*") >= 0 or line.find("*/") >= 0: + return + + for match in _ALT_TOKEN_REPLACEMENT_PATTERN.finditer(line): + error( + filename, + linenum, + "readability/alt_tokens", + 2, + f"Use operator {_ALT_TOKEN_REPLACEMENT[match.group(2)]} instead of {match.group(2)}", + ) def GetLineWidth(line): - """Determines the width of the line in column positions. - - Args: - line: A string, which may be a Unicode string. - - Returns: - The width of the line in column positions, accounting for Unicode - combining characters and wide characters. - """ - if isinstance(line, str): - width = 0 - for uc in unicodedata.normalize('NFC', line): - if unicodedata.east_asian_width(uc) in ('W', 'F'): - width += 2 - elif not unicodedata.combining(uc): - # Issue 337 - # https://mail.python.org/pipermail/python-list/2012-August/628809.html - if (sys.version_info.major, sys.version_info.minor) <= (3, 2): - # https://github.com/python/cpython/blob/2.7/Include/unicodeobject.h#L81 - is_wide_build = sysconfig.get_config_var("Py_UNICODE_SIZE") >= 4 - # https://github.com/python/cpython/blob/2.7/Objects/unicodeobject.c#L564 - is_low_surrogate = 0xDC00 <= ord(uc) <= 0xDFFF - if not is_wide_build and is_low_surrogate: - width -= 1 - - width += 1 - return width - return len(line) - - -def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, - error, cppvar=None): - """Checks rules from the 'C++ style rules' section of cppguide.html. - - Most of these rules are hard to test (naming, comment style), but we - do what we can. In particular we check for 2-space indents, line lengths, - tab usage, spaces inside code, etc. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - file_extension: The extension (without the dot) of the filename. - nesting_state: A NestingState instance which maintains information about - the current stack of nested blocks being parsed. - error: The function to call with any errors found. - cppvar: The header guard variable returned by GetHeaderGuardCPPVar. - """ - - # Don't use "elided" lines here, otherwise we can't check commented lines. - # Don't want to use "raw" either, because we don't want to check inside C++11 - # raw strings, - raw_lines = clean_lines.lines_without_raw_strings - line = raw_lines[linenum] - prev = raw_lines[linenum - 1] if linenum > 0 else '' - - if line.find('\t') != -1: - error(filename, linenum, 'whitespace/tab', 1, - 'Tab found; better to use spaces') - - # One or three blank spaces at the beginning of the line is weird; it's - # hard to reconcile that with 2-space indents. - # NOTE: here are the conditions rob pike used for his tests. Mine aren't - # as sophisticated, but it may be worth becoming so: RLENGTH==initial_spaces - # if(RLENGTH > 20) complain = 0; - # if(match($0, " +(error|private|public|protected):")) complain = 0; - # if(match(prev, "&& *$")) complain = 0; - # if(match(prev, "\\|\\| *$")) complain = 0; - # if(match(prev, "[\",=><] *$")) complain = 0; - # if(match($0, " <<")) complain = 0; - # if(match(prev, " +for \\(")) complain = 0; - # if(prevodd && match(prevprev, " +for \\(")) complain = 0; - scope_or_label_pattern = r'\s*(?:public|private|protected|signals)(?:\s+(?:slots\s*)?)?:\s*\\?$' - classinfo = nesting_state.InnermostClass() - initial_spaces = 0 - cleansed_line = clean_lines.elided[linenum] - while initial_spaces < len(line) and line[initial_spaces] == ' ': - initial_spaces += 1 - # There are certain situations we allow one space, notably for - # section labels, and also lines containing multi-line raw strings. - # We also don't check for lines that look like continuation lines - # (of lines ending in double quotes, commas, equals, or angle brackets) - # because the rules for how to indent those are non-trivial. - if (not re.search(r'[",=><] *$', prev) and - (initial_spaces in {1, 3}) and - not re.match(scope_or_label_pattern, cleansed_line) and - not (clean_lines.raw_lines[linenum] != line and - re.match(r'^\s*""', line))): - error(filename, linenum, 'whitespace/indent', 3, - 'Weird number of spaces at line-start. ' - 'Are you using a 2-space indent?') - - if line and line[-1].isspace(): - error(filename, linenum, 'whitespace/end_of_line', 4, - 'Line ends in whitespace. Consider deleting these extra spaces.') - - # Check if the line is a header guard. - is_header_guard = False - if IsHeaderExtension(file_extension): - if line.startswith((f'#ifndef {cppvar}', f'#define {cppvar}', f'#endif // {cppvar}')): - is_header_guard = True - # #include lines and header guards can be long, since there's no clean way to - # split them. - # - # URLs can be long too. It's possible to split these, but it makes them - # harder to cut&paste. - # - # The "$Id:...$" comment may also get very long without it being the - # developers fault. - # - # Doxygen documentation copying can get pretty long when using an overloaded - # function declaration - if (not line.startswith('#include') and not is_header_guard and - not re.match(r'^\s*//.*http(s?)://\S*$', line) and - not re.match(r'^\s*//\s*[^\s]*$', line) and - not re.match(r'^// \$Id:.*#[0-9]+ \$$', line) and - not re.match(r'^\s*/// [@\\](copydoc|copydetails|copybrief) .*$', line)): - line_width = GetLineWidth(line) - if line_width > _line_length: - error(filename, linenum, 'whitespace/line_length', 2, - f'Lines should be <= {_line_length} characters long') - - if (cleansed_line.count(';') > 1 and - # allow simple single line lambdas - not re.match(r'^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}\n\r]*\}', - line) and - # for loops are allowed two ;'s (and may run over two lines). - cleansed_line.find('for') == -1 and - (GetPreviousNonBlankLine(clean_lines, linenum)[0].find('for') == -1 or - GetPreviousNonBlankLine(clean_lines, linenum)[0].find(';') != -1) and - # It's ok to have many commands in a switch case that fits in 1 line - not ((cleansed_line.find('case ') != -1 or - cleansed_line.find('default:') != -1) and - cleansed_line.find('break;') != -1)): - error(filename, linenum, 'whitespace/newline', 0, - 'More than one command on the same line') - - # Some more style checks - CheckBraces(filename, clean_lines, linenum, error) - CheckTrailingSemicolon(filename, clean_lines, linenum, error) - CheckEmptyBlockBody(filename, clean_lines, linenum, error) - CheckSpacing(filename, clean_lines, linenum, nesting_state, error) - CheckOperatorSpacing(filename, clean_lines, linenum, error) - CheckParenthesisSpacing(filename, clean_lines, linenum, error) - CheckCommaSpacing(filename, clean_lines, linenum, error) - CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error) - CheckSpacingForFunctionCall(filename, clean_lines, linenum, error) - CheckCheck(filename, clean_lines, linenum, error) - CheckAltTokens(filename, clean_lines, linenum, error) - classinfo = nesting_state.InnermostClass() - if classinfo: - CheckSectionSpacing(filename, clean_lines, classinfo, linenum, error) + """Determines the width of the line in column positions. + + Args: + line: A string, which may be a Unicode string. + + Returns: + The width of the line in column positions, accounting for Unicode + combining characters and wide characters. + """ + if isinstance(line, str): + width = 0 + for uc in unicodedata.normalize("NFC", line): + if unicodedata.east_asian_width(uc) in ("W", "F"): + width += 2 + elif not unicodedata.combining(uc): + # Issue 337 + # https://mail.python.org/pipermail/python-list/2012-August/628809.html + if (sys.version_info.major, sys.version_info.minor) <= (3, 2): + # https://github.com/python/cpython/blob/2.7/Include/unicodeobject.h#L81 + is_wide_build = sysconfig.get_config_var("Py_UNICODE_SIZE") >= 4 + # https://github.com/python/cpython/blob/2.7/Objects/unicodeobject.c#L564 + is_low_surrogate = 0xDC00 <= ord(uc) <= 0xDFFF + if not is_wide_build and is_low_surrogate: + width -= 1 + + width += 1 + return width + return len(line) + + +def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, error, cppvar=None): + """Checks rules from the 'C++ style rules' section of cppguide.html. + + Most of these rules are hard to test (naming, comment style), but we + do what we can. In particular we check for 2-space indents, line lengths, + tab usage, spaces inside code, etc. + + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + file_extension: The extension (without the dot) of the filename. + nesting_state: A NestingState instance which maintains information about + the current stack of nested blocks being parsed. + error: The function to call with any errors found. + cppvar: The header guard variable returned by GetHeaderGuardCPPVar. + """ + + # Don't use "elided" lines here, otherwise we can't check commented lines. + # Don't want to use "raw" either, because we don't want to check inside C++11 + # raw strings, + raw_lines = clean_lines.lines_without_raw_strings + line = raw_lines[linenum] + prev = raw_lines[linenum - 1] if linenum > 0 else "" + + if line.find("\t") != -1: + error(filename, linenum, "whitespace/tab", 1, "Tab found; better to use spaces") + + # One or three blank spaces at the beginning of the line is weird; it's + # hard to reconcile that with 2-space indents. + # NOTE: here are the conditions rob pike used for his tests. Mine aren't + # as sophisticated, but it may be worth becoming so: RLENGTH==initial_spaces + # if(RLENGTH > 20) complain = 0; + # if(match($0, " +(error|private|public|protected):")) complain = 0; + # if(match(prev, "&& *$")) complain = 0; + # if(match(prev, "\\|\\| *$")) complain = 0; + # if(match(prev, "[\",=><] *$")) complain = 0; + # if(match($0, " <<")) complain = 0; + # if(match(prev, " +for \\(")) complain = 0; + # if(prevodd && match(prevprev, " +for \\(")) complain = 0; + scope_or_label_pattern = r"\s*(?:public|private|protected|signals)(?:\s+(?:slots\s*)?)?:\s*\\?$" + classinfo = nesting_state.InnermostClass() + initial_spaces = 0 + cleansed_line = clean_lines.elided[linenum] + while initial_spaces < len(line) and line[initial_spaces] == " ": + initial_spaces += 1 + # There are certain situations we allow one space, notably for + # section labels, and also lines containing multi-line raw strings. + # We also don't check for lines that look like continuation lines + # (of lines ending in double quotes, commas, equals, or angle brackets) + # because the rules for how to indent those are non-trivial. + if ( + not re.search(r'[",=><] *$', prev) + and (initial_spaces in {1, 3}) + and not re.match(scope_or_label_pattern, cleansed_line) + and not (clean_lines.raw_lines[linenum] != line and re.match(r'^\s*""', line)) + ): + error( + filename, + linenum, + "whitespace/indent", + 3, + "Weird number of spaces at line-start. Are you using a 2-space indent?", + ) + + if line and line[-1].isspace(): + error( + filename, + linenum, + "whitespace/end_of_line", + 4, + "Line ends in whitespace. Consider deleting these extra spaces.", + ) + + # Check if the line is a header guard. + is_header_guard = False + if IsHeaderExtension(file_extension): + if line.startswith((f"#ifndef {cppvar}", f"#define {cppvar}", f"#endif // {cppvar}")): + is_header_guard = True + # #include lines and header guards can be long, since there's no clean way to + # split them. + # + # URLs can be long too. It's possible to split these, but it makes them + # harder to cut&paste. + # + # The "$Id:...$" comment may also get very long without it being the + # developers fault. + # + # Doxygen documentation copying can get pretty long when using an overloaded + # function declaration + if ( + not line.startswith("#include") + and not is_header_guard + and not re.match(r"^\s*//.*http(s?)://\S*$", line) + and not re.match(r"^\s*//\s*[^\s]*$", line) + and not re.match(r"^// \$Id:.*#[0-9]+ \$$", line) + and not re.match(r"^\s*/// [@\\](copydoc|copydetails|copybrief) .*$", line) + ): + line_width = GetLineWidth(line) + if line_width > _line_length: + error( + filename, + linenum, + "whitespace/line_length", + 2, + f"Lines should be <= {_line_length} characters long", + ) + + if ( + cleansed_line.count(";") > 1 + and + # allow simple single line lambdas + not re.match(r"^[^{};]*\[[^\[\]]*\][^{}]*\{[^{}\n\r]*\}", line) + and + # for loops are allowed two ;'s (and may run over two lines). + cleansed_line.find("for") == -1 + and ( + GetPreviousNonBlankLine(clean_lines, linenum)[0].find("for") == -1 + or GetPreviousNonBlankLine(clean_lines, linenum)[0].find(";") != -1 + ) + and + # It's ok to have many commands in a switch case that fits in 1 line + not ( + (cleansed_line.find("case ") != -1 or cleansed_line.find("default:") != -1) + and cleansed_line.find("break;") != -1 + ) + ): + error(filename, linenum, "whitespace/newline", 0, "More than one command on the same line") + + # Some more style checks + CheckBraces(filename, clean_lines, linenum, error) + CheckTrailingSemicolon(filename, clean_lines, linenum, error) + CheckEmptyBlockBody(filename, clean_lines, linenum, error) + CheckSpacing(filename, clean_lines, linenum, nesting_state, error) + CheckOperatorSpacing(filename, clean_lines, linenum, error) + CheckParenthesisSpacing(filename, clean_lines, linenum, error) + CheckCommaSpacing(filename, clean_lines, linenum, error) + CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error) + CheckSpacingForFunctionCall(filename, clean_lines, linenum, error) + CheckCheck(filename, clean_lines, linenum, error) + CheckAltTokens(filename, clean_lines, linenum, error) + classinfo = nesting_state.InnermostClass() + if classinfo: + CheckSectionSpacing(filename, clean_lines, classinfo, linenum, error) _RE_PATTERN_INCLUDE = re.compile(r'^\s*#\s*include\s*([<"])([^>"]*)[>"].*$') @@ -5046,259 +5507,294 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, # _RE_FIRST_COMPONENT.match('foo.cc').group(0) == 'foo' # _RE_FIRST_COMPONENT.match('foo-bar_baz.cc').group(0) == 'foo' # _RE_FIRST_COMPONENT.match('foo_bar-baz.cc').group(0) == 'foo' -_RE_FIRST_COMPONENT = re.compile(r'^[^-_.]+') +_RE_FIRST_COMPONENT = re.compile(r"^[^-_.]+") def _DropCommonSuffixes(filename): - """Drops common suffixes like _test.cc or -inl.h from filename. - - For example: - >>> _DropCommonSuffixes('foo/foo-inl.h') - 'foo/foo' - >>> _DropCommonSuffixes('foo/bar/foo.cc') - 'foo/bar/foo' - >>> _DropCommonSuffixes('foo/foo_internal.h') - 'foo/foo' - >>> _DropCommonSuffixes('foo/foo_unusualinternal.h') - 'foo/foo_unusualinternal' - - Args: - filename: The input filename. - - Returns: - The filename with the common suffix removed. - """ - for suffix in itertools.chain( - (f"{test_suffix.lstrip('_')}.{ext}" - for test_suffix, ext in itertools.product(_test_suffixes, GetNonHeaderExtensions())), - (f'{suffix}.{ext}' - for suffix, ext in itertools.product(['inl', 'imp', 'internal'], GetHeaderExtensions()))): - if (filename.endswith(suffix) and len(filename) > len(suffix) and - filename[-len(suffix) - 1] in ('-', '_')): - return filename[:-len(suffix) - 1] - return os.path.splitext(filename)[0] + """Drops common suffixes like _test.cc or -inl.h from filename. + + For example: + >>> _DropCommonSuffixes('foo/foo-inl.h') + 'foo/foo' + >>> _DropCommonSuffixes('foo/bar/foo.cc') + 'foo/bar/foo' + >>> _DropCommonSuffixes('foo/foo_internal.h') + 'foo/foo' + >>> _DropCommonSuffixes('foo/foo_unusualinternal.h') + 'foo/foo_unusualinternal' + + Args: + filename: The input filename. + + Returns: + The filename with the common suffix removed. + """ + for suffix in itertools.chain( + ( + f"{test_suffix.lstrip('_')}.{ext}" + for test_suffix, ext in itertools.product(_test_suffixes, GetNonHeaderExtensions()) + ), + ( + f"{suffix}.{ext}" + for suffix, ext in itertools.product(["inl", "imp", "internal"], GetHeaderExtensions()) + ), + ): + if ( + filename.endswith(suffix) + and len(filename) > len(suffix) + and filename[-len(suffix) - 1] in ("-", "_") + ): + return filename[: -len(suffix) - 1] + return os.path.splitext(filename)[0] def _ClassifyInclude(fileinfo, include, used_angle_brackets, include_order="default"): - """Figures out what kind of header 'include' is. - - Args: - fileinfo: The current file cpplint is running over. A FileInfo instance. - include: The path to a #included file. - used_angle_brackets: True if the #include used <> rather than "". - include_order: "default" or other value allowed in program arguments - - Returns: - One of the _XXX_HEADER constants. - - For example: - >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'stdio.h', True) - _C_SYS_HEADER - >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'string', True) - _CPP_SYS_HEADER - >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/foo.h', True, "standardcfirst") - _OTHER_SYS_HEADER - >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/foo.h', False) - _LIKELY_MY_HEADER - >>> _ClassifyInclude(FileInfo('foo/foo_unknown_extension.cc'), - ... 'bar/foo_other_ext.h', False) - _POSSIBLE_MY_HEADER - >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/bar.h', False) - _OTHER_HEADER - """ - # This is a list of all standard c++ header files, except - # those already checked for above. - is_cpp_header = include in _CPP_HEADERS - - # Mark include as C header if in list or in a known folder for standard-ish C headers. - is_std_c_header = (include_order == "default") or (include in _C_HEADERS - # additional linux glibc header folders - or re.search(rf'(?:{"|".join(C_STANDARD_HEADER_FOLDERS)})\/.*\.h', include)) - - # Headers with C++ extensions shouldn't be considered C system headers - include_ext = os.path.splitext(include)[1] - is_system = used_angle_brackets and include_ext not in ['.hh', '.hpp', '.hxx', '.h++'] - - if is_system: - if is_cpp_header: - return _CPP_SYS_HEADER - if is_std_c_header: - return _C_SYS_HEADER - return _OTHER_SYS_HEADER - - # If the target file and the include we're checking share a - # basename when we drop common extensions, and the include - # lives in . , then it's likely to be owned by the target file. - target_dir, target_base = ( - os.path.split(_DropCommonSuffixes(fileinfo.RepositoryName()))) - include_dir, include_base = os.path.split(_DropCommonSuffixes(include)) - target_dir_pub = os.path.normpath(target_dir + '/../public') - target_dir_pub = target_dir_pub.replace('\\', '/') - if target_base == include_base and ( - include_dir in (target_dir, target_dir_pub)): - return _LIKELY_MY_HEADER - - # If the target and include share some initial basename - # component, it's possible the target is implementing the - # include, so it's allowed to be first, but we'll never - # complain if it's not there. - target_first_component = _RE_FIRST_COMPONENT.match(target_base) - include_first_component = _RE_FIRST_COMPONENT.match(include_base) - if (target_first_component and include_first_component and - target_first_component.group(0) == - include_first_component.group(0)): - return _POSSIBLE_MY_HEADER - - return _OTHER_HEADER + """Figures out what kind of header 'include' is. + + Args: + fileinfo: The current file cpplint is running over. A FileInfo instance. + include: The path to a #included file. + used_angle_brackets: True if the #include used <> rather than "". + include_order: "default" or other value allowed in program arguments + + Returns: + One of the _XXX_HEADER constants. + + For example: + >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'stdio.h', True) + _C_SYS_HEADER + >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'string', True) + _CPP_SYS_HEADER + >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/foo.h', True, "standardcfirst") + _OTHER_SYS_HEADER + >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/foo.h', False) + _LIKELY_MY_HEADER + >>> _ClassifyInclude(FileInfo('foo/foo_unknown_extension.cc'), + ... 'bar/foo_other_ext.h', False) + _POSSIBLE_MY_HEADER + >>> _ClassifyInclude(FileInfo('foo/foo.cc'), 'foo/bar.h', False) + _OTHER_HEADER + """ + # This is a list of all standard c++ header files, except + # those already checked for above. + is_cpp_header = include in _CPP_HEADERS + + # Mark include as C header if in list or in a known folder for standard-ish C headers. + is_std_c_header = (include_order == "default") or ( + include in _C_HEADERS + # additional linux glibc header folders + or re.search(rf"(?:{'|'.join(C_STANDARD_HEADER_FOLDERS)})\/.*\.h", include) + ) + # Headers with C++ extensions shouldn't be considered C system headers + include_ext = os.path.splitext(include)[1] + is_system = used_angle_brackets and include_ext not in [".hh", ".hpp", ".hxx", ".h++"] + + if is_system: + if is_cpp_header: + return _CPP_SYS_HEADER + if is_std_c_header: + return _C_SYS_HEADER + return _OTHER_SYS_HEADER + + # If the target file and the include we're checking share a + # basename when we drop common extensions, and the include + # lives in . , then it's likely to be owned by the target file. + target_dir, target_base = os.path.split(_DropCommonSuffixes(fileinfo.RepositoryName())) + include_dir, include_base = os.path.split(_DropCommonSuffixes(include)) + target_dir_pub = os.path.normpath(target_dir + "/../public") + target_dir_pub = target_dir_pub.replace("\\", "/") + if target_base == include_base and (include_dir in (target_dir, target_dir_pub)): + return _LIKELY_MY_HEADER + + # If the target and include share some initial basename + # component, it's possible the target is implementing the + # include, so it's allowed to be first, but we'll never + # complain if it's not there. + target_first_component = _RE_FIRST_COMPONENT.match(target_base) + include_first_component = _RE_FIRST_COMPONENT.match(include_base) + if ( + target_first_component + and include_first_component + and target_first_component.group(0) == include_first_component.group(0) + ): + return _POSSIBLE_MY_HEADER + + return _OTHER_HEADER def CheckIncludeLine(filename, clean_lines, linenum, include_state, error): - """Check rules that are applicable to #include lines. - - Strings on #include lines are NOT removed from elided line, to make - certain tasks easier. However, to prevent false positives, checks - applicable to #include lines in CheckLanguage must be put here. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - include_state: An _IncludeState instance in which the headers are inserted. - error: The function to call with any errors found. - """ - fileinfo = FileInfo(filename) - line = clean_lines.lines[linenum] - - # "include" should use the new style "foo/bar.h" instead of just "bar.h" - # Only do this check if the included header follows google naming - # conventions. If not, assume that it's a 3rd party API that - # requires special include conventions. - # - # We also make an exception for Lua headers, which follow google - # naming convention but not the include convention. - match = re.match(r'#include\s*"([^/]+\.(.*))"', line) - if match: - if (IsHeaderExtension(match.group(2)) and - not _THIRD_PARTY_HEADERS_PATTERN.match(match.group(1))): - error(filename, linenum, 'build/include_subdir', 4, - 'Include the directory when naming header files') - - # we shouldn't include a file more than once. actually, there are a - # handful of instances where doing so is okay, but in general it's - # not. - match = _RE_PATTERN_INCLUDE.search(line) - if match: - include = match.group(2) - used_angle_brackets = match.group(1) == '<' - duplicate_line = include_state.FindHeader(include) - if duplicate_line >= 0: - error(filename, linenum, 'build/include', 4, - f'"{include}" already included at {filename}:{duplicate_line}') - return - - for extension in GetNonHeaderExtensions(): - if (include.endswith('.' + extension) and - os.path.dirname(fileinfo.RepositoryName()) != os.path.dirname(include)): - error(filename, linenum, 'build/include', 4, - 'Do not include .' + extension + ' files from other packages') - return + """Check rules that are applicable to #include lines. - # We DO want to include a 3rd party looking header if it matches the - # filename. Otherwise we get an erroneous error "...should include its - # header" error later. - third_src_header = False - for ext in GetHeaderExtensions(): - basefilename = filename[0:len(filename) - len(fileinfo.Extension())] - headerfile = basefilename + '.' + ext - headername = FileInfo(headerfile).RepositoryName() - if headername in include or include in headername: - third_src_header = True - break - - if third_src_header or not _THIRD_PARTY_HEADERS_PATTERN.match(include): - 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 (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 - # track of the highest type seen, and complains if we see a - # lower type after that. - error_message = include_state.CheckNextIncludeOrder( - _ClassifyInclude(fileinfo, include, used_angle_brackets, _include_order)) - if error_message: - error(filename, linenum, 'build/include_order', 4, - f'{error_message}. Should be: {fileinfo.BaseName()}.h, c system,' - ' c++ system, other.') - canonical_include = include_state.CanonicalizeAlphabeticalOrder(include) - if not include_state.IsInAlphabeticalOrder( - clean_lines, linenum, canonical_include): - error(filename, linenum, 'build/include_alpha', 4, - f'Include "{include}" not in alphabetical order') - include_state.SetLastHeader(canonical_include) + Strings on #include lines are NOT removed from elided line, to make + certain tasks easier. However, to prevent false positives, checks + applicable to #include lines in CheckLanguage must be put here. + + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + include_state: An _IncludeState instance in which the headers are inserted. + error: The function to call with any errors found. + """ + fileinfo = FileInfo(filename) + line = clean_lines.lines[linenum] + # "include" should use the new style "foo/bar.h" instead of just "bar.h" + # Only do this check if the included header follows google naming + # conventions. If not, assume that it's a 3rd party API that + # requires special include conventions. + # + # We also make an exception for Lua headers, which follow google + # naming convention but not the include convention. + match = re.match(r'#include\s*"([^/]+\.(.*))"', line) + if match: + if IsHeaderExtension(match.group(2)) and not _THIRD_PARTY_HEADERS_PATTERN.match( + match.group(1) + ): + error( + filename, + linenum, + "build/include_subdir", + 4, + "Include the directory when naming header files", + ) + + # we shouldn't include a file more than once. actually, there are a + # handful of instances where doing so is okay, but in general it's + # not. + match = _RE_PATTERN_INCLUDE.search(line) + if match: + include = match.group(2) + used_angle_brackets = match.group(1) == "<" + duplicate_line = include_state.FindHeader(include) + if duplicate_line >= 0: + error( + filename, + linenum, + "build/include", + 4, + f'"{include}" already included at {filename}:{duplicate_line}', + ) + return + + for extension in GetNonHeaderExtensions(): + if include.endswith("." + extension) and os.path.dirname( + fileinfo.RepositoryName() + ) != os.path.dirname(include): + error( + filename, + linenum, + "build/include", + 4, + "Do not include ." + extension + " files from other packages", + ) + return + + # We DO want to include a 3rd party looking header if it matches the + # filename. Otherwise we get an erroneous error "...should include its + # header" error later. + third_src_header = False + for ext in GetHeaderExtensions(): + basefilename = filename[0 : len(filename) - len(fileinfo.Extension())] + headerfile = basefilename + "." + ext + headername = FileInfo(headerfile).RepositoryName() + if headername in include or include in headername: + third_src_header = True + break + + if third_src_header or not _THIRD_PARTY_HEADERS_PATTERN.match(include): + 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 (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 + # track of the highest type seen, and complains if we see a + # lower type after that. + error_message = include_state.CheckNextIncludeOrder( + _ClassifyInclude(fileinfo, include, used_angle_brackets, _include_order) + ) + if error_message: + error( + filename, + linenum, + "build/include_order", + 4, + f"{error_message}. Should be: {fileinfo.BaseName()}.h, c system," + " c++ system, other.", + ) + canonical_include = include_state.CanonicalizeAlphabeticalOrder(include) + if not include_state.IsInAlphabeticalOrder(clean_lines, linenum, canonical_include): + error( + filename, + linenum, + "build/include_alpha", + 4, + f'Include "{include}" not in alphabetical order', + ) + include_state.SetLastHeader(canonical_include) def _GetTextInside(text, start_pattern): - r"""Retrieves all the text between matching open and close parentheses. - - Given a string of lines and a regular expression string, retrieve all the text - following the expression and between opening punctuation symbols like - (, [, or {, and the matching close-punctuation symbol. This properly nested - occurrences of the punctuation, so for the text like - printf(a(), b(c())); - a call to _GetTextInside(text, r'printf\(') will return 'a(), b(c())'. - start_pattern must match string having an open punctuation symbol at the end. - - Args: - text: The lines to extract text. Its comments and strings must be elided. - It can be single line and can span multiple lines. - start_pattern: The regexp string indicating where to start extracting - the text. - Returns: - The extracted text. - None if either the opening string or ending punctuation could not be found. - """ - # TODO(unknown): Audit cpplint.py to see what places could be profitably - # rewritten to use _GetTextInside (and use inferior regexp matching today). - - # Give opening punctuation to get the matching close-punctuation. - matching_punctuation = {'(': ')', '{': '}', '[': ']'} - closing_punctuation = set(dict.values(matching_punctuation)) - - # Find the position to start extracting text. - match = re.search(start_pattern, text, re.MULTILINE) - if not match: # start_pattern not found in text. - return None - start_position = match.end(0) - - assert start_position > 0, ( - 'start_pattern must ends with an opening punctuation.') - assert text[start_position - 1] in matching_punctuation, ( - 'start_pattern must ends with an opening punctuation.') - # Stack of closing punctuation we expect to have in text after position. - punctuation_stack = [matching_punctuation[text[start_position - 1]]] - position = start_position - while punctuation_stack and position < len(text): - if text[position] == punctuation_stack[-1]: - punctuation_stack.pop() - elif text[position] in closing_punctuation: - # A closing punctuation without matching opening punctuation. - return None - elif text[position] in matching_punctuation: - punctuation_stack.append(matching_punctuation[text[position]]) - position += 1 - if punctuation_stack: - # Opening punctuation left without matching close-punctuation. - return None - # punctuation match. - return text[start_position:position - 1] + r"""Retrieves all the text between matching open and close parentheses. + + Given a string of lines and a regular expression string, retrieve all the text + following the expression and between opening punctuation symbols like + (, [, or {, and the matching close-punctuation symbol. This properly nested + occurrences of the punctuation, so for the text like + printf(a(), b(c())); + a call to _GetTextInside(text, r'printf\(') will return 'a(), b(c())'. + start_pattern must match string having an open punctuation symbol at the end. + + Args: + text: The lines to extract text. Its comments and strings must be elided. + It can be single line and can span multiple lines. + start_pattern: The regexp string indicating where to start extracting + the text. + Returns: + The extracted text. + None if either the opening string or ending punctuation could not be found. + """ + # TODO(unknown): Audit cpplint.py to see what places could be profitably + # rewritten to use _GetTextInside (and use inferior regexp matching today). + + # Give opening punctuation to get the matching close-punctuation. + matching_punctuation = {"(": ")", "{": "}", "[": "]"} + closing_punctuation = set(dict.values(matching_punctuation)) + + # Find the position to start extracting text. + match = re.search(start_pattern, text, re.MULTILINE) + if not match: # start_pattern not found in text. + return None + start_position = match.end(0) + + assert start_position > 0, "start_pattern must ends with an opening punctuation." + assert text[start_position - 1] in matching_punctuation, ( + "start_pattern must ends with an opening punctuation." + ) + # Stack of closing punctuation we expect to have in text after position. + punctuation_stack = [matching_punctuation[text[start_position - 1]]] + position = start_position + while punctuation_stack and position < len(text): + if text[position] == punctuation_stack[-1]: + punctuation_stack.pop() + elif text[position] in closing_punctuation: + # A closing punctuation without matching opening punctuation. + return None + elif text[position] in matching_punctuation: + punctuation_stack.append(matching_punctuation[text[position]]) + position += 1 + if punctuation_stack: + # Opening punctuation left without matching close-punctuation. + return None + # punctuation match. + return text[start_position : position - 1] # Patterns for matching call-by-reference parameters. @@ -5310,1675 +5806,1996 @@ def _GetTextInside(text, start_pattern): # > # | [^<>] )* # > -_RE_PATTERN_IDENT = r'[_a-zA-Z]\w*' # =~ [[:alpha:]][[:alnum:]]* +_RE_PATTERN_IDENT = r"[_a-zA-Z]\w*" # =~ [[:alpha:]][[:alnum:]]* _RE_PATTERN_TYPE = ( - r'(?:const\s+)?(?:typename\s+|class\s+|struct\s+|union\s+|enum\s+)?' - r'(?:\w|' - r'\s*<(?:<(?:<[^<>]*>|[^<>])*>|[^<>])*>|' - r'::)+') + r"(?:const\s+)?(?:typename\s+|class\s+|struct\s+|union\s+|enum\s+)?" + r"(?:\w|" + r"\s*<(?:<(?:<[^<>]*>|[^<>])*>|[^<>])*>|" + r"::)+" +) # A call-by-reference parameter ends with '& identifier'. _RE_PATTERN_REF_PARAM = re.compile( - r'(' + _RE_PATTERN_TYPE + r'(?:\s*(?:\bconst\b|[*]))*\s*' - r'&\s*' + _RE_PATTERN_IDENT + r')\s*(?:=[^,()]+)?[,)]') + r"(" + _RE_PATTERN_TYPE + r"(?:\s*(?:\bconst\b|[*]))*\s*" + r"&\s*" + _RE_PATTERN_IDENT + r")\s*(?:=[^,()]+)?[,)]" +) # A call-by-const-reference parameter either ends with 'const& identifier' # or looks like 'const type& identifier' when 'type' is atomic. _RE_PATTERN_CONST_REF_PARAM = ( - r'(?:.*\s*\bconst\s*&\s*' + _RE_PATTERN_IDENT + - r'|const\s+' + _RE_PATTERN_TYPE + r'\s*&\s*' + _RE_PATTERN_IDENT + r')') + r"(?:.*\s*\bconst\s*&\s*" + + _RE_PATTERN_IDENT + + r"|const\s+" + + _RE_PATTERN_TYPE + + r"\s*&\s*" + + _RE_PATTERN_IDENT + + r")" +) # Stream types. -_RE_PATTERN_REF_STREAM_PARAM = ( - r'(?:.*stream\s*&\s*' + _RE_PATTERN_IDENT + r')') - - -def CheckLanguage(filename, clean_lines, linenum, file_extension, - include_state, nesting_state, error): - """Checks rules from the 'C++ language rules' section of cppguide.html. - - Some of these rules are hard to test (function overloading, using - uint32_t inappropriately), but we do the best we can. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - file_extension: The extension (without the dot) of the filename. - include_state: An _IncludeState instance in which the headers are inserted. - nesting_state: A NestingState instance which maintains information about - the current stack of nested blocks being parsed. - error: The function to call with any errors found. - """ - # If the line is empty or consists of entirely a comment, no need to - # check it. - line = clean_lines.elided[linenum] - if not line: - return - - match = _RE_PATTERN_INCLUDE.search(line) - if match: - CheckIncludeLine(filename, clean_lines, linenum, include_state, error) - return - - # Reset include state across preprocessor directives. This is meant - # to silence warnings for conditional includes. - match = re.match(r'^\s*#\s*(if|ifdef|ifndef|elif|else|endif)\b', line) - if match: - include_state.ResetSection(match.group(1)) - - - # Perform other checks now that we are sure that this is not an include line - CheckCasts(filename, clean_lines, linenum, error) - CheckGlobalStatic(filename, clean_lines, linenum, error) - CheckPrintf(filename, clean_lines, linenum, error) - - if IsHeaderExtension(file_extension): - # TODO(unknown): check that 1-arg constructors are explicit. - # How to tell it's a constructor? - # (handled in CheckForNonStandardConstructs for now) - # TODO(unknown): check that classes declare or disable copy/assign - # (level 1 error) - pass +_RE_PATTERN_REF_STREAM_PARAM = r"(?:.*stream\s*&\s*" + _RE_PATTERN_IDENT + r")" + + +def CheckLanguage( + filename, clean_lines, linenum, file_extension, include_state, nesting_state, error +): + """Checks rules from the 'C++ language rules' section of cppguide.html. + + Some of these rules are hard to test (function overloading, using + uint32_t inappropriately), but we do the best we can. + + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + file_extension: The extension (without the dot) of the filename. + include_state: An _IncludeState instance in which the headers are inserted. + nesting_state: A NestingState instance which maintains information about + the current stack of nested blocks being parsed. + error: The function to call with any errors found. + """ + # If the line is empty or consists of entirely a comment, no need to + # check it. + line = clean_lines.elided[linenum] + if not line: + return + + match = _RE_PATTERN_INCLUDE.search(line) + if match: + CheckIncludeLine(filename, clean_lines, linenum, include_state, error) + return - # Check if people are using the verboten C basic types. The only exception - # we regularly allow is "unsigned short port" for port. - if re.search(r'\bshort port\b', line): - if not re.search(r'\bunsigned short port\b', line): - error(filename, linenum, 'runtime/int', 4, - 'Use "unsigned short" for ports, not "short"') - else: - match = re.search(r'\b(short|long(?! +double)|long long)\b', line) + # Reset include state across preprocessor directives. This is meant + # to silence warnings for conditional includes. + match = re.match(r"^\s*#\s*(if|ifdef|ifndef|elif|else|endif)\b", line) if match: - error(filename, linenum, 'runtime/int', 4, - f'Use int16_t/int64_t/etc, rather than the C type {match.group(1)}') - - # Check if some verboten operator overloading is going on - # TODO(unknown): catch out-of-line unary operator&: - # class X {}; - # int operator&(const X& x) { return 42; } // unary operator& - # The trick is it's hard to tell apart from binary operator&: - # class Y { int operator&(const Y& x) { return 23; } }; // binary operator& - if re.search(r'\boperator\s*&\s*\(\s*\)', line): - error(filename, linenum, 'runtime/operator', 4, - 'Unary operator& is dangerous. Do not use it.') - - # Check for suspicious usage of "if" like - # } if (a == b) { - if re.search(r'\}\s*if\s*\(', line): - error(filename, linenum, 'readability/braces', 4, - 'Did you mean "else if"? If not, start a new line for "if".') - - # Check for potential format string bugs like printf(foo). - # We constrain the pattern not to pick things like DocidForPrintf(foo). - # Not perfect but it can catch printf(foo.c_str()) and printf(foo->c_str()) - # TODO(unknown): Catch the following case. Need to change the calling - # convention of the whole function to process multiple line to handle it. - # printf( - # boy_this_is_a_really_long_variable_that_cannot_fit_on_the_prev_line); - printf_args = _GetTextInside(line, r'(?i)\b(string)?printf\s*\(') - if printf_args: - match = re.match(r'([\w.\->()]+)$', printf_args) - if match and match.group(1) != '__VA_ARGS__': - function_name = re.search(r'\b((?:string)?printf)\s*\(', - line, re.IGNORECASE).group(1) - error(filename, linenum, 'runtime/printf', 4, - 'Potential format string bug. Do' - f' {function_name}("%s", {match.group(1)}) instead.') - - # Check for potential memset bugs like memset(buf, sizeof(buf), 0). - match = re.search(r'memset\s*\(([^,]*),\s*([^,]*),\s*0\s*\)', line) - if match and not re.match(r"^''|-?[0-9]+|0x[0-9A-Fa-f]$", match.group(2)): - error(filename, linenum, 'runtime/memset', 4, - f'Did you mean "memset({match.group(1)}, 0, {match.group(2)})"?') - - if re.search(r'\busing namespace\b', line): - if re.search(r'\bliterals\b', line): - error(filename, linenum, 'build/namespaces_literals', 5, - 'Do not use namespace using-directives. ' - 'Use using-declarations instead.') + include_state.ResetSection(match.group(1)) + + # Perform other checks now that we are sure that this is not an include line + CheckCasts(filename, clean_lines, linenum, error) + CheckGlobalStatic(filename, clean_lines, linenum, error) + CheckPrintf(filename, clean_lines, linenum, error) + + if IsHeaderExtension(file_extension): + # TODO(unknown): check that 1-arg constructors are explicit. + # How to tell it's a constructor? + # (handled in CheckForNonStandardConstructs for now) + # TODO(unknown): check that classes declare or disable copy/assign + # (level 1 error) + pass + + # Check if people are using the verboten C basic types. The only exception + # we regularly allow is "unsigned short port" for port. + if re.search(r"\bshort port\b", line): + if not re.search(r"\bunsigned short port\b", line): + error( + filename, linenum, "runtime/int", 4, 'Use "unsigned short" for ports, not "short"' + ) else: - error(filename, linenum, 'build/namespaces', 5, - 'Do not use namespace using-directives. ' - 'Use using-declarations instead.') - - # Detect variable-length arrays. - match = re.match(r'\s*(.+::)?(\w+) [a-z]\w*\[(.+)];', line) - if (match and match.group(2) != 'return' and match.group(2) != 'delete' and - match.group(3).find(']') == -1): - # Split the size using space and arithmetic operators as delimiters. - # If any of the resulting tokens are not compile time constants then - # report the error. - tokens = re.split(r'\s|\+|\-|\*|\/|<<|>>]', match.group(3)) - is_const = True - skip_next = False - for tok in tokens: - if skip_next: + match = re.search(r"\b(short|long(?! +double)|long long)\b", line) + if match: + error( + filename, + linenum, + "runtime/int", + 4, + f"Use int16_t/int64_t/etc, rather than the C type {match.group(1)}", + ) + + # Check if some verboten operator overloading is going on + # TODO(unknown): catch out-of-line unary operator&: + # class X {}; + # int operator&(const X& x) { return 42; } // unary operator& + # The trick is it's hard to tell apart from binary operator&: + # class Y { int operator&(const Y& x) { return 23; } }; // binary operator& + if re.search(r"\boperator\s*&\s*\(\s*\)", line): + error( + filename, + linenum, + "runtime/operator", + 4, + "Unary operator& is dangerous. Do not use it.", + ) + + # Check for suspicious usage of "if" like + # } if (a == b) { + if re.search(r"\}\s*if\s*\(", line): + error( + filename, + linenum, + "readability/braces", + 4, + 'Did you mean "else if"? If not, start a new line for "if".', + ) + + # Check for potential format string bugs like printf(foo). + # We constrain the pattern not to pick things like DocidForPrintf(foo). + # Not perfect but it can catch printf(foo.c_str()) and printf(foo->c_str()) + # TODO(unknown): Catch the following case. Need to change the calling + # convention of the whole function to process multiple line to handle it. + # printf( + # boy_this_is_a_really_long_variable_that_cannot_fit_on_the_prev_line); + printf_args = _GetTextInside(line, r"(?i)\b(string)?printf\s*\(") + if printf_args: + match = re.match(r"([\w.\->()]+)$", printf_args) + if match and match.group(1) != "__VA_ARGS__": + function_name = re.search(r"\b((?:string)?printf)\s*\(", line, re.IGNORECASE).group(1) + error( + filename, + linenum, + "runtime/printf", + 4, + f'Potential format string bug. Do {function_name}("%s", {match.group(1)}) instead.', + ) + + # Check for potential memset bugs like memset(buf, sizeof(buf), 0). + match = re.search(r"memset\s*\(([^,]*),\s*([^,]*),\s*0\s*\)", line) + if match and not re.match(r"^''|-?[0-9]+|0x[0-9A-Fa-f]$", match.group(2)): + error( + filename, + linenum, + "runtime/memset", + 4, + f'Did you mean "memset({match.group(1)}, 0, {match.group(2)})"?', + ) + + if re.search(r"\busing namespace\b", line): + if re.search(r"\bliterals\b", line): + error( + filename, + linenum, + "build/namespaces_literals", + 5, + "Do not use namespace using-directives. Use using-declarations instead.", + ) + else: + error( + filename, + linenum, + "build/namespaces", + 5, + "Do not use namespace using-directives. Use using-declarations instead.", + ) + + # Detect variable-length arrays. + match = re.match(r"\s*(.+::)?(\w+) [a-z]\w*\[(.+)];", line) + if ( + match + and match.group(2) != "return" + and match.group(2) != "delete" + and match.group(3).find("]") == -1 + ): + # Split the size using space and arithmetic operators as delimiters. + # If any of the resulting tokens are not compile time constants then + # report the error. + tokens = re.split(r"\s|\+|\-|\*|\/|<<|>>]", match.group(3)) + is_const = True skip_next = False - continue - - if re.search(r'sizeof\(.+\)', tok): - continue - if re.search(r'arraysize\(\w+\)', tok): - continue - - tok = tok.lstrip('(') - tok = tok.rstrip(')') - if not tok: - continue - if re.match(r'\d+', tok): - continue - if re.match(r'0[xX][0-9a-fA-F]+', tok): - continue - if re.match(r'k[A-Z0-9]\w*', tok): - continue - if re.match(r'(.+::)?k[A-Z0-9]\w*', tok): - continue - if re.match(r'(.+::)?[A-Z][A-Z0-9_]*', tok): - continue - # A catch all for tricky sizeof cases, including 'sizeof expression', - # 'sizeof(*type)', 'sizeof(const type)', 'sizeof(struct StructName)' - # requires skipping the next token because we split on ' ' and '*'. - if tok.startswith('sizeof'): - skip_next = True - continue - is_const = False - break - if not is_const: - error(filename, linenum, 'runtime/arrays', 1, - 'Do not use variable-length arrays. Use an appropriately named ' - "('k' followed by CamelCase) compile-time constant for the size.") - - # Check for use of unnamed namespaces in header files. Registration - # macros are typically OK, so we allow use of "namespace {" on lines - # that end with backslashes. - if (IsHeaderExtension(file_extension) - and re.search(r'\bnamespace\s*{', line) - and line[-1] != '\\'): - error(filename, linenum, 'build/namespaces_headers', 4, - 'Do not use unnamed namespaces in header files. See ' - 'https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces' - ' for more information.') + for tok in tokens: + if skip_next: + skip_next = False + continue + + if re.search(r"sizeof\(.+\)", tok): + continue + if re.search(r"arraysize\(\w+\)", tok): + continue + + tok = tok.lstrip("(") + tok = tok.rstrip(")") + if not tok: + continue + if re.match(r"\d+", tok): + continue + if re.match(r"0[xX][0-9a-fA-F]+", tok): + continue + if re.match(r"k[A-Z0-9]\w*", tok): + continue + if re.match(r"(.+::)?k[A-Z0-9]\w*", tok): + continue + if re.match(r"(.+::)?[A-Z][A-Z0-9_]*", tok): + continue + # A catch all for tricky sizeof cases, including 'sizeof expression', + # 'sizeof(*type)', 'sizeof(const type)', 'sizeof(struct StructName)' + # requires skipping the next token because we split on ' ' and '*'. + if tok.startswith("sizeof"): + skip_next = True + continue + is_const = False + break + if not is_const: + error( + filename, + linenum, + "runtime/arrays", + 1, + "Do not use variable-length arrays. Use an appropriately named " + "('k' followed by CamelCase) compile-time constant for the size.", + ) + + # Check for use of unnamed namespaces in header files. Registration + # macros are typically OK, so we allow use of "namespace {" on lines + # that end with backslashes. + if ( + IsHeaderExtension(file_extension) + and re.search(r"\bnamespace\s*{", line) + and line[-1] != "\\" + ): + error( + filename, + linenum, + "build/namespaces_headers", + 4, + "Do not use unnamed namespaces in header files. See " + "https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces" + " for more information.", + ) def CheckGlobalStatic(filename, clean_lines, linenum, error): - """Check for unsafe global or static objects. - - 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] - - # Match two lines at a time to support multiline declarations - if linenum + 1 < clean_lines.NumLines() and not re.search(r'[;({]', line): - line += clean_lines.elided[linenum + 1].strip() - - # Check for people declaring static/global STL strings at the top level. - # This is dangerous because the C++ language does not guarantee that - # globals with constructors are initialized before the first access, and - # also because globals can be destroyed when some threads are still running. - # TODO(unknown): Generalize this to also find static unique_ptr instances. - # TODO(unknown): File bugs for clang-tidy to find these. - match = re.match( - r'((?:|static +)(?:|const +))(?::*std::)?string( +const)? +' - r'([a-zA-Z0-9_:]+)\b(.*)', - line) - - # Remove false positives: - # - String pointers (as opposed to values). - # string *pointer - # const string *pointer - # string const *pointer - # string *const pointer - # - # - Functions and template specializations. - # string Function(... - # string Class::Method(... - # - # - Operators. These are matched separately because operator names - # cross non-word boundaries, and trying to match both operators - # and functions at the same time would decrease accuracy of - # matching identifiers. - # string Class::operator*() - if (match and - not re.search(r'\bstring\b(\s+const)?\s*[\*\&]\s*(const\s+)?\w', line) and - not re.search(r'\boperator\W', line) and - not re.match(r'\s*(<.*>)?(::[a-zA-Z0-9_]+)*\s*\(([^"]|$)', match.group(4))): - if re.search(r'\bconst\b', line): - error(filename, linenum, 'runtime/string', 4, - 'For a static/global string constant, use a C style string instead:' - f' "{match.group(1)}char{match.group(2) or ""} {match.group(3)}[]".') - else: - error(filename, linenum, 'runtime/string', 4, - 'Static/global string variables are not permitted.') + """Check for unsafe global or static objects. + + 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] - if (re.search(r'\b([A-Za-z0-9_]*_)\(\1\)', line) or - re.search(r'\b([A-Za-z0-9_]*_)\(CHECK_NOTNULL\(\1\)\)', line)): - error(filename, linenum, 'runtime/init', 4, - 'You seem to be initializing a member variable with itself.') + # Match two lines at a time to support multiline declarations + if linenum + 1 < clean_lines.NumLines() and not re.search(r"[;({]", line): + line += clean_lines.elided[linenum + 1].strip() + + # Check for people declaring static/global STL strings at the top level. + # This is dangerous because the C++ language does not guarantee that + # globals with constructors are initialized before the first access, and + # also because globals can be destroyed when some threads are still running. + # TODO(unknown): Generalize this to also find static unique_ptr instances. + # TODO(unknown): File bugs for clang-tidy to find these. + match = re.match( + r"((?:|static +)(?:|const +))(?::*std::)?string( +const)? +" + r"([a-zA-Z0-9_:]+)\b(.*)", + line, + ) + + # Remove false positives: + # - String pointers (as opposed to values). + # string *pointer + # const string *pointer + # string const *pointer + # string *const pointer + # + # - Functions and template specializations. + # string Function(... + # string Class::Method(... + # + # - Operators. These are matched separately because operator names + # cross non-word boundaries, and trying to match both operators + # and functions at the same time would decrease accuracy of + # matching identifiers. + # string Class::operator*() + if ( + match + and not re.search(r"\bstring\b(\s+const)?\s*[\*\&]\s*(const\s+)?\w", line) + and not re.search(r"\boperator\W", line) + and not re.match(r'\s*(<.*>)?(::[a-zA-Z0-9_]+)*\s*\(([^"]|$)', match.group(4)) + ): + if re.search(r"\bconst\b", line): + error( + filename, + linenum, + "runtime/string", + 4, + "For a static/global string constant, use a C style string instead:" + f' "{match.group(1)}char{match.group(2) or ""} {match.group(3)}[]".', + ) + else: + error( + filename, + linenum, + "runtime/string", + 4, + "Static/global string variables are not permitted.", + ) + + if re.search(r"\b([A-Za-z0-9_]*_)\(\1\)", line) or re.search( + r"\b([A-Za-z0-9_]*_)\(CHECK_NOTNULL\(\1\)\)", line + ): + error( + filename, + linenum, + "runtime/init", + 4, + "You seem to be initializing a member variable with itself.", + ) def CheckPrintf(filename, clean_lines, linenum, error): - """Check for printf related issues. - - 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] - - # When snprintf is used, the second argument shouldn't be a literal. - match = re.search(r'snprintf\s*\(([^,]*),\s*([0-9]*)\s*,', line) - if match and match.group(2) != '0': - # If 2nd arg is zero, snprintf is used to calculate size. - error(filename, linenum, 'runtime/printf', 3, 'If you can, use' - f' sizeof({match.group(1)}) instead of {match.group(2)}' - ' as the 2nd arg to snprintf.') - - # Check if some verboten C functions are being used. - if re.search(r'\bsprintf\s*\(', line): - error(filename, linenum, 'runtime/printf', 5, - 'Never use sprintf. Use snprintf instead.') - match = re.search(r'\b(strcpy|strcat)\s*\(', line) - if match: - error(filename, linenum, 'runtime/printf', 4, - f'Almost always, snprintf is better than {match.group(1)}') + """Check for printf related issues. + 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] -def IsDerivedFunction(clean_lines, linenum): - """Check if current line contains an inherited function. - - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - Returns: - True if current line contains a function with "override" - virt-specifier. - """ - # Scan back a few lines for start of current function - for i in range(linenum, max(-1, linenum - 10), -1): - match = re.match(r'^([^()]*\w+)\(', clean_lines.elided[i]) + # When snprintf is used, the second argument shouldn't be a literal. + match = re.search(r"snprintf\s*\(([^,]*),\s*([0-9]*)\s*,", line) + if match and match.group(2) != "0": + # If 2nd arg is zero, snprintf is used to calculate size. + error( + filename, + linenum, + "runtime/printf", + 3, + "If you can, use" + f" sizeof({match.group(1)}) instead of {match.group(2)}" + " as the 2nd arg to snprintf.", + ) + + # Check if some verboten C functions are being used. + if re.search(r"\bsprintf\s*\(", line): + error(filename, linenum, "runtime/printf", 5, "Never use sprintf. Use snprintf instead.") + match = re.search(r"\b(strcpy|strcat)\s*\(", line) if match: - # Look for "override" after the matching closing parenthesis - line, _, closing_paren = CloseExpression( - clean_lines, i, len(match.group(1))) - return (closing_paren >= 0 and - re.search(r'\boverride\b', line[closing_paren:])) - return False + error( + filename, + linenum, + "runtime/printf", + 4, + f"Almost always, snprintf is better than {match.group(1)}", + ) + + +def IsDerivedFunction(clean_lines, linenum): + """Check if current line contains an inherited function. + + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + Returns: + True if current line contains a function with "override" + virt-specifier. + """ + # Scan back a few lines for start of current function + for i in range(linenum, max(-1, linenum - 10), -1): + match = re.match(r"^([^()]*\w+)\(", clean_lines.elided[i]) + if match: + # Look for "override" after the matching closing parenthesis + line, _, closing_paren = CloseExpression(clean_lines, i, len(match.group(1))) + return closing_paren >= 0 and re.search(r"\boverride\b", line[closing_paren:]) + return False def IsOutOfLineMethodDefinition(clean_lines, linenum): - """Check if current line contains an out-of-line method definition. + """Check if current line contains an out-of-line method definition. - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - Returns: - True if current line contains an out-of-line method definition. - """ - # Scan back a few lines for start of current function - for i in range(linenum, max(-1, linenum - 10), -1): - if re.match(r'^([^()]*\w+)\(', clean_lines.elided[i]): - return re.match(r'^[^()]*\w+::\w+\(', clean_lines.elided[i]) is not None - return False + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + Returns: + True if current line contains an out-of-line method definition. + """ + # Scan back a few lines for start of current function + for i in range(linenum, max(-1, linenum - 10), -1): + if re.match(r"^([^()]*\w+)\(", clean_lines.elided[i]): + return re.match(r"^[^()]*\w+::\w+\(", clean_lines.elided[i]) is not None + return False def IsInitializerList(clean_lines, linenum): - """Check if current line is inside constructor initializer list. - - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - Returns: - True if current line appears to be inside constructor initializer - list, False otherwise. - """ - for i in range(linenum, 1, -1): - line = clean_lines.elided[i] - if i == linenum: - remove_function_body = re.match(r'^(.*)\{\s*$', line) - if remove_function_body: - line = remove_function_body.group(1) - - if re.search(r'\s:\s*\w+[({]', line): - # A lone colon tend to indicate the start of a constructor - # initializer list. It could also be a ternary operator, which - # also tend to appear in constructor initializer lists as - # opposed to parameter lists. - return True - if re.search(r'\}\s*,\s*$', line): - # A closing brace followed by a comma is probably the end of a - # brace-initialized member in constructor initializer list. - return True - if re.search(r'[{};]\s*$', line): - # Found one of the following: - # - A closing brace or semicolon, probably the end of the previous - # function. - # - An opening brace, probably the start of current class or namespace. - # - # Current line is probably not inside an initializer list since - # we saw one of those things without seeing the starting colon. - return False - - # Got to the beginning of the file without seeing the start of - # constructor initializer list. - return False - - -def CheckForNonConstReference(filename, clean_lines, linenum, - nesting_state, error): - """Check for non-const references. - - Separate from CheckLanguage since it scans backwards from current - line, instead of scanning forward. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - nesting_state: A NestingState instance which maintains information about - the current stack of nested blocks being parsed. - error: The function to call with any errors found. - """ - # Do nothing if there is no '&' on current line. - line = clean_lines.elided[linenum] - if '&' not in line: - return - - # If a function is inherited, current function doesn't have much of - # a choice, so any non-const references should not be blamed on - # derived function. - if IsDerivedFunction(clean_lines, linenum): - return - - # Don't warn on out-of-line method definitions, as we would warn on the - # in-line declaration, if it isn't marked with 'override'. - if IsOutOfLineMethodDefinition(clean_lines, linenum): - return - - # Long type names may be broken across multiple lines, usually in one - # of these forms: - # LongType - # ::LongTypeContinued &identifier - # LongType:: - # LongTypeContinued &identifier - # LongType< - # ...>::LongTypeContinued &identifier - # - # If we detected a type split across two lines, join the previous - # line to current line so that we can match const references - # accordingly. - # - # Note that this only scans back one line, since scanning back - # arbitrary number of lines would be expensive. If you have a type - # that spans more than 2 lines, please use a typedef. - if linenum > 1: - previous = None - if re.match(r'\s*::(?:[\w<>]|::)+\s*&\s*\S', line): - # previous_line\n + ::current_line - previous = re.search(r'\b((?:const\s*)?(?:[\w<>]|::)+[\w<>])\s*$', - clean_lines.elided[linenum - 1]) - elif re.match(r'\s*[a-zA-Z_]([\w<>]|::)+\s*&\s*\S', line): - # previous_line::\n + current_line - previous = re.search(r'\b((?:const\s*)?(?:[\w<>]|::)+::)\s*$', - clean_lines.elided[linenum - 1]) - if previous: - line = previous.group(1) + line.lstrip() - else: - # Check for templated parameter that is split across multiple lines - endpos = line.rfind('>') - if endpos > -1: - (_, startline, startpos) = ReverseCloseExpression( - clean_lines, linenum, endpos) - if startpos > -1 and startline < linenum: - # Found the matching < on an earlier line, collect all - # pieces up to current line. - line = '' - for i in range(startline, linenum + 1): - line += clean_lines.elided[i].strip() - - # Check for non-const references in function parameters. A single '&' may - # found in the following places: - # inside expression: binary & for bitwise AND - # inside expression: unary & for taking the address of something - # inside declarators: reference parameter - # We will exclude the first two cases by checking that we are not inside a - # function body, including one that was just introduced by a trailing '{'. - # TODO(unknown): Doesn't account for 'catch(Exception& e)' [rare]. - if (nesting_state.previous_stack_top and - not (isinstance(nesting_state.previous_stack_top, _ClassInfo) or - isinstance(nesting_state.previous_stack_top, _NamespaceInfo))): - # Not at toplevel, not within a class, and not within a namespace - return - - # Avoid initializer lists. We only need to scan back from the - # current line for something that starts with ':'. - # - # We don't need to check the current line, since the '&' would - # appear inside the second set of parentheses on the current line as - # opposed to the first set. - if linenum > 0: - for i in range(linenum - 1, max(0, linenum - 10), -1): - previous_line = clean_lines.elided[i] - if not re.search(r'[),]\s*$', previous_line): - break - if re.match(r'^\s*:\s+\S', previous_line): + """Check if current line is inside constructor initializer list. + + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + Returns: + True if current line appears to be inside constructor initializer + list, False otherwise. + """ + for i in range(linenum, 1, -1): + line = clean_lines.elided[i] + if i == linenum: + remove_function_body = re.match(r"^(.*)\{\s*$", line) + if remove_function_body: + line = remove_function_body.group(1) + + if re.search(r"\s:\s*\w+[({]", line): + # A lone colon tend to indicate the start of a constructor + # initializer list. It could also be a ternary operator, which + # also tend to appear in constructor initializer lists as + # opposed to parameter lists. + return True + if re.search(r"\}\s*,\s*$", line): + # A closing brace followed by a comma is probably the end of a + # brace-initialized member in constructor initializer list. + return True + if re.search(r"[{};]\s*$", line): + # Found one of the following: + # - A closing brace or semicolon, probably the end of the previous + # function. + # - An opening brace, probably the start of current class or namespace. + # + # Current line is probably not inside an initializer list since + # we saw one of those things without seeing the starting colon. + return False + + # Got to the beginning of the file without seeing the start of + # constructor initializer list. + return False + + +def CheckForNonConstReference(filename, clean_lines, linenum, nesting_state, error): + """Check for non-const references. + + Separate from CheckLanguage since it scans backwards from current + line, instead of scanning forward. + + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + nesting_state: A NestingState instance which maintains information about + the current stack of nested blocks being parsed. + error: The function to call with any errors found. + """ + # Do nothing if there is no '&' on current line. + line = clean_lines.elided[linenum] + if "&" not in line: return - # Avoid preprocessors - if re.search(r'\\\s*$', line): - return - - # Avoid constructor initializer lists - if IsInitializerList(clean_lines, linenum): - return - - # We allow non-const references in a few standard places, like functions - # called "swap()" or iostream operators like "<<" or ">>". Do not check - # those function parameters. - # - # We also accept & in static_assert, which looks like a function but - # it's actually a declaration expression. - allowed_functions = (r'(?:[sS]wap(?:<\w:+>)?|' - r'operator\s*[<>][<>]|' - r'static_assert|COMPILE_ASSERT' - r')\s*\(') - if re.search(allowed_functions, line): - return - if not re.search(r'\S+\([^)]*$', line): - # Don't see an allowed function on this line. Actually we - # didn't see any function name on this line, so this is likely a - # multi-line parameter list. Try a bit harder to catch this case. - for i in range(2): - if (linenum > i and - re.search(allowed_functions, clean_lines.elided[linenum - i - 1])): + # If a function is inherited, current function doesn't have much of + # a choice, so any non-const references should not be blamed on + # derived function. + if IsDerivedFunction(clean_lines, linenum): return - decls = re.sub(r'{[^}]*}', ' ', line) # exclude function body - for parameter in re.findall(_RE_PATTERN_REF_PARAM, decls): - if (not re.match(_RE_PATTERN_CONST_REF_PARAM, parameter) and - not re.match(_RE_PATTERN_REF_STREAM_PARAM, parameter)): - error(filename, linenum, 'runtime/references', 2, - 'Is this a non-const reference? ' - 'If so, make const or use a pointer: ' + - re.sub(' *<', '<', parameter)) + # Don't warn on out-of-line method definitions, as we would warn on the + # in-line declaration, if it isn't marked with 'override'. + if IsOutOfLineMethodDefinition(clean_lines, linenum): + return + + # Long type names may be broken across multiple lines, usually in one + # of these forms: + # LongType + # ::LongTypeContinued &identifier + # LongType:: + # LongTypeContinued &identifier + # LongType< + # ...>::LongTypeContinued &identifier + # + # If we detected a type split across two lines, join the previous + # line to current line so that we can match const references + # accordingly. + # + # Note that this only scans back one line, since scanning back + # arbitrary number of lines would be expensive. If you have a type + # that spans more than 2 lines, please use a typedef. + if linenum > 1: + previous = None + if re.match(r"\s*::(?:[\w<>]|::)+\s*&\s*\S", line): + # previous_line\n + ::current_line + previous = re.search( + r"\b((?:const\s*)?(?:[\w<>]|::)+[\w<>])\s*$", clean_lines.elided[linenum - 1] + ) + elif re.match(r"\s*[a-zA-Z_]([\w<>]|::)+\s*&\s*\S", line): + # previous_line::\n + current_line + previous = re.search( + r"\b((?:const\s*)?(?:[\w<>]|::)+::)\s*$", clean_lines.elided[linenum - 1] + ) + if previous: + line = previous.group(1) + line.lstrip() + else: + # Check for templated parameter that is split across multiple lines + endpos = line.rfind(">") + if endpos > -1: + (_, startline, startpos) = ReverseCloseExpression(clean_lines, linenum, endpos) + if startpos > -1 and startline < linenum: + # Found the matching < on an earlier line, collect all + # pieces up to current line. + line = "" + for i in range(startline, linenum + 1): + line += clean_lines.elided[i].strip() + + # Check for non-const references in function parameters. A single '&' may + # found in the following places: + # inside expression: binary & for bitwise AND + # inside expression: unary & for taking the address of something + # inside declarators: reference parameter + # We will exclude the first two cases by checking that we are not inside a + # function body, including one that was just introduced by a trailing '{'. + # TODO(unknown): Doesn't account for 'catch(Exception& e)' [rare]. + if nesting_state.previous_stack_top and not ( + isinstance(nesting_state.previous_stack_top, _ClassInfo) + or isinstance(nesting_state.previous_stack_top, _NamespaceInfo) + ): + # Not at toplevel, not within a class, and not within a namespace + return + + # Avoid initializer lists. We only need to scan back from the + # current line for something that starts with ':'. + # + # We don't need to check the current line, since the '&' would + # appear inside the second set of parentheses on the current line as + # opposed to the first set. + if linenum > 0: + for i in range(linenum - 1, max(0, linenum - 10), -1): + previous_line = clean_lines.elided[i] + if not re.search(r"[),]\s*$", previous_line): + break + if re.match(r"^\s*:\s+\S", previous_line): + return + + # Avoid preprocessors + if re.search(r"\\\s*$", line): + return + + # Avoid constructor initializer lists + if IsInitializerList(clean_lines, linenum): + return + + # We allow non-const references in a few standard places, like functions + # called "swap()" or iostream operators like "<<" or ">>". Do not check + # those function parameters. + # + # We also accept & in static_assert, which looks like a function but + # it's actually a declaration expression. + allowed_functions = ( + r"(?:[sS]wap(?:<\w:+>)?|" + r"operator\s*[<>][<>]|" + r"static_assert|COMPILE_ASSERT" + r")\s*\(" + ) + if re.search(allowed_functions, line): + return + if not re.search(r"\S+\([^)]*$", line): + # Don't see an allowed function on this line. Actually we + # didn't see any function name on this line, so this is likely a + # multi-line parameter list. Try a bit harder to catch this case. + for i in range(2): + if linenum > i and re.search(allowed_functions, clean_lines.elided[linenum - i - 1]): + return + + decls = re.sub(r"{[^}]*}", " ", line) # exclude function body + for parameter in re.findall(_RE_PATTERN_REF_PARAM, decls): + if not re.match(_RE_PATTERN_CONST_REF_PARAM, parameter) and not re.match( + _RE_PATTERN_REF_STREAM_PARAM, parameter + ): + error( + filename, + linenum, + "runtime/references", + 2, + "Is this a non-const reference? " + "If so, make const or use a pointer: " + re.sub(" *<", "<", parameter), + ) + + +def CheckCasts(filename, clean_lines, linenum, error): + """Various cast related checks. + + 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] + # Check to see if they're using an conversion function cast. + # I just try to capture the most common basic types, though there are more. + # Parameterless conversion functions, such as bool(), are allowed as they are + # probably a member operator declaration or default constructor. + match = re.search( + r"(\bnew\s+(?:const\s+)?|\S<\s*(?:const\s+)?)?\b" + r"(int|float|double|bool|char|int16_t|uint16_t|int32_t|uint32_t|int64_t|uint64_t)" + r"(\([^)].*)", + line, + ) + expecting_function = ExpectingFunctionArgs(clean_lines, linenum) + if match and not expecting_function: + matched_type = match.group(2) -def CheckCasts(filename, clean_lines, linenum, error): - """Various cast related checks. - - 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] - - # Check to see if they're using an conversion function cast. - # I just try to capture the most common basic types, though there are more. - # Parameterless conversion functions, such as bool(), are allowed as they are - # probably a member operator declaration or default constructor. - match = re.search( - r'(\bnew\s+(?:const\s+)?|\S<\s*(?:const\s+)?)?\b' - r'(int|float|double|bool|char|int16_t|uint16_t|int32_t|uint32_t|int64_t|uint64_t)' - r'(\([^)].*)', line) - expecting_function = ExpectingFunctionArgs(clean_lines, linenum) - if match and not expecting_function: - matched_type = match.group(2) - - # matched_new_or_template is used to silence two false positives: - # - New operators - # - Template arguments with function types + # matched_new_or_template is used to silence two false positives: + # - New operators + # - Template arguments with function types + # + # For template arguments, we match on types immediately following + # an opening bracket without any spaces. This is a fast way to + # silence the common case where the function type is the first + # template argument. False negative with less-than comparison is + # avoided because those operators are usually followed by a space. + # + # function // bracket + no space = false positive + # value < double(42) // bracket + space = true positive + matched_new_or_template = match.group(1) + + # Avoid arrays by looking for brackets that come after the closing + # parenthesis. + if re.match(r"\([^()]+\)\s*\[", match.group(3)): + return + + # Other things to ignore: + # - Function pointers + # - Casts to pointer types + # - Placement new + # - Alias declarations + matched_funcptr = match.group(3) + if ( + matched_new_or_template is None + and not ( + matched_funcptr + and ( + re.match(r"\((?:[^() ]+::\s*\*\s*)?[^() ]+\)\s*\(", matched_funcptr) + or matched_funcptr.startswith("(*)") + ) + ) + and not re.match(r"\s*using\s+\S+\s*=\s*" + matched_type, line) + and not re.search(r"new\(\S+\)\s*" + matched_type, line) + ): + error( + filename, + linenum, + "readability/casting", + 4, + f"Using deprecated casting style. Use static_cast<{matched_type}>(...) instead", + ) + + if not expecting_function: + CheckCStyleCast( + filename, + clean_lines, + linenum, + "static_cast", + r"\((int|float|double|bool|char|u?int(16|32|64)_t|size_t)\)", + error, + ) + + # This doesn't catch all cases. Consider (const char * const)"hello". + # + # (char *) "foo" should always be a const_cast (reinterpret_cast won't + # compile). + if CheckCStyleCast( + filename, clean_lines, linenum, "const_cast", r'\((char\s?\*+\s?)\)\s*"', error + ): + pass + else: + # Check pointer casts for other than string constants + CheckCStyleCast( + filename, clean_lines, linenum, "reinterpret_cast", r"\((\w+\s?\*+\s?)\)", error + ) + + # In addition, we look for people taking the address of a cast. This + # is dangerous -- casts can assign to temporaries, so the pointer doesn't + # point where you think. # - # For template arguments, we match on types immediately following - # an opening bracket without any spaces. This is a fast way to - # silence the common case where the function type is the first - # template argument. False negative with less-than comparison is - # avoided because those operators are usually followed by a space. + # Some non-identifier character is required before the '&' for the + # expression to be recognized as a cast. These are casts: + # expression = &static_cast(temporary()); + # function(&(int*)(temporary())); # - # function // bracket + no space = false positive - # value < double(42) // bracket + space = true positive - matched_new_or_template = match.group(1) - - # Avoid arrays by looking for brackets that come after the closing - # parenthesis. - if re.match(r'\([^()]+\)\s*\[', match.group(3)): - return - - # Other things to ignore: - # - Function pointers - # - Casts to pointer types - # - Placement new - # - Alias declarations - matched_funcptr = match.group(3) - if (matched_new_or_template is None and - not (matched_funcptr and - (re.match(r'\((?:[^() ]+::\s*\*\s*)?[^() ]+\)\s*\(', - matched_funcptr) or - matched_funcptr.startswith('(*)'))) and - not re.match(r'\s*using\s+\S+\s*=\s*' + matched_type, line) and - not re.search(r'new\(\S+\)\s*' + matched_type, line)): - error(filename, linenum, 'readability/casting', 4, - 'Using deprecated casting style. ' - f'Use static_cast<{matched_type}>(...) instead') - - if not expecting_function: - CheckCStyleCast(filename, clean_lines, linenum, 'static_cast', - r'\((int|float|double|bool|char|u?int(16|32|64)_t|size_t)\)', error) - - # This doesn't catch all cases. Consider (const char * const)"hello". - # - # (char *) "foo" should always be a const_cast (reinterpret_cast won't - # compile). - if CheckCStyleCast(filename, clean_lines, linenum, 'const_cast', - r'\((char\s?\*+\s?)\)\s*"', error): - pass - else: - # Check pointer casts for other than string constants - CheckCStyleCast(filename, clean_lines, linenum, 'reinterpret_cast', - r'\((\w+\s?\*+\s?)\)', error) - - # In addition, we look for people taking the address of a cast. This - # is dangerous -- casts can assign to temporaries, so the pointer doesn't - # point where you think. - # - # Some non-identifier character is required before the '&' for the - # expression to be recognized as a cast. These are casts: - # expression = &static_cast(temporary()); - # function(&(int*)(temporary())); - # - # This is not a cast: - # reference_type&(int* function_param); - match = re.search( - r'(?:[^\w]&\(([^)*][^)]*)\)[\w(])|' - r'(?:[^\w]&(static|dynamic|down|reinterpret)_cast\b)', line) - if match: - # Try a better error message when the & is bound to something - # dereferenced by the casted pointer, as opposed to the casted - # pointer itself. - parenthesis_error = False - match = re.match(r'^(.*&(?:static|dynamic|down|reinterpret)_cast\b)<', line) + # This is not a cast: + # reference_type&(int* function_param); + match = re.search( + r"(?:[^\w]&\(([^)*][^)]*)\)[\w(])|" + r"(?:[^\w]&(static|dynamic|down|reinterpret)_cast\b)", + line, + ) if match: - _, y1, x1 = CloseExpression(clean_lines, linenum, len(match.group(1))) - if x1 >= 0 and clean_lines.elided[y1][x1] == '(': - _, y2, x2 = CloseExpression(clean_lines, y1, x1) - if x2 >= 0: - extended_line = clean_lines.elided[y2][x2:] - if y2 < clean_lines.NumLines() - 1: - extended_line += clean_lines.elided[y2 + 1] - if re.match(r'\s*(?:->|\[)', extended_line): - parenthesis_error = True - - if parenthesis_error: - error(filename, linenum, 'readability/casting', 4, - ('Are you taking an address of something dereferenced ' - 'from a cast? Wrapping the dereferenced expression in ' - 'parentheses will make the binding more obvious')) - else: - error(filename, linenum, 'runtime/casting', 4, - ('Are you taking an address of a cast? ' - 'This is dangerous: could be a temp var. ' - 'Take the address before doing the cast, rather than after')) + # Try a better error message when the & is bound to something + # dereferenced by the casted pointer, as opposed to the casted + # pointer itself. + parenthesis_error = False + match = re.match(r"^(.*&(?:static|dynamic|down|reinterpret)_cast\b)<", line) + if match: + _, y1, x1 = CloseExpression(clean_lines, linenum, len(match.group(1))) + if x1 >= 0 and clean_lines.elided[y1][x1] == "(": + _, y2, x2 = CloseExpression(clean_lines, y1, x1) + if x2 >= 0: + extended_line = clean_lines.elided[y2][x2:] + if y2 < clean_lines.NumLines() - 1: + extended_line += clean_lines.elided[y2 + 1] + if re.match(r"\s*(?:->|\[)", extended_line): + parenthesis_error = True + + if parenthesis_error: + error( + filename, + linenum, + "readability/casting", + 4, + ( + "Are you taking an address of something dereferenced " + "from a cast? Wrapping the dereferenced expression in " + "parentheses will make the binding more obvious" + ), + ) + else: + error( + filename, + linenum, + "runtime/casting", + 4, + ( + "Are you taking an address of a cast? " + "This is dangerous: could be a temp var. " + "Take the address before doing the cast, rather than after" + ), + ) def CheckCStyleCast(filename, clean_lines, linenum, cast_type, pattern, error): - """Checks for a C-style cast by looking for the pattern. - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - cast_type: The string for the C++ cast to recommend. This is either - reinterpret_cast, static_cast, or const_cast, depending. - pattern: The regular expression used to find C-style casts. - error: The function to call with any errors found. - - Returns: - True if an error was emitted. - False otherwise. - """ - line = clean_lines.elided[linenum] - match = re.search(pattern, line) - if not match: - return False + """Checks for a C-style cast by looking for the pattern. - # Exclude lines with keywords that tend to look like casts - context = line[0:match.start(1) - 1] - if re.match(r'.*\b(?:sizeof|alignof|alignas|[_A-Z][_A-Z0-9]*)\s*$', context): - return False + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + cast_type: The string for the C++ cast to recommend. This is either + reinterpret_cast, static_cast, or const_cast, depending. + pattern: The regular expression used to find C-style casts. + error: The function to call with any errors found. - # Try expanding current context to see if we one level of - # parentheses inside a macro. - if linenum > 0: - for i in range(linenum - 1, max(0, linenum - 5), -1): - context = clean_lines.elided[i] + context - if re.match(r'.*\b[_A-Z][_A-Z0-9]*\s*\((?:\([^()]*\)|[^()])*$', context): - return False + Returns: + True if an error was emitted. + False otherwise. + """ + line = clean_lines.elided[linenum] + match = re.search(pattern, line) + if not match: + return False - # operator++(int) and operator--(int) - if context.endswith((' operator++', ' operator--', '::operator++', '::operator--')): - return False + # Exclude lines with keywords that tend to look like casts + context = line[0 : match.start(1) - 1] + if re.match(r".*\b(?:sizeof|alignof|alignas|[_A-Z][_A-Z0-9]*)\s*$", context): + return False - # A single unnamed argument for a function tends to look like old style cast. - # If we see those, don't issue warnings for deprecated casts. - remainder = line[match.end(0):] - if re.match(r'^\s*(?:;|const\b|throw\b|final\b|override\b|[=>{),]|->)', - remainder): - return False + # Try expanding current context to see if we one level of + # parentheses inside a macro. + if linenum > 0: + for i in range(linenum - 1, max(0, linenum - 5), -1): + context = clean_lines.elided[i] + context + if re.match(r".*\b[_A-Z][_A-Z0-9]*\s*\((?:\([^()]*\)|[^()])*$", context): + return False + + # operator++(int) and operator--(int) + if context.endswith((" operator++", " operator--", "::operator++", "::operator--")): + return False + + # A single unnamed argument for a function tends to look like old style cast. + # If we see those, don't issue warnings for deprecated casts. + remainder = line[match.end(0) :] + if re.match(r"^\s*(?:;|const\b|throw\b|final\b|override\b|[=>{),]|->)", remainder): + return False - # At this point, all that should be left is actual casts. - error(filename, linenum, 'readability/casting', 4, - f'Using C-style cast. Use {cast_type}<{match.group(1)}>(...) instead') + # At this point, all that should be left is actual casts. + error( + filename, + linenum, + "readability/casting", + 4, + f"Using C-style cast. Use {cast_type}<{match.group(1)}>(...) instead", + ) - return True + return True def ExpectingFunctionArgs(clean_lines, linenum): - """Checks whether where function type arguments are expected. - - Args: - clean_lines: A CleansedLines instance containing the file. - linenum: The number of the line to check. - - Returns: - True if the line at 'linenum' is inside something that expects arguments - of function types. - """ - line = clean_lines.elided[linenum] - return (re.match(r'^\s*MOCK_(CONST_)?METHOD\d+(_T)?\(', line) or - (linenum >= 2 and - (re.match(r'^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\((?:\S+,)?\s*$', - clean_lines.elided[linenum - 1]) or - re.match(r'^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\(\s*$', - clean_lines.elided[linenum - 2]) or - re.search(r'\bstd::m?function\s*\<\s*$', - clean_lines.elided[linenum - 1])))) + """Checks whether where function type arguments are expected. + + Args: + clean_lines: A CleansedLines instance containing the file. + linenum: The number of the line to check. + + Returns: + True if the line at 'linenum' is inside something that expects arguments + of function types. + """ + line = clean_lines.elided[linenum] + return re.match(r"^\s*MOCK_(CONST_)?METHOD\d+(_T)?\(", line) or ( + linenum >= 2 + and ( + re.match( + r"^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\((?:\S+,)?\s*$", + clean_lines.elided[linenum - 1], + ) + or re.match( + r"^\s*MOCK_(?:CONST_)?METHOD\d+(?:_T)?\(\s*$", clean_lines.elided[linenum - 2] + ) + or re.search(r"\bstd::m?function\s*\<\s*$", clean_lines.elided[linenum - 1]) + ) + ) _HEADERS_CONTAINING_TEMPLATES = ( - ('', ('deque',)), - ('', ('unary_function', 'binary_function', - 'plus', 'minus', 'multiplies', 'divides', 'modulus', - 'negate', - 'equal_to', 'not_equal_to', 'greater', 'less', - 'greater_equal', 'less_equal', - 'logical_and', 'logical_or', 'logical_not', - 'unary_negate', 'not1', 'binary_negate', 'not2', - 'bind1st', 'bind2nd', - 'pointer_to_unary_function', - 'pointer_to_binary_function', - 'ptr_fun', - 'mem_fun_t', 'mem_fun', 'mem_fun1_t', 'mem_fun1_ref_t', - 'mem_fun_ref_t', - 'const_mem_fun_t', 'const_mem_fun1_t', - 'const_mem_fun_ref_t', 'const_mem_fun1_ref_t', - 'mem_fun_ref', - )), - ('', ('numeric_limits',)), - ('', ('list',)), - ('', ('multimap',)), - ('', ('allocator', 'make_shared', 'make_unique', 'shared_ptr', - 'unique_ptr', 'weak_ptr')), - ('', ('queue', 'priority_queue',)), - ('', ('set', 'multiset',)), - ('', ('stack',)), - ('', ('char_traits', 'basic_string',)), - ('', ('tuple',)), - ('', ('unordered_map', 'unordered_multimap')), - ('', ('unordered_set', 'unordered_multiset')), - ('', ('pair',)), - ('', ('vector',)), - + ("", ("deque",)), + ( + "", + ( + "unary_function", + "binary_function", + "plus", + "minus", + "multiplies", + "divides", + "modulus", + "negate", + "equal_to", + "not_equal_to", + "greater", + "less", + "greater_equal", + "less_equal", + "logical_and", + "logical_or", + "logical_not", + "unary_negate", + "not1", + "binary_negate", + "not2", + "bind1st", + "bind2nd", + "pointer_to_unary_function", + "pointer_to_binary_function", + "ptr_fun", + "mem_fun_t", + "mem_fun", + "mem_fun1_t", + "mem_fun1_ref_t", + "mem_fun_ref_t", + "const_mem_fun_t", + "const_mem_fun1_t", + "const_mem_fun_ref_t", + "const_mem_fun1_ref_t", + "mem_fun_ref", + ), + ), + ("", ("numeric_limits",)), + ("", ("list",)), + ("", ("multimap",)), + ( + "", + ("allocator", "make_shared", "make_unique", "shared_ptr", "unique_ptr", "weak_ptr"), + ), + ( + "", + ( + "queue", + "priority_queue", + ), + ), + ( + "", + ( + "set", + "multiset", + ), + ), + ("", ("stack",)), + ( + "", + ( + "char_traits", + "basic_string", + ), + ), + ("", ("tuple",)), + ("", ("unordered_map", "unordered_multimap")), + ("", ("unordered_set", "unordered_multiset")), + ("", ("pair",)), + ("", ("vector",)), # gcc extensions. # Note: std::hash is their hash, ::hash is our hash - ('', ('hash_map', 'hash_multimap',)), - ('', ('hash_set', 'hash_multiset',)), - ('', ('slist',)), - ) + ( + "", + ( + "hash_map", + "hash_multimap", + ), + ), + ( + "", + ( + "hash_set", + "hash_multiset", + ), + ), + ("", ("slist",)), +) _HEADERS_MAYBE_TEMPLATES = ( - ('', ('copy', 'max', 'min', 'min_element', 'sort', - 'transform', - )), - ('', ('forward', 'make_pair', 'move', 'swap')), - ) + ( + "", + ( + "copy", + "max", + "min", + "min_element", + "sort", + "transform", + ), + ), + ("", ("forward", "make_pair", "move", "swap")), +) # Non templated types or global objects _HEADERS_TYPES_OR_OBJS = ( # String and others are special -- it is a non-templatized type in STL. - ('', ('string',)), - ('', ('cin', 'cout', 'cerr', 'clog', 'wcin', 'wcout', - 'wcerr', 'wclog')), - ('', ('FILE', 'fpos_t'))) + ("", ("string",)), + ("", ("cin", "cout", "cerr", "clog", "wcin", "wcout", "wcerr", "wclog")), + ("", ("FILE", "fpos_t")), +) # Non templated functions _HEADERS_FUNCTIONS = ( - ('', ('fopen', 'freopen', - 'fclose', 'fflush', 'setbuf', 'setvbuf', 'fread', - 'fwrite', 'fgetc', 'getc', 'fgets', 'fputc', 'putc', - 'fputs', 'getchar', 'gets', 'putchar', 'puts', 'ungetc', - 'scanf', 'fscanf', 'sscanf', 'vscanf', 'vfscanf', - 'vsscanf', 'printf', 'fprintf', 'sprintf', 'snprintf', - 'vprintf', 'vfprintf', 'vsprintf', 'vsnprintf', - 'ftell', 'fgetpos', 'fseek', 'fsetpos', - 'clearerr', 'feof', 'ferror', 'perror', - 'tmpfile', 'tmpnam'),),) + ( + "", + ( + "fopen", + "freopen", + "fclose", + "fflush", + "setbuf", + "setvbuf", + "fread", + "fwrite", + "fgetc", + "getc", + "fgets", + "fputc", + "putc", + "fputs", + "getchar", + "gets", + "putchar", + "puts", + "ungetc", + "scanf", + "fscanf", + "sscanf", + "vscanf", + "vfscanf", + "vsscanf", + "printf", + "fprintf", + "sprintf", + "snprintf", + "vprintf", + "vfprintf", + "vsprintf", + "vsnprintf", + "ftell", + "fgetpos", + "fseek", + "fsetpos", + "clearerr", + "feof", + "ferror", + "perror", + "tmpfile", + "tmpnam", + ), + ), +) _re_pattern_headers_maybe_templates = [] for _header, _templates in _HEADERS_MAYBE_TEMPLATES: - # Match max(..., ...), max(..., ...), but not foo->max, foo.max or - # 'type::max()'. - _re_pattern_headers_maybe_templates.extend( - (re.compile(r'((\bstd::)|[^>.:])\b' + _template + r'(<.*?>)?\([^\)]'), - _template, - _header) for _template in _templates) + # Match max(..., ...), max(..., ...), but not foo->max, foo.max or + # 'type::max()'. + _re_pattern_headers_maybe_templates.extend( + (re.compile(r"((\bstd::)|[^>.:])\b" + _template + r"(<.*?>)?\([^\)]"), _template, _header) + for _template in _templates + ) # Map is often overloaded. Only check, if it is fully qualified. # Match 'std::map(...)', but not 'map(...)'' _re_pattern_headers_maybe_templates.append( - (re.compile(r'(std\b::\bmap\s*\<)|(^(std\b::\b)map\b\(\s*\<)'), - 'map<>', - '')) + (re.compile(r"(std\b::\bmap\s*\<)|(^(std\b::\b)map\b\(\s*\<)"), "map<>", "") +) # Other scripts may reach in and modify this pattern. _re_pattern_templates = [] for _header, _templates in _HEADERS_CONTAINING_TEMPLATES: - _re_pattern_templates.extend( - (re.compile(r'((^|(^|\s|((^|\W)::))std::)|[^>.:]\b)' + _template + r'\s*\<'), - _template + '<>', - _header) for _template in _templates) + _re_pattern_templates.extend( + ( + re.compile(r"((^|(^|\s|((^|\W)::))std::)|[^>.:]\b)" + _template + r"\s*\<"), + _template + "<>", + _header, + ) + for _template in _templates + ) _re_pattern_types_or_objs = [] for _header, _types_or_objs in _HEADERS_TYPES_OR_OBJS: - _re_pattern_types_or_objs.extend( - (re.compile(r'\b' + _type_or_obj + r'\b'), - _type_or_obj, - _header) for _type_or_obj in _types_or_objs) + _re_pattern_types_or_objs.extend( + (re.compile(r"\b" + _type_or_obj + r"\b"), _type_or_obj, _header) + for _type_or_obj in _types_or_objs + ) _re_pattern_functions = [] for _header, _functions in _HEADERS_FUNCTIONS: - # Match printf(..., ...), but not foo->printf, foo.printf or - # 'type::printf()'. - _re_pattern_functions.extend( - (re.compile(r'([^>.]|^)\b' + _function + r'\([^\)]'), - _function, - _header) for _function in _functions) + # Match printf(..., ...), but not foo->printf, foo.printf or + # 'type::printf()'. + _re_pattern_functions.extend( + (re.compile(r"([^>.]|^)\b" + _function + r"\([^\)]"), _function, _header) + for _function in _functions + ) + def FilesBelongToSameModule(filename_cc, filename_h): - """Check if these two filenames belong to the same module. - - The concept of a 'module' here is a as follows: - foo.h, foo-inl.h, foo.cc, foo_test.cc and foo_unittest.cc belong to the - same 'module' if they are in the same directory. - some/path/public/xyzzy and some/path/internal/xyzzy are also considered - to belong to the same module here. - - If the filename_cc contains a longer path than the filename_h, for example, - '/absolute/path/to/base/sysinfo.cc', and this file would include - 'base/sysinfo.h', this function also produces the prefix needed to open the - header. This is used by the caller of this function to more robustly open the - header file. We don't have access to the real include paths in this context, - so we need this guesswork here. - - Known bugs: tools/base/bar.cc and base/bar.h belong to the same module - according to this implementation. Because of this, this function gives - some false positives. This should be sufficiently rare in practice. - - Args: - filename_cc: is the path for the source (e.g. .cc) file - filename_h: is the path for the header path - - Returns: - Tuple with a bool and a string: - bool: True if filename_cc and filename_h belong to the same module. - string: the additional prefix needed to open the header file. - """ - fileinfo_cc = FileInfo(filename_cc) - if fileinfo_cc.Extension().lstrip('.') not in GetNonHeaderExtensions(): - return (False, '') - - fileinfo_h = FileInfo(filename_h) - if not IsHeaderExtension(fileinfo_h.Extension().lstrip('.')): - return (False, '') - - filename_cc = filename_cc[:-(len(fileinfo_cc.Extension()))] - matched_test_suffix = re.search(_TEST_FILE_SUFFIX, fileinfo_cc.BaseName()) - if matched_test_suffix: - filename_cc = filename_cc[:-len(matched_test_suffix.group(1))] - - filename_cc = filename_cc.replace('/public/', '/') - filename_cc = filename_cc.replace('/internal/', '/') - - filename_h = filename_h[:-(len(fileinfo_h.Extension()))] - if filename_h.endswith('-inl'): - filename_h = filename_h[:-len('-inl')] - filename_h = filename_h.replace('/public/', '/') - filename_h = filename_h.replace('/internal/', '/') - - files_belong_to_same_module = filename_cc.endswith(filename_h) - common_path = '' - if files_belong_to_same_module: - common_path = filename_cc[:-len(filename_h)] - return files_belong_to_same_module, common_path - - -def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error, - io=codecs): - """Reports for missing stl includes. - - This function will output warnings to make sure you are including the headers - necessary for the stl containers and functions that you use. We only give one - reason to include a header. For example, if you use both equal_to<> and - less<> in a .h file, only one (the latter in the file) of these will be - reported as a reason to include the . - - Args: - filename: The name of the current file. - clean_lines: A CleansedLines instance containing the file. - include_state: An _IncludeState instance. - error: The function to call with any errors found. - io: The IO factory to use to read the header file. Provided for unittest - injection. - """ - required = {} # A map of header name to linenumber and the template entity. - # Example of required: { '': (1219, 'less<>') } - - for linenum in range(clean_lines.NumLines()): - line = clean_lines.elided[linenum] - if not line or line[0] == '#': - continue - - _re_patterns = [] - _re_patterns.extend(_re_pattern_types_or_objs) - _re_patterns.extend(_re_pattern_functions) - for pattern, item, header in _re_patterns: - matched = pattern.search(line) - if matched: - # Don't warn about strings in non-STL namespaces: - # (We check only the first match per line; good enough.) - prefix = line[:matched.start()] - if prefix.endswith('std::') or not prefix.endswith('::'): - required[header] = (linenum, item) - - for pattern, template, header in _re_pattern_headers_maybe_templates: - if pattern.search(line): - required[header] = (linenum, template) - - # The following function is just a speed up, no semantics are changed. - if '<' not in line: # Reduces the cpu time usage by skipping lines. - continue - - for pattern, template, header in _re_pattern_templates: - matched = pattern.search(line) - if matched: - # Don't warn about IWYU in non-STL namespaces: - # (We check only the first match per line; good enough.) - prefix = line[:matched.start()] - if prefix.endswith('std::') or not prefix.endswith('::'): - required[header] = (linenum, template) - - # Let's flatten the include_state include_list and copy it into a dictionary. - include_dict = dict([item for sublist in include_state.include_list - for item in sublist]) - - # All the lines have been processed, report the errors found. - for header in sorted(required, key=required.__getitem__): - template = required[header][1] - header_stripped = header.strip('<>"') - if (header_stripped not in include_dict - and not (header_stripped[0] == 'c' - and (header_stripped[1:] + '.h') in include_dict)): - error(filename, required[header][0], - 'build/include_what_you_use', 4, - 'Add #include ' + header + ' for ' + template) - - -_RE_PATTERN_EXPLICIT_MAKEPAIR = re.compile(r'\bmake_pair\s*<') + """Check if these two filenames belong to the same module. + + The concept of a 'module' here is a as follows: + foo.h, foo-inl.h, foo.cc, foo_test.cc and foo_unittest.cc belong to the + same 'module' if they are in the same directory. + some/path/public/xyzzy and some/path/internal/xyzzy are also considered + to belong to the same module here. + + If the filename_cc contains a longer path than the filename_h, for example, + '/absolute/path/to/base/sysinfo.cc', and this file would include + 'base/sysinfo.h', this function also produces the prefix needed to open the + header. This is used by the caller of this function to more robustly open the + header file. We don't have access to the real include paths in this context, + so we need this guesswork here. + + Known bugs: tools/base/bar.cc and base/bar.h belong to the same module + according to this implementation. Because of this, this function gives + some false positives. This should be sufficiently rare in practice. + + Args: + filename_cc: is the path for the source (e.g. .cc) file + filename_h: is the path for the header path + + Returns: + Tuple with a bool and a string: + bool: True if filename_cc and filename_h belong to the same module. + string: the additional prefix needed to open the header file. + """ + fileinfo_cc = FileInfo(filename_cc) + if fileinfo_cc.Extension().lstrip(".") not in GetNonHeaderExtensions(): + return (False, "") + + fileinfo_h = FileInfo(filename_h) + if not IsHeaderExtension(fileinfo_h.Extension().lstrip(".")): + return (False, "") + + filename_cc = filename_cc[: -(len(fileinfo_cc.Extension()))] + matched_test_suffix = re.search(_TEST_FILE_SUFFIX, fileinfo_cc.BaseName()) + if matched_test_suffix: + filename_cc = filename_cc[: -len(matched_test_suffix.group(1))] + + filename_cc = filename_cc.replace("/public/", "/") + filename_cc = filename_cc.replace("/internal/", "/") + + filename_h = filename_h[: -(len(fileinfo_h.Extension()))] + if filename_h.endswith("-inl"): + filename_h = filename_h[: -len("-inl")] + filename_h = filename_h.replace("/public/", "/") + filename_h = filename_h.replace("/internal/", "/") + + files_belong_to_same_module = filename_cc.endswith(filename_h) + common_path = "" + if files_belong_to_same_module: + common_path = filename_cc[: -len(filename_h)] + return files_belong_to_same_module, common_path + + +def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error, io=codecs): + """Reports for missing stl includes. + + This function will output warnings to make sure you are including the headers + necessary for the stl containers and functions that you use. We only give one + reason to include a header. For example, if you use both equal_to<> and + less<> in a .h file, only one (the latter in the file) of these will be + reported as a reason to include the . + + Args: + filename: The name of the current file. + clean_lines: A CleansedLines instance containing the file. + include_state: An _IncludeState instance. + error: The function to call with any errors found. + io: The IO factory to use to read the header file. Provided for unittest + injection. + """ + required = {} # A map of header name to linenumber and the template entity. + # Example of required: { '': (1219, 'less<>') } + + for linenum in range(clean_lines.NumLines()): + line = clean_lines.elided[linenum] + if not line or line[0] == "#": + continue + + _re_patterns = [] + _re_patterns.extend(_re_pattern_types_or_objs) + _re_patterns.extend(_re_pattern_functions) + for pattern, item, header in _re_patterns: + matched = pattern.search(line) + if matched: + # Don't warn about strings in non-STL namespaces: + # (We check only the first match per line; good enough.) + prefix = line[: matched.start()] + if prefix.endswith("std::") or not prefix.endswith("::"): + required[header] = (linenum, item) + + for pattern, template, header in _re_pattern_headers_maybe_templates: + if pattern.search(line): + required[header] = (linenum, template) + + # The following function is just a speed up, no semantics are changed. + if "<" not in line: # Reduces the cpu time usage by skipping lines. + continue + + for pattern, template, header in _re_pattern_templates: + matched = pattern.search(line) + if matched: + # Don't warn about IWYU in non-STL namespaces: + # (We check only the first match per line; good enough.) + prefix = line[: matched.start()] + if prefix.endswith("std::") or not prefix.endswith("::"): + required[header] = (linenum, template) + + # Let's flatten the include_state include_list and copy it into a dictionary. + include_dict = dict([item for sublist in include_state.include_list for item in sublist]) + + # All the lines have been processed, report the errors found. + for header in sorted(required, key=required.__getitem__): + template = required[header][1] + header_stripped = header.strip('<>"') + if header_stripped not in include_dict and not ( + header_stripped[0] == "c" and (header_stripped[1:] + ".h") in include_dict + ): + error( + filename, + required[header][0], + "build/include_what_you_use", + 4, + "Add #include " + header + " for " + template, + ) + + +_RE_PATTERN_EXPLICIT_MAKEPAIR = re.compile(r"\bmake_pair\s*<") def CheckMakePairUsesDeduction(filename, clean_lines, linenum, error): - """Check that make_pair's template arguments are deduced. - - G++ 4.6 in C++11 mode fails badly if make_pair's template arguments are - specified explicitly, and such use isn't intended in any case. - - 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] - match = _RE_PATTERN_EXPLICIT_MAKEPAIR.search(line) - if match: - error(filename, linenum, 'build/explicit_make_pair', - 4, # 4 = high confidence - 'For C++11-compatibility, omit template arguments from make_pair' - ' OR use pair directly OR if appropriate, construct a pair directly') + """Check that make_pair's template arguments are deduced. + G++ 4.6 in C++11 mode fails badly if make_pair's template arguments are + specified explicitly, and such use isn't intended in any case. -def CheckRedundantVirtual(filename, clean_lines, linenum, error): - """Check if line contains a redundant "virtual" function-specifier. - - 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. - """ - # Look for "virtual" on current line. - line = clean_lines.elided[linenum] - virtual = re.match(r'^(.*)(\bvirtual\b)(.*)$', line) - if not virtual: - return - - # Ignore "virtual" keywords that are near access-specifiers. These - # are only used in class base-specifier and do not apply to member - # functions. - if (re.search(r'\b(public|protected|private)\s+$', virtual.group(1)) or - re.match(r'^\s+(public|protected|private)\b', virtual.group(3))): - return - - # Ignore the "virtual" keyword from virtual base classes. Usually - # there is a column on the same line in these cases (virtual base - # classes are rare in google3 because multiple inheritance is rare). - if re.match(r'^.*[^:]:[^:].*$', line): - return - - # Look for the next opening parenthesis. This is the start of the - # parameter list (possibly on the next line shortly after virtual). - # TODO(unknown): doesn't work if there are virtual functions with - # decltype() or other things that use parentheses, but csearch suggests - # that this is rare. - end_col = -1 - end_line = -1 - start_col = len(virtual.group(2)) - for start_line in range(linenum, min(linenum + 3, clean_lines.NumLines())): - line = clean_lines.elided[start_line][start_col:] - parameter_list = re.match(r'^([^(]*)\(', line) - if parameter_list: - # Match parentheses to find the end of the parameter list - (_, end_line, end_col) = CloseExpression( - clean_lines, start_line, start_col + len(parameter_list.group(1))) - break - start_col = 0 - - if end_col < 0: - return # Couldn't find end of parameter list, give up - - # Look for "override" or "final" after the parameter list - # (possibly on the next few lines). - for i in range(end_line, min(end_line + 3, clean_lines.NumLines())): - line = clean_lines.elided[i][end_col:] - match = re.search(r'\b(override|final)\b', line) + 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] + match = _RE_PATTERN_EXPLICIT_MAKEPAIR.search(line) if match: - error(filename, linenum, 'readability/inheritance', 4, - ('"virtual" is redundant since function is ' - f'already declared as "{match.group(1)}"')) + error( + filename, + linenum, + "build/explicit_make_pair", + 4, # 4 = high confidence + "For C++11-compatibility, omit template arguments from make_pair" + " OR use pair directly OR if appropriate, construct a pair directly", + ) - # Set end_col to check whole lines after we are done with the - # first line. - end_col = 0 - if re.search(r'[^\w]\s*$', line): - break +def CheckRedundantVirtual(filename, clean_lines, linenum, error): + """Check if line contains a redundant "virtual" function-specifier. -def CheckRedundantOverrideOrFinal(filename, clean_lines, linenum, error): - """Check if line contains a redundant "override" or "final" virt-specifier. - - 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. - """ - # Look for closing parenthesis nearby. We need one to confirm where - # the declarator ends and where the virt-specifier starts to avoid - # false positives. - line = clean_lines.elided[linenum] - declarator_end = line.rfind(')') - if declarator_end >= 0: - fragment = line[declarator_end:] - else: - if linenum > 1 and clean_lines.elided[linenum - 1].rfind(')') >= 0: - fragment = line - else: - return + 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. + """ + # Look for "virtual" on current line. + line = clean_lines.elided[linenum] + virtual = re.match(r"^(.*)(\bvirtual\b)(.*)$", line) + if not virtual: + return + + # Ignore "virtual" keywords that are near access-specifiers. These + # are only used in class base-specifier and do not apply to member + # functions. + if re.search(r"\b(public|protected|private)\s+$", virtual.group(1)) or re.match( + r"^\s+(public|protected|private)\b", virtual.group(3) + ): + return + + # Ignore the "virtual" keyword from virtual base classes. Usually + # there is a column on the same line in these cases (virtual base + # classes are rare in google3 because multiple inheritance is rare). + if re.match(r"^.*[^:]:[^:].*$", line): + return + + # Look for the next opening parenthesis. This is the start of the + # parameter list (possibly on the next line shortly after virtual). + # TODO(unknown): doesn't work if there are virtual functions with + # decltype() or other things that use parentheses, but csearch suggests + # that this is rare. + end_col = -1 + end_line = -1 + start_col = len(virtual.group(2)) + for start_line in range(linenum, min(linenum + 3, clean_lines.NumLines())): + line = clean_lines.elided[start_line][start_col:] + parameter_list = re.match(r"^([^(]*)\(", line) + if parameter_list: + # Match parentheses to find the end of the parameter list + (_, end_line, end_col) = CloseExpression( + clean_lines, start_line, start_col + len(parameter_list.group(1)) + ) + break + start_col = 0 + + if end_col < 0: + return # Couldn't find end of parameter list, give up + + # Look for "override" or "final" after the parameter list + # (possibly on the next few lines). + for i in range(end_line, min(end_line + 3, clean_lines.NumLines())): + line = clean_lines.elided[i][end_col:] + match = re.search(r"\b(override|final)\b", line) + if match: + error( + filename, + linenum, + "readability/inheritance", + 4, + ( + '"virtual" is redundant since function is ' + f'already declared as "{match.group(1)}"' + ), + ) + + # Set end_col to check whole lines after we are done with the + # first line. + end_col = 0 + if re.search(r"[^\w]\s*$", line): + break - # Check that at most one of "override" or "final" is present, not both - if re.search(r'\boverride\b', fragment) and re.search(r'\bfinal\b', fragment): - error(filename, linenum, 'readability/inheritance', 4, - ('"override" is redundant since function is ' - 'already declared as "final"')) +def CheckRedundantOverrideOrFinal(filename, clean_lines, linenum, error): + """Check if line contains a redundant "override" or "final" virt-specifier. + + 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. + """ + # Look for closing parenthesis nearby. We need one to confirm where + # the declarator ends and where the virt-specifier starts to avoid + # false positives. + line = clean_lines.elided[linenum] + declarator_end = line.rfind(")") + if declarator_end >= 0: + fragment = line[declarator_end:] + else: + if linenum > 1 and clean_lines.elided[linenum - 1].rfind(")") >= 0: + fragment = line + else: + return + # Check that at most one of "override" or "final" is present, not both + if re.search(r"\boverride\b", fragment) and re.search(r"\bfinal\b", fragment): + error( + filename, + linenum, + "readability/inheritance", + 4, + ('"override" is redundant since function is already declared as "final"'), + ) # Returns true if we are at a new block, and it is directly # inside of a namespace. def IsBlockInNameSpace(nesting_state, is_forward_declaration): - """Checks that the new block is directly in a namespace. - - Args: - nesting_state: The _NestingState object that contains info about our state. - is_forward_declaration: If the class is a forward declared class. - Returns: - Whether or not the new block is directly in a namespace. - """ - if is_forward_declaration: - return len(nesting_state.stack) >= 1 and ( - isinstance(nesting_state.stack[-1], _NamespaceInfo)) - - if len(nesting_state.stack) >= 1: - if isinstance(nesting_state.stack[-1], _NamespaceInfo): - return True - if (len(nesting_state.stack) > 1 and - isinstance(nesting_state.previous_stack_top, _NamespaceInfo) and - isinstance(nesting_state.stack[-2], _NamespaceInfo)): - return True - return False - - -def ShouldCheckNamespaceIndentation(nesting_state: NestingState, is_namespace_indent_item, - raw_lines_no_comments, linenum): - """This method determines if we should apply our namespace indentation check. - - Args: - nesting_state: The current nesting state. - is_namespace_indent_item: If we just put a new class on the stack, True. - If the top of the stack is not a class, or we did not recently - add the class, False. - raw_lines_no_comments: The lines without the comments. - linenum: The current line number we are processing. - - Returns: - True if we should apply our namespace indentation check. Currently, it - only works for classes and namespaces inside of a namespace. - """ - - is_forward_declaration = IsForwardClassDeclaration(raw_lines_no_comments, - linenum) - - if not (is_namespace_indent_item or is_forward_declaration): - return False + """Checks that the new block is directly in a namespace. - # If we are in a macro, we do not want to check the namespace indentation. - if IsMacroDefinition(raw_lines_no_comments, linenum): + Args: + nesting_state: The _NestingState object that contains info about our state. + is_forward_declaration: If the class is a forward declared class. + Returns: + Whether or not the new block is directly in a namespace. + """ + if is_forward_declaration: + return len(nesting_state.stack) >= 1 and ( + isinstance(nesting_state.stack[-1], _NamespaceInfo) + ) + + if len(nesting_state.stack) >= 1: + if isinstance(nesting_state.stack[-1], _NamespaceInfo): + return True + if ( + len(nesting_state.stack) > 1 + and isinstance(nesting_state.previous_stack_top, _NamespaceInfo) + and isinstance(nesting_state.stack[-2], _NamespaceInfo) + ): + return True return False - # Skip if we are inside an open parenthesis block (e.g. function parameters). - if nesting_state.previous_stack_top and nesting_state.previous_open_parentheses > 0: - return False - return IsBlockInNameSpace(nesting_state, is_forward_declaration) +def ShouldCheckNamespaceIndentation( + nesting_state: NestingState, is_namespace_indent_item, raw_lines_no_comments, linenum +): + """This method determines if we should apply our namespace indentation check. + + Args: + nesting_state: The current nesting state. + is_namespace_indent_item: If we just put a new class on the stack, True. + If the top of the stack is not a class, or we did not recently + add the class, False. + raw_lines_no_comments: The lines without the comments. + linenum: The current line number we are processing. + + Returns: + True if we should apply our namespace indentation check. Currently, it + only works for classes and namespaces inside of a namespace. + """ + + is_forward_declaration = IsForwardClassDeclaration(raw_lines_no_comments, linenum) + + if not (is_namespace_indent_item or is_forward_declaration): + return False + + # If we are in a macro, we do not want to check the namespace indentation. + if IsMacroDefinition(raw_lines_no_comments, linenum): + return False + + # Skip if we are inside an open parenthesis block (e.g. function parameters). + if nesting_state.previous_stack_top and nesting_state.previous_open_parentheses > 0: + return False + + return IsBlockInNameSpace(nesting_state, is_forward_declaration) # Call this method if the line is directly inside of a namespace. # If the line above is blank (excluding comments) or the start of # an inner namespace, it cannot be indented. -def CheckItemIndentationInNamespace(filename, raw_lines_no_comments, linenum, - error): - line = raw_lines_no_comments[linenum] - if re.match(r'^\s+', line): - error(filename, linenum, 'whitespace/indent_namespace', 4, - 'Do not indent within a namespace.') - - -def ProcessLine(filename, file_extension, clean_lines, line, - include_state, function_state, nesting_state, error, - extra_check_functions=None, cppvar=None): - """Processes a single line in the file. - - Args: - filename: Filename of the file that is being processed. - file_extension: The extension (dot not included) of the file. - clean_lines: An array of strings, each representing a line of the file, - with comments stripped. - line: Number of line being processed. - include_state: An _IncludeState instance in which the headers are inserted. - function_state: A _FunctionState instance which counts function lines, etc. - nesting_state: A NestingState instance which maintains information about - the current stack of nested blocks being parsed. - error: A callable to which errors are reported, which takes 4 arguments: - filename, line number, error level, and message - extra_check_functions: An array of additional check functions that will be - run on each source line. Each function takes 4 - arguments: filename, clean_lines, line, error - cppvar: The header guard variable returned by GetHeaderGuardCPPVar. - """ - raw_lines = clean_lines.raw_lines - ParseNolintSuppressions(filename, raw_lines[line], line, error) - nesting_state.Update(filename, clean_lines, line, error) - CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line, - error) - if nesting_state.InAsmBlock(): - return - CheckForFunctionLengths(filename, clean_lines, line, function_state, error) - CheckForMultilineCommentsAndStrings(filename, clean_lines, line, error) - CheckStyle(filename, clean_lines, line, file_extension, nesting_state, error, cppvar) - CheckLanguage(filename, clean_lines, line, file_extension, include_state, - nesting_state, error) - CheckForNonConstReference(filename, clean_lines, line, nesting_state, error) - CheckForNonStandardConstructs(filename, clean_lines, line, - nesting_state, error) - CheckVlogArguments(filename, clean_lines, line, error) - CheckPosixThreading(filename, clean_lines, line, error) - CheckInvalidIncrement(filename, clean_lines, line, error) - CheckMakePairUsesDeduction(filename, clean_lines, line, error) - CheckRedundantVirtual(filename, clean_lines, line, error) - CheckRedundantOverrideOrFinal(filename, clean_lines, line, error) - if extra_check_functions: - for check_fn in extra_check_functions: - check_fn(filename, clean_lines, line, error) +def CheckItemIndentationInNamespace(filename, raw_lines_no_comments, linenum, error): + line = raw_lines_no_comments[linenum] + if re.match(r"^\s+", line): + error( + filename, linenum, "whitespace/indent_namespace", 4, "Do not indent within a namespace." + ) + + +def ProcessLine( + filename, + file_extension, + clean_lines, + line, + include_state, + function_state, + nesting_state, + error, + extra_check_functions=None, + cppvar=None, +): + """Processes a single line in the file. + + Args: + filename: Filename of the file that is being processed. + file_extension: The extension (dot not included) of the file. + clean_lines: An array of strings, each representing a line of the file, + with comments stripped. + line: Number of line being processed. + include_state: An _IncludeState instance in which the headers are inserted. + function_state: A _FunctionState instance which counts function lines, etc. + nesting_state: A NestingState instance which maintains information about + the current stack of nested blocks being parsed. + error: A callable to which errors are reported, which takes 4 arguments: + filename, line number, error level, and message + extra_check_functions: An array of additional check functions that will be + run on each source line. Each function takes 4 + arguments: filename, clean_lines, line, error + cppvar: The header guard variable returned by GetHeaderGuardCPPVar. + """ + raw_lines = clean_lines.raw_lines + ParseNolintSuppressions(filename, raw_lines[line], line, error) + nesting_state.Update(filename, clean_lines, line, error) + CheckForNamespaceIndentation(filename, nesting_state, clean_lines, line, error) + if nesting_state.InAsmBlock(): + return + CheckForFunctionLengths(filename, clean_lines, line, function_state, error) + CheckForMultilineCommentsAndStrings(filename, clean_lines, line, error) + CheckStyle(filename, clean_lines, line, file_extension, nesting_state, error, cppvar) + CheckLanguage(filename, clean_lines, line, file_extension, include_state, nesting_state, error) + CheckForNonConstReference(filename, clean_lines, line, nesting_state, error) + CheckForNonStandardConstructs(filename, clean_lines, line, nesting_state, error) + CheckVlogArguments(filename, clean_lines, line, error) + CheckPosixThreading(filename, clean_lines, line, error) + CheckInvalidIncrement(filename, clean_lines, line, error) + CheckMakePairUsesDeduction(filename, clean_lines, line, error) + CheckRedundantVirtual(filename, clean_lines, line, error) + CheckRedundantOverrideOrFinal(filename, clean_lines, line, error) + if extra_check_functions: + for check_fn in extra_check_functions: + check_fn(filename, clean_lines, line, error) def FlagCxxHeaders(filename, clean_lines, linenum, error): - """Flag C++ headers that the styleguide restricts. - - 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] - - include = re.match(r'\s*#\s*include\s+[<"]([^<"]+)[">]', line) - - # Flag unapproved C++11 headers. - if include and include.group(1) in ('cfenv', - 'fenv.h', - 'ratio', - ): - error(filename, linenum, 'build/c++11', 5, - f"<{include.group(1)}> is an unapproved C++11 header.") - - # filesystem is the only unapproved C++17 header - if include and include.group(1) == 'filesystem': - error(filename, linenum, 'build/c++17', 5, - " is an unapproved C++17 header.") - - -def ProcessFileData(filename, file_extension, lines, error, - extra_check_functions=None): - """Performs lint checks and reports any errors to the given error function. - - Args: - filename: Filename of the file that is being processed. - file_extension: The extension (dot not included) of the file. - lines: An array of strings, each representing a line of the file, with the - last element being empty if the file is terminated with a newline. - error: A callable to which errors are reported, which takes 4 arguments: - filename, line number, error level, and message - extra_check_functions: An array of additional check functions that will be - run on each source line. Each function takes 4 - arguments: filename, clean_lines, line, error - """ - lines = (['// marker so line numbers and indices both start at 1'] + lines + - ['// marker so line numbers end in a known way']) - - include_state = _IncludeState() - function_state = _FunctionState() - nesting_state = NestingState() - - ResetNolintSuppressions() - - CheckForCopyright(filename, lines, error) - ProcessGlobalSuppressions(lines) - RemoveMultiLineComments(filename, lines, error) - clean_lines = CleansedLines(lines) - - cppvar = None - if IsHeaderExtension(file_extension): - cppvar = GetHeaderGuardCPPVariable(filename) - CheckForHeaderGuard(filename, clean_lines, error, cppvar) - - for line in range(clean_lines.NumLines()): - ProcessLine(filename, file_extension, clean_lines, line, - include_state, function_state, nesting_state, error, - extra_check_functions, cppvar) - FlagCxxHeaders(filename, clean_lines, line, error) - if _error_suppressions.HasOpenBlock(): - error(filename, _error_suppressions.GetOpenBlockStart(), 'readability/nolint', 5, - 'NONLINT block never ended') - - CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error) - - # Check that the .cc file has included its header if it exists. - if _IsSourceExtension(file_extension): - CheckHeaderFileIncluded(filename, include_state, error) - - # We check here rather than inside ProcessLine so that we see raw - # lines rather than "cleaned" lines. - CheckForBadCharacters(filename, lines, error) - - CheckForNewlineAtEOF(filename, lines, error) + """Flag C++ headers that the styleguide restricts. -def ProcessConfigOverrides(filename): - """ Loads the configuration files and processes the config overrides. + 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] - Args: - filename: The name of the file being processed by the linter. + include = re.match(r'\s*#\s*include\s+[<"]([^<"]+)[">]', line) - Returns: - False if the current |filename| should not be processed further. - """ + # Flag unapproved C++11 headers. + if include and include.group(1) in ( + "cfenv", + "fenv.h", + "ratio", + ): + error( + filename, + linenum, + "build/c++11", + 5, + f"<{include.group(1)}> is an unapproved C++11 header.", + ) - abs_filename = os.path.abspath(filename) - cfg_filters = [] - keep_looking = True - while keep_looking: - abs_path, base_name = os.path.split(abs_filename) - if not base_name: - break # Reached the root directory. + # filesystem is the only unapproved C++17 header + if include and include.group(1) == "filesystem": + error(filename, linenum, "build/c++17", 5, " is an unapproved C++17 header.") - cfg_file = os.path.join(abs_path, _config_filename) - abs_filename = abs_path - if not os.path.isfile(cfg_file): - continue - try: - with codecs.open(cfg_file, 'r', 'utf8', 'replace') as file_handle: - for line in file_handle: - line, _, _ = line.partition('#') # Remove comments. - if not line.strip(): +def ProcessFileData(filename, file_extension, lines, error, extra_check_functions=None): + """Performs lint checks and reports any errors to the given error function. + + Args: + filename: Filename of the file that is being processed. + file_extension: The extension (dot not included) of the file. + lines: An array of strings, each representing a line of the file, with the + last element being empty if the file is terminated with a newline. + error: A callable to which errors are reported, which takes 4 arguments: + filename, line number, error level, and message + extra_check_functions: An array of additional check functions that will be + run on each source line. Each function takes 4 + arguments: filename, clean_lines, line, error + """ + lines = ( + ["// marker so line numbers and indices both start at 1"] + + lines + + ["// marker so line numbers end in a known way"] + ) + + include_state = _IncludeState() + function_state = _FunctionState() + nesting_state = NestingState() + + ResetNolintSuppressions() + + CheckForCopyright(filename, lines, error) + ProcessGlobalSuppressions(lines) + RemoveMultiLineComments(filename, lines, error) + clean_lines = CleansedLines(lines) + + cppvar = None + if IsHeaderExtension(file_extension): + cppvar = GetHeaderGuardCPPVariable(filename) + CheckForHeaderGuard(filename, clean_lines, error, cppvar) + + for line in range(clean_lines.NumLines()): + ProcessLine( + filename, + file_extension, + clean_lines, + line, + include_state, + function_state, + nesting_state, + error, + extra_check_functions, + cppvar, + ) + FlagCxxHeaders(filename, clean_lines, line, error) + if _error_suppressions.HasOpenBlock(): + error( + filename, + _error_suppressions.GetOpenBlockStart(), + "readability/nolint", + 5, + "NONLINT block never ended", + ) + + CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error) + + # Check that the .cc file has included its header if it exists. + if _IsSourceExtension(file_extension): + CheckHeaderFileIncluded(filename, include_state, error) + + # We check here rather than inside ProcessLine so that we see raw + # lines rather than "cleaned" lines. + CheckForBadCharacters(filename, lines, error) + + CheckForNewlineAtEOF(filename, lines, error) + + +def ProcessConfigOverrides(filename): + """Loads the configuration files and processes the config overrides. + + Args: + filename: The name of the file being processed by the linter. + + Returns: + False if the current |filename| should not be processed further. + """ + + abs_filename = os.path.abspath(filename) + cfg_filters = [] + keep_looking = True + while keep_looking: + abs_path, base_name = os.path.split(abs_filename) + if not base_name: + break # Reached the root directory. + + cfg_file = os.path.join(abs_path, _config_filename) + abs_filename = abs_path + if not os.path.isfile(cfg_file): continue - name, _, val = line.partition('=') - name = name.strip() - val = val.strip() - if name == 'set noparent': - keep_looking = False - elif name == 'filter': - cfg_filters.append(val) - elif name == 'exclude_files': - # When matching exclude_files pattern, use the base_name of - # the current file name or the directory name we are processing. - # For example, if we are checking for lint errors in /foo/bar/baz.cc - # and we found the .cfg file at /foo/CPPLINT.cfg, then the config - # file's "exclude_files" filter is meant to be checked against "bar" - # and not "baz" nor "bar/baz.cc". - if base_name: - pattern = re.compile(val) - if pattern.match(base_name): - if _cpplint_state.quiet: - # Suppress "Ignoring file" warning when using --quiet. - return False - _cpplint_state.PrintInfo(f'Ignoring "{filename}": file excluded by "{cfg_file}". ' - 'File path component "%s" matches ' - 'pattern "%s"\n' % - (base_name, val)) - return False - elif name == 'linelength': - global _line_length - try: - _line_length = int(val) - except ValueError: - _cpplint_state.PrintError('Line length must be numeric.') - elif name == 'extensions': - ProcessExtensionsOption(val) - elif name == 'root': - global _root - # root directories are specified relative to CPPLINT.cfg dir. - _root = os.path.join(os.path.dirname(cfg_file), val) - elif name == 'headers': - ProcessHppHeadersOption(val) - elif name == 'includeorder': - ProcessIncludeOrderOption(val) - else: + try: + with codecs.open(cfg_file, "r", "utf8", "replace") as file_handle: + for line in file_handle: + line, _, _ = line.partition("#") # Remove comments. + if not line.strip(): + continue + + name, _, val = line.partition("=") + name = name.strip() + val = val.strip() + if name == "set noparent": + keep_looking = False + elif name == "filter": + cfg_filters.append(val) + elif name == "exclude_files": + # When matching exclude_files pattern, use the base_name of + # the current file name or the directory name we are processing. + # For example, if we are checking for lint errors in /foo/bar/baz.cc + # and we found the .cfg file at /foo/CPPLINT.cfg, then the config + # file's "exclude_files" filter is meant to be checked against "bar" + # and not "baz" nor "bar/baz.cc". + if base_name: + pattern = re.compile(val) + if pattern.match(base_name): + if _cpplint_state.quiet: + # Suppress "Ignoring file" warning when using --quiet. + return False + _cpplint_state.PrintInfo( + f'Ignoring "{filename}": file excluded by "{cfg_file}". ' + 'File path component "%s" matches ' + 'pattern "%s"\n' % (base_name, val) + ) + return False + elif name == "linelength": + global _line_length + try: + _line_length = int(val) + except ValueError: + _cpplint_state.PrintError("Line length must be numeric.") + elif name == "extensions": + ProcessExtensionsOption(val) + elif name == "root": + global _root + # root directories are specified relative to CPPLINT.cfg dir. + _root = os.path.join(os.path.dirname(cfg_file), val) + elif name == "headers": + ProcessHppHeadersOption(val) + elif name == "includeorder": + ProcessIncludeOrderOption(val) + else: + _cpplint_state.PrintError( + f"Invalid configuration option ({name}) in file {cfg_file}\n" + ) + + except IOError: _cpplint_state.PrintError( - f'Invalid configuration option ({name}) in file {cfg_file}\n') - - except IOError: - _cpplint_state.PrintError( - f"Skipping config file '{cfg_file}': Can't open for reading\n") - keep_looking = False + f"Skipping config file '{cfg_file}': Can't open for reading\n" + ) + keep_looking = False - # Apply all the accumulated filters in reverse order (top-level directory - # config options having the least priority). - for cfg_filter in reversed(cfg_filters): - _AddFilters(cfg_filter) + # Apply all the accumulated filters in reverse order (top-level directory + # config options having the least priority). + for cfg_filter in reversed(cfg_filters): + _AddFilters(cfg_filter) - return True + return True def ProcessFile(filename, vlevel, extra_check_functions=None): - """Does google-lint on a single file. + """Does google-lint on a single file. - Args: - filename: The name of the file to parse. + Args: + filename: The name of the file to parse. - vlevel: The level of errors to report. Every error of confidence - >= verbose_level will be reported. 0 is a good default. + vlevel: The level of errors to report. Every error of confidence + >= verbose_level will be reported. 0 is a good default. - extra_check_functions: An array of additional check functions that will be - run on each source line. Each function takes 4 - arguments: filename, clean_lines, line, error - """ + extra_check_functions: An array of additional check functions that will be + run on each source line. Each function takes 4 + arguments: filename, clean_lines, line, error + """ - _SetVerboseLevel(vlevel) - _BackupFilters() - old_errors = _cpplint_state.error_count + _SetVerboseLevel(vlevel) + _BackupFilters() + old_errors = _cpplint_state.error_count - if not ProcessConfigOverrides(filename): - _RestoreFilters() - return - - lf_lines = [] - crlf_lines = [] - try: - # Support the UNIX convention of using "-" for stdin. Note that - # we are not opening the file with universal newline support - # (which codecs doesn't support anyway), so the resulting lines do - # contain trailing '\r' characters if we are reading a file that - # has CRLF endings. - # If after the split a trailing '\r' is present, it is removed - # below. - if filename == '-': - lines = sys.stdin.read().split('\n') + if not ProcessConfigOverrides(filename): + _RestoreFilters() + return + + lf_lines = [] + crlf_lines = [] + try: + # Support the UNIX convention of using "-" for stdin. Note that + # we are not opening the file with universal newline support + # (which codecs doesn't support anyway), so the resulting lines do + # contain trailing '\r' characters if we are reading a file that + # has CRLF endings. + # If after the split a trailing '\r' is present, it is removed + # below. + if filename == "-": + lines = sys.stdin.read().split("\n") + else: + with codecs.open(filename, "r", "utf8", "replace") as target_file: + lines = target_file.read().split("\n") + + # Remove trailing '\r'. + # The -1 accounts for the extra trailing blank line we get from split() + for linenum in range(len(lines) - 1): + if lines[linenum].endswith("\r"): + lines[linenum] = lines[linenum].rstrip("\r") + crlf_lines.append(linenum + 1) + else: + lf_lines.append(linenum + 1) + + except IOError: + # TODO: Maybe make this have an exit code of 2 after all is done + _cpplint_state.PrintError(f"Skipping input '{filename}': Can't open for reading\n") + _RestoreFilters() + return + + # Note, if no dot is found, this will give the entire filename as the ext. + file_extension = filename[filename.rfind(".") + 1 :] + + # When reading from stdin, the extension is unknown, so no cpplint tests + # should rely on the extension. + if filename != "-" and file_extension not in GetAllExtensions(): + _cpplint_state.PrintError( + f"Ignoring {filename}; not a valid file name ({(', '.join(GetAllExtensions()))})\n" + ) else: - with codecs.open(filename, 'r', 'utf8', 'replace') as target_file: - lines = target_file.read().split('\n') - - # Remove trailing '\r'. - # The -1 accounts for the extra trailing blank line we get from split() - for linenum in range(len(lines) - 1): - if lines[linenum].endswith('\r'): - lines[linenum] = lines[linenum].rstrip('\r') - crlf_lines.append(linenum + 1) - else: - lf_lines.append(linenum + 1) - - except IOError: - # TODO: Maybe make this have an exit code of 2 after all is done - _cpplint_state.PrintError( - f"Skipping input '{filename}': Can't open for reading\n") + ProcessFileData(filename, file_extension, lines, Error, extra_check_functions) + + # If end-of-line sequences are a mix of LF and CR-LF, issue + # warnings on the lines with CR. + # + # Don't issue any warnings if all lines are uniformly LF or CR-LF, + # since critique can handle these just fine, and the style guide + # doesn't dictate a particular end of line sequence. + # + # We can't depend on os.linesep to determine what the desired + # end-of-line sequence should be, since that will return the + # server-side end-of-line sequence. + if lf_lines and crlf_lines: + # Warn on every line with CR. An alternative approach might be to + # check whether the file is mostly CRLF or just LF, and warn on the + # minority, we bias toward LF here since most tools prefer LF. + for linenum in crlf_lines: + Error( + filename, + linenum, + "whitespace/newline", + 1, + "Unexpected \\r (^M) found; better to use only \\n", + ) + + # Suppress printing anything if --quiet was passed unless the error + # count has increased after processing this file. + if not _cpplint_state.quiet or old_errors != _cpplint_state.error_count: + _cpplint_state.PrintInfo(f"Done processing {filename}\n") _RestoreFilters() - return - - # Note, if no dot is found, this will give the entire filename as the ext. - file_extension = filename[filename.rfind('.') + 1:] - - # When reading from stdin, the extension is unknown, so no cpplint tests - # should rely on the extension. - if filename != '-' and file_extension not in GetAllExtensions(): - _cpplint_state.PrintError(f'Ignoring {filename}; not a valid file name' - f' ({(", ".join(GetAllExtensions()))})\n') - else: - ProcessFileData(filename, file_extension, lines, Error, - extra_check_functions) - - # If end-of-line sequences are a mix of LF and CR-LF, issue - # warnings on the lines with CR. - # - # Don't issue any warnings if all lines are uniformly LF or CR-LF, - # since critique can handle these just fine, and the style guide - # doesn't dictate a particular end of line sequence. - # - # We can't depend on os.linesep to determine what the desired - # end-of-line sequence should be, since that will return the - # server-side end-of-line sequence. - if lf_lines and crlf_lines: - # Warn on every line with CR. An alternative approach might be to - # check whether the file is mostly CRLF or just LF, and warn on the - # minority, we bias toward LF here since most tools prefer LF. - for linenum in crlf_lines: - Error(filename, linenum, 'whitespace/newline', 1, - 'Unexpected \\r (^M) found; better to use only \\n') - - # Suppress printing anything if --quiet was passed unless the error - # count has increased after processing this file. - if not _cpplint_state.quiet or old_errors != _cpplint_state.error_count: - _cpplint_state.PrintInfo(f'Done processing {filename}\n') - _RestoreFilters() def PrintUsage(message): - """Prints a brief usage string and exits, optionally with an error message. - - Args: - message: The optional error message. - """ - sys.stderr.write(_USAGE % (sorted(GetAllExtensions()), - ','.join(sorted(GetAllExtensions())), - sorted(GetHeaderExtensions()), - ','.join(sorted(GetHeaderExtensions())))) - - if message: - sys.exit('\nFATAL ERROR: ' + message) - else: - sys.exit(0) + """Prints a brief usage string and exits, optionally with an error message. + + Args: + message: The optional error message. + """ + sys.stderr.write( + _USAGE + % ( + sorted(GetAllExtensions()), + ",".join(sorted(GetAllExtensions())), + sorted(GetHeaderExtensions()), + ",".join(sorted(GetHeaderExtensions())), + ) + ) + + if message: + sys.exit("\nFATAL ERROR: " + message) + else: + sys.exit(0) + def PrintVersion(): - sys.stdout.write('Cpplint fork (https://github.com/cpplint/cpplint)\n') - sys.stdout.write('cpplint ' + __VERSION__ + '\n') - sys.stdout.write('Python ' + sys.version + '\n') - sys.exit(0) + sys.stdout.write("Cpplint fork (https://github.com/cpplint/cpplint)\n") + sys.stdout.write("cpplint " + __VERSION__ + "\n") + sys.stdout.write("Python " + sys.version + "\n") + sys.exit(0) + def PrintCategories(): - """Prints a list of all the error-categories used by error messages. + """Prints a list of all the error-categories used by error messages. - These are the categories used to filter messages via --filter. - """ - sys.stderr.write(''.join(f' {cat}\n' for cat in _ERROR_CATEGORIES)) - sys.exit(0) + These are the categories used to filter messages via --filter. + """ + sys.stderr.write("".join(f" {cat}\n" for cat in _ERROR_CATEGORIES)) + sys.exit(0) def ParseArguments(args): - """Parses the command line arguments. - - This may set the output format and verbosity level as side-effects. - - Args: - args: The command line arguments: - - Returns: - The list of filenames to lint. - """ - try: - (opts, filenames) = getopt.getopt(args, '', ['help', 'output=', 'verbose=', - 'v=', - 'version', - 'counting=', - 'filter=', - 'root=', - 'repository=', - 'linelength=', - 'extensions=', - 'exclude=', - 'recursive', - 'headers=', - 'includeorder=', - 'config=', - 'quiet']) - except getopt.GetoptError: - PrintUsage('Invalid arguments.') - - verbosity = _VerboseLevel() - output_format = _OutputFormat() - filters = '' - quiet = _Quiet() - counting_style = '' - recursive = False - - for (opt, val) in opts: - if opt == '--help': - PrintUsage(None) - if opt == '--version': - PrintVersion() - elif opt == '--output': - if val not in ('emacs', 'vs7', 'eclipse', 'junit', 'sed', 'gsed'): - PrintUsage('The only allowed output formats are emacs, vs7, eclipse ' - 'sed, gsed and junit.') - output_format = val - elif opt == '--quiet': - quiet = True - elif opt in {'--verbose', '--v'}: - verbosity = int(val) - elif opt == '--filter': - filters = val - if not filters: - PrintCategories() - elif opt == '--counting': - if val not in ('total', 'toplevel', 'detailed'): - PrintUsage('Valid counting options are total, toplevel, and detailed') - counting_style = val - elif opt == '--root': - global _root - _root = val - elif opt == '--repository': - global _repository - _repository = val - elif opt == '--linelength': - global _line_length - try: - _line_length = int(val) - except ValueError: - PrintUsage('Line length must be digits.') - elif opt == '--exclude': - global _excludes - if not _excludes: - _excludes = set() - _excludes.update(glob.glob(val)) - elif opt == '--extensions': - ProcessExtensionsOption(val) - elif opt == '--headers': - ProcessHppHeadersOption(val) - elif opt == '--recursive': - recursive = True - elif opt == '--includeorder': - ProcessIncludeOrderOption(val) - elif opt == '--config': - global _config_filename - _config_filename = val - if os.path.basename(_config_filename) != _config_filename: - PrintUsage('Config file name must not include directory components.') - - if not filenames: - PrintUsage('No files were specified.') - - if recursive: - filenames = _ExpandDirectories(filenames) - - if _excludes: - filenames = _FilterExcludedFiles(filenames) - - _SetOutputFormat(output_format) - _SetQuiet(quiet) - _SetVerboseLevel(verbosity) - _SetFilters(filters) - _SetCountingStyle(counting_style) - - filenames.sort() - return filenames + """Parses the command line arguments. + + This may set the output format and verbosity level as side-effects. + + Args: + args: The command line arguments: + + Returns: + The list of filenames to lint. + """ + try: + (opts, filenames) = getopt.getopt( + args, + "", + [ + "help", + "output=", + "verbose=", + "v=", + "version", + "counting=", + "filter=", + "root=", + "repository=", + "linelength=", + "extensions=", + "exclude=", + "recursive", + "headers=", + "includeorder=", + "config=", + "quiet", + ], + ) + except getopt.GetoptError: + PrintUsage("Invalid arguments.") + + verbosity = _VerboseLevel() + output_format = _OutputFormat() + filters = "" + quiet = _Quiet() + counting_style = "" + recursive = False + + for opt, val in opts: + if opt == "--help": + PrintUsage(None) + if opt == "--version": + PrintVersion() + elif opt == "--output": + if val not in ("emacs", "vs7", "eclipse", "junit", "sed", "gsed"): + PrintUsage( + "The only allowed output formats are emacs, vs7, eclipse sed, gsed and junit." + ) + output_format = val + elif opt == "--quiet": + quiet = True + elif opt in {"--verbose", "--v"}: + verbosity = int(val) + elif opt == "--filter": + filters = val + if not filters: + PrintCategories() + elif opt == "--counting": + if val not in ("total", "toplevel", "detailed"): + PrintUsage("Valid counting options are total, toplevel, and detailed") + counting_style = val + elif opt == "--root": + global _root + _root = val + elif opt == "--repository": + global _repository + _repository = val + elif opt == "--linelength": + global _line_length + try: + _line_length = int(val) + except ValueError: + PrintUsage("Line length must be digits.") + elif opt == "--exclude": + global _excludes + if not _excludes: + _excludes = set() + _excludes.update(glob.glob(val)) + elif opt == "--extensions": + ProcessExtensionsOption(val) + elif opt == "--headers": + ProcessHppHeadersOption(val) + elif opt == "--recursive": + recursive = True + elif opt == "--includeorder": + ProcessIncludeOrderOption(val) + elif opt == "--config": + global _config_filename + _config_filename = val + if os.path.basename(_config_filename) != _config_filename: + PrintUsage("Config file name must not include directory components.") + + if not filenames: + PrintUsage("No files were specified.") + + if recursive: + filenames = _ExpandDirectories(filenames) + + if _excludes: + filenames = _FilterExcludedFiles(filenames) + + _SetOutputFormat(output_format) + _SetQuiet(quiet) + _SetVerboseLevel(verbosity) + _SetFilters(filters) + _SetCountingStyle(counting_style) + + filenames.sort() + return filenames + def _ParseFilterSelector(parameter): - """Parses the given command line parameter for file- and line-specific - exclusions. - readability/casting:file.cpp - readability/casting:file.cpp:43 - - Args: - parameter: The parameter value of --filter - - Returns: - [category, filename, line]. - Category is always given. - Filename is either a filename or empty if all files are meant. - Line is either a line in filename or -1 if all lines are meant. - """ - colon_pos = parameter.find(":") - if colon_pos == -1: - return parameter, "", -1 - category = parameter[:colon_pos] - second_colon_pos = parameter.find(":", colon_pos + 1) - if second_colon_pos == -1: - return category, parameter[colon_pos + 1:], -1 - return category, parameter[colon_pos + 1: second_colon_pos], \ - int(parameter[second_colon_pos + 1:]) + """Parses the given command line parameter for file- and line-specific + exclusions. + readability/casting:file.cpp + readability/casting:file.cpp:43 + + Args: + parameter: The parameter value of --filter + + Returns: + [category, filename, line]. + Category is always given. + Filename is either a filename or empty if all files are meant. + Line is either a line in filename or -1 if all lines are meant. + """ + colon_pos = parameter.find(":") + if colon_pos == -1: + return parameter, "", -1 + category = parameter[:colon_pos] + second_colon_pos = parameter.find(":", colon_pos + 1) + if second_colon_pos == -1: + return category, parameter[colon_pos + 1 :], -1 + return ( + category, + parameter[colon_pos + 1 : second_colon_pos], + int(parameter[second_colon_pos + 1 :]), + ) + def _ExpandDirectories(filenames): - """Searches a list of filenames and replaces directories in the list with - all files descending from those directories. Files with extensions not in - the valid extensions list are excluded. - - Args: - filenames: A list of files or directories - - Returns: - A list of all files that are members of filenames or descended from a - directory in filenames - """ - expanded = set() - for filename in filenames: - if not os.path.isdir(filename): - expanded.add(filename) - continue - - for root, _, files in os.walk(filename): - for loopfile in files: - fullname = os.path.join(root, loopfile) - if fullname.startswith('.' + os.path.sep): - fullname = fullname[len('.' + os.path.sep):] - expanded.add(fullname) - - return [filename for filename in expanded - if os.path.splitext(filename)[1][1:] in GetAllExtensions()] + """Searches a list of filenames and replaces directories in the list with + all files descending from those directories. Files with extensions not in + the valid extensions list are excluded. + + Args: + filenames: A list of files or directories + + Returns: + A list of all files that are members of filenames or descended from a + directory in filenames + """ + expanded = set() + for filename in filenames: + if not os.path.isdir(filename): + expanded.add(filename) + continue + + for root, _, files in os.walk(filename): + for loopfile in files: + fullname = os.path.join(root, loopfile) + if fullname.startswith("." + os.path.sep): + fullname = fullname[len("." + os.path.sep) :] + expanded.add(fullname) + + return [ + filename for filename in expanded if os.path.splitext(filename)[1][1:] in GetAllExtensions() + ] + def _FilterExcludedFiles(fnames): - """Filters out files listed in the --exclude command line switch. File paths - in the switch are evaluated relative to the current working directory - """ - exclude_paths = [os.path.abspath(f) for f in _excludes] - # because globbing does not work recursively, exclude all subpath of all excluded entries - return [f for f in fnames - if not any(e for e in exclude_paths - if _IsParentOrSame(e, os.path.abspath(f)))] + """Filters out files listed in the --exclude command line switch. File paths + in the switch are evaluated relative to the current working directory + """ + exclude_paths = [os.path.abspath(f) for f in _excludes] + # because globbing does not work recursively, exclude all subpath of all excluded entries + return [ + f + for f in fnames + if not any(e for e in exclude_paths if _IsParentOrSame(e, os.path.abspath(f))) + ] + def _IsParentOrSame(parent, child): - """Return true if child is subdirectory of parent. - Assumes both paths are absolute and don't contain symlinks. - """ - parent = os.path.normpath(parent) - child = os.path.normpath(child) - if parent == child: - return True + """Return true if child is subdirectory of parent. + Assumes both paths are absolute and don't contain symlinks. + """ + parent = os.path.normpath(parent) + child = os.path.normpath(child) + if parent == child: + return True + + prefix = os.path.commonprefix([parent, child]) + if prefix != parent: + return False + # Note: os.path.commonprefix operates on character basis, so + # take extra care of situations like '/foo/ba' and '/foo/bar/baz' + child_suffix = child[len(prefix) :] + child_suffix = child_suffix.lstrip(os.sep) + return child == os.path.join(prefix, child_suffix) - prefix = os.path.commonprefix([parent, child]) - if prefix != parent: - return False - # Note: os.path.commonprefix operates on character basis, so - # take extra care of situations like '/foo/ba' and '/foo/bar/baz' - child_suffix = child[len(prefix):] - child_suffix = child_suffix.lstrip(os.sep) - return child == os.path.join(prefix, child_suffix) def main(): - filenames = ParseArguments(sys.argv[1:]) - backup_err = sys.stderr - try: - # Change stderr to write with replacement characters so we don't die - # if we try to print something containing non-ASCII characters. - sys.stderr = codecs.StreamReader(sys.stderr, 'replace') - - _cpplint_state.ResetErrorCounts() - for filename in filenames: - ProcessFile(filename, _cpplint_state.verbose_level) - # If --quiet is passed, suppress printing error count unless there are errors. - if not _cpplint_state.quiet or _cpplint_state.error_count > 0: - _cpplint_state.PrintErrorCounts() + filenames = ParseArguments(sys.argv[1:]) + backup_err = sys.stderr + try: + # Change stderr to write with replacement characters so we don't die + # if we try to print something containing non-ASCII characters. + sys.stderr = codecs.StreamReader(sys.stderr, "replace") + + _cpplint_state.ResetErrorCounts() + for filename in filenames: + ProcessFile(filename, _cpplint_state.verbose_level) + # If --quiet is passed, suppress printing error count unless there are errors. + if not _cpplint_state.quiet or _cpplint_state.error_count > 0: + _cpplint_state.PrintErrorCounts() - if _cpplint_state.output_format == 'junit': - sys.stderr.write(_cpplint_state.FormatJUnitXML()) + if _cpplint_state.output_format == "junit": + sys.stderr.write(_cpplint_state.FormatJUnitXML()) - finally: - sys.stderr = backup_err + finally: + sys.stderr = backup_err - sys.exit(_cpplint_state.error_count > 0) + sys.exit(_cpplint_state.error_count > 0) -if __name__ == '__main__': - main() +if __name__ == "__main__": + main() diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 3da296c..f20d54d 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -43,10 +43,10 @@ from pytest import mark from testfixtures import compare -BASE_CMD = sys.executable + ' ' + os.path.abspath('./cpplint.py ') +BASE_CMD = sys.executable + " " + os.path.abspath("./cpplint.py ") -def run_shell_command(cmd: str, args: str, cwd='.'): +def run_shell_command(cmd: str, args: str, cwd="."): """Executes a command Args: @@ -59,28 +59,27 @@ def run_shell_command(cmd: str, args: str, cwd='.'): out, err = proc.stdout, proc.stderr # Make output system-agnostic, aka support Windows - if os.sep == '\\': + if os.sep == "\\": # TODO: Support scenario with multiple input names # We currently only support the last arguments as the input name # to prevent accidentally replacing sed tests. # Fixing would likely need coding an internal "replace slashes" option for cpplint itself. - win_path = (os.path.dirname(args[-1]) + '\\').encode() - good_path = win_path.replace(b'\\', b'/') + win_path = (os.path.dirname(args[-1]) + "\\").encode() + good_path = win_path.replace(b"\\", b"/") out, err = out.replace(win_path, good_path), err.replace(win_path, good_path) - if os.linesep == '\r\n': - out, err = out.replace(b'\r\n', b'\n'), err.replace(b'\r\n', b'\n') + if os.linesep == "\r\n": + out, err = out.replace(b"\r\n", b"\n"), err.replace(b"\r\n", b"\n") # print(err) # to get the output at time of test return proc.returncode, out, err class UsageTest(unittest.TestCase): - def testHelp(self): - (status, out, err) = run_shell_command(BASE_CMD, '--help') + (status, out, err) = run_shell_command(BASE_CMD, "--help") self.assertEqual(0, status) - self.assertEqual(b'', out) - self.assertTrue(err.startswith(b'\nSyntax: cpplint')) + self.assertEqual(b"", out) + self.assertTrue(err.startswith(b"\nSyntax: cpplint")) class TemporaryFolderClassSetup(unittest.TestCase): @@ -98,7 +97,7 @@ def setUpClass(cls): """setup tmp folder for testing with samples and custom additions by subclasses""" try: cls._root = os.path.realpath(tempfile.mkdtemp()) - shutil.copytree('samples', os.path.join(cls._root, 'samples')) + shutil.copytree("samples", os.path.join(cls._root, "samples")) cls.prepare_directory(cls._root) except Exception: try: @@ -120,7 +119,7 @@ def prepare_directory(cls, root): def get_extra_command_args(self, cwd): """Override in subclass to add arguments to command""" - return '' + return "" def check_all_in_folder(self, folder_name, expected_defs): # uncomment to show complete diff @@ -128,7 +127,7 @@ def check_all_in_folder(self, folder_name, expected_defs): count = 0 for dirpath, _, fnames in os.walk(folder_name): for f in fnames: - if f.endswith('.def'): + if f.endswith(".def"): count += 1 self.check_def(os.path.join(dirpath, f)) self.assertEqual(count, expected_defs) @@ -136,63 +135,61 @@ def check_all_in_folder(self, folder_name, expected_defs): def check_def(self, path): """runs command and compares to expected output from def file""" # self.maxDiff = None # to see full diff - with open(path, 'rb') as file_handle: + with open(path, "rb") as file_handle: data = file_handle.readlines() stdout_lines = int(data[2]) - filenames = data[0].decode('utf8').strip() + filenames = data[0].decode("utf8").strip() args, _, filenames = filenames.rpartition(" ") - if '*' in filenames: + if "*" in filenames: rel_cwd = os.path.dirname(path) - filenames = ' '.join( - filename[len(rel_cwd) + 1:] - for filename in glob.glob(rel_cwd + '/' + filenames) + filenames = " ".join( + filename[len(rel_cwd) + 1 :] + for filename in glob.glob(rel_cwd + "/" + filenames) ) - args += ' ' + filenames - self._run_and_compare(path, args, int(data[1]), - [line.decode('utf8').strip() - for line in data[3:3 + stdout_lines]], - [line.decode('utf8').strip() - for line in data[3 + stdout_lines:]]) - - def _run_and_compare( - self, - definition_file, - args, - expected_status, - expected_out, - expected_err - ): + args += " " + filenames + self._run_and_compare( + path, + args, + int(data[1]), + [line.decode("utf8").strip() for line in data[3 : 3 + stdout_lines]], + [line.decode("utf8").strip() for line in data[3 + stdout_lines :]], + ) + + def _run_and_compare(self, definition_file, args, expected_status, expected_out, expected_err): rel_cwd = os.path.dirname(definition_file) cmd = BASE_CMD + self.get_extra_command_args(rel_cwd) cwd = os.path.join(self._root, rel_cwd) # command to reproduce, do not forget first two lines have special meaning - print("\ncd " + cwd + " && " + cmd + ' ' + args + " 2> ") + print("\ncd " + cwd + " && " + cmd + " " + args + " 2> ") (status, out, err) = run_shell_command(cmd, args, cwd) - self.assertEqual(expected_status, status, 'bad command status %s' % status) - prefix = 'Failed check in %s comparing to %s for command: %s' % (cwd, definition_file, cmd) - compare('\n'.join(expected_err), err.decode('utf8'), prefix=prefix, show_whitespace=True) - compare('\n'.join(expected_out), out.decode('utf8'), prefix=prefix, show_whitespace=True) + self.assertEqual(expected_status, status, "bad command status %s" % status) + prefix = "Failed check in %s comparing to %s for command: %s" % (cwd, definition_file, cmd) + compare("\n".join(expected_err), err.decode("utf8"), prefix=prefix, show_whitespace=True) + compare("\n".join(expected_out), out.decode("utf8"), prefix=prefix, show_whitespace=True) class NoRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): """runs in a temporary folder (under /tmp in linux) without any .git/.hg/.svn file""" def get_extra_command_args(self, cwd): - return f' --repository {self._root} ' + return f" --repository {self._root} " def _test_name_func(fun, _, x): del fun - return f'test{x.args[0].capitalize()}Sample-{x.args[1]}' - - @parameterized.expand([(folder, case[:-4]) - for folder in ['chromium', 'vlc', 'silly', - 'boost', 'protobuf', 'codelite', 'v8'] - for case in os.listdir(f'./samples/{folder}-sample') - if case.endswith('.def')], - name_func=_test_name_func) + return f"test{x.args[0].capitalize()}Sample-{x.args[1]}" + + @parameterized.expand( + [ + (folder, case[:-4]) + for folder in ["chromium", "vlc", "silly", "boost", "protobuf", "codelite", "v8"] + for case in os.listdir(f"./samples/{folder}-sample") + if case.endswith(".def") + ], + name_func=_test_name_func, + ) @mark.timeout(180) def testSamples(self, folder, case): - self.check_def(os.path.join(f'./samples/{folder}-sample', case + '.def')) + self.check_def(os.path.join(f"./samples/{folder}-sample", case + ".def")) class GitRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): @@ -200,11 +197,11 @@ class GitRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): @classmethod def prepare_directory(cls, root): - with open(os.path.join(root, '.git'), 'a'): + with open(os.path.join(root, ".git"), "a"): pass def testCodeliteSample(self): - self.check_all_in_folder('./samples/codelite-sample', 1) + self.check_all_in_folder("./samples/codelite-sample", 1) class MercurialRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): @@ -212,11 +209,11 @@ class MercurialRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): @classmethod def prepare_directory(cls, root): - with open(os.path.join(root, '.hg'), 'a'): + with open(os.path.join(root, ".hg"), "a"): pass def testCodeliteSample(self): - self.check_all_in_folder('./samples/codelite-sample', 1) + self.check_all_in_folder("./samples/codelite-sample", 1) class SvnRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): @@ -224,12 +221,12 @@ class SvnRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): @classmethod def prepare_directory(cls, root): - with open(os.path.join(root, '.svn'), 'a'): + with open(os.path.join(root, ".svn"), "a"): pass def testCodeliteSample(self): - self.check_all_in_folder('./samples/codelite-sample', 1) + self.check_all_in_folder("./samples/codelite-sample", 1) -if __name__ == '__main__': +if __name__ == "__main__": unittest.main() diff --git a/cpplint_unittest.py b/cpplint_unittest.py index bf961e4..33d3fc8 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -51,740 +51,815 @@ def codecs_latin_encode(x): - if sys.version_info < (3,): - return x - return codecs.latin_1_encode(x)[0] + if sys.version_info < (3,): + return x + return codecs.latin_1_encode(x)[0] + # This class works as an error collector and replaces cpplint.Error # function for the unit tests. We also verify each category we see # is in cpplint._ERROR_CATEGORIES, to help keep that list up to date. class ErrorCollector(object): - # These are a global list, covering all categories seen ever. - _ERROR_CATEGORIES = cpplint._ERROR_CATEGORIES - _SEEN_ERROR_CATEGORIES = {} - - def __init__(self, assert_fn): - """assert_fn: a function to call when we notice a problem.""" - self._assert_fn = assert_fn - self._errors = [] - cpplint.ResetNolintSuppressions() - - def __call__(self, filename, linenum, - category, confidence, message): - self._assert_fn(category in self._ERROR_CATEGORIES, - 'Message "%s" has category "%s",' - ' which is not in _ERROR_CATEGORIES' % (message, category)) - self._SEEN_ERROR_CATEGORIES[category] = 1 - if cpplint._ShouldPrintError(category, confidence, filename, linenum): - self._errors.append('%s [%s] [%d]' % (message, category, confidence)) - - def Results(self): - if len(self._errors) < 2: - return ''.join(self._errors) # Most tests expect to have a string. - return self._errors # Let's give a list if there is more than one. - - def ResultList(self): - return self._errors - - def VerifyAllCategoriesAreSeen(self): - """Fails if there's a category in _ERROR_CATEGORIES~_SEEN_ERROR_CATEGORIES. - - This should only be called after all tests are run, so - _SEEN_ERROR_CATEGORIES has had a chance to fully populate. Since - this isn't called from within the normal unittest framework, we - can't use the normal unittest assert macros. Instead we just exit - when we see an error. Good thing this test is always run last! - """ - for category in self._ERROR_CATEGORIES: - if category not in self._SEEN_ERROR_CATEGORIES: - sys.exit('FATAL ERROR: There are no tests for category "%s"' % category) + # These are a global list, covering all categories seen ever. + _ERROR_CATEGORIES = cpplint._ERROR_CATEGORIES + _SEEN_ERROR_CATEGORIES = {} + + def __init__(self, assert_fn): + """assert_fn: a function to call when we notice a problem.""" + self._assert_fn = assert_fn + self._errors = [] + cpplint.ResetNolintSuppressions() + + def __call__(self, filename, linenum, category, confidence, message): + self._assert_fn( + category in self._ERROR_CATEGORIES, + 'Message "%s" has category "%s",' + " which is not in _ERROR_CATEGORIES" % (message, category), + ) + self._SEEN_ERROR_CATEGORIES[category] = 1 + if cpplint._ShouldPrintError(category, confidence, filename, linenum): + self._errors.append("%s [%s] [%d]" % (message, category, confidence)) + + def Results(self): + if len(self._errors) < 2: + return "".join(self._errors) # Most tests expect to have a string. + return self._errors # Let's give a list if there is more than one. + + def ResultList(self): + return self._errors + + def VerifyAllCategoriesAreSeen(self): + """Fails if there's a category in _ERROR_CATEGORIES~_SEEN_ERROR_CATEGORIES. + + This should only be called after all tests are run, so + _SEEN_ERROR_CATEGORIES has had a chance to fully populate. Since + this isn't called from within the normal unittest framework, we + can't use the normal unittest assert macros. Instead we just exit + when we see an error. Good thing this test is always run last! + """ + for category in self._ERROR_CATEGORIES: + if category not in self._SEEN_ERROR_CATEGORIES: + sys.exit('FATAL ERROR: There are no tests for category "%s"' % category) + + def RemoveIfPresent(self, substr): + for index, error in enumerate(self._errors): + if error.find(substr) != -1: + self._errors = self._errors[0:index] + self._errors[(index + 1) :] + break - def RemoveIfPresent(self, substr): - for (index, error) in enumerate(self._errors): - if error.find(substr) != -1: - self._errors = self._errors[0:index] + self._errors[(index + 1):] - break # This class is a lame mock of codecs. We do not verify filename, mode, or # encoding, but for the current use case it is not needed. class MockIo(object): + def __init__(self, mock_file): + # wrap list to allow "with open(mock)" + class EnterableList(list): + def __enter__(self): + return self - def __init__(self, mock_file): - # wrap list to allow "with open(mock)" - class EnterableList(list): - def __enter__(self): - return self + def __exit__(self, type, value, tb): # noqa: A002 + return self - def __exit__(self, type, value, tb): # noqa: A002 - return self - self.mock_file = EnterableList(mock_file) + self.mock_file = EnterableList(mock_file) - def open(self, # pylint: disable=C6409 - unused_filename, unused_mode, unused_encoding, _): - return self.mock_file + def open( + self, # pylint: disable=C6409 + unused_filename, + unused_mode, + unused_encoding, + _, + ): + return self.mock_file class CpplintTestBase(unittest.TestCase): - """Provides some useful helper functions for cpplint tests.""" - - def setUp(self): - # Allow subclasses to cheat os.path.abspath called in FileInfo class. - self.os_path_abspath_orig = os.path.abspath - - def tearDown(self): - os.path.abspath = self.os_path_abspath_orig - - # Perform lint on single line of input and return the error message. - def PerformSingleLineLint(self, code): - error_collector = ErrorCollector(self.assertTrue) - lines = code.split('\n') - cpplint.RemoveMultiLineComments('foo.h', lines, error_collector) - clean_lines = cpplint.CleansedLines(lines) - include_state = cpplint._IncludeState() - function_state = cpplint._FunctionState() - nesting_state = cpplint.NestingState() - cpplint.ProcessLine('foo.cc', 'cc', clean_lines, 0, - include_state, function_state, - nesting_state, error_collector) - # Single-line lint tests are allowed to fail the 'unlintable function' - # check. - error_collector.RemoveIfPresent( - 'Lint failed to find start of function body.') - return error_collector.Results() - - # Perform lint over multiple lines and return the error message. - def PerformMultiLineLint(self, code): - error_collector = ErrorCollector(self.assertTrue) - lines = code.split('\n') - cpplint.RemoveMultiLineComments('foo.h', lines, error_collector) - lines = cpplint.CleansedLines(lines) - nesting_state = cpplint.NestingState() - for i in range(lines.NumLines()): - nesting_state.Update('foo.h', lines, i, error_collector) - cpplint.CheckStyle('foo.h', lines, i, 'h', nesting_state, - error_collector) - cpplint.CheckForNonStandardConstructs('foo.h', lines, i, - nesting_state, error_collector) - return error_collector.Results() - - # Similar to PerformMultiLineLint, but calls CheckLanguage instead of - # CheckForNonStandardConstructs - def PerformLanguageRulesCheck(self, file_name, code): - error_collector = ErrorCollector(self.assertTrue) - include_state = cpplint._IncludeState() - nesting_state = cpplint.NestingState() - lines = code.split('\n') - cpplint.RemoveMultiLineComments(file_name, lines, error_collector) - lines = cpplint.CleansedLines(lines) - ext = file_name[file_name.rfind('.') + 1:] - for i in range(lines.NumLines()): - cpplint.CheckLanguage(file_name, lines, i, ext, include_state, - nesting_state, error_collector) - return error_collector.Results() - - def PerformFunctionLengthsCheck(self, code): - """Perform Lint function length check on block of code and return warnings. - - Builds up an array of lines corresponding to the code and strips comments - using cpplint functions. - - Establishes an error collector and invokes the function length checking - function following cpplint's pattern. - - Args: - code: C++ source code expected to generate a warning message. + """Provides some useful helper functions for cpplint tests.""" + + def setUp(self): + # Allow subclasses to cheat os.path.abspath called in FileInfo class. + self.os_path_abspath_orig = os.path.abspath + + def tearDown(self): + os.path.abspath = self.os_path_abspath_orig + + # Perform lint on single line of input and return the error message. + def PerformSingleLineLint(self, code): + error_collector = ErrorCollector(self.assertTrue) + lines = code.split("\n") + cpplint.RemoveMultiLineComments("foo.h", lines, error_collector) + clean_lines = cpplint.CleansedLines(lines) + include_state = cpplint._IncludeState() + function_state = cpplint._FunctionState() + nesting_state = cpplint.NestingState() + cpplint.ProcessLine( + "foo.cc", + "cc", + clean_lines, + 0, + include_state, + function_state, + nesting_state, + error_collector, + ) + # Single-line lint tests are allowed to fail the 'unlintable function' + # check. + error_collector.RemoveIfPresent("Lint failed to find start of function body.") + return error_collector.Results() + + # Perform lint over multiple lines and return the error message. + def PerformMultiLineLint(self, code): + error_collector = ErrorCollector(self.assertTrue) + lines = code.split("\n") + cpplint.RemoveMultiLineComments("foo.h", lines, error_collector) + lines = cpplint.CleansedLines(lines) + nesting_state = cpplint.NestingState() + for i in range(lines.NumLines()): + nesting_state.Update("foo.h", lines, i, error_collector) + cpplint.CheckStyle("foo.h", lines, i, "h", nesting_state, error_collector) + cpplint.CheckForNonStandardConstructs("foo.h", lines, i, nesting_state, error_collector) + return error_collector.Results() + + # Similar to PerformMultiLineLint, but calls CheckLanguage instead of + # CheckForNonStandardConstructs + def PerformLanguageRulesCheck(self, file_name, code): + error_collector = ErrorCollector(self.assertTrue) + include_state = cpplint._IncludeState() + nesting_state = cpplint.NestingState() + lines = code.split("\n") + cpplint.RemoveMultiLineComments(file_name, lines, error_collector) + lines = cpplint.CleansedLines(lines) + ext = file_name[file_name.rfind(".") + 1 :] + for i in range(lines.NumLines()): + cpplint.CheckLanguage( + file_name, lines, i, ext, include_state, nesting_state, error_collector + ) + return error_collector.Results() + + def PerformFunctionLengthsCheck(self, code): + """Perform Lint function length check on block of code and return warnings. + + Builds up an array of lines corresponding to the code and strips comments + using cpplint functions. + + Establishes an error collector and invokes the function length checking + function following cpplint's pattern. + + Args: + code: C++ source code expected to generate a warning message. + + Returns: + The accumulated errors. + """ + file_name = "foo.cc" + error_collector = ErrorCollector(self.assertTrue) + function_state = cpplint._FunctionState() + lines = code.split("\n") + cpplint.RemoveMultiLineComments(file_name, lines, error_collector) + lines = cpplint.CleansedLines(lines) + for i in range(lines.NumLines()): + cpplint.CheckForFunctionLengths(file_name, lines, i, function_state, error_collector) + return error_collector.Results() + + def PerformIncludeWhatYouUse(self, code, filename="foo.h", io=codecs): + # First, build up the include state. + error_collector = ErrorCollector(self.assertTrue) + include_state = cpplint._IncludeState() + nesting_state = cpplint.NestingState() + lines = code.split("\n") + cpplint.RemoveMultiLineComments(filename, lines, error_collector) + lines = cpplint.CleansedLines(lines) + for i in range(lines.NumLines()): + cpplint.CheckLanguage( + filename, lines, i, ".h", include_state, nesting_state, error_collector + ) + # We could clear the error_collector here, but this should + # also be fine, since our IncludeWhatYouUse unittests do not + # have language problems. + + # Second, look for missing includes. + cpplint.CheckForIncludeWhatYouUse(filename, lines, include_state, error_collector, io) + return error_collector.Results() + + # Perform lint and make sure one of the errors is what we want + def TestLintContains(self, code, expected_message): + self.assertTrue(expected_message in self.PerformSingleLineLint(code)) + + def TestLintNotContains(self, code, expected_message): + self.assertFalse(expected_message in self.PerformSingleLineLint(code)) + + # Perform lint and compare the error message with "expected_message". + def TestLint(self, code, expected_message): + self.assertEqual(expected_message, self.PerformSingleLineLint(code)) + + def TestMultiLineLint(self, code, expected_message): + self.assertEqual(expected_message, self.PerformMultiLineLint(code)) + + def TestMultiLineLintRE(self, code, expected_message_re): + message = self.PerformMultiLineLint(code) + if not re.search(expected_message_re, message): + self.fail( + "Message was:\n" + message + 'Expected match to "' + expected_message_re + '"' + ) + + def TestLanguageRulesCheck(self, file_name, code, expected_message): + self.assertEqual(expected_message, self.PerformLanguageRulesCheck(file_name, code)) + + def TestIncludeWhatYouUse(self, code, expected_message): + self.assertEqual(expected_message, self.PerformIncludeWhatYouUse(code)) + + def TestBlankLinesCheck(self, lines, start_errors, end_errors): + for extension in ["c", "cc", "cpp", "cxx", "c++", "cu"]: + self.doTestBlankLinesCheck(lines, start_errors, end_errors, extension) + + def doTestBlankLinesCheck(self, lines, start_errors, end_errors, extension): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData("foo." + extension, extension, lines, error_collector) + self.assertEqual( + start_errors, + error_collector.Results().count( + "Redundant blank line at the start of a code block " + "should be deleted. [whitespace/blank_line] [2]" + ), + ) + self.assertEqual( + end_errors, + error_collector.Results().count( + "Redundant blank line at the end of a code block " + "should be deleted. [whitespace/blank_line] [3]" + ), + ) - Returns: - The accumulated errors. - """ - file_name = 'foo.cc' - error_collector = ErrorCollector(self.assertTrue) - function_state = cpplint._FunctionState() - lines = code.split('\n') - cpplint.RemoveMultiLineComments(file_name, lines, error_collector) - lines = cpplint.CleansedLines(lines) - for i in range(lines.NumLines()): - cpplint.CheckForFunctionLengths(file_name, lines, i, - function_state, error_collector) - return error_collector.Results() - - def PerformIncludeWhatYouUse(self, code, filename='foo.h', io=codecs): - # First, build up the include state. - error_collector = ErrorCollector(self.assertTrue) - include_state = cpplint._IncludeState() - nesting_state = cpplint.NestingState() - lines = code.split('\n') - cpplint.RemoveMultiLineComments(filename, lines, error_collector) - lines = cpplint.CleansedLines(lines) - for i in range(lines.NumLines()): - cpplint.CheckLanguage(filename, lines, i, '.h', include_state, - nesting_state, error_collector) - # We could clear the error_collector here, but this should - # also be fine, since our IncludeWhatYouUse unittests do not - # have language problems. - - # Second, look for missing includes. - cpplint.CheckForIncludeWhatYouUse(filename, lines, include_state, - error_collector, io) - return error_collector.Results() - - # Perform lint and make sure one of the errors is what we want - def TestLintContains(self, code, expected_message): - self.assertTrue(expected_message in self.PerformSingleLineLint(code)) - - def TestLintNotContains(self, code, expected_message): - self.assertFalse(expected_message in self.PerformSingleLineLint(code)) - - # Perform lint and compare the error message with "expected_message". - def TestLint(self, code, expected_message): - self.assertEqual(expected_message, self.PerformSingleLineLint(code)) - - def TestMultiLineLint(self, code, expected_message): - self.assertEqual(expected_message, self.PerformMultiLineLint(code)) - - def TestMultiLineLintRE(self, code, expected_message_re): - message = self.PerformMultiLineLint(code) - if not re.search(expected_message_re, message): - self.fail('Message was:\n' + message + 'Expected match to "' + - expected_message_re + '"') - - def TestLanguageRulesCheck(self, file_name, code, expected_message): - self.assertEqual(expected_message, - self.PerformLanguageRulesCheck(file_name, code)) - - def TestIncludeWhatYouUse(self, code, expected_message): - self.assertEqual(expected_message, - self.PerformIncludeWhatYouUse(code)) - - def TestBlankLinesCheck(self, lines, start_errors, end_errors): - for extension in ['c', 'cc', 'cpp', 'cxx', 'c++', 'cu']: - self.doTestBlankLinesCheck(lines, start_errors, end_errors, extension) - - def doTestBlankLinesCheck(self, lines, start_errors, end_errors, extension): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.' + extension, extension, lines, error_collector) - self.assertEqual( - start_errors, - error_collector.Results().count( - 'Redundant blank line at the start of a code block ' - 'should be deleted. [whitespace/blank_line] [2]')) - self.assertEqual( - end_errors, - error_collector.Results().count( - 'Redundant blank line at the end of a code block ' - 'should be deleted. [whitespace/blank_line] [3]')) class CpplintTest(CpplintTestBase): - - def GetNamespaceResults(self, lines): - error_collector = ErrorCollector(self.assertTrue) - cpplint.RemoveMultiLineComments('foo.h', lines, error_collector) - lines = cpplint.CleansedLines(lines) - nesting_state = cpplint.NestingState() - for i in range(lines.NumLines()): - nesting_state.Update('foo.h', lines, i, error_collector) - cpplint.CheckForNamespaceIndentation('foo.h', nesting_state, - lines, i, error_collector) - - return error_collector.Results() - - def testForwardDeclarationNamespaceIndentation(self): - lines = ['namespace Test {', - ' class ForwardDeclaration;', - '} // namespace Test'] - - results = self.GetNamespaceResults(lines) - self.assertEqual(results, 'Do not indent within a namespace. ' - ' [whitespace/indent_namespace] [4]') - - def testNamespaceIndentationForClass(self): - lines = ['namespace Test {', - 'void foo() { }', - ' class Test {', - ' };', - '} // namespace Test'] - - results = self.GetNamespaceResults(lines) - self.assertEqual(results, ['Do not indent within a namespace. ' - ' [whitespace/indent_namespace] [4]', - 'Do not indent within a namespace. ' - ' [whitespace/indent_namespace] [4]']) - - def testNamespaceIndentationIndentedParameter(self): - lines = ['namespace Test {', - 'void foo(' - ' SuperLongTypeName d = 418) { }', - '} // namespace Test'] - - results = self.GetNamespaceResults(lines) - self.assertEqual(results, '') - - def testNestingInNamespace(self): - lines = ['namespace Test {', - 'struct OuterClass {', - ' struct NoFalsePositivesHere;', - ' struct NoFalsePositivesHere member_variable;', - '};', - 'void foo() {', - ' const int no_positives_eh = 418;', - '}', - '} // namespace Test'] - - results = self.GetNamespaceResults(lines) - self.assertEqual(results, '') - - # Test get line width. - def testGetLineWidth(self): - self.assertEqual(0, cpplint.GetLineWidth('')) - self.assertEqual(10, cpplint.GetLineWidth(str('x') * 10)) - self.assertEqual(16, cpplint.GetLineWidth('\u90fd|\u9053|\u5e9c|\u770c|\u652f\u5e81')) - self.assertEqual(16, cpplint.GetLineWidth(u'都|道|府|県|支庁')) - self.assertEqual(5 + 13 + 9, cpplint.GetLineWidth( - u'd𝐱/dt' + u'f : t ⨯ 𝐱 → ℝ' + u't ⨯ 𝐱 → ℝ')) - - def testGetTextInside(self): - self.assertEqual('', cpplint._GetTextInside('fun()', r'fun\(')) - self.assertEqual('x, y', cpplint._GetTextInside('f(x, y)', r'f\(')) - self.assertEqual('a(), b(c())', cpplint._GetTextInside( - 'printf(a(), b(c()))', r'printf\(')) - self.assertEqual('x, y{}', cpplint._GetTextInside('f[x, y{}]', r'f\[')) - self.assertEqual(None, cpplint._GetTextInside('f[a, b(}]', r'f\[')) - self.assertEqual(None, cpplint._GetTextInside('f[x, y]', r'f\(')) - self.assertEqual('y, h(z, (a + b))', cpplint._GetTextInside( - 'f(x, g(y, h(z, (a + b))))', r'g\(')) - self.assertEqual('f(f(x))', cpplint._GetTextInside('f(f(f(x)))', r'f\(')) - # Supports multiple lines. - self.assertEqual('\n return loop(x);\n', - cpplint._GetTextInside( - 'int loop(int x) {\n return loop(x);\n}\n', r'\{')) - # '^' matches the beginning of each line. - self.assertEqual('x, y', - cpplint._GetTextInside( - '#include "inl.h" // skip #define\n' - '#define A2(x, y) a_inl_(x, y, __LINE__)\n' - '#define A(x) a_inl_(x, "", __LINE__)\n', - r'^\s*#define\s*\w+\(')) - - def testFindNextMultiLineCommentStart(self): - self.assertEqual(1, cpplint.FindNextMultiLineCommentStart([''], 0)) - - lines = ['a', 'b', '/* c'] - self.assertEqual(2, cpplint.FindNextMultiLineCommentStart(lines, 0)) - - lines = ['char a[] = "/*";'] # not recognized as comment. - self.assertEqual(1, cpplint.FindNextMultiLineCommentStart(lines, 0)) - - def testFindNextMultiLineCommentEnd(self): - self.assertEqual(1, cpplint.FindNextMultiLineCommentEnd([''], 0)) - lines = ['a', 'b', ' c */'] - self.assertEqual(2, cpplint.FindNextMultiLineCommentEnd(lines, 0)) - - def testRemoveMultiLineCommentsFromRange(self): - lines = ['a', ' /* comment ', ' * still comment', ' comment */ ', 'b'] - cpplint.RemoveMultiLineCommentsFromRange(lines, 1, 4) - self.assertEqual(['a', '/**/', '/**/', '/**/', 'b'], lines) - - def testSpacesAtEndOfLine(self): - self.TestLint( - '// Hello there ', - 'Line ends in whitespace. Consider deleting these extra spaces.' - ' [whitespace/end_of_line] [4]') - - # Test line length check. - def testLineLengthCheck(self): - self.TestLint( - '// Hello', - '') - self.TestLint( - '// x' + ' x' * 40, - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestLint( - '// x' + ' x' * 50, - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestLint( - '// //some/path/to/f' + ('i' * 100) + 'le', - '') - self.TestLint( - '// //some/path/to/f' + ('i' * 100) + 'le', - '') - self.TestLint( - '// //some/path/to/f' + ('i' * 50) + 'le and some comments', - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestLint( - '// http://g' + ('o' * 100) + 'gle.com/', - '') - self.TestLint( - '// https://g' + ('o' * 100) + 'gle.com/', - '') - self.TestLint( - '// https://g' + ('o' * 60) + 'gle.com/ and some comments', - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestLint( - '// Read https://g' + ('o' * 60) + 'gle.com/', - '') - self.TestLint( - '// $Id: g' + ('o' * 80) + 'gle.cc#1 $', - '') - self.TestLint( - '// $Id: g' + ('o' * 80) + 'gle.cc#1', - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestMultiLineLint( - 'static const char kCStr[] = "g' + ('o' * 50) + 'gle";\n', - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestMultiLineLint( - 'static const char kRawStr[] = R"(g' + ('o' * 50) + 'gle)";\n', - '') # no warning because raw string content is elided - self.TestMultiLineLint( - 'static const char kMultiLineRawStr[] = R"(\n' - 'g' + ('o' * 80) + 'gle\n' - ')";', - '') - self.TestMultiLineLint( - 'static const char kL' + ('o' * 50) + 'ngIdentifier[] = R"()";\n', - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestLint( - ' /// @copydoc ' + ('o' * (cpplint._line_length * 2)), - '') - self.TestLint( - ' /// @copydetails ' + ('o' * (cpplint._line_length * 2)), - '') - self.TestLint( - ' /// @copybrief ' + ('o' * (cpplint._line_length * 2)), - '') - - # Test error suppression annotations. - def testErrorSuppression(self): - # Two errors on same line: - self.TestLint( - 'long a = (int64_t) 65;', - ['Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]', - 'Use int16_t/int64_t/etc, rather than the C type long' - ' [runtime/int] [4]', - ]) - # One category of error suppressed: - self.TestLint( - 'long a = (int64_t) 65; // NOLINT(runtime/int)', - 'Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]') - # Two categories of errors suppressed: - self.TestLint( - 'long a = (int64_t) 65; // NOLINT(runtime/int,readability/casting)', - '') - - # All categories suppressed: (two aliases) - self.TestLint('long a = (int64_t) 65; // NOLINT', '') - self.TestLint('long a = (int64_t) 65; // NOLINT(*)', '') - # Malformed NOLINT directive: - self.TestLint( - 'long a = 65; // NOLINT(foo)', - ['Unknown NOLINT error category: foo' - ' [readability/nolint] [5]', - 'Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4]', - ]) - # Irrelevant NOLINT directive has no effect: - self.TestLint( - 'long a = 65; // NOLINT(readability/casting)', - 'Use int16_t/int64_t/etc, rather than the C type long' - ' [runtime/int] [4]') - # NOLINTNEXTLINE silences warning for the next line instead of current line - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTNEXTLINE(whitespace/line_length)', - '// ./command' + (' -verbose' * 80), - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - # NOLINTNEXTLINE multiple categories silences warning for the next line instead of current line - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTNEXTLINE(runtime/int,readability/casting)', - 'long a = (int64_t) 65;', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - # LINT_C_FILE silences cast warnings for entire file. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.h', 'h', - ['// Copyright 2014 Your Company.', - '// NOLINT(build/header_guard)', - 'int64_t a = (uint64_t) 65;', - '// LINT_C_FILE', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - # Vim modes silence cast warnings for entire file. - for modeline in ['vi:filetype=c', - 'vi:sw=8 filetype=c', - 'vi:sw=8 filetype=c ts=8', - 'vi: filetype=c', - 'vi: sw=8 filetype=c', - 'vi: sw=8 filetype=c ts=8', - 'vim:filetype=c', - 'vim:sw=8 filetype=c', - 'vim:sw=8 filetype=c ts=8', - 'vim: filetype=c', - 'vim: sw=8 filetype=c', - 'vim: sw=8 filetype=c ts=8', - 'vim: set filetype=c:', - 'vim: set sw=8 filetype=c:', - 'vim: set sw=8 filetype=c ts=8:', - 'vim: set filetype=c :', - 'vim: set sw=8 filetype=c :', - 'vim: set sw=8 filetype=c ts=8 :', - 'vim: se filetype=c:', - 'vim: se sw=8 filetype=c:', - 'vim: se sw=8 filetype=c ts=8:', - 'vim: se filetype=c :', - 'vim: se sw=8 filetype=c :', - 'vim: se sw=8 filetype=c ts=8 :']: - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.h', 'h', - ['// Copyright 2014 Your Company.', - '// NOLINT(build/header_guard)', - 'int64_t a = (uint64_t) 65;', - '/* Prevent warnings about the modeline', - modeline, - '*/', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - # LINT_KERNEL_FILE silences whitespace/tab warnings for entire file. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.h', 'h', - ['// Copyright 2014 Your Company.', - '// NOLINT(build/header_guard)', - 'struct test {', - '\tint member;', - '};', - '// LINT_KERNEL_FILE', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - # NOLINT, NOLINTNEXTLINE silences the readability/braces warning for "};". - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '#include ', - 'for (int i = 0; i != 100; ++i) {', - ' std::cout << i << std::endl;', - '}; // NOLINT', - 'for (int i = 0; i != 100; ++i) {', - ' std::cout << i << std::endl;', - '// NOLINTNEXTLINE', - '};', - '// LINT_KERNEL_FILE', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - # NOLINTBEGIN and silences all warnings after it - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTBEGIN', - 'long a = (int64_t) 65;' - 'long a = 65;', - '// ./command' + (' -verbose' * 80)], - error_collector) - self.assertEqual('', error_collector.Results()) - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTBEGIN(*)', - 'long a = (int64_t) 65;' - 'long a = 65;', - '// ./command' + (' -verbose' * 80)], - error_collector) - self.assertEqual('', error_collector.Results()) - # NOLINTEND will show warnings after that point - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTBEGIN', - 'long a = (int64_t) 65;' - 'long a = 65;', - '// NOLINTEND', - '// ./command' + (' -verbose' * 80), - ''], - error_collector) - self.assertEqual('Lines should be <= 80 characters long ' - '[whitespace/line_length] [2]', error_collector.Results()) - # NOLINTBEGIN(category) silences category warnings after it - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTBEGIN(readability/casting,runtime/int)', - 'long a = (int64_t) 65;', - 'long a = 65;', - '// ./command' + (' -verbose' * 80), - '// NOLINTEND', - ''], - error_collector) - self.assertEqual('Lines should be <= 80 characters long ' - '[whitespace/line_length] [2]', - error_collector.Results()) - # NOLINTEND(category) will generate an error that categories are not supported - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTBEGIN(readability/casting,runtime/int)', - 'long a = (int64_t) 65;', - 'long a = 65;', - '// NOLINTEND(readability/casting)', - ''], - error_collector) - self.assertEqual('NOLINT categories not supported in block END: readability/casting ' - '[readability/nolint] [5]', - error_collector.Results()) - # nested NOLINTBEGIN is not allowed - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTBEGIN(readability/casting,runtime/int)', - 'long a = (int64_t) 65;', - '// NOLINTBEGIN(runtime/int)', - 'long a = 65;', - '// NOLINTEND(*)', - ''], - error_collector) - self.assertEqual('NONLINT block already defined on line 2 ' - '[readability/nolint] [5]', error_collector.Results()) - # error if NOLINGBEGIN is not ended - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('test.cc', 'cc', - ['// Copyright 2014 Your Company.', - '// NOLINTBEGIN(readability/casting,runtime/int)', - 'long a = (int64_t) 65;', - 'long a = 65;', - ''], - error_collector) - self.assertEqual('NONLINT block never ended [readability/nolint] [5]', error_collector.Results()) - # error if unmatched NOLINTEND - self.TestLint( - '// NOLINTEND', - 'Not in a NOLINT block ' - '[readability/nolint] [5]') - self.TestLint( - '// NOLINTEND(*)', - 'Not in a NOLINT block ' - '[readability/nolint] [5]') - - # Test Variable Declarations. - def testVariableDeclarations(self): - self.TestLint( - 'long a = 65;', - 'Use int16_t/int64_t/etc, rather than the C type long' - ' [runtime/int] [4]') - self.TestLint( - 'long double b = 65.0;', - '') - self.TestLint( - 'long long aa = 6565;', - 'Use int16_t/int64_t/etc, rather than the C type long' - ' [runtime/int] [4]') - - # Test C-style cast cases. - def testCStyleCast(self): - self.TestLint( - 'int a = (int)1.0;', - 'Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]') - self.TestLint( - 'int a = (int)-1.0;', - 'Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]') - self.TestLint( - 'int *a = (int *)NULL;', - 'Using C-style cast. Use reinterpret_cast(...) instead' - ' [readability/casting] [4]') - - self.TestLint( - 'uint16_t a = (uint16_t)1.0;', - 'Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]') - self.TestLint( - 'int32_t a = (int32_t)1.0;', - 'Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]') - self.TestLint( - 'uint64_t a = (uint64_t)1.0;', - 'Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]') - self.TestLint( - 'size_t a = (size_t)1.0;', - 'Using C-style cast. Use static_cast(...) instead' - ' [readability/casting] [4]') - - # These shouldn't be recognized casts. - self.TestLint('u a = (u)NULL;', '') - self.TestLint('uint a = (uint)NULL;', '') - self.TestLint('typedef MockCallback CallbackType;', '') - self.TestLint('scoped_ptr< MockCallback > callback_value;', '') - self.TestLint('std::function', '') - self.TestLint('x = sizeof(int)', '') - self.TestLint('x = alignof(int)', '') - self.TestLint('alignas(int) char x[42]', '') - self.TestLint('alignas(alignof(x)) char y[42]', '') - self.TestLint('void F(int (func)(int));', '') - self.TestLint('void F(int (func)(int*));', '') - self.TestLint('void F(int (Class::member)(int));', '') - self.TestLint('void F(int (Class::member)(int*));', '') - self.TestLint('void F(int (Class::member)(int), int param);', '') - self.TestLint('void F(int (Class::member)(int*), int param);', '') - self.TestLint('X Class::operator++(int)', '') - self.TestLint('X Class::operator--(int)', '') - - # These should not be recognized (lambda functions without arg names). - self.TestLint('[](int/*unused*/) -> bool {', '') - self.TestLint('[](int /*unused*/) -> bool {', '') - self.TestLint('auto f = [](MyStruct* /*unused*/)->int {', '') - self.TestLint('[](int) -> bool {', '') - self.TestLint('auto f = [](MyStruct*)->int {', '') - - # Cast with brace initializers - self.TestLint('int64_t{4096} * 1000 * 1000', '') - self.TestLint('size_t{4096} * 1000 * 1000', '') - self.TestLint('uint_fast16_t{4096} * 1000 * 1000', '') - - # Brace initializer with templated type - self.TestMultiLineLint( - """ + def GetNamespaceResults(self, lines): + error_collector = ErrorCollector(self.assertTrue) + cpplint.RemoveMultiLineComments("foo.h", lines, error_collector) + lines = cpplint.CleansedLines(lines) + nesting_state = cpplint.NestingState() + for i in range(lines.NumLines()): + nesting_state.Update("foo.h", lines, i, error_collector) + cpplint.CheckForNamespaceIndentation("foo.h", nesting_state, lines, i, error_collector) + + return error_collector.Results() + + def testForwardDeclarationNamespaceIndentation(self): + lines = ["namespace Test {", " class ForwardDeclaration;", "} // namespace Test"] + + results = self.GetNamespaceResults(lines) + self.assertEqual( + results, "Do not indent within a namespace. [whitespace/indent_namespace] [4]" + ) + + def testNamespaceIndentationForClass(self): + lines = [ + "namespace Test {", + "void foo() { }", + " class Test {", + " };", + "} // namespace Test", + ] + + results = self.GetNamespaceResults(lines) + self.assertEqual( + results, + [ + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + ], + ) + + def testNamespaceIndentationIndentedParameter(self): + lines = [ + "namespace Test {", + "void foo( SuperLongTypeName d = 418) { }", + "} // namespace Test", + ] + + results = self.GetNamespaceResults(lines) + self.assertEqual(results, "") + + def testNestingInNamespace(self): + lines = [ + "namespace Test {", + "struct OuterClass {", + " struct NoFalsePositivesHere;", + " struct NoFalsePositivesHere member_variable;", + "};", + "void foo() {", + " const int no_positives_eh = 418;", + "}", + "} // namespace Test", + ] + + results = self.GetNamespaceResults(lines) + self.assertEqual(results, "") + + # Test get line width. + def testGetLineWidth(self): + self.assertEqual(0, cpplint.GetLineWidth("")) + self.assertEqual(10, cpplint.GetLineWidth(str("x") * 10)) + self.assertEqual(16, cpplint.GetLineWidth("\u90fd|\u9053|\u5e9c|\u770c|\u652f\u5e81")) + self.assertEqual(16, cpplint.GetLineWidth("都|道|府|県|支庁")) + self.assertEqual(5 + 13 + 9, cpplint.GetLineWidth("d𝐱/dt" + "f : t ⨯ 𝐱 → ℝ" + "t ⨯ 𝐱 → ℝ")) + + def testGetTextInside(self): + self.assertEqual("", cpplint._GetTextInside("fun()", r"fun\(")) + self.assertEqual("x, y", cpplint._GetTextInside("f(x, y)", r"f\(")) + self.assertEqual("a(), b(c())", cpplint._GetTextInside("printf(a(), b(c()))", r"printf\(")) + self.assertEqual("x, y{}", cpplint._GetTextInside("f[x, y{}]", r"f\[")) + self.assertEqual(None, cpplint._GetTextInside("f[a, b(}]", r"f\[")) + self.assertEqual(None, cpplint._GetTextInside("f[x, y]", r"f\(")) + self.assertEqual( + "y, h(z, (a + b))", cpplint._GetTextInside("f(x, g(y, h(z, (a + b))))", r"g\(") + ) + self.assertEqual("f(f(x))", cpplint._GetTextInside("f(f(f(x)))", r"f\(")) + # Supports multiple lines. + self.assertEqual( + "\n return loop(x);\n", + cpplint._GetTextInside("int loop(int x) {\n return loop(x);\n}\n", r"\{"), + ) + # '^' matches the beginning of each line. + self.assertEqual( + "x, y", + cpplint._GetTextInside( + '#include "inl.h" // skip #define\n' + "#define A2(x, y) a_inl_(x, y, __LINE__)\n" + '#define A(x) a_inl_(x, "", __LINE__)\n', + r"^\s*#define\s*\w+\(", + ), + ) + + def testFindNextMultiLineCommentStart(self): + self.assertEqual(1, cpplint.FindNextMultiLineCommentStart([""], 0)) + + lines = ["a", "b", "/* c"] + self.assertEqual(2, cpplint.FindNextMultiLineCommentStart(lines, 0)) + + lines = ['char a[] = "/*";'] # not recognized as comment. + self.assertEqual(1, cpplint.FindNextMultiLineCommentStart(lines, 0)) + + def testFindNextMultiLineCommentEnd(self): + self.assertEqual(1, cpplint.FindNextMultiLineCommentEnd([""], 0)) + lines = ["a", "b", " c */"] + self.assertEqual(2, cpplint.FindNextMultiLineCommentEnd(lines, 0)) + + def testRemoveMultiLineCommentsFromRange(self): + lines = ["a", " /* comment ", " * still comment", " comment */ ", "b"] + cpplint.RemoveMultiLineCommentsFromRange(lines, 1, 4) + self.assertEqual(["a", "/**/", "/**/", "/**/", "b"], lines) + + def testSpacesAtEndOfLine(self): + self.TestLint( + "// Hello there ", + "Line ends in whitespace. Consider deleting these extra spaces." + " [whitespace/end_of_line] [4]", + ) + + # Test line length check. + def testLineLengthCheck(self): + self.TestLint("// Hello", "") + self.TestLint( + "// x" + " x" * 40, + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestLint( + "// x" + " x" * 50, + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestLint("// //some/path/to/f" + ("i" * 100) + "le", "") + self.TestLint("// //some/path/to/f" + ("i" * 100) + "le", "") + self.TestLint( + "// //some/path/to/f" + ("i" * 50) + "le and some comments", + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestLint("// http://g" + ("o" * 100) + "gle.com/", "") + self.TestLint("// https://g" + ("o" * 100) + "gle.com/", "") + self.TestLint( + "// https://g" + ("o" * 60) + "gle.com/ and some comments", + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestLint("// Read https://g" + ("o" * 60) + "gle.com/", "") + self.TestLint("// $Id: g" + ("o" * 80) + "gle.cc#1 $", "") + self.TestLint( + "// $Id: g" + ("o" * 80) + "gle.cc#1", + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestMultiLineLint( + 'static const char kCStr[] = "g' + ("o" * 50) + 'gle";\n', + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestMultiLineLint( + 'static const char kRawStr[] = R"(g' + ("o" * 50) + 'gle)";\n', "" + ) # no warning because raw string content is elided + self.TestMultiLineLint( + 'static const char kMultiLineRawStr[] = R"(\ng' + ("o" * 80) + 'gle\n)";', "" + ) + self.TestMultiLineLint( + "static const char kL" + ("o" * 50) + 'ngIdentifier[] = R"()";\n', + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestLint(" /// @copydoc " + ("o" * (cpplint._line_length * 2)), "") + self.TestLint(" /// @copydetails " + ("o" * (cpplint._line_length * 2)), "") + self.TestLint(" /// @copybrief " + ("o" * (cpplint._line_length * 2)), "") + + # Test error suppression annotations. + def testErrorSuppression(self): + # Two errors on same line: + self.TestLint( + "long a = (int64_t) 65;", + [ + "Using C-style cast. Use static_cast(...) instead" + " [readability/casting] [4]", + "Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4]", + ], + ) + # One category of error suppressed: + self.TestLint( + "long a = (int64_t) 65; // NOLINT(runtime/int)", + "Using C-style cast. Use static_cast(...) instead [readability/casting] [4]", + ) + # Two categories of errors suppressed: + self.TestLint("long a = (int64_t) 65; // NOLINT(runtime/int,readability/casting)", "") + + # All categories suppressed: (two aliases) + self.TestLint("long a = (int64_t) 65; // NOLINT", "") + self.TestLint("long a = (int64_t) 65; // NOLINT(*)", "") + # Malformed NOLINT directive: + self.TestLint( + "long a = 65; // NOLINT(foo)", + [ + "Unknown NOLINT error category: foo [readability/nolint] [5]", + "Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4]", + ], + ) + # Irrelevant NOLINT directive has no effect: + self.TestLint( + "long a = 65; // NOLINT(readability/casting)", + "Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4]", + ) + # NOLINTNEXTLINE silences warning for the next line instead of current line + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTNEXTLINE(whitespace/line_length)", + "// ./command" + (" -verbose" * 80), + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + # NOLINTNEXTLINE multiple categories silences warning for the next line instead of current + # line + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTNEXTLINE(runtime/int,readability/casting)", + "long a = (int64_t) 65;", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + # LINT_C_FILE silences cast warnings for entire file. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.h", + "h", + [ + "// Copyright 2014 Your Company.", + "// NOLINT(build/header_guard)", + "int64_t a = (uint64_t) 65;", + "// LINT_C_FILE", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + # Vim modes silence cast warnings for entire file. + for modeline in [ + "vi:filetype=c", + "vi:sw=8 filetype=c", + "vi:sw=8 filetype=c ts=8", + "vi: filetype=c", + "vi: sw=8 filetype=c", + "vi: sw=8 filetype=c ts=8", + "vim:filetype=c", + "vim:sw=8 filetype=c", + "vim:sw=8 filetype=c ts=8", + "vim: filetype=c", + "vim: sw=8 filetype=c", + "vim: sw=8 filetype=c ts=8", + "vim: set filetype=c:", + "vim: set sw=8 filetype=c:", + "vim: set sw=8 filetype=c ts=8:", + "vim: set filetype=c :", + "vim: set sw=8 filetype=c :", + "vim: set sw=8 filetype=c ts=8 :", + "vim: se filetype=c:", + "vim: se sw=8 filetype=c:", + "vim: se sw=8 filetype=c ts=8:", + "vim: se filetype=c :", + "vim: se sw=8 filetype=c :", + "vim: se sw=8 filetype=c ts=8 :", + ]: + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.h", + "h", + [ + "// Copyright 2014 Your Company.", + "// NOLINT(build/header_guard)", + "int64_t a = (uint64_t) 65;", + "/* Prevent warnings about the modeline", + modeline, + "*/", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + # LINT_KERNEL_FILE silences whitespace/tab warnings for entire file. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.h", + "h", + [ + "// Copyright 2014 Your Company.", + "// NOLINT(build/header_guard)", + "struct test {", + "\tint member;", + "};", + "// LINT_KERNEL_FILE", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + # NOLINT, NOLINTNEXTLINE silences the readability/braces warning for "};". + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "#include ", + "for (int i = 0; i != 100; ++i) {", + " std::cout << i << std::endl;", + "}; // NOLINT", + "for (int i = 0; i != 100; ++i) {", + " std::cout << i << std::endl;", + "// NOLINTNEXTLINE", + "};", + "// LINT_KERNEL_FILE", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + # NOLINTBEGIN and silences all warnings after it + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTBEGIN", + "long a = (int64_t) 65;long a = 65;", + "// ./command" + (" -verbose" * 80), + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTBEGIN(*)", + "long a = (int64_t) 65;long a = 65;", + "// ./command" + (" -verbose" * 80), + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + # NOLINTEND will show warnings after that point + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTBEGIN", + "long a = (int64_t) 65;long a = 65;", + "// NOLINTEND", + "// ./command" + (" -verbose" * 80), + "", + ], + error_collector, + ) + self.assertEqual( + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + error_collector.Results(), + ) + # NOLINTBEGIN(category) silences category warnings after it + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTBEGIN(readability/casting,runtime/int)", + "long a = (int64_t) 65;", + "long a = 65;", + "// ./command" + (" -verbose" * 80), + "// NOLINTEND", + "", + ], + error_collector, + ) + self.assertEqual( + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + error_collector.Results(), + ) + # NOLINTEND(category) will generate an error that categories are not supported + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTBEGIN(readability/casting,runtime/int)", + "long a = (int64_t) 65;", + "long a = 65;", + "// NOLINTEND(readability/casting)", + "", + ], + error_collector, + ) + self.assertEqual( + "NOLINT categories not supported in block END: readability/casting " + "[readability/nolint] [5]", + error_collector.Results(), + ) + # nested NOLINTBEGIN is not allowed + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTBEGIN(readability/casting,runtime/int)", + "long a = (int64_t) 65;", + "// NOLINTBEGIN(runtime/int)", + "long a = 65;", + "// NOLINTEND(*)", + "", + ], + error_collector, + ) + self.assertEqual( + "NONLINT block already defined on line 2 [readability/nolint] [5]", + error_collector.Results(), + ) + # error if NOLINGBEGIN is not ended + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "// NOLINTBEGIN(readability/casting,runtime/int)", + "long a = (int64_t) 65;", + "long a = 65;", + "", + ], + error_collector, + ) + self.assertEqual( + "NONLINT block never ended [readability/nolint] [5]", error_collector.Results() + ) + # error if unmatched NOLINTEND + self.TestLint("// NOLINTEND", "Not in a NOLINT block [readability/nolint] [5]") + self.TestLint("// NOLINTEND(*)", "Not in a NOLINT block [readability/nolint] [5]") + + # Test Variable Declarations. + def testVariableDeclarations(self): + self.TestLint( + "long a = 65;", + "Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4]", + ) + self.TestLint("long double b = 65.0;", "") + self.TestLint( + "long long aa = 6565;", + "Use int16_t/int64_t/etc, rather than the C type long [runtime/int] [4]", + ) + + # Test C-style cast cases. + def testCStyleCast(self): + self.TestLint( + "int a = (int)1.0;", + "Using C-style cast. Use static_cast(...) instead [readability/casting] [4]", + ) + self.TestLint( + "int a = (int)-1.0;", + "Using C-style cast. Use static_cast(...) instead [readability/casting] [4]", + ) + self.TestLint( + "int *a = (int *)NULL;", + "Using C-style cast. Use reinterpret_cast(...) instead" + " [readability/casting] [4]", + ) + + self.TestLint( + "uint16_t a = (uint16_t)1.0;", + "Using C-style cast. Use static_cast(...) instead" + " [readability/casting] [4]", + ) + self.TestLint( + "int32_t a = (int32_t)1.0;", + "Using C-style cast. Use static_cast(...) instead [readability/casting] [4]", + ) + self.TestLint( + "uint64_t a = (uint64_t)1.0;", + "Using C-style cast. Use static_cast(...) instead" + " [readability/casting] [4]", + ) + self.TestLint( + "size_t a = (size_t)1.0;", + "Using C-style cast. Use static_cast(...) instead [readability/casting] [4]", + ) + + # These shouldn't be recognized casts. + self.TestLint("u a = (u)NULL;", "") + self.TestLint("uint a = (uint)NULL;", "") + self.TestLint("typedef MockCallback CallbackType;", "") + self.TestLint("scoped_ptr< MockCallback > callback_value;", "") + self.TestLint("std::function", "") + self.TestLint("x = sizeof(int)", "") + self.TestLint("x = alignof(int)", "") + self.TestLint("alignas(int) char x[42]", "") + self.TestLint("alignas(alignof(x)) char y[42]", "") + self.TestLint("void F(int (func)(int));", "") + self.TestLint("void F(int (func)(int*));", "") + self.TestLint("void F(int (Class::member)(int));", "") + self.TestLint("void F(int (Class::member)(int*));", "") + self.TestLint("void F(int (Class::member)(int), int param);", "") + self.TestLint("void F(int (Class::member)(int*), int param);", "") + self.TestLint("X Class::operator++(int)", "") + self.TestLint("X Class::operator--(int)", "") + + # These should not be recognized (lambda functions without arg names). + self.TestLint("[](int/*unused*/) -> bool {", "") + self.TestLint("[](int /*unused*/) -> bool {", "") + self.TestLint("auto f = [](MyStruct* /*unused*/)->int {", "") + self.TestLint("[](int) -> bool {", "") + self.TestLint("auto f = [](MyStruct*)->int {", "") + + # Cast with brace initializers + self.TestLint("int64_t{4096} * 1000 * 1000", "") + self.TestLint("size_t{4096} * 1000 * 1000", "") + self.TestLint("uint_fast16_t{4096} * 1000 * 1000", "") + + # Brace initializer with templated type + self.TestMultiLineLint( + """ template void Function(int arg1, int arg2) { variable &= ~Type1{0} - 1; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ template class Class { void Function() { variable &= ~Type{0} - 1; } };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ template class Class { void Function() { variable &= ~Type{0} - 1; } };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ namespace { template class Class { @@ -795,443 +870,456 @@ class Class { } }; }""", - '') - - # Test taking address of casts (runtime/casting) - def testRuntimeCasting(self): - error_msg = ('Are you taking an address of a cast? ' - 'This is dangerous: could be a temp var. ' - 'Take the address before doing the cast, rather than after' - ' [runtime/casting] [4]') - self.TestLint('int* x = &static_cast(foo);', error_msg) - self.TestLint('int* x = &reinterpret_cast(foo);', error_msg) - self.TestLint('int* x = &(int*)foo;', - ['Using C-style cast. Use reinterpret_cast(...) ' - 'instead [readability/casting] [4]', - error_msg]) - self.TestLint('BudgetBuckets&(BudgetWinHistory::*BucketFn)(void) const;', - '') - self.TestLint('&(*func_ptr)(arg)', '') - self.TestLint('Compute(arg, &(*func_ptr)(i, j));', '') - - # Alternative error message - alt_error_msg = ('Are you taking an address of something dereferenced ' - 'from a cast? Wrapping the dereferenced expression in ' - 'parentheses will make the binding more obvious' - ' [readability/casting] [4]') - self.TestLint('int* x = &down_cast(obj)->member_;', alt_error_msg) - self.TestLint('int* x = &down_cast(obj)[index];', alt_error_msg) - self.TestLint('int* x = &(down_cast(obj)->member_);', '') - self.TestLint('int* x = &(down_cast(obj)[index]);', '') - self.TestLint('int* x = &down_cast(obj)\n->member_;', alt_error_msg) - self.TestLint('int* x = &(down_cast(obj)\n->member_);', '') - - # It's OK to cast an address. - self.TestLint('int* x = reinterpret_cast(&foo);', '') - - # Function pointers returning references should not be confused - # with taking address of old-style casts. - self.TestLint('auto x = implicit_cast(&foo);', '') - - def testRuntimeSelfinit(self): - self.TestLint( - 'Foo::Foo(Bar r, Bel l) : r_(r_), l_(l_) { }', - 'You seem to be initializing a member variable with itself.' - ' [runtime/init] [4]') - self.TestLint( - 'Foo::Foo(Bar r, Bel l) : r_(CHECK_NOTNULL(r_)) { }', - 'You seem to be initializing a member variable with itself.' - ' [runtime/init] [4]') - self.TestLint( - 'Foo::Foo(Bar r, Bel l) : r_(r), l_(l) { }', - '') - self.TestLint( - 'Foo::Foo(Bar r) : r_(r), l_(r_), ll_(l_) { }', - '') - - # Test for unnamed arguments in a method. - def testCheckForUnnamedParams(self): - self.TestLint('virtual void Func(int*) const;', '') - self.TestLint('virtual void Func(int*);', '') - self.TestLint('void Method(char*) {', '') - self.TestLint('void Method(char*);', '') - self.TestLint('static void operator delete[](void*) throw();', '') - self.TestLint('int Method(int);', '') - - self.TestLint('virtual void Func(int* p);', '') - self.TestLint('void operator delete(void* x) throw();', '') - self.TestLint('void Method(char* x) {', '') - self.TestLint('void Method(char* /*x*/) {', '') - self.TestLint('void Method(char* x);', '') - self.TestLint('typedef void (*Method)(int32_t x);', '') - self.TestLint('static void operator delete[](void* x) throw();', '') - self.TestLint('static void operator delete[](void* /*x*/) throw();', '') - - self.TestLint('X operator++(int);', '') - self.TestLint('X operator++(int) {', '') - self.TestLint('X operator--(int);', '') - self.TestLint('X operator--(int /*unused*/) {', '') - self.TestLint('MACRO(int);', '') - self.TestLint('MACRO(func(int));', '') - self.TestLint('MACRO(arg, func(int));', '') - - self.TestLint('void (*func)(void*);', '') - self.TestLint('void Func((*func)(void*)) {}', '') - self.TestLint('template void func();', '') - self.TestLint('virtual void f(int /*unused*/) {', '') - self.TestLint('void f(int /*unused*/) override {', '') - self.TestLint('void f(int /*unused*/) final {', '') - - # Test deprecated casts such as int(d) - def testDeprecatedCast(self): - self.TestLint( - 'int a = int(2.2);', - 'Using deprecated casting style. ' - 'Use static_cast(...) instead' - ' [readability/casting] [4]') - - self.TestLint( - '(char *) "foo"', - 'Using C-style cast. ' - 'Use const_cast(...) instead' - ' [readability/casting] [4]') - - self.TestLint( - '(int*)foo', - 'Using C-style cast. ' - 'Use reinterpret_cast(...) instead' - ' [readability/casting] [4]') - - # Checks for false positives... - self.TestLint('int a = int();', '') # constructor - self.TestLint('X::X() : a(int()) {}', '') # default constructor - self.TestLint('operator bool();', '') # Conversion operator - self.TestLint('new int64_t(123);', '') # "new" operator on basic type - self.TestLint('new int64_t(123);', '') # "new" operator on basic type - self.TestLint('new const int(42);', '') # "new" on const-qualified type - self.TestLint('using a = bool(int arg);', '') # C++11 alias-declaration - self.TestLint('x = bit_cast(y);', '') # array of array - self.TestLint('void F(const char(&src)[N]);', '') # array of references - - # Placement new - self.TestLint( - 'new(field_ptr) int(field->default_value_enum()->number());', - '') - - # C++11 function wrappers - self.TestLint('std::function', '') - self.TestLint('std::function', '') - self.TestLint('std::function< int(bool) >', '') - self.TestLint('mfunction', '') - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'test.cc', 'cc', - ['// Copyright 2014 Your Company. All Rights Reserved.', - 'typedef std::function<', - ' bool(int)> F;', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - - # Return types for function pointers - self.TestLint('typedef bool(FunctionPointer)();', '') - self.TestLint('typedef bool(FunctionPointer)(int param);', '') - self.TestLint('typedef bool(MyClass::*MemberFunctionPointer)();', '') - self.TestLint('typedef bool(MyClass::* MemberFunctionPointer)();', '') - self.TestLint('typedef bool(MyClass::*MemberFunctionPointer)() const;', '') - self.TestLint('void Function(bool(FunctionPointerArg)());', '') - self.TestLint('void Function(bool(FunctionPointerArg)()) {}', '') - self.TestLint('typedef set SortedIdSet', '') - self.TestLint( - 'bool TraverseNode(T *Node, bool(VisitorBase:: *traverse) (T *t)) {}', - '') - - # The second parameter to a gMock method definition is a function signature - # that often looks like a bad cast but should not picked up by lint. - def testMockMethod(self): - self.TestLint( - 'MOCK_METHOD0(method, int());', - '') - self.TestLint( - 'MOCK_CONST_METHOD1(method, float(string));', - '') - self.TestLint( - 'MOCK_CONST_METHOD2_T(method, double(float, float));', - '') - self.TestLint( - 'MOCK_CONST_METHOD1(method, SomeType(int));', - '') - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('mock.cc', 'cc', - ['MOCK_METHOD1(method1,', - ' bool(int));', - 'MOCK_METHOD1(', - ' method2,', - ' bool(int));', - 'MOCK_CONST_METHOD2(', - ' method3, bool(int,', - ' int));', - 'MOCK_METHOD1(method4, int(bool));', - 'const int kConstant = int(42);'], # true positive - error_collector) - self.assertEqual( - 0, - error_collector.Results().count( - ('Using deprecated casting style. ' - 'Use static_cast(...) instead ' - '[readability/casting] [4]'))) - self.assertEqual( - 1, - error_collector.Results().count( - ('Using deprecated casting style. ' - 'Use static_cast(...) instead ' - '[readability/casting] [4]'))) - - # Like gMock method definitions, MockCallback instantiations look very similar - # to bad casts. - def testMockCallback(self): - self.TestLint( - 'MockCallback', - '') - self.TestLint( - 'MockCallback', - '') - - # Test false errors that happened with some include file names - def testIncludeFilenameFalseError(self): - self.TestLint( - '#include "foo/long-foo.h"', - '') - self.TestLint( - '#include "foo/sprintf.h"', - '') - - # Test typedef cases. There was a bug that cpplint misidentified - # typedef for pointer to function as C-style cast and produced - # false-positive error messages. - def testTypedefForPointerToFunction(self): - self.TestLint( - 'typedef void (*Func)(int x);', - '') - self.TestLint( - 'typedef void (*Func)(int *x);', - '') - self.TestLint( - 'typedef void Func(int x);', - '') - self.TestLint( - 'typedef void Func(int *x);', - '') - - def testIncludeWhatYouUseNoImplementationFiles(self): - code = 'std::vector foo;' - for extension in ['h', 'hpp', 'hxx', 'h++', 'cuh', - 'c', 'cc', 'cpp', 'cxx', 'c++', 'cu']: - self.assertEqual('Add #include for vector<>' - ' [build/include_what_you_use] [4]', - self.PerformIncludeWhatYouUse(code, 'foo.' + extension)) - - def testIncludeWhatYouUse(self): - self.TestIncludeWhatYouUse( - """#include + "", + ) + + # Test taking address of casts (runtime/casting) + def testRuntimeCasting(self): + error_msg = ( + "Are you taking an address of a cast? " + "This is dangerous: could be a temp var. " + "Take the address before doing the cast, rather than after" + " [runtime/casting] [4]" + ) + self.TestLint("int* x = &static_cast(foo);", error_msg) + self.TestLint("int* x = &reinterpret_cast(foo);", error_msg) + self.TestLint( + "int* x = &(int*)foo;", + [ + "Using C-style cast. Use reinterpret_cast(...) " + "instead [readability/casting] [4]", + error_msg, + ], + ) + self.TestLint("BudgetBuckets&(BudgetWinHistory::*BucketFn)(void) const;", "") + self.TestLint("&(*func_ptr)(arg)", "") + self.TestLint("Compute(arg, &(*func_ptr)(i, j));", "") + + # Alternative error message + alt_error_msg = ( + "Are you taking an address of something dereferenced " + "from a cast? Wrapping the dereferenced expression in " + "parentheses will make the binding more obvious" + " [readability/casting] [4]" + ) + self.TestLint("int* x = &down_cast(obj)->member_;", alt_error_msg) + self.TestLint("int* x = &down_cast(obj)[index];", alt_error_msg) + self.TestLint("int* x = &(down_cast(obj)->member_);", "") + self.TestLint("int* x = &(down_cast(obj)[index]);", "") + self.TestLint("int* x = &down_cast(obj)\n->member_;", alt_error_msg) + self.TestLint("int* x = &(down_cast(obj)\n->member_);", "") + + # It's OK to cast an address. + self.TestLint("int* x = reinterpret_cast(&foo);", "") + + # Function pointers returning references should not be confused + # with taking address of old-style casts. + self.TestLint("auto x = implicit_cast(&foo);", "") + + def testRuntimeSelfinit(self): + self.TestLint( + "Foo::Foo(Bar r, Bel l) : r_(r_), l_(l_) { }", + "You seem to be initializing a member variable with itself. [runtime/init] [4]", + ) + self.TestLint( + "Foo::Foo(Bar r, Bel l) : r_(CHECK_NOTNULL(r_)) { }", + "You seem to be initializing a member variable with itself. [runtime/init] [4]", + ) + self.TestLint("Foo::Foo(Bar r, Bel l) : r_(r), l_(l) { }", "") + self.TestLint("Foo::Foo(Bar r) : r_(r), l_(r_), ll_(l_) { }", "") + + # Test for unnamed arguments in a method. + def testCheckForUnnamedParams(self): + self.TestLint("virtual void Func(int*) const;", "") + self.TestLint("virtual void Func(int*);", "") + self.TestLint("void Method(char*) {", "") + self.TestLint("void Method(char*);", "") + self.TestLint("static void operator delete[](void*) throw();", "") + self.TestLint("int Method(int);", "") + + self.TestLint("virtual void Func(int* p);", "") + self.TestLint("void operator delete(void* x) throw();", "") + self.TestLint("void Method(char* x) {", "") + self.TestLint("void Method(char* /*x*/) {", "") + self.TestLint("void Method(char* x);", "") + self.TestLint("typedef void (*Method)(int32_t x);", "") + self.TestLint("static void operator delete[](void* x) throw();", "") + self.TestLint("static void operator delete[](void* /*x*/) throw();", "") + + self.TestLint("X operator++(int);", "") + self.TestLint("X operator++(int) {", "") + self.TestLint("X operator--(int);", "") + self.TestLint("X operator--(int /*unused*/) {", "") + self.TestLint("MACRO(int);", "") + self.TestLint("MACRO(func(int));", "") + self.TestLint("MACRO(arg, func(int));", "") + + self.TestLint("void (*func)(void*);", "") + self.TestLint("void Func((*func)(void*)) {}", "") + self.TestLint("template void func();", "") + self.TestLint("virtual void f(int /*unused*/) {", "") + self.TestLint("void f(int /*unused*/) override {", "") + self.TestLint("void f(int /*unused*/) final {", "") + + # Test deprecated casts such as int(d) + def testDeprecatedCast(self): + self.TestLint( + "int a = int(2.2);", + "Using deprecated casting style. " + "Use static_cast(...) instead" + " [readability/casting] [4]", + ) + + self.TestLint( + '(char *) "foo"', + "Using C-style cast. Use const_cast(...) instead [readability/casting] [4]", + ) + + self.TestLint( + "(int*)foo", + "Using C-style cast. " + "Use reinterpret_cast(...) instead" + " [readability/casting] [4]", + ) + + # Checks for false positives... + self.TestLint("int a = int();", "") # constructor + self.TestLint("X::X() : a(int()) {}", "") # default constructor + self.TestLint("operator bool();", "") # Conversion operator + self.TestLint("new int64_t(123);", "") # "new" operator on basic type + self.TestLint("new int64_t(123);", "") # "new" operator on basic type + self.TestLint("new const int(42);", "") # "new" on const-qualified type + self.TestLint("using a = bool(int arg);", "") # C++11 alias-declaration + self.TestLint("x = bit_cast(y);", "") # array of array + self.TestLint("void F(const char(&src)[N]);", "") # array of references + + # Placement new + self.TestLint("new(field_ptr) int(field->default_value_enum()->number());", "") + + # C++11 function wrappers + self.TestLint("std::function", "") + self.TestLint("std::function", "") + self.TestLint("std::function< int(bool) >", "") + self.TestLint("mfunction", "") + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.cc", + "cc", + [ + "// Copyright 2014 Your Company. All Rights Reserved.", + "typedef std::function<", + " bool(int)> F;", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + + # Return types for function pointers + self.TestLint("typedef bool(FunctionPointer)();", "") + self.TestLint("typedef bool(FunctionPointer)(int param);", "") + self.TestLint("typedef bool(MyClass::*MemberFunctionPointer)();", "") + self.TestLint("typedef bool(MyClass::* MemberFunctionPointer)();", "") + self.TestLint("typedef bool(MyClass::*MemberFunctionPointer)() const;", "") + self.TestLint("void Function(bool(FunctionPointerArg)());", "") + self.TestLint("void Function(bool(FunctionPointerArg)()) {}", "") + self.TestLint("typedef set SortedIdSet", "") + self.TestLint("bool TraverseNode(T *Node, bool(VisitorBase:: *traverse) (T *t)) {}", "") + + # The second parameter to a gMock method definition is a function signature + # that often looks like a bad cast but should not picked up by lint. + def testMockMethod(self): + self.TestLint("MOCK_METHOD0(method, int());", "") + self.TestLint("MOCK_CONST_METHOD1(method, float(string));", "") + self.TestLint("MOCK_CONST_METHOD2_T(method, double(float, float));", "") + self.TestLint("MOCK_CONST_METHOD1(method, SomeType(int));", "") + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "mock.cc", + "cc", + [ + "MOCK_METHOD1(method1,", + " bool(int));", + "MOCK_METHOD1(", + " method2,", + " bool(int));", + "MOCK_CONST_METHOD2(", + " method3, bool(int,", + " int));", + "MOCK_METHOD1(method4, int(bool));", + "const int kConstant = int(42);", + ], # true positive + error_collector, + ) + self.assertEqual( + 0, + error_collector.Results().count( + ( + "Using deprecated casting style. " + "Use static_cast(...) instead " + "[readability/casting] [4]" + ) + ), + ) + self.assertEqual( + 1, + error_collector.Results().count( + ( + "Using deprecated casting style. " + "Use static_cast(...) instead " + "[readability/casting] [4]" + ) + ), + ) + + # Like gMock method definitions, MockCallback instantiations look very similar + # to bad casts. + def testMockCallback(self): + self.TestLint("MockCallback", "") + self.TestLint("MockCallback", "") + + # Test false errors that happened with some include file names + def testIncludeFilenameFalseError(self): + self.TestLint('#include "foo/long-foo.h"', "") + self.TestLint('#include "foo/sprintf.h"', "") + + # Test typedef cases. There was a bug that cpplint misidentified + # typedef for pointer to function as C-style cast and produced + # false-positive error messages. + def testTypedefForPointerToFunction(self): + self.TestLint("typedef void (*Func)(int x);", "") + self.TestLint("typedef void (*Func)(int *x);", "") + self.TestLint("typedef void Func(int x);", "") + self.TestLint("typedef void Func(int *x);", "") + + def testIncludeWhatYouUseNoImplementationFiles(self): + code = "std::vector foo;" + for extension in ["h", "hpp", "hxx", "h++", "cuh", "c", "cc", "cpp", "cxx", "c++", "cu"]: + self.assertEqual( + "Add #include for vector<> [build/include_what_you_use] [4]", + self.PerformIncludeWhatYouUse(code, "foo." + extension), + ) + + def testIncludeWhatYouUse(self): + self.TestIncludeWhatYouUse( + """#include std::vector foo; """, - '') - self.TestIncludeWhatYouUse( - """#include + "", + ) + self.TestIncludeWhatYouUse( + """#include std::pair foo; """, - 'Add #include for pair<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for pair<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include std::pair foo; """, - 'Add #include for pair<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for pair<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include std::pair foo; """, - 'Add #include for pair<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for pair<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include auto foo = std::make_pair(1, 2); """, - 'Add #include for make_pair' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for make_pair [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include std::pair foo; """, - '') - self.TestIncludeWhatYouUse( - """#include + "", + ) + self.TestIncludeWhatYouUse( + """#include DECLARE_string(foobar); """, - '') - self.TestIncludeWhatYouUse( - """#include + "", + ) + self.TestIncludeWhatYouUse( + """#include DEFINE_string(foobar, "", ""); """, - '') - self.TestIncludeWhatYouUse( - """#include + "", + ) + self.TestIncludeWhatYouUse( + """#include std::pair foo; """, - 'Add #include for pair<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "Add #include for pair<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" std::vector foo; """, - 'Add #include for vector<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for vector<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include std::set foo; """, - 'Add #include for set<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "Add #include for set<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" hash_map foobar; """, - 'Add #include for hash_map<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include "base/containers/hash_tables.h" + "Add #include for hash_map<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include "base/containers/hash_tables.h" base::hash_map foobar; """, - '') - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "", + ) + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" bool foobar = std::less(0,1); """, - 'Add #include for less<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "Add #include for less<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" bool foobar = min(0,1); """, - 'Add #include for min [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - 'cout << "hello world" << endl;', - 'Add #include for cout [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - 'printf("hello world");', - 'Add #include for printf [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include - printf("hello world");""", '') # Avoid false positives w/ c-style include - self.TestIncludeWhatYouUse( - 'void a(const string &foobar);', - 'Add #include for string [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - 'void a(const std::string &foobar);', - 'Add #include for string [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - 'void a(const my::string &foobar);', - '') # Avoid false positives on strings in other namespaces. - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "Add #include for min [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + 'cout << "hello world" << endl;', + "Add #include for cout [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + 'printf("hello world");', + "Add #include for printf [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include + printf("hello world");""", + "", + ) # Avoid false positives w/ c-style include + self.TestIncludeWhatYouUse( + "void a(const string &foobar);", + "Add #include for string [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + "void a(const std::string &foobar);", + "Add #include for string [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + "void a(const my::string &foobar);", "" + ) # Avoid false positives on strings in other namespaces. + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" bool foobar = swap(0,1); """, - 'Add #include for swap [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "Add #include for swap [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" bool foobar = transform(a.begin(), a.end(), b.start(), Foo); """, - 'Add #include for transform ' - '[build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "Add #include for transform [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" boost::range::transform(input, std::back_inserter(output), square); """, - '') # Avoid false positives on transform in other namespaces. - self.TestIncludeWhatYouUse( - """#include "base/foobar.h" + "", + ) # Avoid false positives on transform in other namespaces. + self.TestIncludeWhatYouUse( + """#include "base/foobar.h" bool foobar = std::min_element(a.begin(), a.end()); """, - 'Add #include for min_element ' - '[build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """foo->swap(0,1); + "Add #include for min_element [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """foo->swap(0,1); foo.swap(0,1); """, - '') - self.TestIncludeWhatYouUse( - """#include + "", + ) + self.TestIncludeWhatYouUse( + """#include void a(const std::multimap &foobar); """, - 'Add #include for multimap<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for multimap<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include void a(const std::unordered_map &foobar); """, - 'Add #include for unordered_map<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for unordered_map<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include void a(const std::unordered_set &foobar); """, - 'Add #include for unordered_set<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for unordered_set<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include void a(const std::priority_queue &foobar); """, - '') - self.TestIncludeWhatYouUse( - """#include + "", + ) + self.TestIncludeWhatYouUse( + """#include #include #include #include "base/basictypes.h" #include "base/port.h" - vector hajoa;""", '') - self.TestIncludeWhatYouUse( - """#include + vector hajoa;""", + "", + ) + self.TestIncludeWhatYouUse( + """#include int i = numeric_limits::max() """, - 'Add #include for numeric_limits<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for numeric_limits<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include int i = numeric_limits::max() """, - '') - self.TestIncludeWhatYouUse( - """#include + "", + ) + self.TestIncludeWhatYouUse( + """#include std::unique_ptr x; """, - 'Add #include for unique_ptr<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for unique_ptr<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include auto x = std::make_unique(0); """, - 'Add #include for make_unique<>' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for make_unique<> [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include vector foo(vector x) { return std::move(x); } """, - 'Add #include for move' - ' [build/include_what_you_use] [4]') - self.TestIncludeWhatYouUse( - """#include + "Add #include for move [build/include_what_you_use] [4]", + ) + self.TestIncludeWhatYouUse( + """#include int a, b; std::swap(a, b); """, - 'Add #include for swap' - ' [build/include_what_you_use] [4]') - # False positive for std::set - self.TestIncludeWhatYouUse( - """ + "Add #include for swap [build/include_what_you_use] [4]", + ) + # False positive for std::set + self.TestIncludeWhatYouUse( + """ #include struct Foo { template @@ -1241,10 +1329,11 @@ def testIncludeWhatYouUse(self): Foo* pbar = &bar; bar.set("int", 5); pbar->set("bool", false);""", - '') - # False positive for std::map - self.TestIncludeWhatYouUse( - """ + "", + ) + # False positive for std::map + self.TestIncludeWhatYouUse( + """ template struct Foo { T t; @@ -1257,105 +1346,103 @@ def testIncludeWhatYouUse(self): }; auto res = map(); """, - '') - # False positive for boost::container::set - self.TestIncludeWhatYouUse( - """ + "", + ) + # False positive for boost::container::set + self.TestIncludeWhatYouUse( + """ boost::container::set foo; """, - '') - - def testFilesBelongToSameModule(self): - f = cpplint.FilesBelongToSameModule - self.assertEqual((True, ''), f('a.cc', 'a.h')) - self.assertEqual((True, ''), f('base/google.cc', 'base/google.h')) - self.assertEqual((True, ''), f('base/google_test.c', 'base/google.h')) - self.assertEqual((True, ''), f('base/google_test.cc', 'base/google.h')) - self.assertEqual((True, ''), f('base/google_test.cc', 'base/google.hpp')) - self.assertEqual((True, ''), f('base/google_test.cxx', 'base/google.hxx')) - self.assertEqual((True, ''), f('base/google_test.cpp', 'base/google.hpp')) - self.assertEqual((True, ''), f('base/google_test.c++', 'base/google.h++')) - self.assertEqual((True, ''), f('base/google_test.cu', 'base/google.cuh')) - self.assertEqual((True, ''), - f('base/google_unittest.cc', 'base/google.h')) - self.assertEqual((True, ''), - f('base/internal/google_unittest.cc', - 'base/public/google.h')) - self.assertEqual((True, 'xxx/yyy/'), - f('xxx/yyy/base/internal/google_unittest.cc', - 'base/public/google.h')) - self.assertEqual((True, 'xxx/yyy/'), - f('xxx/yyy/base/google_unittest.cc', - 'base/public/google.h')) - self.assertEqual((True, ''), - f('base/google_unittest.cc', 'base/google-inl.h')) - self.assertEqual((True, '/home/build/google3/'), - f('/home/build/google3/base/google.cc', 'base/google.h')) - - self.assertEqual((False, ''), - f('/home/build/google3/base/google.cc', 'basu/google.h')) - self.assertEqual((False, ''), f('a.cc', 'b.h')) - - def testCleanseLine(self): - self.assertEqual('int foo = 0;', - cpplint.CleanseComments('int foo = 0; // danger!')) - self.assertEqual('int o = 0;', - cpplint.CleanseComments('int /* foo */ o = 0;')) - self.assertEqual('foo(int a, int b);', - cpplint.CleanseComments('foo(int a /* abc */, int b);')) - self.assertEqual('f(a, b);', - cpplint.CleanseComments('f(a, /* name */ b);')) - self.assertEqual('f(a, b);', - cpplint.CleanseComments('f(a /* name */, b);')) - self.assertEqual('f(a, b);', - cpplint.CleanseComments('f(a, /* name */b);')) - self.assertEqual('f(a, b, c);', - cpplint.CleanseComments('f(a, /**/b, /**/c);')) - self.assertEqual('f(a, b, c);', - cpplint.CleanseComments('f(a, /**/b/**/, c);')) - - def testRawStrings(self): - self.TestMultiLineLint( - """ + "", + ) + + def testFilesBelongToSameModule(self): + f = cpplint.FilesBelongToSameModule + self.assertEqual((True, ""), f("a.cc", "a.h")) + self.assertEqual((True, ""), f("base/google.cc", "base/google.h")) + self.assertEqual((True, ""), f("base/google_test.c", "base/google.h")) + self.assertEqual((True, ""), f("base/google_test.cc", "base/google.h")) + self.assertEqual((True, ""), f("base/google_test.cc", "base/google.hpp")) + self.assertEqual((True, ""), f("base/google_test.cxx", "base/google.hxx")) + self.assertEqual((True, ""), f("base/google_test.cpp", "base/google.hpp")) + self.assertEqual((True, ""), f("base/google_test.c++", "base/google.h++")) + self.assertEqual((True, ""), f("base/google_test.cu", "base/google.cuh")) + self.assertEqual((True, ""), f("base/google_unittest.cc", "base/google.h")) + self.assertEqual((True, ""), f("base/internal/google_unittest.cc", "base/public/google.h")) + self.assertEqual( + (True, "xxx/yyy/"), + f("xxx/yyy/base/internal/google_unittest.cc", "base/public/google.h"), + ) + self.assertEqual( + (True, "xxx/yyy/"), f("xxx/yyy/base/google_unittest.cc", "base/public/google.h") + ) + self.assertEqual((True, ""), f("base/google_unittest.cc", "base/google-inl.h")) + self.assertEqual( + (True, "/home/build/google3/"), f("/home/build/google3/base/google.cc", "base/google.h") + ) + + self.assertEqual((False, ""), f("/home/build/google3/base/google.cc", "basu/google.h")) + self.assertEqual((False, ""), f("a.cc", "b.h")) + + def testCleanseLine(self): + self.assertEqual("int foo = 0;", cpplint.CleanseComments("int foo = 0; // danger!")) + self.assertEqual("int o = 0;", cpplint.CleanseComments("int /* foo */ o = 0;")) + self.assertEqual( + "foo(int a, int b);", cpplint.CleanseComments("foo(int a /* abc */, int b);") + ) + self.assertEqual("f(a, b);", cpplint.CleanseComments("f(a, /* name */ b);")) + self.assertEqual("f(a, b);", cpplint.CleanseComments("f(a /* name */, b);")) + self.assertEqual("f(a, b);", cpplint.CleanseComments("f(a, /* name */b);")) + self.assertEqual("f(a, b, c);", cpplint.CleanseComments("f(a, /**/b, /**/c);")) + self.assertEqual("f(a, b, c);", cpplint.CleanseComments("f(a, /**/b/**/, c);")) + + def testRawStrings(self): + self.TestMultiLineLint( + """ int main() { struct A { A(std::string s, A&& a); }; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ template > class unique_ptr { public: unique_ptr(unique_ptr&& u) noexcept; };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ void Func() { static const char kString[] = R"( #endif <- invalid preprocessor should be ignored */ <- invalid comment should be ignored too )"; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ void Func() { string s = R"TrueDelimiter( )" )FalseDelimiter" )TrueDelimiter"; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ void Func() { char char kString[] = R"( ";" )"; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ static const char kRawString[] = R"( \tstatic const int kLineWithTab = 1; static const int kLineWithTrailingWhiteSpace = 1;\x20 @@ -1372,9 +1459,10 @@ def testRawStrings(self): } )";""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ void Func() { string s = StrCat(R"TrueDelimiter( )" @@ -1384,984 +1472,1111 @@ def testRawStrings(self): )FalseDelimiter2" )TrueDelimiter2"); }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ static SomeStruct kData = { {0, R"(line1 line2 )"} };""", - '') + "", + ) - def testMultiLineComments(self): - # missing explicit is bad - self.TestMultiLineLint( - r"""int a = 0; + def testMultiLineComments(self): + # missing explicit is bad + self.TestMultiLineLint( + r"""int a = 0; /* multi-liner class Foo { Foo(int f); // should cause a lint warning in code } */ """, - '') - self.TestMultiLineLint( - r"""/* int a = 0; multi-liner + "", + ) + self.TestMultiLineLint( + r"""/* int a = 0; multi-liner static const int b = 0;""", - 'Could not find end of multi-line comment' - ' [readability/multiline_comment] [5]') - self.TestMultiLineLint(r""" /* multi-line comment""", - 'Could not find end of multi-line comment' - ' [readability/multiline_comment] [5]') - self.TestMultiLineLint(r""" // /* comment, but not multi-line""", '') - self.TestMultiLineLint(r"""/********** - */""", '') - self.TestMultiLineLint(r"""/** + "Could not find end of multi-line comment [readability/multiline_comment] [5]", + ) + self.TestMultiLineLint( + r""" /* multi-line comment""", + "Could not find end of multi-line comment [readability/multiline_comment] [5]", + ) + self.TestMultiLineLint(r""" // /* comment, but not multi-line""", "") + self.TestMultiLineLint( + r"""/********** + */""", + "", + ) + self.TestMultiLineLint( + r"""/** * Doxygen comment */""", - '') - self.TestMultiLineLint(r"""/*! + "", + ) + self.TestMultiLineLint( + r"""/*! * Doxygen comment */""", - '') - - def testMultilineStrings(self): - multiline_string_error_message = ( - 'Multi-line string ("...") found. This lint script doesn\'t ' - 'do well with such strings, and may give bogus warnings. ' - 'Use C++11 raw strings or concatenation instead.' - ' [readability/multiline_string] [5]') - - for extension in ['c', 'cc', 'cpp', 'cxx', 'c++', 'cu']: - file_path = 'mydir/foo.' + extension - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, extension, - ['const char* str = "This is a\\', - ' multiline string.";'], - error_collector) - self.assertEqual( - 2, # One per line. - error_collector.ResultList().count(multiline_string_error_message)) - - # Test non-explicit single-argument constructors - def testExplicitSingleArgumentConstructors(self): - old_verbose_level = cpplint._cpplint_state.verbose_level - cpplint._cpplint_state.verbose_level = 0 - - try: - # missing explicit is bad - self.TestMultiLineLint( - """ + "", + ) + + def testMultilineStrings(self): + multiline_string_error_message = ( + 'Multi-line string ("...") found. This lint script doesn\'t ' + "do well with such strings, and may give bogus warnings. " + "Use C++11 raw strings or concatenation instead." + " [readability/multiline_string] [5]" + ) + + for extension in ["c", "cc", "cpp", "cxx", "c++", "cu"]: + file_path = "mydir/foo." + extension + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + extension, + ['const char* str = "This is a\\', ' multiline string.";'], + error_collector, + ) + self.assertEqual( + 2, # One per line. + error_collector.ResultList().count(multiline_string_error_message), + ) + + # Test non-explicit single-argument constructors + def testExplicitSingleArgumentConstructors(self): + old_verbose_level = cpplint._cpplint_state.verbose_level + cpplint._cpplint_state.verbose_level = 0 + + try: + # missing explicit is bad + self.TestMultiLineLint( + """ class Foo { Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # missing explicit is bad, even with whitespace - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # missing explicit is bad, even with whitespace + self.TestMultiLineLint( + """ class Foo { Foo (int f); };""", - ['Extra space before ( in function call [whitespace/parens] [4]', - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]']) - # missing explicit, with distracting comment, is still bad - self.TestMultiLineLint( - """ + [ + "Extra space before ( in function call [whitespace/parens] [4]", + "Single-parameter constructors should be marked explicit." + " [runtime/explicit] [4]", + ], + ) + # missing explicit, with distracting comment, is still bad + self.TestMultiLineLint( + """ class Foo { Foo(int f); // simpler than Foo(blargh, blarg) };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # missing explicit, with qualified classname - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # missing explicit, with qualified classname + self.TestMultiLineLint( + """ class Qualifier::AnotherOne::Foo { Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # missing explicit for inline constructors is bad as well - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # missing explicit for inline constructors is bad as well + self.TestMultiLineLint( + """ class Foo { inline Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # missing explicit for constexpr constructors is bad as well - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # missing explicit for constexpr constructors is bad as well + self.TestMultiLineLint( + """ class Foo { constexpr Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # missing explicit for constexpr+inline constructors is bad as well - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # missing explicit for constexpr+inline constructors is bad as well + self.TestMultiLineLint( + """ class Foo { constexpr inline Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + self.TestMultiLineLint( + """ class Foo { inline constexpr Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # explicit with inline is accepted - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # explicit with inline is accepted + self.TestMultiLineLint( + """ class Foo { inline explicit Foo(int f); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { explicit inline Foo(int f); };""", - '') - # explicit with constexpr is accepted - self.TestMultiLineLint( - """ + "", + ) + # explicit with constexpr is accepted + self.TestMultiLineLint( + """ class Foo { constexpr explicit Foo(int f); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { explicit constexpr Foo(int f); };""", - '') - # explicit with constexpr+inline is accepted - self.TestMultiLineLint( - """ + "", + ) + # explicit with constexpr+inline is accepted + self.TestMultiLineLint( + """ class Foo { inline constexpr explicit Foo(int f); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { explicit inline constexpr Foo(int f); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { constexpr inline explicit Foo(int f); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { explicit constexpr inline Foo(int f); };""", - '') - # structs are caught as well. - self.TestMultiLineLint( - """ + "", + ) + # structs are caught as well. + self.TestMultiLineLint( + """ struct Foo { Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # Templatized classes are caught as well. - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # Templatized classes are caught as well. + self.TestMultiLineLint( + """ template class Foo { Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # inline case for templatized classes. - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # inline case for templatized classes. + self.TestMultiLineLint( + """ template class Foo { inline Foo(int f); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # constructors with a default argument should still be marked explicit - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # constructors with a default argument should still be marked explicit + self.TestMultiLineLint( + """ class Foo { Foo(int f = 0); };""", - 'Constructors callable with one argument should be marked explicit.' - ' [runtime/explicit] [4]') - # multi-argument constructors with all but one default argument should be - # marked explicit - self.TestMultiLineLint( - """ + "Constructors callable with one argument should be marked explicit." + " [runtime/explicit] [4]", + ) + # multi-argument constructors with all but one default argument should be + # marked explicit + self.TestMultiLineLint( + """ class Foo { Foo(int f, int g = 0); };""", - 'Constructors callable with one argument should be marked explicit.' - ' [runtime/explicit] [4]') - # multi-argument constructors with all default arguments should be marked - # explicit - self.TestMultiLineLint( - """ + "Constructors callable with one argument should be marked explicit." + " [runtime/explicit] [4]", + ) + # multi-argument constructors with all default arguments should be marked + # explicit + self.TestMultiLineLint( + """ class Foo { Foo(int f = 0, int g = 0); };""", - 'Constructors callable with one argument should be marked explicit.' - ' [runtime/explicit] [4]') - # explicit no-argument constructors are just fine - self.TestMultiLineLint( - """ + "Constructors callable with one argument should be marked explicit." + " [runtime/explicit] [4]", + ) + # explicit no-argument constructors are just fine + self.TestMultiLineLint( + """ class Foo { explicit Foo(); };""", - '') - # void constructors are considered no-argument - self.TestMultiLineLint( - """ + "", + ) + # void constructors are considered no-argument + self.TestMultiLineLint( + """ class Foo { explicit Foo(void); };""", - '') - # No warning for multi-parameter constructors - self.TestMultiLineLint( - """ + "", + ) + # No warning for multi-parameter constructors + self.TestMultiLineLint( + """ class Foo { explicit Foo(int f, int g); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { explicit Foo(int f, int g = 0); };""", - '') - # single-argument constructors that take a function that takes multiple - # arguments should be explicit - self.TestMultiLineLint( - """ + "", + ) + # single-argument constructors that take a function that takes multiple + # arguments should be explicit + self.TestMultiLineLint( + """ class Foo { Foo(void (*f)(int f, int g)); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # single-argument constructors that take a single template argument with - # multiple parameters should be explicit - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # single-argument constructors that take a single template argument with + # multiple parameters should be explicit + self.TestMultiLineLint( + """ template class Foo { Foo(Bar b); };""", - 'Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]') - # but copy constructors that take multiple template parameters are OK - self.TestMultiLineLint( - """ + "Single-parameter constructors should be marked explicit. [runtime/explicit] [4]", + ) + # but copy constructors that take multiple template parameters are OK + self.TestMultiLineLint( + """ template class Foo { Foo(Foo& f); };""", - '') - # proper style is okay - self.TestMultiLineLint( - """ + "", + ) + # proper style is okay + self.TestMultiLineLint( + """ class Foo { explicit Foo(int f); };""", - '') - # two argument constructor is okay - self.TestMultiLineLint( - """ + "", + ) + # two argument constructor is okay + self.TestMultiLineLint( + """ class Foo { Foo(int f, int b); };""", - '') - # two argument constructor, across two lines, is okay - self.TestMultiLineLint( - """ + "", + ) + # two argument constructor, across two lines, is okay + self.TestMultiLineLint( + """ class Foo { Foo(int f, int b); };""", - '') - # non-constructor (but similar name), is okay - self.TestMultiLineLint( - """ + "", + ) + # non-constructor (but similar name), is okay + self.TestMultiLineLint( + """ class Foo { aFoo(int f); };""", - '') - # constructor with void argument is okay - self.TestMultiLineLint( - """ + "", + ) + # constructor with void argument is okay + self.TestMultiLineLint( + """ class Foo { Foo(void); };""", - '') - # single argument method is okay - self.TestMultiLineLint( - """ + "", + ) + # single argument method is okay + self.TestMultiLineLint( + """ class Foo { Bar(int b); };""", - '') - # comments should be ignored - self.TestMultiLineLint( - """ + "", + ) + # comments should be ignored + self.TestMultiLineLint( + """ class Foo { // Foo(int f); };""", - '') - # single argument function following class definition is okay - # (okay, it's not actually valid, but we don't want a false positive) - self.TestMultiLineLint( - """ + "", + ) + # single argument function following class definition is okay + # (okay, it's not actually valid, but we don't want a false positive) + self.TestMultiLineLint( + """ class Foo { Foo(int f, int b); }; Foo(int f);""", - '') - # single argument function is okay - self.TestMultiLineLint( - """static Foo(int f);""", - '') - # single argument copy constructor is okay. - self.TestMultiLineLint( - """ + "", + ) + # single argument function is okay + self.TestMultiLineLint("""static Foo(int f);""", "") + # single argument copy constructor is okay. + self.TestMultiLineLint( + """ class Foo { Foo(const Foo&); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { Foo(volatile Foo&); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { Foo(volatile const Foo&); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { Foo(const volatile Foo&); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { Foo(Foo const&); };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo { Foo(Foo&); };""", - '') - # templatized copy constructor is okay. - self.TestMultiLineLint( - """ + "", + ) + # templatized copy constructor is okay. + self.TestMultiLineLint( + """ template class Foo { Foo(const Foo&); };""", - '') - # Special case for std::initializer_list - self.TestMultiLineLint( - """ + "", + ) + # Special case for std::initializer_list + self.TestMultiLineLint( + """ class Foo { Foo(std::initializer_list &arg) {} };""", - '') - # Special case for variadic arguments - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['class Foo {', - ' template', - ' explicit Foo(const int arg, Args&&... args) {}', - '};'], - error_collector) - self.assertEqual(0, error_collector.ResultList().count( - 'Constructors that require multiple arguments should not be marked ' - 'explicit. [runtime/explicit] [0]')) - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['class Foo {', - ' template', - ' explicit Foo(Args&&... args) {}', - '};'], - error_collector) - self.assertEqual(0, error_collector.ResultList().count( - 'Constructors that require multiple arguments should not be marked ' - 'explicit. [runtime/explicit] [0]')) - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['class Foo {', - ' template', - ' Foo(const int arg, Args&&... args) {}', - '};'], - error_collector) - self.assertEqual(1, error_collector.ResultList().count( - 'Constructors callable with one argument should be marked explicit.' - ' [runtime/explicit] [4]')) - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['class Foo {', - ' template', - ' Foo(Args&&... args) {}', - '};'], - error_collector) - self.assertEqual(1, error_collector.ResultList().count( - 'Constructors callable with one argument should be marked explicit.' - ' [runtime/explicit] [4]')) - # Anything goes inside an assembly block - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['void Func() {', - ' __asm__ (', - ' "hlt"', - ' );', - ' asm {', - ' movdqa [edx + 32], xmm2', - ' }', - '}'], - error_collector) - self.assertEqual( - 0, - error_collector.ResultList().count( - 'Extra space before ( in function call [whitespace/parens] [4]')) - self.assertEqual( - 0, - error_collector.ResultList().count( - 'Closing ) should be moved to the previous line ' - '[whitespace/parens] [2]')) - self.assertEqual( - 0, - error_collector.ResultList().count( - 'Extra space before [ [whitespace/braces] [5]')) - finally: - cpplint._cpplint_state.verbose_level = old_verbose_level - - def testSlashStarCommentOnSingleLine(self): - self.TestMultiLineLint( - """/* static */ Foo(int f);""", - '') - self.TestMultiLineLint( - """/*/ static */ Foo(int f);""", - '') - self.TestMultiLineLint( - """/*/ static Foo(int f);""", - 'Could not find end of multi-line comment' - ' [readability/multiline_comment] [5]') - self.TestMultiLineLint( - """ /*/ static Foo(int f);""", - 'Could not find end of multi-line comment' - ' [readability/multiline_comment] [5]') - self.TestMultiLineLint( - """ /**/ static Foo(int f);""", - '') - - # Test suspicious usage of "if" like this: - # if (a == b) { - # DoSomething(); - # } if (a == c) { // Should be "else if". - # DoSomething(); // This gets called twice if a == b && a == c. - # } - def testSuspiciousUsageOfIf(self): - self.TestLint( - ' if (a == b) {', - '') - self.TestLint( - ' } if (a == b) {', - 'Did you mean "else if"? If not, start a new line for "if".' - ' [readability/braces] [4]') - - # Test suspicious usage of memset. Specifically, a 0 - # as the final argument is almost certainly an error. - def testSuspiciousUsageOfMemset(self): - # Normal use is okay. - self.TestLint( - ' memset(buf, 0, sizeof(buf))', - '') - - # A 0 as the final argument is almost certainly an error. - self.TestLint( - ' memset(buf, sizeof(buf), 0)', - 'Did you mean "memset(buf, 0, sizeof(buf))"?' - ' [runtime/memset] [4]') - self.TestLint( - ' memset(buf, xsize * ysize, 0)', - 'Did you mean "memset(buf, 0, xsize * ysize)"?' - ' [runtime/memset] [4]') - - # There is legitimate test code that uses this form. - # This is okay since the second argument is a literal. - self.TestLint( - " memset(buf, 'y', 0)", - '') - self.TestLint( - ' memset(buf, 4, 0)', - '') - self.TestLint( - ' memset(buf, -1, 0)', - '') - self.TestLint( - ' memset(buf, 0xF1, 0)', - '') - self.TestLint( - ' memset(buf, 0xcd, 0)', - '') - - def testRedundantVirtual(self): - self.TestLint('virtual void F()', '') - self.TestLint('virtual void F();', '') - self.TestLint('virtual void F() {}', '') - - message_template = ('"%s" is redundant since function is already ' - 'declared as "%s" [readability/inheritance] [4]') - for virt_specifier in ['override', 'final']: - error_message = message_template % ('virtual', virt_specifier) - self.TestLint('virtual int F() %s' % virt_specifier, error_message) - self.TestLint('virtual int F() %s;' % virt_specifier, error_message) - self.TestLint('virtual int F() %s {' % virt_specifier, error_message) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - 'virtual void F(int a,', - ' int b) ' + virt_specifier + ';', - 'virtual void F(int a,', - ' int b) LOCKS_EXCLUDED(lock) ' + virt_specifier + ';', - 'virtual void F(int a,', - ' int b)', - ' LOCKS_EXCLUDED(lock) ' + virt_specifier + ';', - ''], - error_collector) - self.assertEqual( - [error_message, error_message, error_message], - error_collector.Results()) - - error_message = message_template % ('override', 'final') - self.TestLint('int F() override final', error_message) - self.TestLint('int F() override final;', error_message) - self.TestLint('int F() override final {}', error_message) - self.TestLint('int F() final override', error_message) - self.TestLint('int F() final override;', error_message) - self.TestLint('int F() final override {}', error_message) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - 'struct A : virtual B {', - ' ~A() override;' - '};', - 'class C', - ' : public D,', - ' public virtual E {', - ' void Func() override;', - '}', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - - self.TestLint('void Finalize(AnnotationProto *final) override;', '') - - def testCheckDeprecated(self): - self.TestLanguageRulesCheck('foo_test.cc', '#include ', '') - self.TestLanguageRulesCheck('foo_unittest.cc', '#include ', '') - - def testCheckPosixThreading(self): - self.TestLint('var = sctime_r()', '') - self.TestLint('var = strtok_r()', '') - self.TestLint('var = strtok_r(foo, ba, r)', '') - self.TestLint('var = brand()', '') - self.TestLint('_rand()', '') - self.TestLint('.rand()', '') - self.TestLint('->rand()', '') - self.TestLint('ACMRandom rand(seed)', '') - self.TestLint('ISAACRandom rand()', '') - self.TestLint('var = rand()', - 'Consider using rand_r(...) instead of rand(...)' - ' for improved thread safety.' - ' [runtime/threadsafe_fn] [2]') - self.TestLint('var = strtok(str, delim)', - 'Consider using strtok_r(...) ' - 'instead of strtok(...)' - ' for improved thread safety.' - ' [runtime/threadsafe_fn] [2]') - - def testVlogMisuse(self): - self.TestLint('VLOG(1)', '') - self.TestLint('VLOG(99)', '') - self.TestLint('LOG(ERROR)', '') - self.TestLint('LOG(INFO)', '') - self.TestLint('LOG(WARNING)', '') - self.TestLint('LOG(FATAL)', '') - self.TestLint('LOG(DFATAL)', '') - self.TestLint('VLOG(SOMETHINGWEIRD)', '') - self.TestLint('MYOWNVLOG(ERROR)', '') - errmsg = ('VLOG() should be used with numeric verbosity level. ' - 'Use LOG() if you want symbolic severity levels.' - ' [runtime/vlog] [5]') - self.TestLint('VLOG(ERROR)', errmsg) - self.TestLint('VLOG(INFO)', errmsg) - self.TestLint('VLOG(WARNING)', errmsg) - self.TestLint('VLOG(FATAL)', errmsg) - self.TestLint('VLOG(DFATAL)', errmsg) - self.TestLint(' VLOG(ERROR)', errmsg) - self.TestLint(' VLOG(INFO)', errmsg) - self.TestLint(' VLOG(WARNING)', errmsg) - self.TestLint(' VLOG(FATAL)', errmsg) - self.TestLint(' VLOG(DFATAL)', errmsg) - - # Test potential format string bugs like printf(foo). - def testFormatStrings(self): - self.TestLint('printf("foo")', '') - self.TestLint('printf("foo: %s", foo)', '') - self.TestLint('DocidForPrintf(docid)', '') # Should not trigger. - self.TestLint('printf(format, value)', '') # Should not trigger. - self.TestLint('printf(__VA_ARGS__)', '') # Should not trigger. - self.TestLint('printf(format.c_str(), value)', '') # Should not trigger. - self.TestLint('printf(format(index).c_str(), value)', '') - self.TestLint( - 'printf(foo)', - 'Potential format string bug. Do printf("%s", foo) instead.' - ' [runtime/printf] [4]') - self.TestLint( - 'printf(foo.c_str())', - 'Potential format string bug. ' - 'Do printf("%s", foo.c_str()) instead.' - ' [runtime/printf] [4]') - self.TestLint( - 'printf(foo->c_str())', - 'Potential format string bug. ' - 'Do printf("%s", foo->c_str()) instead.' - ' [runtime/printf] [4]') - self.TestLint( - 'StringPrintf(foo)', - 'Potential format string bug. Do StringPrintf("%s", foo) instead.' - '' - ' [runtime/printf] [4]') - - # Test disallowed use of operator& and other operators. - def testIllegalOperatorOverloading(self): - errmsg = ('Unary operator& is dangerous. Do not use it.' - ' [runtime/operator] [4]') - self.TestLint('void operator=(const Myclass&)', '') - self.TestLint('void operator&(int a, int b)', '') # binary operator& ok - self.TestLint('void operator&() { }', errmsg) - self.TestLint('void operator & ( ) { }', - ['Extra space after ( [whitespace/parens] [2]', errmsg]) - - # const string reference members are dangerous.. - def testConstStringReferenceMembers(self): - errmsg = ('const string& members are dangerous. It is much better to use ' - 'alternatives, such as pointers or simple constants.' - ' [runtime/member_string_references] [2]') - - members_declarations = ['const string& church', - 'const string &turing', - 'const string & godel'] - # TODO(unknown): Enable also these tests if and when we ever - # decide to check for arbitrary member references. - # "const Turing & a", - # "const Church& a", - # "const vector& a", - # "const Kurt::Godel & godel", - # "const Kazimierz::Kuratowski& kk" ] - - # The Good. - - self.TestLint('void f(const string&)', '') - self.TestLint('const string& f(const string& a, const string& b)', '') - self.TestLint('typedef const string& A;', '') - - for decl in members_declarations: - self.TestLint(decl + ' = b;', '') - self.TestLint(decl + ' =', '') - - # The Bad. - - for decl in members_declarations: - self.TestLint(decl + ';', errmsg) - - # Variable-length arrays are not permitted. - def testVariableLengthArrayDetection(self): - errmsg = ('Do not use variable-length arrays. Use an appropriately named ' - "('k' followed by CamelCase) compile-time constant for the size." - ' [runtime/arrays] [1]') - - self.TestLint('int a[any_old_variable];', errmsg) - self.TestLint('int doublesize[some_var * 2];', errmsg) - self.TestLint('int a[afunction()];', errmsg) - self.TestLint('int a[function(kMaxFooBars)];', errmsg) - self.TestLint('bool a_list[items_->size()];', errmsg) - self.TestLint('namespace::Type buffer[len+1];', errmsg) - - self.TestLint('int a[64];', '') - self.TestLint('int a[0xFF];', '') - self.TestLint('int first[256], second[256];', '') - self.TestLint('int array_name[kCompileTimeConstant];', '') - self.TestLint('char buf[somenamespace::kBufSize];', '') - self.TestLint('int array_name[ALL_CAPS];', '') - self.TestLint('AClass array1[foo::bar::ALL_CAPS];', '') - self.TestLint('int a[kMaxStrLen + 1];', '') - self.TestLint('int a[sizeof(foo)];', '') - self.TestLint('int a[sizeof(*foo)];', '') - self.TestLint('int a[sizeof foo];', '') - self.TestLint('int a[sizeof(struct Foo)];', '') - self.TestLint('int a[128 - sizeof(const bar)];', '') - self.TestLint('int a[(sizeof(foo) * 4)];', '') - self.TestLint('int a[(arraysize(fixed_size_array)/2) << 1];', '') - self.TestLint('delete a[some_var];', '') - self.TestLint('return a[some_var];', '') - - # DISALLOW_COPY_AND_ASSIGN and DISALLOW_IMPLICIT_CONSTRUCTORS should be at - # end of class if present. - def testDisallowMacrosAtEnd(self): - for macro_name in ( - 'DISALLOW_COPY_AND_ASSIGN', - 'DISALLOW_IMPLICIT_CONSTRUCTORS'): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - 'class SomeClass {', - ' private:', - ' %s(SomeClass);' % macro_name, - ' int member_;', - '};', - ''], - error_collector) - self.assertEqual( - ('%s should be the last thing in the class' % macro_name) + - ' [readability/constructors] [3]', - error_collector.Results()) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - 'class OuterClass {', - ' private:', - ' struct InnerClass {', - ' private:', - ' %s(InnerClass);' % macro_name, - ' int member;', - ' };', - '};', - ''], - error_collector) - self.assertEqual( - ('%s should be the last thing in the class' % macro_name) + - ' [readability/constructors] [3]', - error_collector.Results()) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - 'class OuterClass1 {', - ' private:', - ' struct InnerClass1 {', - ' private:', - ' %s(InnerClass1);' % macro_name, - ' };', - ' %s(OuterClass1);' % macro_name, - '};', - 'struct OuterClass2 {', - ' private:', - ' class InnerClass2 {', - ' private:', - ' %s(InnerClass2);' % macro_name, - ' // comment', - ' };', - '', - ' %s(OuterClass2);' % macro_name, - '', - ' // comment', - '};', - 'void Func() {', - ' struct LocalClass {', - ' private:', - ' %s(LocalClass);' % macro_name, - ' } variable;', - '}', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - - # Brace usage - def testBraces(self): - # Braces shouldn't be followed by a ; unless they're defining a struct - # or initializing an array - self.TestLint('int a[3] = { 1, 2, 3 };', '') - self.TestLint( - """const int foo[] = + "", + ) + # Special case for variadic arguments + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "class Foo {", + " template", + " explicit Foo(const int arg, Args&&... args) {}", + "};", + ], + error_collector, + ) + self.assertEqual( + 0, + error_collector.ResultList().count( + "Constructors that require multiple arguments should not be marked " + "explicit. [runtime/explicit] [0]" + ), + ) + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "class Foo {", + " template", + " explicit Foo(Args&&... args) {}", + "};", + ], + error_collector, + ) + self.assertEqual( + 0, + error_collector.ResultList().count( + "Constructors that require multiple arguments should not be marked " + "explicit. [runtime/explicit] [0]" + ), + ) + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "class Foo {", + " template", + " Foo(const int arg, Args&&... args) {}", + "};", + ], + error_collector, + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + "Constructors callable with one argument should be marked explicit." + " [runtime/explicit] [4]" + ), + ) + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + ["class Foo {", " template", " Foo(Args&&... args) {}", "};"], + error_collector, + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + "Constructors callable with one argument should be marked explicit." + " [runtime/explicit] [4]" + ), + ) + # Anything goes inside an assembly block + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "void Func() {", + " __asm__ (", + ' "hlt"', + " );", + " asm {", + " movdqa [edx + 32], xmm2", + " }", + "}", + ], + error_collector, + ) + self.assertEqual( + 0, + error_collector.ResultList().count( + "Extra space before ( in function call [whitespace/parens] [4]" + ), + ) + self.assertEqual( + 0, + error_collector.ResultList().count( + "Closing ) should be moved to the previous line [whitespace/parens] [2]" + ), + ) + self.assertEqual( + 0, + error_collector.ResultList().count("Extra space before [ [whitespace/braces] [5]"), + ) + finally: + cpplint._cpplint_state.verbose_level = old_verbose_level + + def testSlashStarCommentOnSingleLine(self): + self.TestMultiLineLint("""/* static */ Foo(int f);""", "") + self.TestMultiLineLint("""/*/ static */ Foo(int f);""", "") + self.TestMultiLineLint( + """/*/ static Foo(int f);""", + "Could not find end of multi-line comment [readability/multiline_comment] [5]", + ) + self.TestMultiLineLint( + """ /*/ static Foo(int f);""", + "Could not find end of multi-line comment [readability/multiline_comment] [5]", + ) + self.TestMultiLineLint(""" /**/ static Foo(int f);""", "") + + # Test suspicious usage of "if" like this: + # if (a == b) { + # DoSomething(); + # } if (a == c) { // Should be "else if". + # DoSomething(); // This gets called twice if a == b && a == c. + # } + def testSuspiciousUsageOfIf(self): + self.TestLint(" if (a == b) {", "") + self.TestLint( + " } if (a == b) {", + 'Did you mean "else if"? If not, start a new line for "if". [readability/braces] [4]', + ) + + # Test suspicious usage of memset. Specifically, a 0 + # as the final argument is almost certainly an error. + def testSuspiciousUsageOfMemset(self): + # Normal use is okay. + self.TestLint(" memset(buf, 0, sizeof(buf))", "") + + # A 0 as the final argument is almost certainly an error. + self.TestLint( + " memset(buf, sizeof(buf), 0)", + 'Did you mean "memset(buf, 0, sizeof(buf))"? [runtime/memset] [4]', + ) + self.TestLint( + " memset(buf, xsize * ysize, 0)", + 'Did you mean "memset(buf, 0, xsize * ysize)"? [runtime/memset] [4]', + ) + + # There is legitimate test code that uses this form. + # This is okay since the second argument is a literal. + self.TestLint(" memset(buf, 'y', 0)", "") + self.TestLint(" memset(buf, 4, 0)", "") + self.TestLint(" memset(buf, -1, 0)", "") + self.TestLint(" memset(buf, 0xF1, 0)", "") + self.TestLint(" memset(buf, 0xcd, 0)", "") + + def testRedundantVirtual(self): + self.TestLint("virtual void F()", "") + self.TestLint("virtual void F();", "") + self.TestLint("virtual void F() {}", "") + + message_template = ( + '"%s" is redundant since function is already ' + 'declared as "%s" [readability/inheritance] [4]' + ) + for virt_specifier in ["override", "final"]: + error_message = message_template % ("virtual", virt_specifier) + self.TestLint("virtual int F() %s" % virt_specifier, error_message) + self.TestLint("virtual int F() %s;" % virt_specifier, error_message) + self.TestLint("virtual int F() %s {" % virt_specifier, error_message) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "virtual void F(int a,", + " int b) " + virt_specifier + ";", + "virtual void F(int a,", + " int b) LOCKS_EXCLUDED(lock) " + virt_specifier + ";", + "virtual void F(int a,", + " int b)", + " LOCKS_EXCLUDED(lock) " + virt_specifier + ";", + "", + ], + error_collector, + ) + self.assertEqual( + [error_message, error_message, error_message], error_collector.Results() + ) + + error_message = message_template % ("override", "final") + self.TestLint("int F() override final", error_message) + self.TestLint("int F() override final;", error_message) + self.TestLint("int F() override final {}", error_message) + self.TestLint("int F() final override", error_message) + self.TestLint("int F() final override;", error_message) + self.TestLint("int F() final override {}", error_message) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "struct A : virtual B {", + " ~A() override;};", + "class C", + " : public D,", + " public virtual E {", + " void Func() override;", + "}", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + + self.TestLint("void Finalize(AnnotationProto *final) override;", "") + + def testCheckDeprecated(self): + self.TestLanguageRulesCheck("foo_test.cc", "#include ", "") + self.TestLanguageRulesCheck("foo_unittest.cc", "#include ", "") + + def testCheckPosixThreading(self): + self.TestLint("var = sctime_r()", "") + self.TestLint("var = strtok_r()", "") + self.TestLint("var = strtok_r(foo, ba, r)", "") + self.TestLint("var = brand()", "") + self.TestLint("_rand()", "") + self.TestLint(".rand()", "") + self.TestLint("->rand()", "") + self.TestLint("ACMRandom rand(seed)", "") + self.TestLint("ISAACRandom rand()", "") + self.TestLint( + "var = rand()", + "Consider using rand_r(...) instead of rand(...)" + " for improved thread safety." + " [runtime/threadsafe_fn] [2]", + ) + self.TestLint( + "var = strtok(str, delim)", + "Consider using strtok_r(...) " + "instead of strtok(...)" + " for improved thread safety." + " [runtime/threadsafe_fn] [2]", + ) + + def testVlogMisuse(self): + self.TestLint("VLOG(1)", "") + self.TestLint("VLOG(99)", "") + self.TestLint("LOG(ERROR)", "") + self.TestLint("LOG(INFO)", "") + self.TestLint("LOG(WARNING)", "") + self.TestLint("LOG(FATAL)", "") + self.TestLint("LOG(DFATAL)", "") + self.TestLint("VLOG(SOMETHINGWEIRD)", "") + self.TestLint("MYOWNVLOG(ERROR)", "") + errmsg = ( + "VLOG() should be used with numeric verbosity level. " + "Use LOG() if you want symbolic severity levels." + " [runtime/vlog] [5]" + ) + self.TestLint("VLOG(ERROR)", errmsg) + self.TestLint("VLOG(INFO)", errmsg) + self.TestLint("VLOG(WARNING)", errmsg) + self.TestLint("VLOG(FATAL)", errmsg) + self.TestLint("VLOG(DFATAL)", errmsg) + self.TestLint(" VLOG(ERROR)", errmsg) + self.TestLint(" VLOG(INFO)", errmsg) + self.TestLint(" VLOG(WARNING)", errmsg) + self.TestLint(" VLOG(FATAL)", errmsg) + self.TestLint(" VLOG(DFATAL)", errmsg) + + # Test potential format string bugs like printf(foo). + def testFormatStrings(self): + self.TestLint('printf("foo")', "") + self.TestLint('printf("foo: %s", foo)', "") + self.TestLint("DocidForPrintf(docid)", "") # Should not trigger. + self.TestLint("printf(format, value)", "") # Should not trigger. + self.TestLint("printf(__VA_ARGS__)", "") # Should not trigger. + self.TestLint("printf(format.c_str(), value)", "") # Should not trigger. + self.TestLint("printf(format(index).c_str(), value)", "") + self.TestLint( + "printf(foo)", + 'Potential format string bug. Do printf("%s", foo) instead. [runtime/printf] [4]', + ) + self.TestLint( + "printf(foo.c_str())", + "Potential format string bug. " + 'Do printf("%s", foo.c_str()) instead.' + " [runtime/printf] [4]", + ) + self.TestLint( + "printf(foo->c_str())", + "Potential format string bug. " + 'Do printf("%s", foo->c_str()) instead.' + " [runtime/printf] [4]", + ) + self.TestLint( + "StringPrintf(foo)", + 'Potential format string bug. Do StringPrintf("%s", foo) instead.' + "" + " [runtime/printf] [4]", + ) + + # Test disallowed use of operator& and other operators. + def testIllegalOperatorOverloading(self): + errmsg = "Unary operator& is dangerous. Do not use it. [runtime/operator] [4]" + self.TestLint("void operator=(const Myclass&)", "") + self.TestLint("void operator&(int a, int b)", "") # binary operator& ok + self.TestLint("void operator&() { }", errmsg) + self.TestLint( + "void operator & ( ) { }", ["Extra space after ( [whitespace/parens] [2]", errmsg] + ) + + # const string reference members are dangerous.. + def testConstStringReferenceMembers(self): + errmsg = ( + "const string& members are dangerous. It is much better to use " + "alternatives, such as pointers or simple constants." + " [runtime/member_string_references] [2]" + ) + + members_declarations = [ + "const string& church", + "const string &turing", + "const string & godel", + ] + # TODO(unknown): Enable also these tests if and when we ever + # decide to check for arbitrary member references. + # "const Turing & a", + # "const Church& a", + # "const vector& a", + # "const Kurt::Godel & godel", + # "const Kazimierz::Kuratowski& kk" ] + + # The Good. + + self.TestLint("void f(const string&)", "") + self.TestLint("const string& f(const string& a, const string& b)", "") + self.TestLint("typedef const string& A;", "") + + for decl in members_declarations: + self.TestLint(decl + " = b;", "") + self.TestLint(decl + " =", "") + + # The Bad. + + for decl in members_declarations: + self.TestLint(decl + ";", errmsg) + + # Variable-length arrays are not permitted. + def testVariableLengthArrayDetection(self): + errmsg = ( + "Do not use variable-length arrays. Use an appropriately named " + "('k' followed by CamelCase) compile-time constant for the size." + " [runtime/arrays] [1]" + ) + + self.TestLint("int a[any_old_variable];", errmsg) + self.TestLint("int doublesize[some_var * 2];", errmsg) + self.TestLint("int a[afunction()];", errmsg) + self.TestLint("int a[function(kMaxFooBars)];", errmsg) + self.TestLint("bool a_list[items_->size()];", errmsg) + self.TestLint("namespace::Type buffer[len+1];", errmsg) + + self.TestLint("int a[64];", "") + self.TestLint("int a[0xFF];", "") + self.TestLint("int first[256], second[256];", "") + self.TestLint("int array_name[kCompileTimeConstant];", "") + self.TestLint("char buf[somenamespace::kBufSize];", "") + self.TestLint("int array_name[ALL_CAPS];", "") + self.TestLint("AClass array1[foo::bar::ALL_CAPS];", "") + self.TestLint("int a[kMaxStrLen + 1];", "") + self.TestLint("int a[sizeof(foo)];", "") + self.TestLint("int a[sizeof(*foo)];", "") + self.TestLint("int a[sizeof foo];", "") + self.TestLint("int a[sizeof(struct Foo)];", "") + self.TestLint("int a[128 - sizeof(const bar)];", "") + self.TestLint("int a[(sizeof(foo) * 4)];", "") + self.TestLint("int a[(arraysize(fixed_size_array)/2) << 1];", "") + self.TestLint("delete a[some_var];", "") + self.TestLint("return a[some_var];", "") + + # DISALLOW_COPY_AND_ASSIGN and DISALLOW_IMPLICIT_CONSTRUCTORS should be at + # end of class if present. + def testDisallowMacrosAtEnd(self): + for macro_name in ("DISALLOW_COPY_AND_ASSIGN", "DISALLOW_IMPLICIT_CONSTRUCTORS"): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "class SomeClass {", + " private:", + " %s(SomeClass);" % macro_name, + " int member_;", + "};", + "", + ], + error_collector, + ) + self.assertEqual( + ("%s should be the last thing in the class" % macro_name) + + " [readability/constructors] [3]", + error_collector.Results(), + ) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "class OuterClass {", + " private:", + " struct InnerClass {", + " private:", + " %s(InnerClass);" % macro_name, + " int member;", + " };", + "};", + "", + ], + error_collector, + ) + self.assertEqual( + ("%s should be the last thing in the class" % macro_name) + + " [readability/constructors] [3]", + error_collector.Results(), + ) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "class OuterClass1 {", + " private:", + " struct InnerClass1 {", + " private:", + " %s(InnerClass1);" % macro_name, + " };", + " %s(OuterClass1);" % macro_name, + "};", + "struct OuterClass2 {", + " private:", + " class InnerClass2 {", + " private:", + " %s(InnerClass2);" % macro_name, + " // comment", + " };", + "", + " %s(OuterClass2);" % macro_name, + "", + " // comment", + "};", + "void Func() {", + " struct LocalClass {", + " private:", + " %s(LocalClass);" % macro_name, + " } variable;", + "}", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + + # Brace usage + def testBraces(self): + # Braces shouldn't be followed by a ; unless they're defining a struct + # or initializing an array + self.TestLint("int a[3] = { 1, 2, 3 };", "") + self.TestLint( + """const int foo[] = {1, 2, 3 };""", - '') - # For single line, unmatched '}' with a ';' is ignored (not enough context) - self.TestMultiLineLint( - """int a[3] = { 1, + "", + ) + # For single line, unmatched '}' with a ';' is ignored (not enough context) + self.TestMultiLineLint( + """int a[3] = { 1, 2, 3 };""", - '') - self.TestMultiLineLint( - """int a[2][3] = { { 1, 2 }, + "", + ) + self.TestMultiLineLint( + """int a[2][3] = { { 1, 2 }, { 3, 4 } };""", - '') - self.TestMultiLineLint( - """int a[2][3] = + "", + ) + self.TestMultiLineLint( + """int a[2][3] = { { 1, 2 }, { 3, 4 } };""", - '') - self.TestMultiLineLint( # should not claim else should have braces on both sides - """if (foo) { + "", + ) + self.TestMultiLineLint( # should not claim else should have braces on both sides + """if (foo) { bar; } else { baz; }""", - 'An else should appear on the same line as the preceding } [whitespace/newline] [4]') - - # CHECK/EXPECT_TRUE/EXPECT_FALSE replacements - def testCheckCheck(self): - self.TestLint('CHECK(x == 42);', - 'Consider using CHECK_EQ instead of CHECK(a == b)' - ' [readability/check] [2]') - self.TestLint('CHECK(x != 42);', - 'Consider using CHECK_NE instead of CHECK(a != b)' - ' [readability/check] [2]') - self.TestLint('CHECK(x >= 42);', - 'Consider using CHECK_GE instead of CHECK(a >= b)' - ' [readability/check] [2]') - self.TestLint('CHECK(x > 42);', - 'Consider using CHECK_GT instead of CHECK(a > b)' - ' [readability/check] [2]') - self.TestLint('CHECK(x <= 42);', - 'Consider using CHECK_LE instead of CHECK(a <= b)' - ' [readability/check] [2]') - self.TestLint('CHECK(x < 42);', - 'Consider using CHECK_LT instead of CHECK(a < b)' - ' [readability/check] [2]') - - self.TestLint('DCHECK(x == 42);', - 'Consider using DCHECK_EQ instead of DCHECK(a == b)' - ' [readability/check] [2]') - self.TestLint('DCHECK(x != 42);', - 'Consider using DCHECK_NE instead of DCHECK(a != b)' - ' [readability/check] [2]') - self.TestLint('DCHECK(x >= 42);', - 'Consider using DCHECK_GE instead of DCHECK(a >= b)' - ' [readability/check] [2]') - self.TestLint('DCHECK(x > 42);', - 'Consider using DCHECK_GT instead of DCHECK(a > b)' - ' [readability/check] [2]') - self.TestLint('DCHECK(x <= 42);', - 'Consider using DCHECK_LE instead of DCHECK(a <= b)' - ' [readability/check] [2]') - self.TestLint('DCHECK(x < 42);', - 'Consider using DCHECK_LT instead of DCHECK(a < b)' - ' [readability/check] [2]') - - self.TestLint( - 'EXPECT_TRUE("42" == x);', - 'Consider using EXPECT_EQ instead of EXPECT_TRUE(a == b)' - ' [readability/check] [2]') - self.TestLint( - 'EXPECT_TRUE("42" != x);', - 'Consider using EXPECT_NE instead of EXPECT_TRUE(a != b)' - ' [readability/check] [2]') - self.TestLint( - 'EXPECT_TRUE(+42 >= x);', - 'Consider using EXPECT_GE instead of EXPECT_TRUE(a >= b)' - ' [readability/check] [2]') - - self.TestLint( - 'EXPECT_FALSE(x == 42);', - 'Consider using EXPECT_NE instead of EXPECT_FALSE(a == b)' - ' [readability/check] [2]') - self.TestLint( - 'EXPECT_FALSE(x != 42);', - 'Consider using EXPECT_EQ instead of EXPECT_FALSE(a != b)' - ' [readability/check] [2]') - self.TestLint( - 'EXPECT_FALSE(x >= 42);', - 'Consider using EXPECT_LT instead of EXPECT_FALSE(a >= b)' - ' [readability/check] [2]') - self.TestLint( - 'ASSERT_FALSE(x > 42);', - 'Consider using ASSERT_LE instead of ASSERT_FALSE(a > b)' - ' [readability/check] [2]') - self.TestLint( - 'ASSERT_FALSE(x <= 42);', - 'Consider using ASSERT_GT instead of ASSERT_FALSE(a <= b)' - ' [readability/check] [2]') - - self.TestLint('CHECK(x<42);', - ['Missing spaces around <' - ' [whitespace/operators] [3]', - 'Consider using CHECK_LT instead of CHECK(a < b)' - ' [readability/check] [2]']) - self.TestLint('CHECK(x>42);', - ['Missing spaces around >' - ' [whitespace/operators] [3]', - 'Consider using CHECK_GT instead of CHECK(a > b)' - ' [readability/check] [2]']) - - self.TestLint('using some::namespace::operator<<;', '') - self.TestLint('using some::namespace::operator>>;', '') - - self.TestLint('CHECK(x->y == 42);', - 'Consider using CHECK_EQ instead of CHECK(a == b)' - ' [readability/check] [2]') - - self.TestLint( - ' EXPECT_TRUE(42 < x); // Random comment.', - 'Consider using EXPECT_LT instead of EXPECT_TRUE(a < b)' - ' [readability/check] [2]') - self.TestLint( - 'EXPECT_TRUE( 42 < x );', - ['Extra space after ( in function call' - ' [whitespace/parens] [4]', - 'Extra space before ) [whitespace/parens] [2]', - 'Consider using EXPECT_LT instead of EXPECT_TRUE(a < b)' - ' [readability/check] [2]']) - - self.TestLint('CHECK(4\'2 == x);', - 'Consider using CHECK_EQ instead of CHECK(a == b)' - ' [readability/check] [2]') - - def testCheckCheckFalsePositives(self): - self.TestLint('CHECK(some_iterator == obj.end());', '') - self.TestLint('EXPECT_TRUE(some_iterator == obj.end());', '') - self.TestLint('EXPECT_FALSE(some_iterator == obj.end());', '') - self.TestLint('CHECK(some_pointer != NULL);', '') - self.TestLint('EXPECT_TRUE(some_pointer != NULL);', '') - self.TestLint('EXPECT_FALSE(some_pointer != NULL);', '') - - self.TestLint('CHECK(CreateTestFile(dir, (1 << 20)));', '') - self.TestLint('CHECK(CreateTestFile(dir, (1 >> 20)));', '') - - self.TestLint('CHECK(x ^ (y < 42));', '') - self.TestLint('CHECK((x > 42) ^ (x < 54));', '') - self.TestLint('CHECK(a && b < 42);', '') - self.TestLint('CHECK(42 < a && a < b);', '') - self.TestLint('SOFT_CHECK(x > 42);', '') - - self.TestMultiLineLint( - """_STLP_DEFINE_BINARY_OP_CHECK(==, _OP_EQUAL); + "An else should appear on the same line as the preceding } [whitespace/newline] [4]", + ) + + # CHECK/EXPECT_TRUE/EXPECT_FALSE replacements + def testCheckCheck(self): + self.TestLint( + "CHECK(x == 42);", + "Consider using CHECK_EQ instead of CHECK(a == b) [readability/check] [2]", + ) + self.TestLint( + "CHECK(x != 42);", + "Consider using CHECK_NE instead of CHECK(a != b) [readability/check] [2]", + ) + self.TestLint( + "CHECK(x >= 42);", + "Consider using CHECK_GE instead of CHECK(a >= b) [readability/check] [2]", + ) + self.TestLint( + "CHECK(x > 42);", + "Consider using CHECK_GT instead of CHECK(a > b) [readability/check] [2]", + ) + self.TestLint( + "CHECK(x <= 42);", + "Consider using CHECK_LE instead of CHECK(a <= b) [readability/check] [2]", + ) + self.TestLint( + "CHECK(x < 42);", + "Consider using CHECK_LT instead of CHECK(a < b) [readability/check] [2]", + ) + + self.TestLint( + "DCHECK(x == 42);", + "Consider using DCHECK_EQ instead of DCHECK(a == b) [readability/check] [2]", + ) + self.TestLint( + "DCHECK(x != 42);", + "Consider using DCHECK_NE instead of DCHECK(a != b) [readability/check] [2]", + ) + self.TestLint( + "DCHECK(x >= 42);", + "Consider using DCHECK_GE instead of DCHECK(a >= b) [readability/check] [2]", + ) + self.TestLint( + "DCHECK(x > 42);", + "Consider using DCHECK_GT instead of DCHECK(a > b) [readability/check] [2]", + ) + self.TestLint( + "DCHECK(x <= 42);", + "Consider using DCHECK_LE instead of DCHECK(a <= b) [readability/check] [2]", + ) + self.TestLint( + "DCHECK(x < 42);", + "Consider using DCHECK_LT instead of DCHECK(a < b) [readability/check] [2]", + ) + + self.TestLint( + 'EXPECT_TRUE("42" == x);', + "Consider using EXPECT_EQ instead of EXPECT_TRUE(a == b) [readability/check] [2]", + ) + self.TestLint( + 'EXPECT_TRUE("42" != x);', + "Consider using EXPECT_NE instead of EXPECT_TRUE(a != b) [readability/check] [2]", + ) + self.TestLint( + "EXPECT_TRUE(+42 >= x);", + "Consider using EXPECT_GE instead of EXPECT_TRUE(a >= b) [readability/check] [2]", + ) + + self.TestLint( + "EXPECT_FALSE(x == 42);", + "Consider using EXPECT_NE instead of EXPECT_FALSE(a == b) [readability/check] [2]", + ) + self.TestLint( + "EXPECT_FALSE(x != 42);", + "Consider using EXPECT_EQ instead of EXPECT_FALSE(a != b) [readability/check] [2]", + ) + self.TestLint( + "EXPECT_FALSE(x >= 42);", + "Consider using EXPECT_LT instead of EXPECT_FALSE(a >= b) [readability/check] [2]", + ) + self.TestLint( + "ASSERT_FALSE(x > 42);", + "Consider using ASSERT_LE instead of ASSERT_FALSE(a > b) [readability/check] [2]", + ) + self.TestLint( + "ASSERT_FALSE(x <= 42);", + "Consider using ASSERT_GT instead of ASSERT_FALSE(a <= b) [readability/check] [2]", + ) + + self.TestLint( + "CHECK(x<42);", + [ + "Missing spaces around < [whitespace/operators] [3]", + "Consider using CHECK_LT instead of CHECK(a < b) [readability/check] [2]", + ], + ) + self.TestLint( + "CHECK(x>42);", + [ + "Missing spaces around > [whitespace/operators] [3]", + "Consider using CHECK_GT instead of CHECK(a > b) [readability/check] [2]", + ], + ) + + self.TestLint("using some::namespace::operator<<;", "") + self.TestLint("using some::namespace::operator>>;", "") + + self.TestLint( + "CHECK(x->y == 42);", + "Consider using CHECK_EQ instead of CHECK(a == b) [readability/check] [2]", + ) + + self.TestLint( + " EXPECT_TRUE(42 < x); // Random comment.", + "Consider using EXPECT_LT instead of EXPECT_TRUE(a < b) [readability/check] [2]", + ) + self.TestLint( + "EXPECT_TRUE( 42 < x );", + [ + "Extra space after ( in function call [whitespace/parens] [4]", + "Extra space before ) [whitespace/parens] [2]", + "Consider using EXPECT_LT instead of EXPECT_TRUE(a < b) [readability/check] [2]", + ], + ) + + self.TestLint( + "CHECK(4'2 == x);", + "Consider using CHECK_EQ instead of CHECK(a == b) [readability/check] [2]", + ) + + def testCheckCheckFalsePositives(self): + self.TestLint("CHECK(some_iterator == obj.end());", "") + self.TestLint("EXPECT_TRUE(some_iterator == obj.end());", "") + self.TestLint("EXPECT_FALSE(some_iterator == obj.end());", "") + self.TestLint("CHECK(some_pointer != NULL);", "") + self.TestLint("EXPECT_TRUE(some_pointer != NULL);", "") + self.TestLint("EXPECT_FALSE(some_pointer != NULL);", "") + + self.TestLint("CHECK(CreateTestFile(dir, (1 << 20)));", "") + self.TestLint("CHECK(CreateTestFile(dir, (1 >> 20)));", "") + + self.TestLint("CHECK(x ^ (y < 42));", "") + self.TestLint("CHECK((x > 42) ^ (x < 54));", "") + self.TestLint("CHECK(a && b < 42);", "") + self.TestLint("CHECK(42 < a && a < b);", "") + self.TestLint("SOFT_CHECK(x > 42);", "") + + self.TestMultiLineLint( + """_STLP_DEFINE_BINARY_OP_CHECK(==, _OP_EQUAL); _STLP_DEFINE_BINARY_OP_CHECK(!=, _OP_NOT_EQUAL); _STLP_DEFINE_BINARY_OP_CHECK(<, _OP_LESS_THAN); _STLP_DEFINE_BINARY_OP_CHECK(<=, _OP_LESS_EQUAL); @@ -2372,1521 +2587,1762 @@ def testCheckCheckFalsePositives(self): _STLP_DEFINE_BINARY_OP_CHECK(/, _OP_DIVIDE); _STLP_DEFINE_BINARY_OP_CHECK(-, _OP_SUBTRACT); _STLP_DEFINE_BINARY_OP_CHECK(%, _OP_MOD);""", - '') - - self.TestLint('CHECK(x < 42) << "Custom error message";', '') - - # Alternative token to punctuation operator replacements - def testCheckAltTokens(self): - self.TestLint('true or true', - 'Use operator || instead of or' - ' [readability/alt_tokens] [2]') - self.TestLint('true and true', - 'Use operator && instead of and' - ' [readability/alt_tokens] [2]') - self.TestLint('if (not true)', - 'Use operator ! instead of not' - ' [readability/alt_tokens] [2]') - self.TestLint('1 bitor 1', - 'Use operator | instead of bitor' - ' [readability/alt_tokens] [2]') - self.TestLint('1 xor 1', - 'Use operator ^ instead of xor' - ' [readability/alt_tokens] [2]') - self.TestLint('1 bitand 1', - 'Use operator & instead of bitand' - ' [readability/alt_tokens] [2]') - self.TestLint('x = compl 1', - 'Use operator ~ instead of compl' - ' [readability/alt_tokens] [2]') - self.TestLint('x and_eq y', - 'Use operator &= instead of and_eq' - ' [readability/alt_tokens] [2]') - self.TestLint('x or_eq y', - 'Use operator |= instead of or_eq' - ' [readability/alt_tokens] [2]') - self.TestLint('x xor_eq y', - 'Use operator ^= instead of xor_eq' - ' [readability/alt_tokens] [2]') - self.TestLint('x not_eq y', - 'Use operator != instead of not_eq' - ' [readability/alt_tokens] [2]') - self.TestLint('line_continuation or', - 'Use operator || instead of or' - ' [readability/alt_tokens] [2]') - self.TestLint('if(true and(parentheses', - 'Use operator && instead of and' - ' [readability/alt_tokens] [2]') - - self.TestLint('#include "base/false-and-false.h"', '') - self.TestLint('#error false or false', '') - self.TestLint('false nor false', '') - self.TestLint('false nand false', '') - - # Passing and returning non-const references - def testNonConstReference(self): - # Passing a non-const reference as function parameter is forbidden. - operand_error_message = ('Is this a non-const reference? ' - 'If so, make const or use a pointer: %s' - ' [runtime/references] [2]') - # Warn of use of a non-const reference in operators and functions - self.TestLint('bool operator>(Foo& s, Foo& f);', - [operand_error_message % 'Foo& s', - operand_error_message % 'Foo& f']) - self.TestLint('bool operator+(Foo& s, Foo& f);', - [operand_error_message % 'Foo& s', - operand_error_message % 'Foo& f']) - self.TestLint('int len(Foo& s);', operand_error_message % 'Foo& s') - # Allow use of non-const references in a few specific cases - self.TestLint('stream& operator>>(stream& s, Foo& f);', '') - self.TestLint('stream& operator<<(stream& s, Foo& f);', '') - self.TestLint('void swap(Bar& a, Bar& b);', '') - self.TestLint('ostream& LogFunc(ostream& s);', '') - self.TestLint('ostringstream& LogFunc(ostringstream& s);', '') - self.TestLint('istream& LogFunc(istream& s);', '') - self.TestLint('istringstream& LogFunc(istringstream& s);', '') - # Returning a non-const reference from a function is OK. - self.TestLint('int& g();', '') - # Passing a const reference to a struct (using the struct keyword) is OK. - self.TestLint('void foo(const struct tm& tm);', '') - # Passing a const reference to a typename is OK. - self.TestLint('void foo(const typename tm& tm);', '') - # Const reference to a pointer type is OK. - self.TestLint('void foo(const Bar* const& p) {', '') - self.TestLint('void foo(Bar const* const& p) {', '') - self.TestLint('void foo(Bar* const& p) {', '') - # Const reference to a templated type is OK. - self.TestLint('void foo(const std::vector& v);', '') - # Non-const reference to a pointer type is not OK. - self.TestLint('void foo(Bar*& p);', - operand_error_message % 'Bar*& p') - self.TestLint('void foo(const Bar*& p);', - operand_error_message % 'const Bar*& p') - self.TestLint('void foo(Bar const*& p);', - operand_error_message % 'Bar const*& p') - self.TestLint('void foo(struct Bar*& p);', - operand_error_message % 'struct Bar*& p') - self.TestLint('void foo(const struct Bar*& p);', - operand_error_message % 'const struct Bar*& p') - self.TestLint('void foo(struct Bar const*& p);', - operand_error_message % 'struct Bar const*& p') - # Non-const reference to a templated type is not OK. - self.TestLint('void foo(std::vector& p);', - operand_error_message % 'std::vector& p') - # Returning an address of something is not prohibited. - self.TestLint('return &something;', '') - self.TestLint('if (condition) {return &something; }', - 'Controlled statements inside brackets of if clause should be on a separate line' - ' [whitespace/newline] [5]') - self.TestLint('if (condition) return &something;', '') - self.TestLint('if (condition) address = &something;', '') - self.TestLint('if (condition) result = lhs&rhs;', '') - self.TestLint('if (condition) result = lhs & rhs;', '') - self.TestLint('a = (b+c) * sizeof &f;', '') - self.TestLint('a = MySize(b) * sizeof &f;', '') - # We don't get confused by C++11 range-based for loops. - self.TestLint('for (const string& s : c)', '') - self.TestLint('for (auto& r : c)', '') - self.TestLint('for (typename Type& a : b)', '') - # We don't get confused by some other uses of '&'. - self.TestLint('T& operator=(const T& t);', '') - self.TestLint('int g() { return (a & b); }', '') - self.TestLint('T& r = (T&)*(vp());', '') - self.TestLint('T& r = v', '') - self.TestLint('static_assert((kBits & kMask) == 0, "text");', '') - self.TestLint('COMPILE_ASSERT((kBits & kMask) == 0, text);', '') - # Spaces before template arguments. This is poor style, but - # happens 0.15% of the time. - self.TestLint('void Func(const vector &const_x, ' - 'vector &nonconst_x) {', - operand_error_message % 'vector &nonconst_x') - - # Derived member functions are spared from override check - self.TestLint('void Func(X& x);', operand_error_message % 'X& x') - self.TestLint('void Func(X& x) {}', operand_error_message % 'X& x') - self.TestLint('void Func(X& x) override;', '') - self.TestLint('void Func(X& x) override {', '') - self.TestLint('void Func(X& x) const override;', '') - self.TestLint('void Func(X& x) const override {', '') - - # Don't warn on out-of-line method definitions. - self.TestLint('void NS::Func(X& x) {', '') - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company. All Rights Reserved.', - 'void a::b() {}', - 'void f(int& q) {}', - ''], - error_collector) - self.assertEqual( - operand_error_message % 'int& q', - error_collector.Results()) - - # Other potential false positives. These need full parser - # state to reproduce as opposed to just TestLint. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company. All Rights Reserved.', - '#include ', - '#include ', - 'void swap(int &x,', - ' int &y) {', - '}', - 'void swap(', - ' sparsegroup &x,', - ' sparsegroup &y) {', - '}', - 'ostream& operator<<(', - ' ostream& out', - ' const dense_hash_set& seq) {', - '}', - 'class A {', - ' void Function(', - ' string &x) override {', - ' }', - '};', - 'void Derived::Function(', - ' string &x) {', - '}', - '#define UNSUPPORTED_MASK(_mask) \\', - ' if (flags & _mask) { \\', - ' LOG(FATAL) << "Unsupported flag: " << #_mask; \\', - ' }', - 'Constructor::Constructor()', - ' : initializer1_(a1 & b1),', - ' initializer2_(a2 & b2) {', - '}', - 'Constructor::Constructor()', - ' : initializer1_{a3 & b3},', - ' initializer2_(a4 & b4) {', - '}', - 'Constructor::Constructor()', - ' : initializer1_{a5 & b5},', - ' initializer2_(a6 & b6) {}', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - - # Multi-line references - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company. All Rights Reserved.', - 'void Func(const Outer::', - ' Inner& const_x,', - ' const Outer', - ' ::Inner& const_y,', - ' const Outer<', - ' int>::Inner& const_z,', - ' Outer::', - ' Inner& nonconst_x,', - ' Outer', - ' ::Inner& nonconst_y,', - ' Outer<', - ' int>::Inner& nonconst_z) {', - '}', - ''], - error_collector) - self.assertEqual( - [operand_error_message % 'Outer::Inner& nonconst_x', - operand_error_message % 'Outer::Inner& nonconst_y', - operand_error_message % 'Outer::Inner& nonconst_z'], - error_collector.Results()) - - # A peculiar false positive due to bad template argument parsing - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company. All Rights Reserved.', - 'inline RCULocked::ReadPtr::ReadPtr(const RCULocked* rcu) {', - ' DCHECK(!(data & kFlagMask)) << "Error";', - '}', - '', - 'RCULocked::WritePtr::WritePtr(RCULocked* rcu)', - ' : lock_(&rcu_->mutex_) {', - '}', - ''], - error_collector.Results()) - self.assertEqual('', error_collector.Results()) - - def testBraceAtBeginOfLine(self): - self.TestLint('{', - '{ should almost always be at the end of the previous line' - ' [whitespace/braces] [4]') - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['int function()', - '{', # warning here - ' MutexLock l(&mu);', - '}', - 'int variable;' - '{', # no warning - ' MutexLock l(&mu);', - '}', - 'MyType m = {', - ' {value1, value2},', - ' {', # no warning - ' loooong_value1, looooong_value2', - ' }', - '};', - '#if PREPROCESSOR', - '{', # no warning - ' MutexLock l(&mu);', - '}', - '#endif'], - error_collector) - self.assertEqual(1, error_collector.Results().count( - '{ should almost always be at the end of the previous line' - ' [whitespace/braces] [4]')) - - self.TestMultiLineLint( - """ + "", + ) + + self.TestLint('CHECK(x < 42) << "Custom error message";', "") + + # Alternative token to punctuation operator replacements + def testCheckAltTokens(self): + self.TestLint("true or true", "Use operator || instead of or [readability/alt_tokens] [2]") + self.TestLint( + "true and true", "Use operator && instead of and [readability/alt_tokens] [2]" + ) + self.TestLint( + "if (not true)", "Use operator ! instead of not [readability/alt_tokens] [2]" + ) + self.TestLint("1 bitor 1", "Use operator | instead of bitor [readability/alt_tokens] [2]") + self.TestLint("1 xor 1", "Use operator ^ instead of xor [readability/alt_tokens] [2]") + self.TestLint( + "1 bitand 1", "Use operator & instead of bitand [readability/alt_tokens] [2]" + ) + self.TestLint( + "x = compl 1", "Use operator ~ instead of compl [readability/alt_tokens] [2]" + ) + self.TestLint( + "x and_eq y", "Use operator &= instead of and_eq [readability/alt_tokens] [2]" + ) + self.TestLint("x or_eq y", "Use operator |= instead of or_eq [readability/alt_tokens] [2]") + self.TestLint( + "x xor_eq y", "Use operator ^= instead of xor_eq [readability/alt_tokens] [2]" + ) + self.TestLint( + "x not_eq y", "Use operator != instead of not_eq [readability/alt_tokens] [2]" + ) + self.TestLint( + "line_continuation or", "Use operator || instead of or [readability/alt_tokens] [2]" + ) + self.TestLint( + "if(true and(parentheses", + "Use operator && instead of and [readability/alt_tokens] [2]", + ) + + self.TestLint('#include "base/false-and-false.h"', "") + self.TestLint("#error false or false", "") + self.TestLint("false nor false", "") + self.TestLint("false nand false", "") + + # Passing and returning non-const references + def testNonConstReference(self): + # Passing a non-const reference as function parameter is forbidden. + operand_error_message = ( + "Is this a non-const reference? " + "If so, make const or use a pointer: %s" + " [runtime/references] [2]" + ) + # Warn of use of a non-const reference in operators and functions + self.TestLint( + "bool operator>(Foo& s, Foo& f);", + [operand_error_message % "Foo& s", operand_error_message % "Foo& f"], + ) + self.TestLint( + "bool operator+(Foo& s, Foo& f);", + [operand_error_message % "Foo& s", operand_error_message % "Foo& f"], + ) + self.TestLint("int len(Foo& s);", operand_error_message % "Foo& s") + # Allow use of non-const references in a few specific cases + self.TestLint("stream& operator>>(stream& s, Foo& f);", "") + self.TestLint("stream& operator<<(stream& s, Foo& f);", "") + self.TestLint("void swap(Bar& a, Bar& b);", "") + self.TestLint("ostream& LogFunc(ostream& s);", "") + self.TestLint("ostringstream& LogFunc(ostringstream& s);", "") + self.TestLint("istream& LogFunc(istream& s);", "") + self.TestLint("istringstream& LogFunc(istringstream& s);", "") + # Returning a non-const reference from a function is OK. + self.TestLint("int& g();", "") + # Passing a const reference to a struct (using the struct keyword) is OK. + self.TestLint("void foo(const struct tm& tm);", "") + # Passing a const reference to a typename is OK. + self.TestLint("void foo(const typename tm& tm);", "") + # Const reference to a pointer type is OK. + self.TestLint("void foo(const Bar* const& p) {", "") + self.TestLint("void foo(Bar const* const& p) {", "") + self.TestLint("void foo(Bar* const& p) {", "") + # Const reference to a templated type is OK. + self.TestLint("void foo(const std::vector& v);", "") + # Non-const reference to a pointer type is not OK. + self.TestLint("void foo(Bar*& p);", operand_error_message % "Bar*& p") + self.TestLint("void foo(const Bar*& p);", operand_error_message % "const Bar*& p") + self.TestLint("void foo(Bar const*& p);", operand_error_message % "Bar const*& p") + self.TestLint("void foo(struct Bar*& p);", operand_error_message % "struct Bar*& p") + self.TestLint( + "void foo(const struct Bar*& p);", operand_error_message % "const struct Bar*& p" + ) + self.TestLint( + "void foo(struct Bar const*& p);", operand_error_message % "struct Bar const*& p" + ) + # Non-const reference to a templated type is not OK. + self.TestLint( + "void foo(std::vector& p);", operand_error_message % "std::vector& p" + ) + # Returning an address of something is not prohibited. + self.TestLint("return &something;", "") + self.TestLint( + "if (condition) {return &something; }", + "Controlled statements inside brackets of if clause should be on a separate line" + " [whitespace/newline] [5]", + ) + self.TestLint("if (condition) return &something;", "") + self.TestLint("if (condition) address = &something;", "") + self.TestLint("if (condition) result = lhs&rhs;", "") + self.TestLint("if (condition) result = lhs & rhs;", "") + self.TestLint("a = (b+c) * sizeof &f;", "") + self.TestLint("a = MySize(b) * sizeof &f;", "") + # We don't get confused by C++11 range-based for loops. + self.TestLint("for (const string& s : c)", "") + self.TestLint("for (auto& r : c)", "") + self.TestLint("for (typename Type& a : b)", "") + # We don't get confused by some other uses of '&'. + self.TestLint("T& operator=(const T& t);", "") + self.TestLint("int g() { return (a & b); }", "") + self.TestLint("T& r = (T&)*(vp());", "") + self.TestLint("T& r = v", "") + self.TestLint('static_assert((kBits & kMask) == 0, "text");', "") + self.TestLint("COMPILE_ASSERT((kBits & kMask) == 0, text);", "") + # Spaces before template arguments. This is poor style, but + # happens 0.15% of the time. + self.TestLint( + "void Func(const vector &const_x, vector &nonconst_x) {", + operand_error_message % "vector &nonconst_x", + ) + + # Derived member functions are spared from override check + self.TestLint("void Func(X& x);", operand_error_message % "X& x") + self.TestLint("void Func(X& x) {}", operand_error_message % "X& x") + self.TestLint("void Func(X& x) override;", "") + self.TestLint("void Func(X& x) override {", "") + self.TestLint("void Func(X& x) const override;", "") + self.TestLint("void Func(X& x) const override {", "") + + # Don't warn on out-of-line method definitions. + self.TestLint("void NS::Func(X& x) {", "") + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company. All Rights Reserved.", + "void a::b() {}", + "void f(int& q) {}", + "", + ], + error_collector, + ) + self.assertEqual(operand_error_message % "int& q", error_collector.Results()) + + # Other potential false positives. These need full parser + # state to reproduce as opposed to just TestLint. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company. All Rights Reserved.", + "#include ", + "#include ", + "void swap(int &x,", + " int &y) {", + "}", + "void swap(", + " sparsegroup &x,", + " sparsegroup &y) {", + "}", + "ostream& operator<<(", + " ostream& out", + " const dense_hash_set& seq) {", + "}", + "class A {", + " void Function(", + " string &x) override {", + " }", + "};", + "void Derived::Function(", + " string &x) {", + "}", + "#define UNSUPPORTED_MASK(_mask) \\", + " if (flags & _mask) { \\", + ' LOG(FATAL) << "Unsupported flag: " << #_mask; \\', + " }", + "Constructor::Constructor()", + " : initializer1_(a1 & b1),", + " initializer2_(a2 & b2) {", + "}", + "Constructor::Constructor()", + " : initializer1_{a3 & b3},", + " initializer2_(a4 & b4) {", + "}", + "Constructor::Constructor()", + " : initializer1_{a5 & b5},", + " initializer2_(a6 & b6) {}", + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + + # Multi-line references + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company. All Rights Reserved.", + "void Func(const Outer::", + " Inner& const_x,", + " const Outer", + " ::Inner& const_y,", + " const Outer<", + " int>::Inner& const_z,", + " Outer::", + " Inner& nonconst_x,", + " Outer", + " ::Inner& nonconst_y,", + " Outer<", + " int>::Inner& nonconst_z) {", + "}", + "", + ], + error_collector, + ) + self.assertEqual( + [ + operand_error_message % "Outer::Inner& nonconst_x", + operand_error_message % "Outer::Inner& nonconst_y", + operand_error_message % "Outer::Inner& nonconst_z", + ], + error_collector.Results(), + ) + + # A peculiar false positive due to bad template argument parsing + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company. All Rights Reserved.", + "inline RCULocked::ReadPtr::ReadPtr(const RCULocked* rcu) {", + ' DCHECK(!(data & kFlagMask)) << "Error";', + "}", + "", + "RCULocked::WritePtr::WritePtr(RCULocked* rcu)", + " : lock_(&rcu_->mutex_) {", + "}", + "", + ], + error_collector.Results(), + ) + self.assertEqual("", error_collector.Results()) + + def testBraceAtBeginOfLine(self): + self.TestLint( + "{", + "{ should almost always be at the end of the previous line [whitespace/braces] [4]", + ) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "int function()", + "{", # warning here + " MutexLock l(&mu);", + "}", + "int variable;{", # no warning + " MutexLock l(&mu);", + "}", + "MyType m = {", + " {value1, value2},", + " {", # no warning + " loooong_value1, looooong_value2", + " }", + "};", + "#if PREPROCESSOR", + "{", # no warning + " MutexLock l(&mu);", + "}", + "#endif", + ], + error_collector, + ) + self.assertEqual( + 1, + error_collector.Results().count( + "{ should almost always be at the end of the previous line [whitespace/braces] [4]" + ), + ) + + self.TestMultiLineLint( + """ foo( { loooooooooooooooong_value, });""", - '') - - def testMismatchingSpacesInParens(self): - self.TestLint('if (foo ) {', 'Mismatching spaces inside () in if' - ' [whitespace/parens] [5]') - self.TestLint('switch ( foo) {', 'Mismatching spaces inside () in switch' - ' [whitespace/parens] [5]') - self.TestLint('for (foo; ba; bar ) {', 'Mismatching spaces inside () in for' - ' [whitespace/parens] [5]') - self.TestLint('for (; foo; bar) {', '') - self.TestLint('for ( ; foo; bar) {', '') - self.TestLint('for ( ; foo; bar ) {', '') - self.TestLint('for (foo; bar; ) {', '') - self.TestLint('while ( foo ) {', 'Should have zero or one spaces inside' - ' ( and ) in while [whitespace/parens] [5]') - - def testSpacingForFncall(self): - self.TestLint('if (foo) {', '') - self.TestLint('for (foo; bar; baz) {', '') - self.TestLint('for (;;) {', '') - # Space should be allowed in placement new operators. - self.TestLint('Something* p = new (place) Something();', '') - # Test that there is no warning when increment statement is empty. - self.TestLint('for (foo; baz;) {', '') - self.TestLint('for (foo;bar;baz) {', 'Missing space after ;' - ' [whitespace/semicolon] [3]') - # we don't warn about this semicolon, at least for now - self.TestLintNotContains('if (condition) { return &something; }', - 'Missing space after ; [whitespace/semicolon] [3]') - # seen in some macros - self.TestLint('DoSth();\\', '') - # Test that there is no warning about semicolon here. - self.TestLint('abc;// this is abc', - 'At least two spaces is best between code' - ' and comments [whitespace/comments] [2]') - self.TestLint('while (foo) {', '') - self.TestLint('switch (foo) {', '') - self.TestLint('foo( bar)', 'Extra space after ( in function call' - ' [whitespace/parens] [4]') - self.TestLint('foo( // comment', '') - self.TestLint('foo( // comment', - 'At least two spaces is best between code' - ' and comments [whitespace/comments] [2]') - self.TestLint('foobar( \\', '') - self.TestLint('foobar( \\', '') - self.TestLint('( a + b)', 'Extra space after (' - ' [whitespace/parens] [2]') - self.TestLint('((a+b))', '') - self.TestLint('foo (foo)', 'Extra space before ( in function call' - ' [whitespace/parens] [4]') - # asm volatile () may have a space, as it isn't a function call. - self.TestLint('asm volatile ("")', '') - self.TestLint('__asm__ __volatile__ ("")', '') - self.TestLint('} catch (const Foo& ex) {', '') - self.TestLint('case (42):', '') - self.TestLint('typedef foo (*foo)(foo)', '') - self.TestLint('typedef foo (*foo12bar_)(foo)', '') - self.TestLint('typedef foo (Foo::*bar)(foo)', '') - self.TestLint('using foo = type (Foo::*bar)(foo)', '') - self.TestLint('using foo = type (Foo::*bar)(', '') - self.TestLint('using foo = type (Foo::*)(', '') - self.TestLint('foo (Foo::*bar)(', '') - self.TestLint('foo (x::y::*z)(', '') - self.TestLint('foo (Foo::bar)(', - 'Extra space before ( in function call' - ' [whitespace/parens] [4]') - self.TestLint('foo (*bar)(', '') - self.TestLint('typedef foo (Foo::*bar)(', '') - self.TestLint('(foo)(bar)', '') - self.TestLint('Foo (*foo)(bar)', '') - self.TestLint('Foo (*foo)(Bar bar,', '') - self.TestLint('char (*p)[sizeof(foo)] = &foo', '') - self.TestLint('char (&ref)[sizeof(foo)] = &foo', '') - self.TestLint('const char32 (*table[])[6];', '') - # The sizeof operator is often written as if it were a function call, with - # an opening parenthesis directly following the operator name, but it can - # also be written like any other operator, with a space following the - # operator name, and the argument optionally in parentheses. - self.TestLint('sizeof(foo)', '') - self.TestLint('sizeof foo', '') - self.TestLint('sizeof (foo)', '') - - def testReplaceAlternateTokens(self): - assert cpplint.ReplaceAlternateTokens('tor or orc') == 'tor || orc' - assert cpplint.ReplaceAlternateTokens('orc or tor') == 'orc || tor' - assert cpplint.ReplaceAlternateTokens('tor or (orc)') == 'tor || (orc)' - assert cpplint.ReplaceAlternateTokens('tor or(orc)') == 'tor ||(orc)' - assert cpplint.ReplaceAlternateTokens('sand and(android)') == \ - 'sand &&(android)' - assert cpplint.ReplaceAlternateTokens('(sand) and (android)') == \ - '(sand) && (android)' - assert cpplint.ReplaceAlternateTokens(' not note') == ' !note' - assert cpplint.ReplaceAlternateTokens(')not note') == ')!note' - assert cpplint.ReplaceAlternateTokens('(not note') == '(!note' - assert cpplint.ReplaceAlternateTokens(' not(note)') == ' !(note)' - assert cpplint.ReplaceAlternateTokens(' not (splinot)') == ' !(splinot)' - assert cpplint.ReplaceAlternateTokens('tor and orc or android') == \ - 'tor && orc || android' - assert cpplint.ReplaceAlternateTokens('tor or orc and ands not note') == \ - 'tor || orc && ands !note' - - def testSpacingAfterAlternateToken(self): - try: - cpplint._cpplint_state.AddFilters('-readability/alt_tokens') - self.TestLint('if (foo or (bar) or foobar) {', '') - self.TestLint('if (foo or (bar)) {', '') - self.TestLint('if ((foo) or (bar)) {', '') - self.TestLint('if (not foo) {', '') - self.TestLint('if (not (foo)) {', '') - self.TestLint('if (not(foo)) {', '') - self.TestLint('if ((foo)or(bar)) {', 'Missing spaces around ||' - ' [whitespace/operators] [3]') - finally: - cpplint._cpplint_state.SetFilters('') - - def testSpacingBeforeBraces(self): - self.TestLint('if (foo){', 'Missing space before {' - ' [whitespace/braces] [5]') - self.TestLint('for{', 'Missing space before {' - ' [whitespace/braces] [5]') - self.TestLint('for {', '') - self.TestLint('EXPECT_DEBUG_DEATH({', '') - self.TestLint('std::is_convertible{}', '') - self.TestLint('blah{32}', 'Missing space before {' - ' [whitespace/braces] [5]') - self.TestLint('int8_t{3}', '') - self.TestLint('int16_t{3}', '') - self.TestLint('int32_t{3}', '') - self.TestLint('uint64_t{12345}', '') - self.TestLint('constexpr int64_t kBatchGapMicros =' - ' int64_t{7} * 24 * 3600 * 1000000; // 1 wk.', '') - self.TestLint('MoveOnly(int i1, int i2) : ip1{new int{i1}}, ' - 'ip2{new int{i2}} {}', - '') - - def testSemiColonAfterBraces(self): - self.TestLintContains('if (cond) { func(); };', - 'You don\'t need a ; after a } [readability/braces] [4]') - self.TestLint('void Func() {};', - 'You don\'t need a ; after a } [readability/braces] [4]') - self.TestLint('void Func() const {};', - 'You don\'t need a ; after a } [readability/braces] [4]') - self.TestLint('class X {};', '') - for keyword in ['struct', 'union']: - for align in ['', ' alignas(16)']: - for typename in ['', ' X']: - for identifier in ['', ' x']: - self.TestLint(keyword + align + typename + ' {}' + identifier + ';', - '') - - self.TestLint('class X : public Y {};', '') - self.TestLint('class X : public MACRO() {};', '') - self.TestLint('class X : public decltype(expr) {};', '') - self.TestLint('DEFINE_FACADE(PCQueue::Watcher, PCQueue) {};', '') - self.TestLint('VCLASS(XfaTest, XfaContextTest) {};', '') - self.TestLint('class STUBBY_CLASS(H, E) {};', '') - self.TestLint('class STUBBY2_CLASS(H, E) {};', '') - self.TestLint('TEST(TestCase, TestName) {};', - 'You don\'t need a ; after a } [readability/braces] [4]') - self.TestLint('TEST_F(TestCase, TestName) {};', - 'You don\'t need a ; after a } [readability/braces] [4]') - - self.TestLint('file_tocs_[i] = (FileToc) {a, b, c};', '') - self.TestMultiLineLint('class X : public Y,\npublic Z {};', '') - self.TestMultiLineLint('template\n' - 'concept Addable = requires(T x) { x + x; };', - '') - self.TestMultiLineLint('template \n' - 'concept C = requires(T a, T b) {\n' - ' requires a == b;\n' - '};', - '') - self.TestMultiLineLint('template \n' - 'concept C = (std::integral || std::floating_point) &&\n' - ' (std::integral || std::floating_point) &&\n' - ' requires(T t, U u) {\n' - ' std::min(static_cast(t), static_cast(u));\n' - '};', - '') - - def testSpacingBeforeBrackets(self): - self.TestLint('int numbers [] = { 1, 2, 3 };', - 'Extra space before [ [whitespace/braces] [5]') - # space allowed in some cases - self.TestLint('auto [abc, def] = func();', '') - self.TestLint('#define NODISCARD [[nodiscard]]', '') - self.TestLint('void foo(int param [[maybe_unused]]);', '') - - def testLambda(self): - self.TestLint('auto x = []() {};', '') - self.TestLint('return []() {};', '') - self.TestMultiLineLint('auto x = []() {\n};\n', '') - self.TestLint('int operator[](int x) {};', - 'You don\'t need a ; after a } [readability/braces] [4]') - - self.TestMultiLineLint('auto x = [&a,\nb]() {};', '') - self.TestMultiLineLint('auto x = [&a,\nb]\n() {};', '') - self.TestMultiLineLint('auto x = [&a,\n' - ' b](\n' - ' int a,\n' - ' int b) {\n' - ' return a +\n' - ' b;\n' - '};\n', - '') - - # Avoid false positives with operator[] - self.TestLint('table_to_children[&*table].push_back(dependent);', '') - - def testBraceInitializerList(self): - self.TestLint('MyStruct p = {1, 2};', '') - self.TestLint('MyStruct p{1, 2};', '') - self.TestLint('vector p = {1, 2};', '') - self.TestLint('vector p{1, 2};', '') - self.TestLint('x = vector{1, 2};', '') - self.TestLint('x = (struct in_addr){ 0 };', '') - self.TestLint('Func(vector{1, 2})', '') - self.TestLint('Func((struct in_addr){ 0 })', '') - self.TestLint('Func(vector{1, 2}, 3)', '') - self.TestLint('Func((struct in_addr){ 0 }, 3)', '') - self.TestLint('LOG(INFO) << char{7};', '') - self.TestLint('LOG(INFO) << char{7} << "!";', '') - self.TestLint('int p[2] = {1, 2};', '') - self.TestLint('return {1, 2};', '') - self.TestLint('std::unique_ptr foo{new Foo{}};', '') - self.TestLint('auto foo = std::unique_ptr{new Foo{}};', '') - self.TestLint('static_assert(Max7String{}.IsValid(), "");', '') - self.TestLint('map_of_pairs[{1, 2}] = 3;', '') - self.TestLint('ItemView{has_offer() ? new Offer{offer()} : nullptr', '') - self.TestLint('template {}> = 0>', '') - - self.TestMultiLineLint('std::unique_ptr foo{\n' - ' new Foo{}\n' - '};\n', '') - self.TestMultiLineLint('std::unique_ptr foo{\n' - ' new Foo{\n' - ' new Bar{}\n' - ' }\n' - '};\n', '') - self.TestMultiLineLint('if (true) {\n' - ' if (false){\n' - ' func();\n' - ' }' - '}\n', - 'Missing space before { [whitespace/braces] [5]') - self.TestMultiLineLint('MyClass::MyClass()\n' - ' : initializer_{\n' - ' Func()} {\n' - '}\n', '') - self.TestLint('const pair kCL' + - ('o' * 41) + 'gStr[] = {\n', - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - self.TestMultiLineLint('const pair kCL' + - ('o' * 40) + 'ngStr[] =\n' - ' {\n' - ' {"gooooo", "oooogle"},\n' - '};\n', '') - self.TestMultiLineLint('const pair kCL' + - ('o' * 39) + 'ngStr[] =\n' - ' {\n' - ' {"gooooo", "oooogle"},\n' - '};\n', '{ should almost always be at the end of ' - 'the previous line [whitespace/braces] [4]') - - def testSpacingAroundElse(self): - self.TestLint('}else {', 'Missing space before else' - ' [whitespace/braces] [5]') - self.TestLint('} else{', 'Missing space before {' - ' [whitespace/braces] [5]') - self.TestLint('} else {', '') - self.TestLint('} else if (foo) {', '') - - def testSpacingWithInitializerLists(self): - self.TestLint('int v[1][3] = {{1, 2, 3}};', '') - self.TestLint('int v[1][1] = {{0}};', '') - - def testSpacingForBinaryOps(self): - self.TestLint('if (foo||bar) {', 'Missing spaces around ||' - ' [whitespace/operators] [3]') - self.TestLint('if (foo<=bar) {', 'Missing spaces around <=' - ' [whitespace/operators] [3]') - self.TestLint('if (foobar) {', 'Missing spaces around >' - ' [whitespace/operators] [3]') - self.TestLint('if (foobaz) {', 'Missing spaces around <' - ' [whitespace/operators] [3]') - self.TestLint('if (foobar) {', 'Missing spaces around <' - ' [whitespace/operators] [3]') - self.TestLint('template', '') - self.TestLint('std::unique_ptr>', '') - self.TestLint('typedef hash_map', '') - self.TestLint('10<<20', '') - self.TestLint('10<>b', - 'Missing spaces around >> [whitespace/operators] [3]') - self.TestLint('10>>b', - 'Missing spaces around >> [whitespace/operators] [3]') - self.TestLint('LOG(ERROR)<<*foo', - 'Missing spaces around << [whitespace/operators] [3]') - self.TestLint('LOG(ERROR)<<&foo', - 'Missing spaces around << [whitespace/operators] [3]') - self.TestLint('StringCoder>::ToString()', '') - self.TestLint('map, map>::iterator', '') - self.TestLint('func>>()', '') - self.TestLint('MACRO1(list>)', '') - self.TestLint('MACRO2(list>, 42)', '') - self.TestLint('void DoFoo(const set>& arg1);', '') - self.TestLint('void SetFoo(set>* arg1);', '') - self.TestLint('foo = new set>;', '') - self.TestLint('reinterpret_cast>*>(a);', '') - self.TestLint('MACRO(<<)', '') - self.TestLint('MACRO(<<, arg)', '') - self.TestLint('MACRO(<<=)', '') - self.TestLint('MACRO(<<=, arg)', '') - - self.TestLint('using Vector3::operator==;', '') - self.TestLint('using Vector3::operator!=;', '') - - def testSpacingBeforeLastSemicolon(self): - self.TestLint('call_function() ;', - 'Extra space before last semicolon. If this should be an ' - 'empty statement, use {} instead.' - ' [whitespace/semicolon] [5]') - self.TestLint('while (true) ;', - 'Extra space before last semicolon. If this should be an ' - 'empty statement, use {} instead.' - ' [whitespace/semicolon] [5]') - self.TestLint('default:;', - 'Semicolon defining empty statement. Use {} instead.' - ' [whitespace/semicolon] [5]') - self.TestLint(' ;', - 'Line contains only semicolon. If this should be an empty ' - 'statement, use {} instead.' - ' [whitespace/semicolon] [5]') - self.TestLint('for (int i = 0; ;', '') - - def testEmptyBlockBody(self): - self.TestLint('while (true);', - 'Empty loop bodies should use {} or continue' - ' [whitespace/empty_loop_body] [5]') - self.TestLint('if (true);', - 'Empty conditional bodies should use {}' - ' [whitespace/empty_conditional_body] [5]') - self.TestLint('while (true)', '') - self.TestLint('while (true) continue;', '') - self.TestLint('for (;;);', - 'Empty loop bodies should use {} or continue' - ' [whitespace/empty_loop_body] [5]') - self.TestLint('for (;;)', '') - self.TestLint('for (;;) continue;', '') - self.TestLint('for (;;) func();', '') - self.TestLint('if (test) {}', - 'If statement had no body and no else clause' - ' [whitespace/empty_if_body] [4]') - self.TestLint('if (test) func();', '') - self.TestLint('if (test) {} else {}', '') - self.TestMultiLineLint("""while (true && + "", + ) + + def testMismatchingSpacesInParens(self): + self.TestLint("if (foo ) {", "Mismatching spaces inside () in if [whitespace/parens] [5]") + self.TestLint( + "switch ( foo) {", "Mismatching spaces inside () in switch [whitespace/parens] [5]" + ) + self.TestLint( + "for (foo; ba; bar ) {", "Mismatching spaces inside () in for [whitespace/parens] [5]" + ) + self.TestLint("for (; foo; bar) {", "") + self.TestLint("for ( ; foo; bar) {", "") + self.TestLint("for ( ; foo; bar ) {", "") + self.TestLint("for (foo; bar; ) {", "") + self.TestLint( + "while ( foo ) {", + "Should have zero or one spaces inside ( and ) in while [whitespace/parens] [5]", + ) + + def testSpacingForFncall(self): + self.TestLint("if (foo) {", "") + self.TestLint("for (foo; bar; baz) {", "") + self.TestLint("for (;;) {", "") + # Space should be allowed in placement new operators. + self.TestLint("Something* p = new (place) Something();", "") + # Test that there is no warning when increment statement is empty. + self.TestLint("for (foo; baz;) {", "") + self.TestLint("for (foo;bar;baz) {", "Missing space after ; [whitespace/semicolon] [3]") + # we don't warn about this semicolon, at least for now + self.TestLintNotContains( + "if (condition) { return &something; }", + "Missing space after ; [whitespace/semicolon] [3]", + ) + # seen in some macros + self.TestLint("DoSth();\\", "") + # Test that there is no warning about semicolon here. + self.TestLint( + "abc;// this is abc", + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestLint("while (foo) {", "") + self.TestLint("switch (foo) {", "") + self.TestLint("foo( bar)", "Extra space after ( in function call [whitespace/parens] [4]") + self.TestLint("foo( // comment", "") + self.TestLint( + "foo( // comment", + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestLint("foobar( \\", "") + self.TestLint("foobar( \\", "") + self.TestLint("( a + b)", "Extra space after ( [whitespace/parens] [2]") + self.TestLint("((a+b))", "") + self.TestLint("foo (foo)", "Extra space before ( in function call [whitespace/parens] [4]") + # asm volatile () may have a space, as it isn't a function call. + self.TestLint('asm volatile ("")', "") + self.TestLint('__asm__ __volatile__ ("")', "") + self.TestLint("} catch (const Foo& ex) {", "") + self.TestLint("case (42):", "") + self.TestLint("typedef foo (*foo)(foo)", "") + self.TestLint("typedef foo (*foo12bar_)(foo)", "") + self.TestLint("typedef foo (Foo::*bar)(foo)", "") + self.TestLint("using foo = type (Foo::*bar)(foo)", "") + self.TestLint("using foo = type (Foo::*bar)(", "") + self.TestLint("using foo = type (Foo::*)(", "") + self.TestLint("foo (Foo::*bar)(", "") + self.TestLint("foo (x::y::*z)(", "") + self.TestLint( + "foo (Foo::bar)(", "Extra space before ( in function call [whitespace/parens] [4]" + ) + self.TestLint("foo (*bar)(", "") + self.TestLint("typedef foo (Foo::*bar)(", "") + self.TestLint("(foo)(bar)", "") + self.TestLint("Foo (*foo)(bar)", "") + self.TestLint("Foo (*foo)(Bar bar,", "") + self.TestLint("char (*p)[sizeof(foo)] = &foo", "") + self.TestLint("char (&ref)[sizeof(foo)] = &foo", "") + self.TestLint("const char32 (*table[])[6];", "") + # The sizeof operator is often written as if it were a function call, with + # an opening parenthesis directly following the operator name, but it can + # also be written like any other operator, with a space following the + # operator name, and the argument optionally in parentheses. + self.TestLint("sizeof(foo)", "") + self.TestLint("sizeof foo", "") + self.TestLint("sizeof (foo)", "") + + def testReplaceAlternateTokens(self): + assert cpplint.ReplaceAlternateTokens("tor or orc") == "tor || orc" + assert cpplint.ReplaceAlternateTokens("orc or tor") == "orc || tor" + assert cpplint.ReplaceAlternateTokens("tor or (orc)") == "tor || (orc)" + assert cpplint.ReplaceAlternateTokens("tor or(orc)") == "tor ||(orc)" + assert cpplint.ReplaceAlternateTokens("sand and(android)") == "sand &&(android)" + assert cpplint.ReplaceAlternateTokens("(sand) and (android)") == "(sand) && (android)" + assert cpplint.ReplaceAlternateTokens(" not note") == " !note" + assert cpplint.ReplaceAlternateTokens(")not note") == ")!note" + assert cpplint.ReplaceAlternateTokens("(not note") == "(!note" + assert cpplint.ReplaceAlternateTokens(" not(note)") == " !(note)" + assert cpplint.ReplaceAlternateTokens(" not (splinot)") == " !(splinot)" + assert cpplint.ReplaceAlternateTokens("tor and orc or android") == "tor && orc || android" + assert ( + cpplint.ReplaceAlternateTokens("tor or orc and ands not note") + == "tor || orc && ands !note" + ) + + def testSpacingAfterAlternateToken(self): + try: + cpplint._cpplint_state.AddFilters("-readability/alt_tokens") + self.TestLint("if (foo or (bar) or foobar) {", "") + self.TestLint("if (foo or (bar)) {", "") + self.TestLint("if ((foo) or (bar)) {", "") + self.TestLint("if (not foo) {", "") + self.TestLint("if (not (foo)) {", "") + self.TestLint("if (not(foo)) {", "") + self.TestLint( + "if ((foo)or(bar)) {", "Missing spaces around || [whitespace/operators] [3]" + ) + finally: + cpplint._cpplint_state.SetFilters("") + + def testSpacingBeforeBraces(self): + self.TestLint("if (foo){", "Missing space before { [whitespace/braces] [5]") + self.TestLint("for{", "Missing space before { [whitespace/braces] [5]") + self.TestLint("for {", "") + self.TestLint("EXPECT_DEBUG_DEATH({", "") + self.TestLint("std::is_convertible{}", "") + self.TestLint("blah{32}", "Missing space before { [whitespace/braces] [5]") + self.TestLint("int8_t{3}", "") + self.TestLint("int16_t{3}", "") + self.TestLint("int32_t{3}", "") + self.TestLint("uint64_t{12345}", "") + self.TestLint( + "constexpr int64_t kBatchGapMicros = int64_t{7} * 24 * 3600 * 1000000; // 1 wk.", "" + ) + self.TestLint("MoveOnly(int i1, int i2) : ip1{new int{i1}}, ip2{new int{i2}} {}", "") + + def testSemiColonAfterBraces(self): + self.TestLintContains( + "if (cond) { func(); };", "You don't need a ; after a } [readability/braces] [4]" + ) + self.TestLint("void Func() {};", "You don't need a ; after a } [readability/braces] [4]") + self.TestLint( + "void Func() const {};", "You don't need a ; after a } [readability/braces] [4]" + ) + self.TestLint("class X {};", "") + for keyword in ["struct", "union"]: + for align in ["", " alignas(16)"]: + for typename in ["", " X"]: + for identifier in ["", " x"]: + self.TestLint(keyword + align + typename + " {}" + identifier + ";", "") + + self.TestLint("class X : public Y {};", "") + self.TestLint("class X : public MACRO() {};", "") + self.TestLint("class X : public decltype(expr) {};", "") + self.TestLint("DEFINE_FACADE(PCQueue::Watcher, PCQueue) {};", "") + self.TestLint("VCLASS(XfaTest, XfaContextTest) {};", "") + self.TestLint("class STUBBY_CLASS(H, E) {};", "") + self.TestLint("class STUBBY2_CLASS(H, E) {};", "") + self.TestLint( + "TEST(TestCase, TestName) {};", "You don't need a ; after a } [readability/braces] [4]" + ) + self.TestLint( + "TEST_F(TestCase, TestName) {};", + "You don't need a ; after a } [readability/braces] [4]", + ) + + self.TestLint("file_tocs_[i] = (FileToc) {a, b, c};", "") + self.TestMultiLineLint("class X : public Y,\npublic Z {};", "") + self.TestMultiLineLint( + "template\nconcept Addable = requires(T x) { x + x; };", "" + ) + self.TestMultiLineLint( + "template \nconcept C = requires(T a, T b) {\n requires a == b;\n};", "" + ) + self.TestMultiLineLint( + "template \n" + "concept C = (std::integral || std::floating_point) &&\n" + " (std::integral || std::floating_point) &&\n" + " requires(T t, U u) {\n" + " std::min(static_cast(t), static_cast(u));\n" + "};", + "", + ) + + def testSpacingBeforeBrackets(self): + self.TestLint( + "int numbers [] = { 1, 2, 3 };", "Extra space before [ [whitespace/braces] [5]" + ) + # space allowed in some cases + self.TestLint("auto [abc, def] = func();", "") + self.TestLint("#define NODISCARD [[nodiscard]]", "") + self.TestLint("void foo(int param [[maybe_unused]]);", "") + + def testLambda(self): + self.TestLint("auto x = []() {};", "") + self.TestLint("return []() {};", "") + self.TestMultiLineLint("auto x = []() {\n};\n", "") + self.TestLint( + "int operator[](int x) {};", "You don't need a ; after a } [readability/braces] [4]" + ) + + self.TestMultiLineLint("auto x = [&a,\nb]() {};", "") + self.TestMultiLineLint("auto x = [&a,\nb]\n() {};", "") + self.TestMultiLineLint( + "auto x = [&a,\n" + " b](\n" + " int a,\n" + " int b) {\n" + " return a +\n" + " b;\n" + "};\n", + "", + ) + + # Avoid false positives with operator[] + self.TestLint("table_to_children[&*table].push_back(dependent);", "") + + def testBraceInitializerList(self): + self.TestLint("MyStruct p = {1, 2};", "") + self.TestLint("MyStruct p{1, 2};", "") + self.TestLint("vector p = {1, 2};", "") + self.TestLint("vector p{1, 2};", "") + self.TestLint("x = vector{1, 2};", "") + self.TestLint("x = (struct in_addr){ 0 };", "") + self.TestLint("Func(vector{1, 2})", "") + self.TestLint("Func((struct in_addr){ 0 })", "") + self.TestLint("Func(vector{1, 2}, 3)", "") + self.TestLint("Func((struct in_addr){ 0 }, 3)", "") + self.TestLint("LOG(INFO) << char{7};", "") + self.TestLint('LOG(INFO) << char{7} << "!";', "") + self.TestLint("int p[2] = {1, 2};", "") + self.TestLint("return {1, 2};", "") + self.TestLint("std::unique_ptr foo{new Foo{}};", "") + self.TestLint("auto foo = std::unique_ptr{new Foo{}};", "") + self.TestLint('static_assert(Max7String{}.IsValid(), "");', "") + self.TestLint("map_of_pairs[{1, 2}] = 3;", "") + self.TestLint("ItemView{has_offer() ? new Offer{offer()} : nullptr", "") + self.TestLint("template {}> = 0>", "") + + self.TestMultiLineLint("std::unique_ptr foo{\n new Foo{}\n};\n", "") + self.TestMultiLineLint( + "std::unique_ptr foo{\n new Foo{\n new Bar{}\n }\n};\n", "" + ) + self.TestMultiLineLint( + "if (true) {\n if (false){\n func();\n }}\n", + "Missing space before { [whitespace/braces] [5]", + ) + self.TestMultiLineLint( + "MyClass::MyClass()\n : initializer_{\n Func()} {\n}\n", "" + ) + self.TestLint( + "const pair kCL" + ("o" * 41) + "gStr[] = {\n", + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + self.TestMultiLineLint( + "const pair kCL" + ("o" * 40) + "ngStr[] =\n" + " {\n" + ' {"gooooo", "oooogle"},\n' + "};\n", + "", + ) + self.TestMultiLineLint( + "const pair kCL" + ("o" * 39) + "ngStr[] =\n" + " {\n" + ' {"gooooo", "oooogle"},\n' + "};\n", + "{ should almost always be at the end of the previous line [whitespace/braces] [4]", + ) + + def testSpacingAroundElse(self): + self.TestLint("}else {", "Missing space before else [whitespace/braces] [5]") + self.TestLint("} else{", "Missing space before { [whitespace/braces] [5]") + self.TestLint("} else {", "") + self.TestLint("} else if (foo) {", "") + + def testSpacingWithInitializerLists(self): + self.TestLint("int v[1][3] = {{1, 2, 3}};", "") + self.TestLint("int v[1][1] = {{0}};", "") + + def testSpacingForBinaryOps(self): + self.TestLint("if (foo||bar) {", "Missing spaces around || [whitespace/operators] [3]") + self.TestLint("if (foo<=bar) {", "Missing spaces around <= [whitespace/operators] [3]") + self.TestLint("if (foobar) {", "Missing spaces around > [whitespace/operators] [3]") + self.TestLint("if (foobaz) {", "Missing spaces around < [whitespace/operators] [3]") + self.TestLint("if (foobar) {", "Missing spaces around < [whitespace/operators] [3]") + self.TestLint("template", "") + self.TestLint("std::unique_ptr>", "") + self.TestLint("typedef hash_map", "") + self.TestLint("10<<20", "") + self.TestLint("10<>b", "Missing spaces around >> [whitespace/operators] [3]") + self.TestLint("10>>b", "Missing spaces around >> [whitespace/operators] [3]") + self.TestLint("LOG(ERROR)<<*foo", "Missing spaces around << [whitespace/operators] [3]") + self.TestLint("LOG(ERROR)<<&foo", "Missing spaces around << [whitespace/operators] [3]") + self.TestLint("StringCoder>::ToString()", "") + self.TestLint("map, map>::iterator", "") + self.TestLint("func>>()", "") + self.TestLint("MACRO1(list>)", "") + self.TestLint("MACRO2(list>, 42)", "") + self.TestLint("void DoFoo(const set>& arg1);", "") + self.TestLint("void SetFoo(set>* arg1);", "") + self.TestLint("foo = new set>;", "") + self.TestLint("reinterpret_cast>*>(a);", "") + self.TestLint("MACRO(<<)", "") + self.TestLint("MACRO(<<, arg)", "") + self.TestLint("MACRO(<<=)", "") + self.TestLint("MACRO(<<=, arg)", "") + + self.TestLint("using Vector3::operator==;", "") + self.TestLint("using Vector3::operator!=;", "") + + def testSpacingBeforeLastSemicolon(self): + self.TestLint( + "call_function() ;", + "Extra space before last semicolon. If this should be an " + "empty statement, use {} instead." + " [whitespace/semicolon] [5]", + ) + self.TestLint( + "while (true) ;", + "Extra space before last semicolon. If this should be an " + "empty statement, use {} instead." + " [whitespace/semicolon] [5]", + ) + self.TestLint( + "default:;", + "Semicolon defining empty statement. Use {} instead. [whitespace/semicolon] [5]", + ) + self.TestLint( + " ;", + "Line contains only semicolon. If this should be an empty " + "statement, use {} instead." + " [whitespace/semicolon] [5]", + ) + self.TestLint("for (int i = 0; ;", "") + + def testEmptyBlockBody(self): + self.TestLint( + "while (true);", + "Empty loop bodies should use {} or continue [whitespace/empty_loop_body] [5]", + ) + self.TestLint( + "if (true);", + "Empty conditional bodies should use {} [whitespace/empty_conditional_body] [5]", + ) + self.TestLint("while (true)", "") + self.TestLint("while (true) continue;", "") + self.TestLint( + "for (;;);", + "Empty loop bodies should use {} or continue [whitespace/empty_loop_body] [5]", + ) + self.TestLint("for (;;)", "") + self.TestLint("for (;;) continue;", "") + self.TestLint("for (;;) func();", "") + self.TestLint( + "if (test) {}", + "If statement had no body and no else clause [whitespace/empty_if_body] [4]", + ) + self.TestLint("if (test) func();", "") + self.TestLint("if (test) {} else {}", "") + self.TestMultiLineLint( + """while (true && false);""", - 'Empty loop bodies should use {} or continue' - ' [whitespace/empty_loop_body] [5]') - self.TestMultiLineLint("""do { + "Empty loop bodies should use {} or continue [whitespace/empty_loop_body] [5]", + ) + self.TestMultiLineLint( + """do { } while (false);""", - '') - self.TestMultiLineLint("""#define MACRO \\ + "", + ) + self.TestMultiLineLint( + """#define MACRO \\ do { \\ } while (false);""", - '') - self.TestMultiLineLint("""do { + "", + ) + self.TestMultiLineLint( + """do { } while (false); // next line gets a warning while (false);""", - 'Empty loop bodies should use {} or continue' - ' [whitespace/empty_loop_body] [5]') - self.TestMultiLineLint("""if (test) { + "Empty loop bodies should use {} or continue [whitespace/empty_loop_body] [5]", + ) + self.TestMultiLineLint( + """if (test) { }""", - 'If statement had no body and no else clause' - ' [whitespace/empty_if_body] [4]') - self.TestMultiLineLint("""if (test, + "If statement had no body and no else clause [whitespace/empty_if_body] [4]", + ) + self.TestMultiLineLint( + """if (test, func({})) { }""", - 'If statement had no body and no else clause' - ' [whitespace/empty_if_body] [4]') - self.TestMultiLineLint("""if (test) - func();""", '') - self.TestLint('if (test) { hello; }', - 'Controlled statements inside brackets of if clause should be on a separate line' - ' [whitespace/newline] [5]') - self.TestLint('if (test({})) { hello; }', - 'Controlled statements inside brackets of if clause should be on a separate line' - ' [whitespace/newline] [5]') - self.TestMultiLineLint("""if (test) { + "If statement had no body and no else clause [whitespace/empty_if_body] [4]", + ) + self.TestMultiLineLint( + """if (test) + func();""", + "", + ) + self.TestLint( + "if (test) { hello; }", + "Controlled statements inside brackets of if clause should be on a separate line" + " [whitespace/newline] [5]", + ) + self.TestLint( + "if (test({})) { hello; }", + "Controlled statements inside brackets of if clause should be on a separate line" + " [whitespace/newline] [5]", + ) + self.TestMultiLineLint( + """if (test) { func(); - }""", '') - self.TestMultiLineLint("""if (test) { + }""", + "", + ) + self.TestMultiLineLint( + """if (test) { // multiline // comment - }""", '') - self.TestMultiLineLint("""if (test) { // comment - }""", '') - self.TestMultiLineLint("""if (test) { + }""", + "", + ) + self.TestMultiLineLint( + """if (test) { // comment + }""", + "", + ) + self.TestMultiLineLint( + """if (test) { } else { - }""", '') - self.TestMultiLineLint("""if (func(p1, + }""", + "", + ) + self.TestMultiLineLint( + """if (func(p1, p2, p3)) { func(); - }""", '') - self.TestMultiLineLint("""if (func({}, p1)) { + }""", + "", + ) + self.TestMultiLineLint( + """if (func({}, p1)) { func(); - }""", '') - - def testSpacingForRangeBasedFor(self): - # Basic correctly formatted case: - self.TestLint('for (int i : numbers) {', '') - - # Missing space before colon: - self.TestLint('for (int i: numbers) {', - 'Missing space around colon in range-based for loop' - ' [whitespace/forcolon] [2]') - # Missing space after colon: - self.TestLint('for (int i :numbers) {', - 'Missing space around colon in range-based for loop' - ' [whitespace/forcolon] [2]') - # Missing spaces both before and after the colon. - self.TestLint('for (int i:numbers) {', - 'Missing space around colon in range-based for loop' - ' [whitespace/forcolon] [2]') - - # The scope operator '::' shouldn't cause warnings... - self.TestLint('for (std::size_t i : sizes) {}', '') - # ...but it shouldn't suppress them either. - self.TestLint('for (std::size_t i: sizes) {}', - 'Missing space around colon in range-based for loop' - ' [whitespace/forcolon] [2]') - - # Static or global STL strings. - def testStaticOrGlobalSTLStrings(self): - # A template for the error message for a const global/static string. - error_msg = ('For a static/global string constant, use a C style ' - 'string instead: "%s[]". [runtime/string] [4]') - # The error message for a non-const global/static string variable. - nonconst_error_msg = ('Static/global string variables are not permitted.' - ' [runtime/string] [4]') - - self.TestLint('string foo;', - nonconst_error_msg) - self.TestLint('string kFoo = "hello"; // English', - nonconst_error_msg) - self.TestLint('static string foo;', - nonconst_error_msg) - self.TestLint('static const string foo;', - error_msg % 'static const char foo') - self.TestLint('static const std::string foo;', - error_msg % 'static const char foo') - self.TestLint('string Foo::bar;', - nonconst_error_msg) - - self.TestLint('std::string foo;', - nonconst_error_msg) - self.TestLint('std::string kFoo = "hello"; // English', - nonconst_error_msg) - self.TestLint('static std::string foo;', - nonconst_error_msg) - self.TestLint('static const std::string foo;', - error_msg % 'static const char foo') - self.TestLint('std::string Foo::bar;', - nonconst_error_msg) - - self.TestLint('::std::string foo;', - nonconst_error_msg) - self.TestLint('::std::string kFoo = "hello"; // English', - nonconst_error_msg) - self.TestLint('static ::std::string foo;', - nonconst_error_msg) - self.TestLint('static const ::std::string foo;', - error_msg % 'static const char foo') - self.TestLint('::std::string Foo::bar;', - nonconst_error_msg) - - self.TestLint('string* pointer', '') - self.TestLint('string *pointer', '') - self.TestLint('string* pointer = Func();', '') - self.TestLint('string *pointer = Func();', '') - self.TestLint('const string* pointer', '') - self.TestLint('const string *pointer', '') - self.TestLint('const string* pointer = Func();', '') - self.TestLint('const string *pointer = Func();', '') - self.TestLint('string const* pointer', '') - self.TestLint('string const *pointer', '') - self.TestLint('string const* pointer = Func();', '') - self.TestLint('string const *pointer = Func();', '') - self.TestLint('string* const pointer', '') - self.TestLint('string *const pointer', '') - self.TestLint('string* const pointer = Func();', '') - self.TestLint('string *const pointer = Func();', '') - self.TestLint('string Foo::bar() {}', '') - self.TestLint('string Foo::operator*() {}', '') - # Rare case. - self.TestLint('string foo("foobar");', nonconst_error_msg) - # Should not catch local or member variables. - self.TestLint(' string foo', '') - # Should not catch functions. - self.TestLint('string EmptyString() { return ""; }', '') - self.TestLint('string EmptyString () { return ""; }', '') - self.TestLint('string const& FileInfo::Pathname() const;', '') - self.TestLint('string const &FileInfo::Pathname() const;', '') - self.TestLint('string VeryLongNameFunctionSometimesEndsWith(\n' - ' VeryLongNameType very_long_name_variable) {}', '') - self.TestLint('template<>\n' - 'string FunctionTemplateSpecialization(\n' - ' int x) { return ""; }', '') - self.TestLint('template<>\n' - 'string FunctionTemplateSpecialization* >(\n' - ' int x) { return ""; }', '') - - # should not catch methods of template classes. - self.TestLint('string Class::Method() const {\n' - ' return "";\n' - '}\n', '') - self.TestLint('string Class::Method(\n' - ' int arg) const {\n' - ' return "";\n' - '}\n', '') - - # Check multiline cases. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - '#include ', - 'string Class', - '::MemberFunction1();', - 'string Class::', - 'MemberFunction2();', - 'string Class::', - 'NestedClass::MemberFunction3();', - 'string TemplateClass::', - 'NestedClass::MemberFunction4();', - 'const string Class', - '::static_member_variable1;', - 'const string Class::', - 'static_member_variable2;', - 'const string Class', - '::static_member_variable3 = "initial value";', - 'const string Class::', - 'static_member_variable4 = "initial value";', - 'string Class::', - 'static_member_variable5;', - ''], - error_collector) - self.assertEqual(error_collector.Results(), - [error_msg % 'const char Class::static_member_variable1', - error_msg % 'const char Class::static_member_variable2', - error_msg % 'const char Class::static_member_variable3', - error_msg % 'const char Class::static_member_variable4', - nonconst_error_msg]) - - def testNoSpacesInFunctionCalls(self): - self.TestLint('TellStory(1, 3);', - '') - self.TestLint('TellStory(1, 3 );', - 'Extra space before )' - ' [whitespace/parens] [2]') - self.TestLint('TellStory(1 /* wolf */, 3 /* pigs */);', - '') - self.TestMultiLineLint("""TellStory(1, 3 + }""", + "", + ) + + def testSpacingForRangeBasedFor(self): + # Basic correctly formatted case: + self.TestLint("for (int i : numbers) {", "") + + # Missing space before colon: + self.TestLint( + "for (int i: numbers) {", + "Missing space around colon in range-based for loop [whitespace/forcolon] [2]", + ) + # Missing space after colon: + self.TestLint( + "for (int i :numbers) {", + "Missing space around colon in range-based for loop [whitespace/forcolon] [2]", + ) + # Missing spaces both before and after the colon. + self.TestLint( + "for (int i:numbers) {", + "Missing space around colon in range-based for loop [whitespace/forcolon] [2]", + ) + + # The scope operator '::' shouldn't cause warnings... + self.TestLint("for (std::size_t i : sizes) {}", "") + # ...but it shouldn't suppress them either. + self.TestLint( + "for (std::size_t i: sizes) {}", + "Missing space around colon in range-based for loop [whitespace/forcolon] [2]", + ) + + # Static or global STL strings. + def testStaticOrGlobalSTLStrings(self): + # A template for the error message for a const global/static string. + error_msg = ( + "For a static/global string constant, use a C style " + 'string instead: "%s[]". [runtime/string] [4]' + ) + # The error message for a non-const global/static string variable. + nonconst_error_msg = ( + "Static/global string variables are not permitted. [runtime/string] [4]" + ) + + self.TestLint("string foo;", nonconst_error_msg) + self.TestLint('string kFoo = "hello"; // English', nonconst_error_msg) + self.TestLint("static string foo;", nonconst_error_msg) + self.TestLint("static const string foo;", error_msg % "static const char foo") + self.TestLint("static const std::string foo;", error_msg % "static const char foo") + self.TestLint("string Foo::bar;", nonconst_error_msg) + + self.TestLint("std::string foo;", nonconst_error_msg) + self.TestLint('std::string kFoo = "hello"; // English', nonconst_error_msg) + self.TestLint("static std::string foo;", nonconst_error_msg) + self.TestLint("static const std::string foo;", error_msg % "static const char foo") + self.TestLint("std::string Foo::bar;", nonconst_error_msg) + + self.TestLint("::std::string foo;", nonconst_error_msg) + self.TestLint('::std::string kFoo = "hello"; // English', nonconst_error_msg) + self.TestLint("static ::std::string foo;", nonconst_error_msg) + self.TestLint("static const ::std::string foo;", error_msg % "static const char foo") + self.TestLint("::std::string Foo::bar;", nonconst_error_msg) + + self.TestLint("string* pointer", "") + self.TestLint("string *pointer", "") + self.TestLint("string* pointer = Func();", "") + self.TestLint("string *pointer = Func();", "") + self.TestLint("const string* pointer", "") + self.TestLint("const string *pointer", "") + self.TestLint("const string* pointer = Func();", "") + self.TestLint("const string *pointer = Func();", "") + self.TestLint("string const* pointer", "") + self.TestLint("string const *pointer", "") + self.TestLint("string const* pointer = Func();", "") + self.TestLint("string const *pointer = Func();", "") + self.TestLint("string* const pointer", "") + self.TestLint("string *const pointer", "") + self.TestLint("string* const pointer = Func();", "") + self.TestLint("string *const pointer = Func();", "") + self.TestLint("string Foo::bar() {}", "") + self.TestLint("string Foo::operator*() {}", "") + # Rare case. + self.TestLint('string foo("foobar");', nonconst_error_msg) + # Should not catch local or member variables. + self.TestLint(" string foo", "") + # Should not catch functions. + self.TestLint('string EmptyString() { return ""; }', "") + self.TestLint('string EmptyString () { return ""; }', "") + self.TestLint("string const& FileInfo::Pathname() const;", "") + self.TestLint("string const &FileInfo::Pathname() const;", "") + self.TestLint( + "string VeryLongNameFunctionSometimesEndsWith(\n" + " VeryLongNameType very_long_name_variable) {}", + "", + ) + self.TestLint( + "template<>\n" + "string FunctionTemplateSpecialization(\n" + ' int x) { return ""; }', + "", + ) + self.TestLint( + "template<>\n" + "string FunctionTemplateSpecialization* >(\n" + ' int x) { return ""; }', + "", + ) + + # should not catch methods of template classes. + self.TestLint('string Class::Method() const {\n return "";\n}\n', "") + self.TestLint('string Class::Method(\n int arg) const {\n return "";\n}\n', "") + + # Check multiline cases. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "#include ", + "string Class", + "::MemberFunction1();", + "string Class::", + "MemberFunction2();", + "string Class::", + "NestedClass::MemberFunction3();", + "string TemplateClass::", + "NestedClass::MemberFunction4();", + "const string Class", + "::static_member_variable1;", + "const string Class::", + "static_member_variable2;", + "const string Class", + '::static_member_variable3 = "initial value";', + "const string Class::", + 'static_member_variable4 = "initial value";', + "string Class::", + "static_member_variable5;", + "", + ], + error_collector, + ) + self.assertEqual( + error_collector.Results(), + [ + error_msg % "const char Class::static_member_variable1", + error_msg % "const char Class::static_member_variable2", + error_msg % "const char Class::static_member_variable3", + error_msg % "const char Class::static_member_variable4", + nonconst_error_msg, + ], + ) + + def testNoSpacesInFunctionCalls(self): + self.TestLint("TellStory(1, 3);", "") + self.TestLint("TellStory(1, 3 );", "Extra space before ) [whitespace/parens] [2]") + self.TestLint("TellStory(1 /* wolf */, 3 /* pigs */);", "") + self.TestMultiLineLint( + """TellStory(1, 3 );""", - 'Closing ) should be moved to the previous line' - ' [whitespace/parens] [2]') - self.TestMultiLineLint("""TellStory(Wolves(1), + "Closing ) should be moved to the previous line [whitespace/parens] [2]", + ) + self.TestMultiLineLint( + """TellStory(Wolves(1), Pigs(3 ));""", - 'Closing ) should be moved to the previous line' - ' [whitespace/parens] [2]') - self.TestMultiLineLint("""TellStory(1, + "Closing ) should be moved to the previous line [whitespace/parens] [2]", + ) + self.TestMultiLineLint( + """TellStory(1, 3 );""", - 'Extra space before )' - ' [whitespace/parens] [2]') - - def testToDoComments(self): - start_space = ('Too many spaces before TODO' - ' [whitespace/todo] [2]') - missing_username = ('Missing username in TODO; it should look like ' - '"// TODO(my_username): Stuff."' - ' [readability/todo] [2]') - end_space = ('TODO(my_username) should be followed by a space' - ' [whitespace/todo] [2]') - - self.TestLint('// TODOfix this', - [start_space, missing_username, end_space]) - self.TestLint('// TODO(ljenkins)fix this', - [start_space, end_space]) - self.TestLint('// TODO fix this', - [start_space, missing_username]) - self.TestLint('// TODO fix this', missing_username) - self.TestLint('// TODO: fix this', missing_username) - self.TestLint('//TODO(ljenkins): Fix this', - 'Should have a space between // and comment' - ' [whitespace/comments] [4]') - self.TestLint('// TODO(ljenkins):Fix this', end_space) - self.TestLint('// TODO(ljenkins):', '') - self.TestLint('// TODO(ljenkins): fix this', '') - self.TestLint('// TODO(ljenkins): Fix this', '') - self.TestLint('#if 1 // TEST_URLTODOCID_WHICH_HAS_THAT_WORD_IN_IT_H_', '') - self.TestLint('// See also similar TODO above', '') - self.TestLint(r'EXPECT_EQ("\\", ' - r'NormalizePath("/./../foo///bar/..//x/../..", ""));', - '') - - def testTwoSpacesBetweenCodeAndComments(self): - self.TestLint('} // namespace foo', - 'At least two spaces is best between code and comments' - ' [whitespace/comments] [2]') - self.TestLint('}// namespace foo', - 'At least two spaces is best between code and comments' - ' [whitespace/comments] [2]') - self.TestLint('printf("foo"); // Outside quotes.', - 'At least two spaces is best between code and comments' - ' [whitespace/comments] [2]') - self.TestLint('int i = 0; // Having two spaces is fine.', '') - self.TestLint('int i = 0; // Having three spaces is OK.', '') - self.TestLint('// Top level comment', '') - self.TestLint(' // Line starts with two spaces.', '') - self.TestMultiLineLint('void foo() {\n' - ' { // A scope is opening.\n' - ' int a;', '') - self.TestMultiLineLint('void foo() {\n' - ' { // A scope is opening.\n' - '#define A a', - 'At least two spaces is best between code and ' - 'comments [whitespace/comments] [2]') - self.TestMultiLineLint(' foo();\n' - ' { // An indented scope is opening.\n' - ' int a;', '') - self.TestMultiLineLint('vector my_elements = {// first\n' - ' 1,', '') - self.TestMultiLineLint('vector my_elements = {// my_elements is ..\n' - ' 1,', - 'At least two spaces is best between code and ' - 'comments [whitespace/comments] [2]') - self.TestLint('if (foo) { // not a pure scope; comment is too close!', - 'At least two spaces is best between code and comments' - ' [whitespace/comments] [2]') - self.TestLint('printf("// In quotes.")', '') - self.TestLint('printf("\\"%s // In quotes.")', '') - self.TestLint('printf("%s", "// In quotes.")', '') - - def testSpaceAfterCommentMarker(self): - self.TestLint('//', '') - self.TestLint('//x', 'Should have a space between // and comment' - ' [whitespace/comments] [4]') - self.TestLint('// x', '') - self.TestLint('///', '') - self.TestLint('/// x', '') - self.TestLint('//!', '') - self.TestLint('//----', '') - self.TestLint('//====', '') - self.TestLint('//////', '') - self.TestLint('////// x', '') - self.TestLint('///< x', '') # After-member Doxygen comment - self.TestLint('//!< x', '') # After-member Doxygen comment - self.TestLint('////x', 'Should have a space between // and comment' - ' [whitespace/comments] [4]') - self.TestLint('//}', '') - self.TestLint('//}x', 'Should have a space between // and comment' - ' [whitespace/comments] [4]') - self.TestLint('//!, ', - ' class B = piyo, ', - ' class C = fuga >', - 'class D {', - ' public:', - '};', - '', '', '', '', - '}'], - error_collector) - self.assertEqual(0, error_collector.Results().count( - 'Redundant blank line at the end of a code block should be deleted.' - ' [whitespace/blank_line] [3]')) - - def testAllowBlankLineBeforeIfElseChain(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['if (hoge) {', - '', # No warning - '} else if (piyo) {', - '', # No warning - '} else if (piyopiyo) {', - ' hoge = true;', # No warning - '} else {', - '', # Warning on this line - '}'], - error_collector) - self.assertEqual(1, error_collector.Results().count( - 'Redundant blank line at the end of a code block should be deleted.' - ' [whitespace/blank_line] [3]')) - - def testAllowBlankLineAfterExtern(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['extern "C" {', - '', - 'EXPORTAPI void APICALL Some_function() {}', - '', - '}'], - error_collector) - self.assertEqual(0, error_collector.Results().count( - 'Redundant blank line at the start of a code block should be deleted.' - ' [whitespace/blank_line] [2]')) - self.assertEqual(0, error_collector.Results().count( - 'Redundant blank line at the end of a code block should be deleted.' - ' [whitespace/blank_line] [3]')) - - def testBlankLineBeforeSectionKeyword(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['class A {', - ' public:', - ' protected:', # warning 1 - ' private:', # warning 2 - ' struct B {', - ' public:', - ' private:'] + # warning 3 - ([''] * 100) + # Make A and B longer than 100 lines - [' };', - ' struct C {', - ' protected:', - ' private:', # C is too short for warnings - ' };', - '};', - 'class D', - ' : public {', - ' public:', # no warning - '};', - 'class E {\\', - ' public:\\'] + - (['\\'] * 100) + # Makes E > 100 lines - [' int non_empty_line;\\', - ' private:\\', # no warning - ' int a;\\', - '};'], - error_collector) - self.assertEqual(2, error_collector.Results().count( - '"private:" should be preceded by a blank line' - ' [whitespace/blank_line] [3]')) - self.assertEqual(1, error_collector.Results().count( - '"protected:" should be preceded by a blank line' - ' [whitespace/blank_line] [3]')) - - def testNoBlankLineAfterSectionKeyword(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['class A {', - ' public:', - '', # warning 1 - ' private:', - '', # warning 2 - ' struct B {', - ' protected:', - '', # warning 3 - ' };', - '};'], - error_collector) - self.assertEqual(1, error_collector.Results().count( - 'Do not leave a blank line after "public:"' - ' [whitespace/blank_line] [3]')) - self.assertEqual(1, error_collector.Results().count( - 'Do not leave a blank line after "protected:"' - ' [whitespace/blank_line] [3]')) - self.assertEqual(1, error_collector.Results().count( - 'Do not leave a blank line after "private:"' - ' [whitespace/blank_line] [3]')) - - def testAllowBlankLinesInRawStrings(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - 'static const char *kData[] = {R"(', - '', - ')", R"(', - '', - ')"};', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - - def testElseOnSameLineAsClosingBraces(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['if (hoge) {', - '}', - 'else if (piyo) {', # Warning on this line - '}', - ' else {' # Warning on this line - '', - '}'], - error_collector) - self.assertEqual(2, error_collector.Results().count( - 'An else should appear on the same line as the preceding }' - ' [whitespace/newline] [4]')) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['if (hoge) {', - '', - '}', - 'else', # Warning on this line - '{', - '', - '}'], - error_collector) - self.assertEqual(1, error_collector.Results().count( - 'An else should appear on the same line as the preceding }' - ' [whitespace/newline] [4]')) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['if (hoge) {', - '', - '}', - 'else_function();'], - error_collector) - self.assertEqual(0, error_collector.Results().count( - 'An else should appear on the same line as the preceding }' - ' [whitespace/newline] [4]')) - - def testMultipleStatementsOnSameLine(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['for (int i = 0; i < 1; i++) {}', - 'switch (x) {', - ' case 0: func(); break; ', - '}', - 'sum += MathUtil::SafeIntRound(x); x += 0.1;'], - error_collector) - self.assertEqual(0, error_collector.Results().count( - 'More than one command on the same line [whitespace/newline] [0]')) - - old_verbose_level = cpplint._cpplint_state.verbose_level - cpplint._cpplint_state.verbose_level = 0 - cpplint.ProcessFileData('foo.cc', 'cc', - ['sum += MathUtil::SafeIntRound(x); x += 0.1;'], - error_collector) - cpplint._cpplint_state.verbose_level = old_verbose_level - - def testLambdasOnSameLine(self): - error_collector = ErrorCollector(self.assertTrue) - old_verbose_level = cpplint._cpplint_state.verbose_level - cpplint._cpplint_state.verbose_level = 0 - cpplint.ProcessFileData('foo.cc', 'cc', - ['const auto lambda = ' - '[](const int i) { return i; };'], - error_collector) - cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual(0, error_collector.Results().count( - 'More than one command on the same line [whitespace/newline] [0]')) - - error_collector = ErrorCollector(self.assertTrue) - old_verbose_level = cpplint._cpplint_state.verbose_level - cpplint._cpplint_state.verbose_level = 0 - cpplint.ProcessFileData('foo.cc', 'cc', - ['const auto result = std::any_of(vector.begin(), ' - 'vector.end(), ' - '[](const int i) { return i > 0; });'], - error_collector) - cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual(0, error_collector.Results().count( - 'More than one command on the same line [whitespace/newline] [0]')) - - error_collector = ErrorCollector(self.assertTrue) - old_verbose_level = cpplint._cpplint_state.verbose_level - cpplint._cpplint_state.verbose_level = 0 - cpplint.ProcessFileData('foo.cc', 'cc', - ['return mutex::Lock([this]() { ' - 'this->ReadLock(); }, [this]() { ' - 'this->ReadUnlock(); });'], - error_collector) - cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual(0, error_collector.Results().count( - 'More than one command on the same line [whitespace/newline] [0]')) - - error_collector = ErrorCollector(self.assertTrue) - old_verbose_level = cpplint._cpplint_state.verbose_level - cpplint._cpplint_state.verbose_level = 0 - cpplint.ProcessFileData('foo.cc', 'cc', - ['return mutex::Lock([this]() { ' - 'this->ReadLock(); }, [this]() { ' - 'this->ReadUnlock(); }, object);'], - error_collector) - cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual(0, error_collector.Results().count( - 'More than one command on the same line [whitespace/newline] [0]')) - - def testEndOfNamespaceComments(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('foo.cc', 'cc', - ['namespace {', - '', - '}', # No warning (too short) - 'namespace expected {', - '} // namespace mismatched', # Warning here - 'namespace {', - '} // namespace mismatched', # Warning here - 'namespace outer { namespace nested {'] + - ([''] * 10) + - ['}', # Warning here - '}', # Warning here - 'namespace {'] + - ([''] * 10) + - ['}', # Warning here - 'namespace {'] + - ([''] * 10) + - ['} // namespace some description', # Anon warning - 'namespace {'] + - ([''] * 10) + - ['} // namespace anonymous', # Variant warning - 'namespace {'] + - ([''] * 10) + - ['} // anonymous namespace (utils)', # Variant - 'namespace {'] + - ([''] * 10) + - ['} // anonymous namespace', # No warning - 'namespace missing_comment {'] + - ([''] * 10) + - ['}', # Warning here - 'namespace no_warning {'] + - ([''] * 10) + - ['} // namespace no_warning', - 'namespace no_warning {'] + - ([''] * 10) + - ['}; // end namespace no_warning', - '#define MACRO \\', - 'namespace c_style { \\'] + - (['\\'] * 10) + - ['} /* namespace c_style. */ \\', - ';'], - error_collector) - self.assertEqual(1, error_collector.Results().count( - 'Namespace should be terminated with "// namespace expected"' - ' [readability/namespace] [5]')) - self.assertEqual(1, error_collector.Results().count( - 'Namespace should be terminated with "// namespace outer"' - ' [readability/namespace] [5]')) - self.assertEqual(1, error_collector.Results().count( - 'Namespace should be terminated with "// namespace nested"' - ' [readability/namespace] [5]')) - self.assertEqual(3, error_collector.Results().count( - 'Anonymous namespace should be terminated with "// namespace"' - ' [readability/namespace] [5]')) - self.assertEqual(2, error_collector.Results().count( - 'Anonymous namespace should be terminated with "// namespace" or' - ' "// anonymous namespace"' - ' [readability/namespace] [5]')) - self.assertEqual(1, error_collector.Results().count( - 'Namespace should be terminated with "// namespace missing_comment"' - ' [readability/namespace] [5]')) - self.assertEqual(0, error_collector.Results().count( - 'Namespace should be terminated with "// namespace no_warning"' - ' [readability/namespace] [5]')) - - def testComma(self): - self.TestLint('a = f(1,2);', - 'Missing space after , [whitespace/comma] [3]') - self.TestLint('int tmp=a,a=b,b=tmp;', - ['Missing spaces around = [whitespace/operators] [4]', - 'Missing space after , [whitespace/comma] [3]']) - self.TestLint('f(a, /* name */ b);', '') - self.TestLint('f(a, /* name */b);', '') - self.TestLint('f(a, /* name */-1);', '') - self.TestLint('f(a, /* name */"1");', '') - self.TestLint('f(1, /* empty macro arg */, 2)', '') - self.TestLint('f(1,, 2)', '') - self.TestLint('operator,()', '') - self.TestLint('operator,(a,b)', - 'Missing space after , [whitespace/comma] [3]') - self.TestLint('__VA_OPT__(,)', '') - self.TestLint('__VA_OPT__ (,)', - 'Extra space before ( in function call [whitespace/parens] [4]') - - def testEqualsOperatorSpacing(self): - self.TestLint('int tmp= a;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('int tmp =a;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('int tmp=a;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('int tmp= 7;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('int tmp =7;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('int tmp=7;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('int* tmp=*p;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('int* tmp= *p;', - 'Missing spaces around = [whitespace/operators] [4]') - self.TestMultiLineLint( - TrimExtraIndent(''' + "Extra space before ) [whitespace/parens] [2]", + ) + + def testToDoComments(self): + start_space = "Too many spaces before TODO [whitespace/todo] [2]" + missing_username = ( + "Missing username in TODO; it should look like " + '"// TODO(my_username): Stuff."' + " [readability/todo] [2]" + ) + end_space = "TODO(my_username) should be followed by a space [whitespace/todo] [2]" + + self.TestLint("// TODOfix this", [start_space, missing_username, end_space]) + self.TestLint("// TODO(ljenkins)fix this", [start_space, end_space]) + self.TestLint("// TODO fix this", [start_space, missing_username]) + self.TestLint("// TODO fix this", missing_username) + self.TestLint("// TODO: fix this", missing_username) + self.TestLint( + "//TODO(ljenkins): Fix this", + "Should have a space between // and comment [whitespace/comments] [4]", + ) + self.TestLint("// TODO(ljenkins):Fix this", end_space) + self.TestLint("// TODO(ljenkins):", "") + self.TestLint("// TODO(ljenkins): fix this", "") + self.TestLint("// TODO(ljenkins): Fix this", "") + self.TestLint("#if 1 // TEST_URLTODOCID_WHICH_HAS_THAT_WORD_IN_IT_H_", "") + self.TestLint("// See also similar TODO above", "") + self.TestLint( + r'EXPECT_EQ("\\", ' + r'NormalizePath("/./../foo///bar/..//x/../..", ""));', + "", + ) + + def testTwoSpacesBetweenCodeAndComments(self): + self.TestLint( + "} // namespace foo", + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestLint( + "}// namespace foo", + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestLint( + 'printf("foo"); // Outside quotes.', + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestLint("int i = 0; // Having two spaces is fine.", "") + self.TestLint("int i = 0; // Having three spaces is OK.", "") + self.TestLint("// Top level comment", "") + self.TestLint(" // Line starts with two spaces.", "") + self.TestMultiLineLint("void foo() {\n { // A scope is opening.\n int a;", "") + self.TestMultiLineLint( + "void foo() {\n { // A scope is opening.\n#define A a", + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestMultiLineLint(" foo();\n { // An indented scope is opening.\n int a;", "") + self.TestMultiLineLint( + "vector my_elements = {// first\n 1,", "" + ) + self.TestMultiLineLint( + "vector my_elements = {// my_elements is ..\n 1,", + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestLint( + "if (foo) { // not a pure scope; comment is too close!", + "At least two spaces is best between code and comments [whitespace/comments] [2]", + ) + self.TestLint('printf("// In quotes.")', "") + self.TestLint('printf("\\"%s // In quotes.")', "") + self.TestLint('printf("%s", "// In quotes.")', "") + + def testSpaceAfterCommentMarker(self): + self.TestLint("//", "") + self.TestLint( + "//x", "Should have a space between // and comment [whitespace/comments] [4]" + ) + self.TestLint("// x", "") + self.TestLint("///", "") + self.TestLint("/// x", "") + self.TestLint("//!", "") + self.TestLint("//----", "") + self.TestLint("//====", "") + self.TestLint("//////", "") + self.TestLint("////// x", "") + self.TestLint("///< x", "") # After-member Doxygen comment + self.TestLint("//!< x", "") # After-member Doxygen comment + self.TestLint( + "////x", "Should have a space between // and comment [whitespace/comments] [4]" + ) + self.TestLint("//}", "") + self.TestLint( + "//}x", "Should have a space between // and comment [whitespace/comments] [4]" + ) + self.TestLint( + "//!, ", + " class B = piyo, ", + " class C = fuga >", + "class D {", + " public:", + "};", + "", + "", + "", + "", + "}", + ], + error_collector, + ) + self.assertEqual( + 0, + error_collector.Results().count( + "Redundant blank line at the end of a code block should be deleted." + " [whitespace/blank_line] [3]" + ), + ) + + def testAllowBlankLineBeforeIfElseChain(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "if (hoge) {", + "", # No warning + "} else if (piyo) {", + "", # No warning + "} else if (piyopiyo) {", + " hoge = true;", # No warning + "} else {", + "", # Warning on this line + "}", + ], + error_collector, + ) + self.assertEqual( + 1, + error_collector.Results().count( + "Redundant blank line at the end of a code block should be deleted." + " [whitespace/blank_line] [3]" + ), + ) + + def testAllowBlankLineAfterExtern(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + ['extern "C" {', "", "EXPORTAPI void APICALL Some_function() {}", "", "}"], + error_collector, + ) + self.assertEqual( + 0, + error_collector.Results().count( + "Redundant blank line at the start of a code block should be deleted." + " [whitespace/blank_line] [2]" + ), + ) + self.assertEqual( + 0, + error_collector.Results().count( + "Redundant blank line at the end of a code block should be deleted." + " [whitespace/blank_line] [3]" + ), + ) + + def testBlankLineBeforeSectionKeyword(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "class A {", + " public:", + " protected:", # warning 1 + " private:", # warning 2 + " struct B {", + " public:", + " private:", + ] # warning 3 + + ([""] * 100) # Make A and B longer than 100 lines + + [ + " };", + " struct C {", + " protected:", + " private:", # C is too short for warnings + " };", + "};", + "class D", + " : public {", + " public:", # no warning + "};", + "class E {\\", + " public:\\", + ] + + (["\\"] * 100) # Makes E > 100 lines + + [ + " int non_empty_line;\\", + " private:\\", # no warning + " int a;\\", + "};", + ], + error_collector, + ) + self.assertEqual( + 2, + error_collector.Results().count( + '"private:" should be preceded by a blank line [whitespace/blank_line] [3]' + ), + ) + self.assertEqual( + 1, + error_collector.Results().count( + '"protected:" should be preceded by a blank line [whitespace/blank_line] [3]' + ), + ) + + def testNoBlankLineAfterSectionKeyword(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "class A {", + " public:", + "", # warning 1 + " private:", + "", # warning 2 + " struct B {", + " protected:", + "", # warning 3 + " };", + "};", + ], + error_collector, + ) + self.assertEqual( + 1, + error_collector.Results().count( + 'Do not leave a blank line after "public:" [whitespace/blank_line] [3]' + ), + ) + self.assertEqual( + 1, + error_collector.Results().count( + 'Do not leave a blank line after "protected:" [whitespace/blank_line] [3]' + ), + ) + self.assertEqual( + 1, + error_collector.Results().count( + 'Do not leave a blank line after "private:" [whitespace/blank_line] [3]' + ), + ) + + def testAllowBlankLinesInRawStrings(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + 'static const char *kData[] = {R"(', + "", + ')", R"(', + "", + ')"};', + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + + def testElseOnSameLineAsClosingBraces(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "if (hoge) {", + "}", + "else if (piyo) {", # Warning on this line + "}", + " else {" # Warning on this line + "", + "}", + ], + error_collector, + ) + self.assertEqual( + 2, + error_collector.Results().count( + "An else should appear on the same line as the preceding }" + " [whitespace/newline] [4]" + ), + ) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "if (hoge) {", + "", + "}", + "else", # Warning on this line + "{", + "", + "}", + ], + error_collector, + ) + self.assertEqual( + 1, + error_collector.Results().count( + "An else should appear on the same line as the preceding }" + " [whitespace/newline] [4]" + ), + ) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", "cc", ["if (hoge) {", "", "}", "else_function();"], error_collector + ) + self.assertEqual( + 0, + error_collector.Results().count( + "An else should appear on the same line as the preceding }" + " [whitespace/newline] [4]" + ), + ) + + def testMultipleStatementsOnSameLine(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "for (int i = 0; i < 1; i++) {}", + "switch (x) {", + " case 0: func(); break; ", + "}", + "sum += MathUtil::SafeIntRound(x); x += 0.1;", + ], + error_collector, + ) + self.assertEqual( + 0, + error_collector.Results().count( + "More than one command on the same line [whitespace/newline] [0]" + ), + ) + + old_verbose_level = cpplint._cpplint_state.verbose_level + cpplint._cpplint_state.verbose_level = 0 + cpplint.ProcessFileData( + "foo.cc", "cc", ["sum += MathUtil::SafeIntRound(x); x += 0.1;"], error_collector + ) + cpplint._cpplint_state.verbose_level = old_verbose_level + + def testLambdasOnSameLine(self): + error_collector = ErrorCollector(self.assertTrue) + old_verbose_level = cpplint._cpplint_state.verbose_level + cpplint._cpplint_state.verbose_level = 0 + cpplint.ProcessFileData( + "foo.cc", "cc", ["const auto lambda = [](const int i) { return i; };"], error_collector + ) + cpplint._cpplint_state.verbose_level = old_verbose_level + self.assertEqual( + 0, + error_collector.Results().count( + "More than one command on the same line [whitespace/newline] [0]" + ), + ) + + error_collector = ErrorCollector(self.assertTrue) + old_verbose_level = cpplint._cpplint_state.verbose_level + cpplint._cpplint_state.verbose_level = 0 + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "const auto result = std::any_of(vector.begin(), " + "vector.end(), " + "[](const int i) { return i > 0; });" + ], + error_collector, + ) + cpplint._cpplint_state.verbose_level = old_verbose_level + self.assertEqual( + 0, + error_collector.Results().count( + "More than one command on the same line [whitespace/newline] [0]" + ), + ) + + error_collector = ErrorCollector(self.assertTrue) + old_verbose_level = cpplint._cpplint_state.verbose_level + cpplint._cpplint_state.verbose_level = 0 + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "return mutex::Lock([this]() { " + "this->ReadLock(); }, [this]() { " + "this->ReadUnlock(); });" + ], + error_collector, + ) + cpplint._cpplint_state.verbose_level = old_verbose_level + self.assertEqual( + 0, + error_collector.Results().count( + "More than one command on the same line [whitespace/newline] [0]" + ), + ) + + error_collector = ErrorCollector(self.assertTrue) + old_verbose_level = cpplint._cpplint_state.verbose_level + cpplint._cpplint_state.verbose_level = 0 + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "return mutex::Lock([this]() { " + "this->ReadLock(); }, [this]() { " + "this->ReadUnlock(); }, object);" + ], + error_collector, + ) + cpplint._cpplint_state.verbose_level = old_verbose_level + self.assertEqual( + 0, + error_collector.Results().count( + "More than one command on the same line [whitespace/newline] [0]" + ), + ) + + def testEndOfNamespaceComments(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "namespace {", + "", + "}", # No warning (too short) + "namespace expected {", + "} // namespace mismatched", # Warning here + "namespace {", + "} // namespace mismatched", # Warning here + "namespace outer { namespace nested {", + ] + + ([""] * 10) + + [ + "}", # Warning here + "}", # Warning here + "namespace {", + ] + + ([""] * 10) + + [ + "}", # Warning here + "namespace {", + ] + + ([""] * 10) + + [ + "} // namespace some description", # Anon warning + "namespace {", + ] + + ([""] * 10) + + [ + "} // namespace anonymous", # Variant warning + "namespace {", + ] + + ([""] * 10) + + [ + "} // anonymous namespace (utils)", # Variant + "namespace {", + ] + + ([""] * 10) + + [ + "} // anonymous namespace", # No warning + "namespace missing_comment {", + ] + + ([""] * 10) + + [ + "}", # Warning here + "namespace no_warning {", + ] + + ([""] * 10) + + ["} // namespace no_warning", "namespace no_warning {"] + + ([""] * 10) + + ["}; // end namespace no_warning", "#define MACRO \\", "namespace c_style { \\"] + + (["\\"] * 10) + + ["} /* namespace c_style. */ \\", ";"], + error_collector, + ) + self.assertEqual( + 1, + error_collector.Results().count( + 'Namespace should be terminated with "// namespace expected"' + " [readability/namespace] [5]" + ), + ) + self.assertEqual( + 1, + error_collector.Results().count( + 'Namespace should be terminated with "// namespace outer"' + " [readability/namespace] [5]" + ), + ) + self.assertEqual( + 1, + error_collector.Results().count( + 'Namespace should be terminated with "// namespace nested"' + " [readability/namespace] [5]" + ), + ) + self.assertEqual( + 3, + error_collector.Results().count( + 'Anonymous namespace should be terminated with "// namespace"' + " [readability/namespace] [5]" + ), + ) + self.assertEqual( + 2, + error_collector.Results().count( + 'Anonymous namespace should be terminated with "// namespace" or' + ' "// anonymous namespace"' + " [readability/namespace] [5]" + ), + ) + self.assertEqual( + 1, + error_collector.Results().count( + 'Namespace should be terminated with "// namespace missing_comment"' + " [readability/namespace] [5]" + ), + ) + self.assertEqual( + 0, + error_collector.Results().count( + 'Namespace should be terminated with "// namespace no_warning"' + " [readability/namespace] [5]" + ), + ) + + def testComma(self): + self.TestLint("a = f(1,2);", "Missing space after , [whitespace/comma] [3]") + self.TestLint( + "int tmp=a,a=b,b=tmp;", + [ + "Missing spaces around = [whitespace/operators] [4]", + "Missing space after , [whitespace/comma] [3]", + ], + ) + self.TestLint("f(a, /* name */ b);", "") + self.TestLint("f(a, /* name */b);", "") + self.TestLint("f(a, /* name */-1);", "") + self.TestLint('f(a, /* name */"1");', "") + self.TestLint("f(1, /* empty macro arg */, 2)", "") + self.TestLint("f(1,, 2)", "") + self.TestLint("operator,()", "") + self.TestLint("operator,(a,b)", "Missing space after , [whitespace/comma] [3]") + self.TestLint("__VA_OPT__(,)", "") + self.TestLint( + "__VA_OPT__ (,)", "Extra space before ( in function call [whitespace/parens] [4]" + ) + + def testEqualsOperatorSpacing(self): + self.TestLint("int tmp= a;", "Missing spaces around = [whitespace/operators] [4]") + self.TestLint("int tmp =a;", "Missing spaces around = [whitespace/operators] [4]") + self.TestLint("int tmp=a;", "Missing spaces around = [whitespace/operators] [4]") + self.TestLint("int tmp= 7;", "Missing spaces around = [whitespace/operators] [4]") + self.TestLint("int tmp =7;", "Missing spaces around = [whitespace/operators] [4]") + self.TestLint("int tmp=7;", "Missing spaces around = [whitespace/operators] [4]") + self.TestLint("int* tmp=*p;", "Missing spaces around = [whitespace/operators] [4]") + self.TestLint("int* tmp= *p;", "Missing spaces around = [whitespace/operators] [4]") + self.TestMultiLineLint( + TrimExtraIndent(""" lookahead_services_= - ::strings::Split(FLAGS_ls, ",", ::strings::SkipEmpty());'''), - 'Missing spaces around = [whitespace/operators] [4]') - self.TestLint('bool result = a>=42;', - 'Missing spaces around >= [whitespace/operators] [3]') - self.TestLint('bool result = a<=42;', - 'Missing spaces around <= [whitespace/operators] [3]') - self.TestLint('bool result = a==42;', - 'Missing spaces around == [whitespace/operators] [3]') - self.TestLint('auto result = a!=42;', - 'Missing spaces around != [whitespace/operators] [3]') - self.TestLint('int a = b!=c;', - 'Missing spaces around != [whitespace/operators] [3]') - self.TestLint('a&=42;', '') - self.TestLint('a|=42;', '') - self.TestLint('a^=42;', '') - self.TestLint('a+=42;', '') - self.TestLint('a*=42;', '') - self.TestLint('a/=42;', '') - self.TestLint('a%=42;', '') - self.TestLint('a>>=5;', '') - self.TestLint('a<<=5;', '') - - def testShiftOperatorSpacing(self): - self.TestLint('a<>b', - 'Missing spaces around >> [whitespace/operators] [3]') - self.TestLint('1<<20', '') - self.TestLint('1024>>10', '') - self.TestLint('Kernel<<<1, 2>>>()', '') - - def testIndent(self): - self.TestLint('static int noindent;', '') - self.TestLint(' int two_space_indent;', '') - self.TestLint(' int four_space_indent;', '') - self.TestLint(' int one_space_indent;', - 'Weird number of spaces at line-start. ' - 'Are you using a 2-space indent? [whitespace/indent] [3]') - self.TestLint(' int three_space_indent;', - 'Weird number of spaces at line-start. ' - 'Are you using a 2-space indent? [whitespace/indent] [3]') - self.TestLint(' char* one_space_indent = "public:";', - 'Weird number of spaces at line-start. ' - 'Are you using a 2-space indent? [whitespace/indent] [3]') - self.TestLint(' public:', '') - self.TestLint(' protected:', '') - self.TestLint(' private:', '') - self.TestLint(' protected: \\', '') - self.TestLint(' public: \\', '') - self.TestLint(' private: \\', '') - # examples using QT signals/slots macro - self.TestMultiLineLint( - TrimExtraIndent(""" + ::strings::Split(FLAGS_ls, ",", ::strings::SkipEmpty());"""), + "Missing spaces around = [whitespace/operators] [4]", + ) + self.TestLint( + "bool result = a>=42;", "Missing spaces around >= [whitespace/operators] [3]" + ) + self.TestLint( + "bool result = a<=42;", "Missing spaces around <= [whitespace/operators] [3]" + ) + self.TestLint( + "bool result = a==42;", "Missing spaces around == [whitespace/operators] [3]" + ) + self.TestLint( + "auto result = a!=42;", "Missing spaces around != [whitespace/operators] [3]" + ) + self.TestLint("int a = b!=c;", "Missing spaces around != [whitespace/operators] [3]") + self.TestLint("a&=42;", "") + self.TestLint("a|=42;", "") + self.TestLint("a^=42;", "") + self.TestLint("a+=42;", "") + self.TestLint("a*=42;", "") + self.TestLint("a/=42;", "") + self.TestLint("a%=42;", "") + self.TestLint("a>>=5;", "") + self.TestLint("a<<=5;", "") + + def testShiftOperatorSpacing(self): + self.TestLint("a<>b", "Missing spaces around >> [whitespace/operators] [3]") + self.TestLint("1<<20", "") + self.TestLint("1024>>10", "") + self.TestLint("Kernel<<<1, 2>>>()", "") + + def testIndent(self): + self.TestLint("static int noindent;", "") + self.TestLint(" int two_space_indent;", "") + self.TestLint(" int four_space_indent;", "") + self.TestLint( + " int one_space_indent;", + "Weird number of spaces at line-start. " + "Are you using a 2-space indent? [whitespace/indent] [3]", + ) + self.TestLint( + " int three_space_indent;", + "Weird number of spaces at line-start. " + "Are you using a 2-space indent? [whitespace/indent] [3]", + ) + self.TestLint( + ' char* one_space_indent = "public:";', + "Weird number of spaces at line-start. " + "Are you using a 2-space indent? [whitespace/indent] [3]", + ) + self.TestLint(" public:", "") + self.TestLint(" protected:", "") + self.TestLint(" private:", "") + self.TestLint(" protected: \\", "") + self.TestLint(" public: \\", "") + self.TestLint(" private: \\", "") + # examples using QT signals/slots macro + self.TestMultiLineLint( + TrimExtraIndent(""" class foo { public slots: void bar(); signals: };"""), - '') - self.TestMultiLineLint( - TrimExtraIndent(""" + "", + ) + self.TestMultiLineLint( + TrimExtraIndent(""" class foo { public slots: void bar(); };"""), - 'public slots: should be indented +1 space inside class foo' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - TrimExtraIndent(""" + "public slots: should be indented +1 space inside class foo [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + TrimExtraIndent(""" class foo { signals: void bar(); };"""), - 'signals: should be indented +1 space inside class foo' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - TrimExtraIndent(''' + "signals: should be indented +1 space inside class foo [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + TrimExtraIndent(""" static const char kRawString[] = R"(" - ")";'''), - '') - self.TestMultiLineLint( - TrimExtraIndent(''' + ")";"""), + "", + ) + self.TestMultiLineLint( + TrimExtraIndent(""" KV>'''), - '') - self.TestMultiLineLint( - ' static const char kSingleLineRawString[] = R"(...)";', - 'Weird number of spaces at line-start. ' - 'Are you using a 2-space indent? [whitespace/indent] [3]') - - def testSectionIndent(self): - self.TestMultiLineLint( - """ + Tuple>"""), + "", + ) + self.TestMultiLineLint( + ' static const char kSingleLineRawString[] = R"(...)";', + "Weird number of spaces at line-start. " + "Are you using a 2-space indent? [whitespace/indent] [3]", + ) + + def testSectionIndent(self): + self.TestMultiLineLint( + """ class A { public: // no warning private: // warning here };""", - 'private: should be indented +1 space inside class A' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - """ + "private: should be indented +1 space inside class A [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + """ class B { public: // no warning template<> struct C { @@ -3894,251 +4350,272 @@ class B { protected: // no warning }; };""", - 'public: should be indented +1 space inside struct C' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - """ + "public: should be indented +1 space inside struct C [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + """ struct D { };""", - 'Closing brace should be aligned with beginning of struct D' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - """ + "Closing brace should be aligned with beginning of struct D [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + """ template class F { };""", - 'Closing brace should be aligned with beginning of class F' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - """ + "Closing brace should be aligned with beginning of class F [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + """ class G { Q_OBJECT public slots: signals: };""", - ['public slots: should be indented +1 space inside class G' - ' [whitespace/indent] [3]', - 'signals: should be indented +1 space inside class G' - ' [whitespace/indent] [3]']) - self.TestMultiLineLint( - """ + [ + "public slots: should be indented +1 space inside class G [whitespace/indent] [3]", + "signals: should be indented +1 space inside class G [whitespace/indent] [3]", + ], + ) + self.TestMultiLineLint( + """ class H { /* comments */ class I { public: // no warning private: // warning here }; };""", - 'private: should be indented +1 space inside class I' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - """ + "private: should be indented +1 space inside class I [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + """ class J : public ::K { public: // no warning protected: // warning here };""", - 'protected: should be indented +1 space inside class J' - ' [whitespace/indent] [3]') - self.TestMultiLineLint( - """ + "protected: should be indented +1 space inside class J [whitespace/indent] [3]", + ) + self.TestMultiLineLint( + """ class L : public M, public ::N { };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ template static void Func() { }""", - '') + "", + ) - def testConditionals(self): - self.TestMultiLineLint( - """ + def testConditionals(self): + self.TestMultiLineLint( + """ if (foo) goto fail; goto fail;""", - 'If/else bodies with multiple statements require braces' - ' [readability/braces] [4]') - self.TestMultiLineLint( - """ + "If/else bodies with multiple statements require braces [readability/braces] [4]", + ) + self.TestMultiLineLint( + """ if (foo) goto fail; goto fail;""", - 'If/else bodies with multiple statements require braces' - ' [readability/braces] [4]') - self.TestMultiLineLint( - """ + "If/else bodies with multiple statements require braces [readability/braces] [4]", + ) + self.TestMultiLineLint( + """ if (foo) foo; else goto fail; goto fail;""", - 'If/else bodies with multiple statements require braces' - ' [readability/braces] [4]') - self.TestMultiLineLint( - """ + "If/else bodies with multiple statements require braces [readability/braces] [4]", + ) + self.TestMultiLineLint( + """ if (foo) goto fail; goto fail;""", - 'If/else bodies with multiple statements require braces' - ' [readability/braces] [4]') - self.TestMultiLineLint( - """ + "If/else bodies with multiple statements require braces [readability/braces] [4]", + ) + self.TestMultiLineLint( + """ if constexpr (foo) { goto fail; goto fail; } else if constexpr (bar) { hello(); }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo) if (bar) baz; else qux;""", - 'Else clause should be indented at the same level as if. Ambiguous' - ' nested if/else chains require braces. [readability/braces] [4]') - self.TestMultiLineLint( - """ + "Else clause should be indented at the same level as if. Ambiguous" + " nested if/else chains require braces. [readability/braces] [4]", + ) + self.TestMultiLineLint( + """ if (foo) if (bar) baz; else qux;""", - 'Else clause should be indented at the same level as if. Ambiguous' - ' nested if/else chains require braces. [readability/braces] [4]') - self.TestMultiLineLint( - """ + "Else clause should be indented at the same level as if. Ambiguous" + " nested if/else chains require braces. [readability/braces] [4]", + ) + self.TestMultiLineLint( + """ if (foo) { bar; baz; } else qux;""", - 'If an else has a brace on one side, it should have it on both' - ' [readability/braces] [5]') - self.TestMultiLineLint( - """ + "If an else has a brace on one side, it should have it on both" + " [readability/braces] [5]", + ) + self.TestMultiLineLint( + """ if (foo) bar; else { baz; }""", - 'If an else has a brace on one side, it should have it on both' - ' [readability/braces] [5]') - self.TestMultiLineLint( - """ + "If an else has a brace on one side, it should have it on both" + " [readability/braces] [5]", + ) + self.TestMultiLineLint( + """ if (foo) bar; else if (baz) { qux; }""", - 'If an else has a brace on one side, it should have it on both' - ' [readability/braces] [5]') - self.TestMultiLineLint( - """ + "If an else has a brace on one side, it should have it on both" + " [readability/braces] [5]", + ) + self.TestMultiLineLint( + """ if (foo) { bar; } else if (baz) qux;""", - 'If an else has a brace on one side, it should have it on both' - ' [readability/braces] [5]') - self.TestMultiLineLint( - """ + "If an else has a brace on one side, it should have it on both" + " [readability/braces] [5]", + ) + self.TestMultiLineLint( + """ if (foo) goto fail; bar;""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo && bar) { baz; qux; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo) goto fail;""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo) bar; else baz; qux;""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ for (;;) { if (foo) bar; else baz; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo) bar; else if (baz) baz;""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo) bar; else baz;""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo) { bar; } else { baz; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ if (foo) { bar; } else if (baz) { qux; }""", - '') - # Note: this is an error for a different reason, but should not trigger the - # single-line if error. - self.TestMultiLineLint( - """ + "", + ) + # Note: this is an error for a different reason, but should not trigger the + # single-line if error. + self.TestMultiLineLint( + """ if (foo) { bar; baz; }""", - '{ should almost always be at the end of the previous line' - ' [whitespace/braces] [4]') - self.TestMultiLineLint( - """ + "{ should almost always be at the end of the previous line [whitespace/braces] [4]", + ) + self.TestMultiLineLint( + """ void foo() { if (bar) baz; }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ #if foo bar; #else baz; qux; #endif""", - '') - self.TestMultiLineLint( - """void F() { + "", + ) + self.TestMultiLineLint( + """void F() { variable = [] { if (true); }; variable = [] { if (true); }; @@ -4146,480 +4623,507 @@ def testConditionals(self): [] { if (true); }, [] { if (true); }); }""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ #if(A == 0) foo(); #elif(A == 1) bar(); #endif""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ #if (A == 0) foo(); #elif (A == 1) bar(); #endif""", - '') - - @parameterized.expand(['else if', 'if', 'while', 'for', 'switch']) - def testControlClauseWithParensNewline(self, keyword): - # The % 2 part is pseudorandom whitespace-support testing - self.TestLintContains( - f'{keyword}{["", " "][len(keyword) % 2]}(condition)' - f'{[" ", ""][len(keyword) % 2]}[[unlikely]]' - f'{[" ", ""][len(keyword) % 2]}{{' - f'{["", " "][len(keyword) % 2]}do_something(); }}', - f'Controlled statements inside brackets of {keyword} clause' - f' should be on a separate line [whitespace/newline] [5]' - ) - - @parameterized.expand(['else', 'do', 'try']) - def testControlClauseWithoutParensNewline(self, keyword): - # The % 2 part is pseudorandom whitespace-support testing - self.TestLintContains( - f'{keyword}{["", " "][len(keyword) % 2]}{{' - f'{[" ", ""][len(keyword) % 2]}do_something(); }}', - f'Controlled statements inside brackets of {keyword} clause' - f' should be on a separate line [whitespace/newline] [5]' - ) - - def testControlClauseNewlineNameFalsePositives(self): - self.TestLint(' else if_condition_do_something();', '') - self.TestLint(' } else if (blah) {', '') - self.TestLint(' variable_ends_in_else = true;', '') - - def testTab(self): - self.TestLint('\tint a;', - 'Tab found; better to use spaces [whitespace/tab] [1]') - self.TestLint('int a = 5;\t\t// set a to 5', - 'Tab found; better to use spaces [whitespace/tab] [1]') - - def testParseArguments(self): - old_output_format = cpplint._cpplint_state.output_format - old_verbose_level = cpplint._cpplint_state.verbose_level - old_headers = cpplint._hpp_headers - old_filters = cpplint._cpplint_state.filters - old_line_length = cpplint._line_length - old_valid_extensions = cpplint._valid_extensions - try: - # Don't print usage during the tests, or filter categories - sys.stdout = open(os.devnull, 'w') - sys.stderr = open(os.devnull, 'w') - - self.assertRaises(SystemExit, cpplint.ParseArguments, []) - self.assertRaises(SystemExit, cpplint.ParseArguments, ['--badopt']) - self.assertRaises(SystemExit, cpplint.ParseArguments, ['--help']) - self.assertRaises(SystemExit, cpplint.ParseArguments, ['--version']) - self.assertRaises(SystemExit, cpplint.ParseArguments, ['--v=0']) - self.assertRaises(SystemExit, cpplint.ParseArguments, ['--filter=']) - # This is illegal because all filters must start with + or - - self.assertRaises(SystemExit, cpplint.ParseArguments, ['--filter=foo']) - self.assertRaises(SystemExit, cpplint.ParseArguments, - ['--filter=+a,b,-c']) - self.assertRaises(SystemExit, cpplint.ParseArguments, ['--headers']) - - self.assertEqual(['foo.cc'], cpplint.ParseArguments(['foo.cc'])) - self.assertEqual(old_output_format, cpplint._cpplint_state.output_format) - self.assertEqual(old_verbose_level, cpplint._cpplint_state.verbose_level) - - self.assertEqual(['foo.cc'], - cpplint.ParseArguments(['--v=1', 'foo.cc'])) - self.assertEqual(1, cpplint._cpplint_state.verbose_level) - self.assertEqual(['foo.h'], - cpplint.ParseArguments(['--v=3', 'foo.h'])) - self.assertEqual(3, cpplint._cpplint_state.verbose_level) - self.assertEqual(['foo.cpp'], - cpplint.ParseArguments(['--verbose=5', 'foo.cpp'])) - self.assertEqual(5, cpplint._cpplint_state.verbose_level) - self.assertRaises(ValueError, - cpplint.ParseArguments, ['--v=f', 'foo.cc']) - - self.assertEqual(['foo.cc'], - cpplint.ParseArguments(['--output=emacs', 'foo.cc'])) - self.assertEqual('emacs', cpplint._cpplint_state.output_format) - self.assertEqual(['foo.h'], - cpplint.ParseArguments(['--output=vs7', 'foo.h'])) - self.assertEqual('vs7', cpplint._cpplint_state.output_format) - self.assertRaises(SystemExit, - cpplint.ParseArguments, ['--output=blah', 'foo.cc']) - - filt = '-,+whitespace,-whitespace/indent' - self.assertEqual(['foo.h'], - cpplint.ParseArguments(['--filter='+filt, 'foo.h'])) - self.assertEqual(['-', '+whitespace', '-whitespace/indent'], - cpplint._cpplint_state.filters) - - self.assertEqual(['foo.cc', 'foo.h'], - cpplint.ParseArguments(['foo.cc', 'foo.h'])) - - cpplint._hpp_headers = old_headers - cpplint._valid_extensions = old_valid_extensions - self.assertEqual(['foo.h'], - cpplint.ParseArguments(['--linelength=120', 'foo.h'])) - self.assertEqual(120, cpplint._line_length) - self.assertEqual({'h', 'hh', 'hpp', 'hxx', 'h++', 'cuh'}, cpplint.GetHeaderExtensions()) # Default value - - cpplint._hpp_headers = old_headers - cpplint._valid_extensions = old_valid_extensions - self.assertEqual(['foo.h'], - cpplint.ParseArguments(['--headers=h', 'foo.h'])) - self.assertEqual({'h', 'c', 'cc', 'cpp', 'cxx', 'c++', 'cu'}, cpplint.GetAllExtensions()) - - cpplint._hpp_headers = old_headers - cpplint._valid_extensions = old_valid_extensions - self.assertEqual(['foo.h'], - cpplint.ParseArguments(['--extensions=hpp,cpp,cpp', 'foo.h'])) - self.assertEqual({'hpp', 'cpp'}, cpplint.GetAllExtensions()) - self.assertEqual({'hpp'}, cpplint.GetHeaderExtensions()) - - cpplint._hpp_headers = old_headers - cpplint._valid_extensions = old_valid_extensions - self.assertEqual(['foo.h'], - cpplint.ParseArguments(['--extensions=cpp,cpp', '--headers=hpp,h', 'foo.h'])) - self.assertEqual({'hpp', 'h'}, cpplint.GetHeaderExtensions()) - self.assertEqual({'hpp', 'h', 'cpp'}, cpplint.GetAllExtensions()) - - finally: - sys.stdout = sys.__stdout__ - sys.stderr = sys.__stderr__ - cpplint._cpplint_state.output_format = old_output_format - cpplint._cpplint_state.verbose_level = old_verbose_level - cpplint._cpplint_state.filters = old_filters - cpplint._line_length = old_line_length - cpplint._valid_extensions = old_valid_extensions - cpplint._hpp_headers = old_headers - - def testRecursiveArgument(self): - working_dir = os.getcwd() - temp_dir = os.path.realpath(tempfile.mkdtemp()) - try: - src_dir = os.path.join(temp_dir, "src") - nested_dir = os.path.join(temp_dir, "src", "nested") - os.makedirs(nested_dir) - open(os.path.join(temp_dir, "one.cpp"), 'w').close() - open(os.path.join(src_dir, "two.cpp"), 'w').close() - open(os.path.join(nested_dir, "three.cpp"), 'w').close() - os.chdir(temp_dir) - expected = ['one.cpp', os.path.join('src', 'two.cpp'), - os.path.join('src', 'nested', 'three.cpp')] - cpplint._excludes = None - actual = cpplint.ParseArguments(['--recursive', 'one.cpp', 'src']) - self.assertEqual(set(expected), set(actual)) - finally: - os.chdir(working_dir) - shutil.rmtree(temp_dir) - - def testRecursiveExcludeInvalidFileExtension(self): - working_dir = os.getcwd() - temp_dir = os.path.realpath(tempfile.mkdtemp()) - try: - src_dir = os.path.join(temp_dir, "src") - os.makedirs(src_dir) - open(os.path.join(temp_dir, "one.cpp"), 'w').close() - open(os.path.join(src_dir, "two.cpp"), 'w').close() - open(os.path.join(src_dir, "three.cc"), 'w').close() - os.chdir(temp_dir) - expected = ['one.cpp', os.path.join('src', 'two.cpp')] - cpplint._excludes = None - actual = cpplint.ParseArguments(['--recursive', '--extensions=cpp', - 'one.cpp', 'src']) - self.assertEqual(set(expected), set(actual)) - finally: - os.chdir(working_dir) - shutil.rmtree(temp_dir) - cpplint._hpp_headers = set() - cpplint._valid_extensions = set() - - def testRecursiveExclude(self): - working_dir = os.getcwd() - temp_dir = os.path.realpath(tempfile.mkdtemp()) - try: - src_dir = os.path.join(temp_dir, 'src') - src2_dir = os.path.join(temp_dir, 'src2') - os.makedirs(src_dir) - os.makedirs(src2_dir) - open(os.path.join(src_dir, 'one.cc'), 'w').close() - open(os.path.join(src_dir, 'two.cc'), 'w').close() - open(os.path.join(src_dir, 'three.cc'), 'w').close() - open(os.path.join(src2_dir, 'one.cc'), 'w').close() - open(os.path.join(src2_dir, 'two.cc'), 'w').close() - open(os.path.join(src2_dir, 'three.cc'), 'w').close() - os.chdir(temp_dir) - - expected = [ - os.path.join('src', 'one.cc'), - os.path.join('src', 'two.cc'), - os.path.join('src', 'three.cc') - ] - cpplint._excludes = None - actual = cpplint.ParseArguments(['src']) - self.assertEqual({'src'}, set(actual)) - - cpplint._excludes = None - actual = cpplint.ParseArguments(['--recursive', 'src']) - self.assertEqual(set(expected), set(actual)) - - expected = [os.path.join('src', 'one.cc')] - cpplint._excludes = None - actual = cpplint.ParseArguments(['--recursive', - '--exclude=src{0}t*'.format(os.sep), 'src']) - self.assertEqual(set(expected), set(actual)) - - expected = [os.path.join('src', 'one.cc')] - cpplint._excludes = None - actual = cpplint.ParseArguments(['--recursive', - '--exclude=src/two.cc', '--exclude=src/three.cc', 'src']) - self.assertEqual(set(expected), set(actual)) - - expected = { - os.path.join('src2', 'one.cc'), - os.path.join('src2', 'two.cc'), - os.path.join('src2', 'three.cc') - } - cpplint._excludes = None - actual = cpplint.ParseArguments(['--recursive', - '--exclude=src', '.']) - self.assertEqual(expected, set(actual)) - finally: - os.chdir(working_dir) - shutil.rmtree(temp_dir) - - def testJUnitXML(self): - try: - cpplint._cpplint_state._junit_errors = [] - cpplint._cpplint_state._junit_failures = [] - expected = ('\n' - '' - '' - '') - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) - - cpplint._cpplint_state._junit_errors = ['ErrMsg1'] - cpplint._cpplint_state._junit_failures = [] - expected = ('\n' - '' - 'ErrMsg1' - '') - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) - - cpplint._cpplint_state._junit_errors = ['ErrMsg1', 'ErrMsg2'] - cpplint._cpplint_state._junit_failures = [] - expected = ('\n' - '' - 'ErrMsg1\nErrMsg2' - '') - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) - - cpplint._cpplint_state._junit_errors = ['ErrMsg'] - cpplint._cpplint_state._junit_failures = [ - ('File', 5, 'FailMsg', 'category/subcategory', 3)] - expected = ('\n' - '' - 'ErrMsg' - '5: FailMsg [category/subcategory] ' - '[3]') - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) - - cpplint._cpplint_state._junit_errors = [] - cpplint._cpplint_state._junit_failures = [ - ('File1', 5, 'FailMsg1', 'category/subcategory', 3), - ('File2', 99, 'FailMsg2', 'category/subcategory', 3), - ('File1', 19, 'FailMsg3', 'category/subcategory', 3)] - expected = ('\n' - '' - '5: FailMsg1 [category/subcategory]' - ' [3]\n19: FailMsg3 [category/subcategory] [3]' - '99: FailMsg2 ' - '[category/subcategory] [3]') - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) - - cpplint._cpplint_state._junit_errors = ['&'] - cpplint._cpplint_state._junit_failures = [ - ('File1', 5, '&', 'category/subcategory', 3)] - expected = ('\n' - '' - '&</error>' - '5: ' - '&</failure> [category/subcategory] [3]' - '') - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) - - finally: - cpplint._cpplint_state._junit_errors = [] - cpplint._cpplint_state._junit_failures = [] - - def testQuiet(self): - self.assertEqual(cpplint._cpplint_state.quiet, False) - cpplint.ParseArguments(['--quiet', 'one.cpp']) - self.assertEqual(cpplint._cpplint_state.quiet, True) - - def testLineLength(self): - old_line_length = cpplint._line_length - try: - cpplint._line_length = 80 - self.TestLint( - '// H %s' % ('H' * 75), - '') - self.TestLint( - '// H %s' % ('H' * 76), - 'Lines should be <= 80 characters long' - ' [whitespace/line_length] [2]') - cpplint._line_length = 120 - self.TestLint( - '// H %s' % ('H' * 115), - '') - self.TestLint( - '// H %s' % ('H' * 116), - 'Lines should be <= 120 characters long' - ' [whitespace/line_length] [2]') - finally: - cpplint._line_length = old_line_length - - def testFilter(self): - old_filters = cpplint._cpplint_state.filters - try: - cpplint._cpplint_state.SetFilters('-,+whitespace,-whitespace/indent') - self.TestLint( - '// Hello there ', - 'Line ends in whitespace. Consider deleting these extra spaces.' - ' [whitespace/end_of_line] [4]') - self.TestLint('int a = (int)1.0;', '') - self.TestLint(' weird opening space', '') - finally: - cpplint._cpplint_state.filters = old_filters - - def testDefaultFilter(self): - default_filters = cpplint._DEFAULT_FILTERS - old_filters = cpplint._cpplint_state.filters - cpplint._DEFAULT_FILTERS = ['-whitespace'] - try: - # Reset filters - cpplint._cpplint_state.SetFilters('') - self.TestLint('// Hello there ', '') - cpplint._cpplint_state.SetFilters('+whitespace/end_of_line') - self.TestLint( - '// Hello there ', - 'Line ends in whitespace. Consider deleting these extra spaces.' - ' [whitespace/end_of_line] [4]') - self.TestLint(' weird opening space', '') - finally: - cpplint._cpplint_state.filters = old_filters - cpplint._DEFAULT_FILTERS = default_filters - - def testFileSpecificFilter(self): - old_filters = cpplint._cpplint_state.filters - try: - test_code = """ + "", + ) + + @parameterized.expand(["else if", "if", "while", "for", "switch"]) + def testControlClauseWithParensNewline(self, keyword): + # The % 2 part is pseudorandom whitespace-support testing + self.TestLintContains( + f"{keyword}{['', ' '][len(keyword) % 2]}(condition)" + f"{[' ', ''][len(keyword) % 2]}[[unlikely]]" + f"{[' ', ''][len(keyword) % 2]}{{" + f"{['', ' '][len(keyword) % 2]}do_something(); }}", + f"Controlled statements inside brackets of {keyword} clause" + f" should be on a separate line [whitespace/newline] [5]", + ) + + @parameterized.expand(["else", "do", "try"]) + def testControlClauseWithoutParensNewline(self, keyword): + # The % 2 part is pseudorandom whitespace-support testing + self.TestLintContains( + f"{keyword}{['', ' '][len(keyword) % 2]}{{" + f"{[' ', ''][len(keyword) % 2]}do_something(); }}", + f"Controlled statements inside brackets of {keyword} clause" + f" should be on a separate line [whitespace/newline] [5]", + ) + + def testControlClauseNewlineNameFalsePositives(self): + self.TestLint(" else if_condition_do_something();", "") + self.TestLint(" } else if (blah) {", "") + self.TestLint(" variable_ends_in_else = true;", "") + + def testTab(self): + self.TestLint("\tint a;", "Tab found; better to use spaces [whitespace/tab] [1]") + self.TestLint( + "int a = 5;\t\t// set a to 5", "Tab found; better to use spaces [whitespace/tab] [1]" + ) + + def testParseArguments(self): + old_output_format = cpplint._cpplint_state.output_format + old_verbose_level = cpplint._cpplint_state.verbose_level + old_headers = cpplint._hpp_headers + old_filters = cpplint._cpplint_state.filters + old_line_length = cpplint._line_length + old_valid_extensions = cpplint._valid_extensions + try: + # Don't print usage during the tests, or filter categories + sys.stdout = open(os.devnull, "w") + sys.stderr = open(os.devnull, "w") + + self.assertRaises(SystemExit, cpplint.ParseArguments, []) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--badopt"]) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--help"]) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--version"]) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--v=0"]) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--filter="]) + # This is illegal because all filters must start with + or - + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--filter=foo"]) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--filter=+a,b,-c"]) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--headers"]) + + self.assertEqual(["foo.cc"], cpplint.ParseArguments(["foo.cc"])) + self.assertEqual(old_output_format, cpplint._cpplint_state.output_format) + self.assertEqual(old_verbose_level, cpplint._cpplint_state.verbose_level) + + self.assertEqual(["foo.cc"], cpplint.ParseArguments(["--v=1", "foo.cc"])) + self.assertEqual(1, cpplint._cpplint_state.verbose_level) + self.assertEqual(["foo.h"], cpplint.ParseArguments(["--v=3", "foo.h"])) + self.assertEqual(3, cpplint._cpplint_state.verbose_level) + self.assertEqual(["foo.cpp"], cpplint.ParseArguments(["--verbose=5", "foo.cpp"])) + self.assertEqual(5, cpplint._cpplint_state.verbose_level) + self.assertRaises(ValueError, cpplint.ParseArguments, ["--v=f", "foo.cc"]) + + self.assertEqual(["foo.cc"], cpplint.ParseArguments(["--output=emacs", "foo.cc"])) + self.assertEqual("emacs", cpplint._cpplint_state.output_format) + self.assertEqual(["foo.h"], cpplint.ParseArguments(["--output=vs7", "foo.h"])) + self.assertEqual("vs7", cpplint._cpplint_state.output_format) + self.assertRaises(SystemExit, cpplint.ParseArguments, ["--output=blah", "foo.cc"]) + + filt = "-,+whitespace,-whitespace/indent" + self.assertEqual(["foo.h"], cpplint.ParseArguments(["--filter=" + filt, "foo.h"])) + self.assertEqual( + ["-", "+whitespace", "-whitespace/indent"], cpplint._cpplint_state.filters + ) + + self.assertEqual(["foo.cc", "foo.h"], cpplint.ParseArguments(["foo.cc", "foo.h"])) + + cpplint._hpp_headers = old_headers + cpplint._valid_extensions = old_valid_extensions + self.assertEqual(["foo.h"], cpplint.ParseArguments(["--linelength=120", "foo.h"])) + self.assertEqual(120, cpplint._line_length) + self.assertEqual( + {"h", "hh", "hpp", "hxx", "h++", "cuh"}, cpplint.GetHeaderExtensions() + ) # Default value + + cpplint._hpp_headers = old_headers + cpplint._valid_extensions = old_valid_extensions + self.assertEqual(["foo.h"], cpplint.ParseArguments(["--headers=h", "foo.h"])) + self.assertEqual( + {"h", "c", "cc", "cpp", "cxx", "c++", "cu"}, cpplint.GetAllExtensions() + ) + + cpplint._hpp_headers = old_headers + cpplint._valid_extensions = old_valid_extensions + self.assertEqual( + ["foo.h"], cpplint.ParseArguments(["--extensions=hpp,cpp,cpp", "foo.h"]) + ) + self.assertEqual({"hpp", "cpp"}, cpplint.GetAllExtensions()) + self.assertEqual({"hpp"}, cpplint.GetHeaderExtensions()) + + cpplint._hpp_headers = old_headers + cpplint._valid_extensions = old_valid_extensions + self.assertEqual( + ["foo.h"], + cpplint.ParseArguments(["--extensions=cpp,cpp", "--headers=hpp,h", "foo.h"]), + ) + self.assertEqual({"hpp", "h"}, cpplint.GetHeaderExtensions()) + self.assertEqual({"hpp", "h", "cpp"}, cpplint.GetAllExtensions()) + + finally: + sys.stdout = sys.__stdout__ + sys.stderr = sys.__stderr__ + cpplint._cpplint_state.output_format = old_output_format + cpplint._cpplint_state.verbose_level = old_verbose_level + cpplint._cpplint_state.filters = old_filters + cpplint._line_length = old_line_length + cpplint._valid_extensions = old_valid_extensions + cpplint._hpp_headers = old_headers + + def testRecursiveArgument(self): + working_dir = os.getcwd() + temp_dir = os.path.realpath(tempfile.mkdtemp()) + try: + src_dir = os.path.join(temp_dir, "src") + nested_dir = os.path.join(temp_dir, "src", "nested") + os.makedirs(nested_dir) + open(os.path.join(temp_dir, "one.cpp"), "w").close() + open(os.path.join(src_dir, "two.cpp"), "w").close() + open(os.path.join(nested_dir, "three.cpp"), "w").close() + os.chdir(temp_dir) + expected = [ + "one.cpp", + os.path.join("src", "two.cpp"), + os.path.join("src", "nested", "three.cpp"), + ] + cpplint._excludes = None + actual = cpplint.ParseArguments(["--recursive", "one.cpp", "src"]) + self.assertEqual(set(expected), set(actual)) + finally: + os.chdir(working_dir) + shutil.rmtree(temp_dir) + + def testRecursiveExcludeInvalidFileExtension(self): + working_dir = os.getcwd() + temp_dir = os.path.realpath(tempfile.mkdtemp()) + try: + src_dir = os.path.join(temp_dir, "src") + os.makedirs(src_dir) + open(os.path.join(temp_dir, "one.cpp"), "w").close() + open(os.path.join(src_dir, "two.cpp"), "w").close() + open(os.path.join(src_dir, "three.cc"), "w").close() + os.chdir(temp_dir) + expected = ["one.cpp", os.path.join("src", "two.cpp")] + cpplint._excludes = None + actual = cpplint.ParseArguments(["--recursive", "--extensions=cpp", "one.cpp", "src"]) + self.assertEqual(set(expected), set(actual)) + finally: + os.chdir(working_dir) + shutil.rmtree(temp_dir) + cpplint._hpp_headers = set() + cpplint._valid_extensions = set() + + def testRecursiveExclude(self): + working_dir = os.getcwd() + temp_dir = os.path.realpath(tempfile.mkdtemp()) + try: + src_dir = os.path.join(temp_dir, "src") + src2_dir = os.path.join(temp_dir, "src2") + os.makedirs(src_dir) + os.makedirs(src2_dir) + open(os.path.join(src_dir, "one.cc"), "w").close() + open(os.path.join(src_dir, "two.cc"), "w").close() + open(os.path.join(src_dir, "three.cc"), "w").close() + open(os.path.join(src2_dir, "one.cc"), "w").close() + open(os.path.join(src2_dir, "two.cc"), "w").close() + open(os.path.join(src2_dir, "three.cc"), "w").close() + os.chdir(temp_dir) + + expected = [ + os.path.join("src", "one.cc"), + os.path.join("src", "two.cc"), + os.path.join("src", "three.cc"), + ] + cpplint._excludes = None + actual = cpplint.ParseArguments(["src"]) + self.assertEqual({"src"}, set(actual)) + + cpplint._excludes = None + actual = cpplint.ParseArguments(["--recursive", "src"]) + self.assertEqual(set(expected), set(actual)) + + expected = [os.path.join("src", "one.cc")] + cpplint._excludes = None + actual = cpplint.ParseArguments( + ["--recursive", "--exclude=src{0}t*".format(os.sep), "src"] + ) + self.assertEqual(set(expected), set(actual)) + + expected = [os.path.join("src", "one.cc")] + cpplint._excludes = None + actual = cpplint.ParseArguments( + ["--recursive", "--exclude=src/two.cc", "--exclude=src/three.cc", "src"] + ) + self.assertEqual(set(expected), set(actual)) + + expected = { + os.path.join("src2", "one.cc"), + os.path.join("src2", "two.cc"), + os.path.join("src2", "three.cc"), + } + cpplint._excludes = None + actual = cpplint.ParseArguments(["--recursive", "--exclude=src", "."]) + self.assertEqual(expected, set(actual)) + finally: + os.chdir(working_dir) + shutil.rmtree(temp_dir) + + def testJUnitXML(self): + try: + cpplint._cpplint_state._junit_errors = [] + cpplint._cpplint_state._junit_failures = [] + expected = ( + '\n' + '' + '' + "" + ) + self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + + cpplint._cpplint_state._junit_errors = ["ErrMsg1"] + cpplint._cpplint_state._junit_failures = [] + expected = ( + '\n' + '' + 'ErrMsg1' + "" + ) + self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + + cpplint._cpplint_state._junit_errors = ["ErrMsg1", "ErrMsg2"] + cpplint._cpplint_state._junit_failures = [] + expected = ( + '\n' + '' + 'ErrMsg1\nErrMsg2' + "" + ) + self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + + cpplint._cpplint_state._junit_errors = ["ErrMsg"] + cpplint._cpplint_state._junit_failures = [ + ("File", 5, "FailMsg", "category/subcategory", 3) + ] + expected = ( + '\n' + '' + 'ErrMsg' + '5: FailMsg [category/subcategory] ' + "[3]" + ) + self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + + cpplint._cpplint_state._junit_errors = [] + cpplint._cpplint_state._junit_failures = [ + ("File1", 5, "FailMsg1", "category/subcategory", 3), + ("File2", 99, "FailMsg2", "category/subcategory", 3), + ("File1", 19, "FailMsg3", "category/subcategory", 3), + ] + expected = ( + '\n' + '' + '5: FailMsg1 [category/subcategory]' + " [3]\n19: FailMsg3 [category/subcategory] [3]" + '99: FailMsg2 ' + "[category/subcategory] [3]" + ) + self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + + cpplint._cpplint_state._junit_errors = ["&"] + cpplint._cpplint_state._junit_failures = [ + ("File1", 5, "&", "category/subcategory", 3) + ] + expected = ( + '\n' + '' + '&</error>' + '5: ' + "&</failure> [category/subcategory] [3]" + "" + ) + self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + + finally: + cpplint._cpplint_state._junit_errors = [] + cpplint._cpplint_state._junit_failures = [] + + def testQuiet(self): + self.assertEqual(cpplint._cpplint_state.quiet, False) + cpplint.ParseArguments(["--quiet", "one.cpp"]) + self.assertEqual(cpplint._cpplint_state.quiet, True) + + def testLineLength(self): + old_line_length = cpplint._line_length + try: + cpplint._line_length = 80 + self.TestLint("// H %s" % ("H" * 75), "") + self.TestLint( + "// H %s" % ("H" * 76), + "Lines should be <= 80 characters long [whitespace/line_length] [2]", + ) + cpplint._line_length = 120 + self.TestLint("// H %s" % ("H" * 115), "") + self.TestLint( + "// H %s" % ("H" * 116), + "Lines should be <= 120 characters long [whitespace/line_length] [2]", + ) + finally: + cpplint._line_length = old_line_length + + def testFilter(self): + old_filters = cpplint._cpplint_state.filters + try: + cpplint._cpplint_state.SetFilters("-,+whitespace,-whitespace/indent") + self.TestLint( + "// Hello there ", + "Line ends in whitespace. Consider deleting these extra spaces." + " [whitespace/end_of_line] [4]", + ) + self.TestLint("int a = (int)1.0;", "") + self.TestLint(" weird opening space", "") + finally: + cpplint._cpplint_state.filters = old_filters + + def testDefaultFilter(self): + default_filters = cpplint._DEFAULT_FILTERS + old_filters = cpplint._cpplint_state.filters + cpplint._DEFAULT_FILTERS = ["-whitespace"] + try: + # Reset filters + cpplint._cpplint_state.SetFilters("") + self.TestLint("// Hello there ", "") + cpplint._cpplint_state.SetFilters("+whitespace/end_of_line") + self.TestLint( + "// Hello there ", + "Line ends in whitespace. Consider deleting these extra spaces." + " [whitespace/end_of_line] [4]", + ) + self.TestLint(" weird opening space", "") + finally: + cpplint._cpplint_state.filters = old_filters + cpplint._DEFAULT_FILTERS = default_filters + + def testFileSpecificFilter(self): + old_filters = cpplint._cpplint_state.filters + try: + test_code = """ class Foo { Foo(int f) { } };""" - cpplint._cpplint_state.SetFilters('') - self.TestMultiLineLint( - test_code, - ['Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]', - '{ should almost always be at the end of the previous line' - ' [whitespace/braces] [4]'] - ) - - cpplint._cpplint_state.SetFilters('-runtime/explicit:foo.h') - self.TestMultiLineLint( - test_code, - '{ should almost always be at the end of the previous line' - ' [whitespace/braces] [4]' - ) - - cpplint._cpplint_state.SetFilters('-runtime/explicit:foo.h:2') - self.TestMultiLineLint( - test_code, - '{ should almost always be at the end of the previous line' - ' [whitespace/braces] [4]' - ) - - cpplint._cpplint_state.SetFilters('-runtime/explicit:foo.h:14,-whitespace/braces:otherfile.h:3') - self.TestMultiLineLint( - test_code, - ['Single-parameter constructors should be marked explicit.' - ' [runtime/explicit] [4]', - '{ should almost always be at the end of the previous line' - ' [whitespace/braces] [4]'] - ) - - cpplint._cpplint_state.SetFilters('-runtime/explicit:foo.h:2,-whitespace/braces:foo.h:3') - self.TestMultiLineLint( - test_code, - '' - ) - finally: - cpplint._cpplint_state.filters = old_filters - - def testDuplicateHeader(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('path/self.cc', 'cc', - ['// Copyright 2014 Your Company. All Rights Reserved.', - '#include "path/self.h"', - '#include "path/duplicate.h"', - '#include "path/duplicate.h"', - '#ifdef MACRO', - '#include "path/unique.h"', - '#else', - '#include "path/unique.h"', - '#endif', - ''], - error_collector) - self.assertEqual( - ['"path/duplicate.h" already included at path/self.cc:3 ' - '[build/include] [4]'], - error_collector.ResultList()) - - def testUnnamedNamespacesInHeaders(self): - for extension in ['h', 'hpp', 'hxx', 'h++', 'cuh']: - self.doTestUnnamedNamespacesInHeaders(extension) - - def doTestUnnamedNamespacesInHeaders(self, extension): - self.TestLanguageRulesCheck( - 'foo.' + extension, 'namespace {', - 'Do not use unnamed namespaces in header files. See' - ' https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces' - ' for more information. [build/namespaces_headers] [4]') - # namespace registration macros are OK. - self.TestLanguageRulesCheck('foo.' + extension, 'namespace { \\', '') - # named namespaces are OK. - self.TestLanguageRulesCheck('foo.' + extension, 'namespace foo {', '') - self.TestLanguageRulesCheck('foo.' + extension, 'namespace foonamespace {', '') - - def testUnnamedNamespacesInNonHeaders(self): - for extension in ['c', 'cc', 'cpp', 'cxx', 'c++', 'cu']: - self.TestLanguageRulesCheck('foo.' + extension, 'namespace {', '') - self.TestLanguageRulesCheck('foo.' + extension, 'namespace foo {', '') - - def testBuildClass(self): - # Test that the linter can parse to the end of class definitions, - # and that it will report when it can't. - # Don't warn on forward declarations of various types. - self.TestMultiLineLint( - 'class Foo;', - '') - self.TestMultiLineLint( - """struct Foo* + cpplint._cpplint_state.SetFilters("") + self.TestMultiLineLint( + test_code, + [ + "Single-parameter constructors should be marked explicit." + " [runtime/explicit] [4]", + "{ should almost always be at the end of the previous line" + " [whitespace/braces] [4]", + ], + ) + + cpplint._cpplint_state.SetFilters("-runtime/explicit:foo.h") + self.TestMultiLineLint( + test_code, + "{ should almost always be at the end of the previous line" + " [whitespace/braces] [4]", + ) + + cpplint._cpplint_state.SetFilters("-runtime/explicit:foo.h:2") + self.TestMultiLineLint( + test_code, + "{ should almost always be at the end of the previous line" + " [whitespace/braces] [4]", + ) + + cpplint._cpplint_state.SetFilters( + "-runtime/explicit:foo.h:14,-whitespace/braces:otherfile.h:3" + ) + self.TestMultiLineLint( + test_code, + [ + "Single-parameter constructors should be marked explicit." + " [runtime/explicit] [4]", + "{ should almost always be at the end of the previous line" + " [whitespace/braces] [4]", + ], + ) + + cpplint._cpplint_state.SetFilters( + "-runtime/explicit:foo.h:2,-whitespace/braces:foo.h:3" + ) + self.TestMultiLineLint(test_code, "") + finally: + cpplint._cpplint_state.filters = old_filters + + def testDuplicateHeader(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "path/self.cc", + "cc", + [ + "// Copyright 2014 Your Company. All Rights Reserved.", + '#include "path/self.h"', + '#include "path/duplicate.h"', + '#include "path/duplicate.h"', + "#ifdef MACRO", + '#include "path/unique.h"', + "#else", + '#include "path/unique.h"', + "#endif", + "", + ], + error_collector, + ) + self.assertEqual( + ['"path/duplicate.h" already included at path/self.cc:3 [build/include] [4]'], + error_collector.ResultList(), + ) + + def testUnnamedNamespacesInHeaders(self): + for extension in ["h", "hpp", "hxx", "h++", "cuh"]: + self.doTestUnnamedNamespacesInHeaders(extension) + + def doTestUnnamedNamespacesInHeaders(self, extension): + self.TestLanguageRulesCheck( + "foo." + extension, + "namespace {", + "Do not use unnamed namespaces in header files. See" + " https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces" + " for more information. [build/namespaces_headers] [4]", + ) + # namespace registration macros are OK. + self.TestLanguageRulesCheck("foo." + extension, "namespace { \\", "") + # named namespaces are OK. + self.TestLanguageRulesCheck("foo." + extension, "namespace foo {", "") + self.TestLanguageRulesCheck("foo." + extension, "namespace foonamespace {", "") + + def testUnnamedNamespacesInNonHeaders(self): + for extension in ["c", "cc", "cpp", "cxx", "c++", "cu"]: + self.TestLanguageRulesCheck("foo." + extension, "namespace {", "") + self.TestLanguageRulesCheck("foo." + extension, "namespace foo {", "") + + def testBuildClass(self): + # Test that the linter can parse to the end of class definitions, + # and that it will report when it can't. + # Don't warn on forward declarations of various types. + self.TestMultiLineLint("class Foo;", "") + self.TestMultiLineLint( + """struct Foo* foo = NewFoo();""", - '') - # Test preprocessor. - self.TestMultiLineLint( - """#ifdef DERIVE_FROM_GOO + "", + ) + # Test preprocessor. + self.TestMultiLineLint( + """#ifdef DERIVE_FROM_GOO struct Foo : public Goo { #else struct Foo : public Hoo { #endif };""", - '') - self.TestMultiLineLint( - """ + "", + ) + self.TestMultiLineLint( + """ class Foo #ifdef DERIVE_FROM_GOO : public Goo { @@ -4627,2102 +5131,2133 @@ class Foo : public Hoo { #endif };""", - '') - - def testBuildEndComment(self): - # The crosstool compiler we currently use will fail to compile the - # code in this test, so we might consider removing the lint check. - self.TestMultiLineLint( - """#if 0 + "", + ) + + def testBuildEndComment(self): + # The crosstool compiler we currently use will fail to compile the + # code in this test, so we might consider removing the lint check. + self.TestMultiLineLint( + """#if 0 #endif Not a comment""", - 'Uncommented text after #endif is non-standard. Use a comment.' - ' [build/endif_comment] [5]') - - def testBuildForwardDecl(self): - # The crosstool compiler we currently use will fail to compile the - # code in this test, so we might consider removing the lint check. - self.TestLint('class Foo::Goo;', - 'Inner-style forward declarations are invalid.' - ' Remove this line.' - ' [build/forward_decl] [5]') - - def GetBuildHeaderGuardPreprocessorSymbol(self, file_path): - # Figure out the expected header guard by processing an empty file. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', [], error_collector) - for error in error_collector.ResultList(): - matched = re.search( - 'No #ifndef header guard found, suggested CPP variable is: ' - '([A-Z0-9_]+)', - error) - if matched is not None: - return matched.group(1) - return None - - def testBuildHeaderGuard(self): - file_path = 'mydir/foo.h' - expected_guard = self.GetBuildHeaderGuardPreprocessorSymbol(file_path) - self.assertTrue(re.search('MYDIR_FOO_H_$', expected_guard)) - - # No guard at all: expect one error. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', [], error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - 'No #ifndef header guard found, suggested CPP variable is: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # No header guard, but the error is suppressed. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['// Copyright 2014 Your Company.', - '// NOLINT(build/header_guard)', ''], - error_collector) - self.assertEqual([], error_collector.ResultList()) - - # Wrong guard - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef FOO_H', '#define FOO_H'], error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#ifndef header guard has wrong style, please use: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # No define - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s' % expected_guard], error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - 'No #ifndef header guard found, suggested CPP variable is: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # Mismatched define - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s' % expected_guard, - '#define FOO_H'], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - 'No #ifndef header guard found, suggested CPP variable is: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # No endif - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s' % expected_guard, - '#define %s' % expected_guard, - ''], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#endif line should be "#endif // %s"' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # Commentless endif - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s' % expected_guard, - '#define %s' % expected_guard, - '#endif'], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#endif line should be "#endif // %s"' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # Commentless endif for old-style guard - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s_' % expected_guard, - '#define %s_' % expected_guard, - '#endif'], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#endif line should be "#endif // %s"' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # No header guard errors - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s' % expected_guard, - '#define %s' % expected_guard, - '#endif // %s' % expected_guard], - error_collector) - for line in error_collector.ResultList(): - if line.find('build/header_guard') != -1: - self.fail('Unexpected error: %s' % line) - - # No header guard errors for old-style guard - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s_' % expected_guard, - '#define %s_' % expected_guard, - '#endif // %s_' % expected_guard], - error_collector) - for line in error_collector.ResultList(): - if line.find('build/header_guard') != -1: - self.fail('Unexpected error: %s' % line) - - old_verbose_level = cpplint._cpplint_state.verbose_level - try: - cpplint._cpplint_state.verbose_level = 0 - # Warn on old-style guard if verbosity is 0. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef %s_' % expected_guard, - '#define %s_' % expected_guard, - '#endif // %s_' % expected_guard], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#ifndef header guard has wrong style, please use: %s' - ' [build/header_guard] [0]' % expected_guard), - error_collector.ResultList()) - finally: - cpplint._cpplint_state.verbose_level = old_verbose_level - - # Completely incorrect header guard - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef FOO', - '#define FOO', - '#endif // FOO'], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#ifndef header guard has wrong style, please use: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#endif line should be "#endif // %s"' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # incorrect header guard with nolint - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'h', - ['#ifndef FOO // NOLINT', - '#define FOO', - '#endif // FOO NOLINT'], - error_collector) - self.assertEqual( - 0, - error_collector.ResultList().count( - '#ifndef header guard has wrong style, please use: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - self.assertEqual( - 0, - error_collector.ResultList().count( - '#endif line should be "#endif // %s"' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # Special case for flymake - for test_file in ['mydir/foo_flymake.h', 'mydir/.flymake/foo.h']: - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(test_file, 'h', - ['// Copyright 2014 Your Company.', ''], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - 'No #ifndef header guard found, suggested CPP variable is: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - # Cuda guard - file_path = 'mydir/foo.cuh' - expected_guard = self.GetBuildHeaderGuardPreprocessorSymbol(file_path) - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'cuh', - ['#ifndef FOO', - '#define FOO', - '#endif // FOO'], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#ifndef header guard has wrong style, please use: %s' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - self.assertEqual( - 1, - error_collector.ResultList().count( - '#endif line should be "#endif // %s"' - ' [build/header_guard] [5]' % expected_guard), - error_collector.ResultList()) - - def testPragmaOnce(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData('mydir/foo.h', 'h', - ['// Copyright 2014 Your Company.', '#pragma once', ''], - error_collector) - self.assertEqual([], error_collector.ResultList()) - - def testBuildHeaderGuardWithRoot(self): - temp_directory = os.path.realpath(tempfile.mkdtemp()) - try: - test_directory = os.path.join(temp_directory, "test") - os.makedirs(test_directory) - os.makedirs(os.path.join(test_directory, ".svn")) - header_directory = os.path.join(test_directory, "cpplint") - os.makedirs(header_directory) - self.doTestBuildHeaderGuardWithRoot(header_directory) - finally: - shutil.rmtree(temp_directory) - - def doTestBuildHeaderGuardWithRoot(self, header_directory): - - # note: Tested file paths must be real, otherwise - # the repository name lookup will fail. - file_path = os.path.join(header_directory, - 'cpplint_test_header.h') - open(file_path, 'a').close() - file_info = cpplint.FileInfo(file_path) - if file_info.FullName() == file_info.RepositoryName(): - # When FileInfo cannot deduce the root directory of the repository, - # FileInfo.RepositoryName returns the same value as FileInfo.FullName. - # This can happen when this source file was obtained without .svn or - # .git directory. (e.g. using 'svn export' or 'git archive'). - # Skip this test in such a case because --root flag makes sense only - # when the root directory of the repository is properly deduced. - return - - self.assertEqual('CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - # - # test --root flags: - # this changes the cpp header guard prefix - # - - # left-strip the header guard by using a root dir inside of the repo dir. - # relative directory - cpplint._root = 'cpplint' - self.assertEqual('CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - nested_header_directory = os.path.join(header_directory, "nested") - nested_file_path = os.path.join(nested_header_directory, 'cpplint_test_header.h') - os.makedirs(nested_header_directory) - open(nested_file_path, 'a').close() - - cpplint._root = os.path.join('cpplint', 'nested') - actual = cpplint.GetHeaderGuardCPPVariable(nested_file_path) - self.assertEqual('CPPLINT_TEST_HEADER_H_', - actual) - - # absolute directory - # (note that CPPLINT.cfg root=setting is always made absolute) - cpplint._root = header_directory - self.assertEqual('CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - cpplint._root = nested_header_directory - self.assertEqual('CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(nested_file_path)) - - # --root flag is ignored if an non-existent directory is specified. - cpplint._root = 'NON_EXISTENT_DIR' - self.assertEqual('CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - # prepend to the header guard by using a root dir that is more outer - # than the repo dir - - # (using absolute paths) - # (note that CPPLINT.cfg root=setting is always made absolute) - this_files_path = os.path.dirname(os.path.abspath(file_path)) - (styleguide_path, this_files_dir) = os.path.split(this_files_path) - (styleguide_parent_path, styleguide_dir_name) = os.path.split(styleguide_path) - # parent dir of styleguide - cpplint._root = styleguide_parent_path - self.assertIsNotNone(styleguide_parent_path) - # do not hardcode the 'styleguide' repository name, it could be anything. - expected_prefix = re.sub(r'[^a-zA-Z0-9]', '_', styleguide_dir_name).upper() + '_' - # do not have 'styleguide' repo in '/' - self.assertEqual('%sCPPLINT_CPPLINT_TEST_HEADER_H_' % (expected_prefix), - cpplint.GetHeaderGuardCPPVariable(file_path)) - - # To run the 'relative path' tests, we must be in the directory of this test file. - cur_dir = os.getcwd() - os.chdir(this_files_path) - - # (using relative paths) - styleguide_rel_path = os.path.relpath(styleguide_path, this_files_path) - # '..' - cpplint._root = styleguide_rel_path - self.assertEqual('CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - styleguide_rel_path = os.path.relpath(styleguide_parent_path, - this_files_path) # '../..' - cpplint._root = styleguide_rel_path - self.assertEqual('%sCPPLINT_CPPLINT_TEST_HEADER_H_' % (expected_prefix), - cpplint.GetHeaderGuardCPPVariable(file_path)) - - cpplint._root = None - - # Restore previous CWD. - os.chdir(cur_dir) - - def testIncludeItsHeader(self): - temp_directory = os.path.realpath(tempfile.mkdtemp()) - cur_dir = os.getcwd() - try: - test_directory = os.path.join(temp_directory, "test") - os.makedirs(test_directory) - file_path = os.path.join(test_directory, 'foo.h') - open(file_path, 'a').close() - file_path = os.path.join(test_directory, 'Bar.h') - open(file_path, 'a').close() - - os.chdir(temp_directory) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'test/foo.cc', 'cc', - [''], - error_collector) - - if platform.system() == 'Windows': - test_directory = test_directory.replace('\\', '/') - expected = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h [build/include] [5]".format( - fn="foo", - dir=test_directory) - self.assertEqual( - 1, - error_collector.Results().count(expected)) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'test/foo.cc', 'cc', - [r'#include "test/foo.h"', - '' - ], - error_collector) - self.assertEqual( - 0, - error_collector.Results().count(expected)) - - # Unix directory aliases are not allowed, and should trigger the - # "include itse header file" error - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'test/foo.cc', 'cc', - [r'#include "./test/foo.h"', - '' - ], - error_collector) - expected = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h{unix_text} [build/include] [5]".format( - fn="foo", - dir=test_directory, - unix_text=". Relative paths like . and .. are not allowed.") - self.assertEqual( - 1, - error_collector.Results().count(expected)) - - # This should continue to work - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'test/Bar.cc', 'cc', - [r'#include "test/Bar.h"', - '' - ], - error_collector) - expected = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h [build/include] [5]".format( - fn="Bar", - dir=test_directory) - self.assertEqual( - 0, - error_collector.Results().count(expected)) - - # Since Bar.cc & Bar.h look 3rd party-ish, it should be ok without the include dir - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'test/Bar.cc', 'cc', - [r'#include "Bar.h"', - '' - ], - error_collector) - self.assertEqual( - 0, - error_collector.Results().count(expected)) - - # Test edge case in which multiple files have the same base name - open(os.path.join(test_directory, 'foo.hpp'), 'a').close() - cpplint.ProcessFileData( - 'test/foo.cc', 'cc', - [r'#include "foo.hpp"', - '' - ], - error_collector) - self.assertEqual( - 0, - error_collector.Results().count(expected)) - - finally: - # Restore previous CWD. - os.chdir(cur_dir) - shutil.rmtree(temp_directory) - - def testPathSplitToList(self): - self.assertEqual([''], - cpplint.PathSplitToList(os.path.join(''))) - - self.assertEqual(['.'], - cpplint.PathSplitToList(os.path.join('.'))) - - self.assertEqual(['..'], - cpplint.PathSplitToList(os.path.join('..'))) - - self.assertEqual(['..', 'a', 'b'], - cpplint.PathSplitToList(os.path.join('..', 'a', 'b'))) - - self.assertEqual(['a', 'b', 'c', 'd'], - cpplint.PathSplitToList(os.path.join('a', 'b', 'c', 'd'))) - - def testBuildHeaderGuardWithRepository(self): - temp_directory = os.path.realpath(tempfile.mkdtemp()) - temp_directory2 = os.path.realpath(tempfile.mkdtemp()) - - # On Windows, os.path.relpath fails when the input is on - # a different drive than the current drive. - # In GitHub Actions CI, TEMP is set to C: drive, while the - # repository clone is on D: drive. - current_directory = os.getcwd() - try: - os.chdir(temp_directory) - - os.makedirs(os.path.join(temp_directory, ".svn")) - trunk_dir = os.path.join(temp_directory, "trunk") - os.makedirs(trunk_dir) - header_directory = os.path.join(trunk_dir, "cpplint") - os.makedirs(header_directory) - file_path = os.path.join(header_directory, 'cpplint_test_header.h') - open(file_path, 'a').close() - - # search for .svn if _repository is not specified - self.assertEqual('TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - # use the provided repository root for header guards - cpplint._repository = os.path.relpath(trunk_dir) - self.assertEqual('CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - cpplint._repository = os.path.abspath(trunk_dir) - self.assertEqual('CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - # ignore _repository if it doesn't exist - cpplint._repository = os.path.join(temp_directory, 'NON_EXISTENT') - self.assertEqual('TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - # ignore _repository if it exists but file isn't in it - cpplint._repository = os.path.relpath(temp_directory2) - self.assertEqual('TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - # _root should be relative to _repository - cpplint._repository = os.path.relpath(trunk_dir) - cpplint._root = 'cpplint' - self.assertEqual('CPPLINT_TEST_HEADER_H_', - cpplint.GetHeaderGuardCPPVariable(file_path)) - - finally: - os.chdir(current_directory) - shutil.rmtree(temp_directory) - shutil.rmtree(temp_directory2) - cpplint._repository = None - cpplint._root = None - - def testBuildInclude(self): - # Test that include statements have slashes in them. - self.TestLint('#include "foo.h"', - 'Include the directory when naming header files' - ' [build/include_subdir] [4]') - self.TestLint('#include "bar.hh"', - 'Include the directory when naming header files' - ' [build/include_subdir] [4]') - self.TestLint('#include "baz.aa"', '') - self.TestLint('#include "dir/foo.h"', '') - self.TestLint('#include "Python.h"', '') - self.TestLint('#include "lua.h"', '') - - def testHppInclude(self): - code = '\n'.join([ - '#include ', - '#include ' - ]) - self.TestLanguageRulesCheck('foo.h', code, '') - - def testBuildPrintfFormat(self): - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - [r'printf("\%%d", value);', - r'snprintf(buffer, sizeof(buffer), "\[%d", value);', - r'fprintf(file, "\(%d", value);', - r'vsnprintf(buffer, sizeof(buffer), "\\\{%d", ap);'], - error_collector) - self.assertEqual( - 4, - error_collector.Results().count( - '%, [, (, and { are undefined character escapes. Unescape them.' - ' [build/printf_format] [3]')) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - 'foo.cc', 'cc', - ['// Copyright 2014 Your Company.', - '#include ', - r'printf("\\%%%d", value);', - r'printf(R"(\[)");', - r'printf(R"(\[%s)", R"(\])");', - ''], - error_collector) - self.assertEqual('', error_collector.Results()) - - def testRuntimePrintfFormat(self): - self.TestLint( - r'fprintf(file, "%q", value);', - '%q in format strings is deprecated. Use %ll instead.' - ' [runtime/printf_format] [3]') - - self.TestLint( - r'aprintf(file, "The number is %12q", value);', - '%q in format strings is deprecated. Use %ll instead.' - ' [runtime/printf_format] [3]') - - self.TestLint( - r'printf(file, "The number is" "%-12q", value);', - '%q in format strings is deprecated. Use %ll instead.' - ' [runtime/printf_format] [3]') - - self.TestLint( - r'printf(file, "The number is" "%+12q", value);', - '%q in format strings is deprecated. Use %ll instead.' - ' [runtime/printf_format] [3]') - - self.TestLint( - r'printf(file, "The number is" "% 12q", value);', - '%q in format strings is deprecated. Use %ll instead.' - ' [runtime/printf_format] [3]') - - self.TestLint( - r'snprintf(file, "Never mix %d and %1$d parameters!", value);', - '%N$ formats are unconventional. Try rewriting to avoid them.' - ' [runtime/printf_format] [2]') - - def TestLintLogCodeOnError(self, code, expected_message): - # Special TestLint which logs the input code on error. - result = self.PerformSingleLineLint(code) - if result != expected_message: - self.fail('For code: "%s"\nGot: "%s"\nExpected: "%s"' - % (code, result, expected_message)) - - def testBuildStorageClass(self): - qualifiers = [None, 'const', 'volatile'] - signs = [None, 'signed', 'unsigned'] - types = ['void', 'char', 'int', 'float', 'double', - 'schar', 'int8_t', 'uint8_t', 'int16_t', 'uint16_t', - 'int32_t', 'uint32_t', 'int64_t', 'uint64_t'] - storage_classes = ['extern', 'register', 'static', 'typedef'] - - build_storage_class_error_message = ( - 'Storage-class specifier (static, extern, typedef, etc) should be ' - 'at the beginning of the declaration. [build/storage_class] [5]') - - # Some explicit cases. Legal in C++, deprecated in C99. - self.TestLint('const int static foo = 5;', - build_storage_class_error_message) - - self.TestLint('char static foo;', - build_storage_class_error_message) - - self.TestLint('double const static foo = 2.0;', - build_storage_class_error_message) - - self.TestLint('uint64_t typedef unsigned_long_long;', - build_storage_class_error_message) - - self.TestLint('int register foo = 0;', - build_storage_class_error_message) - - # Since there are a very large number of possibilities, randomly - # construct declarations. - # Make sure that the declaration is logged if there's an error. - # Seed generator with an integer for absolute reproducibility. - random.seed(25) - for _i in range(10): - # Build up random list of non-storage-class declaration specs. - other_decl_specs = [random.choice(qualifiers), random.choice(signs), - random.choice(types)] - # remove None - other_decl_specs = [x for x in other_decl_specs if x is not None] - - # shuffle - random.shuffle(other_decl_specs) - - # insert storage class after the first - storage_class = random.choice(storage_classes) - insertion_point = random.randint(1, len(other_decl_specs)) - decl_specs = (other_decl_specs[0:insertion_point] - + [storage_class] - + other_decl_specs[insertion_point:]) - - self.TestLintLogCodeOnError( - ' '.join(decl_specs) + ';', - build_storage_class_error_message) - - # but no error if storage class is first - self.TestLintLogCodeOnError( - storage_class + ' ' + ' '.join(other_decl_specs), - '') - - def testLegalCopyright(self): - legal_copyright_message = ( - 'No copyright message found. ' - 'You should have a line: "Copyright [year] "' - ' [legal/copyright] [5]') - - copyright_line = '// Copyright 2014 Google Inc. All Rights Reserved.' - - file_path = 'mydir/googleclient/foo.cc' - - # There should be a copyright message in the first 10 lines - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'cc', [], error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count(legal_copyright_message)) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - file_path, 'cc', - ['' for unused_i in range(10)] + [copyright_line], - error_collector) - self.assertEqual( - 1, - error_collector.ResultList().count(legal_copyright_message)) - - # Test that warning isn't issued if Copyright line appears early enough. - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(file_path, 'cc', [copyright_line], error_collector) - for message in error_collector.ResultList(): - if message.find('legal/copyright') != -1: - self.fail('Unexpected error: %s' % message) - - error_collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData( - file_path, 'cc', - ['' for unused_i in range(9)] + [copyright_line], - error_collector) - for message in error_collector.ResultList(): - if message.find('legal/copyright') != -1: - self.fail('Unexpected error: %s' % message) - - def testInvalidIncrement(self): - self.TestLint('*count++;', - 'Changing pointer instead of value (or unused value of ' - 'operator*). [runtime/invalid_increment] [5]') - - def testSnprintfSize(self): - self.TestLint('vsnprintf(NULL, 0, format)', '') - self.TestLint('snprintf(fisk, 1, format)', - 'If you can, use sizeof(fisk) instead of 1 as the 2nd arg ' - 'to snprintf. [runtime/printf] [3]') -class CxxTest(CpplintTestBase): + "Uncommented text after #endif is non-standard. Use a comment." + " [build/endif_comment] [5]", + ) + + def testBuildForwardDecl(self): + # The crosstool compiler we currently use will fail to compile the + # code in this test, so we might consider removing the lint check. + self.TestLint( + "class Foo::Goo;", + "Inner-style forward declarations are invalid." + " Remove this line." + " [build/forward_decl] [5]", + ) + + def GetBuildHeaderGuardPreprocessorSymbol(self, file_path): + # Figure out the expected header guard by processing an empty file. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData(file_path, "h", [], error_collector) + for error in error_collector.ResultList(): + matched = re.search( + "No #ifndef header guard found, suggested CPP variable is: ([A-Z0-9_]+)", error + ) + if matched is not None: + return matched.group(1) + return None + + def testBuildHeaderGuard(self): + file_path = "mydir/foo.h" + expected_guard = self.GetBuildHeaderGuardPreprocessorSymbol(file_path) + self.assertTrue(re.search("MYDIR_FOO_H_$", expected_guard)) + + # No guard at all: expect one error. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData(file_path, "h", [], error_collector) + self.assertEqual( + 1, + error_collector.ResultList().count( + "No #ifndef header guard found, suggested CPP variable is: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + + # No header guard, but the error is suppressed. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + ["// Copyright 2014 Your Company.", "// NOLINT(build/header_guard)", ""], + error_collector, + ) + self.assertEqual([], error_collector.ResultList()) + + # Wrong guard + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData(file_path, "h", ["#ifndef FOO_H", "#define FOO_H"], error_collector) + self.assertEqual( + 1, + error_collector.ResultList().count( + "#ifndef header guard has wrong style, please use: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + + # No define + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData(file_path, "h", ["#ifndef %s" % expected_guard], error_collector) + self.assertEqual( + 1, + error_collector.ResultList().count( + "No #ifndef header guard found, suggested CPP variable is: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + + # Mismatched define + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, "h", ["#ifndef %s" % expected_guard, "#define FOO_H"], error_collector + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + "No #ifndef header guard found, suggested CPP variable is: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + + # No endif + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + ["#ifndef %s" % expected_guard, "#define %s" % expected_guard, ""], + error_collector, + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard + ), + error_collector.ResultList(), + ) + + # Commentless endif + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + ["#ifndef %s" % expected_guard, "#define %s" % expected_guard, "#endif"], + error_collector, + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard + ), + error_collector.ResultList(), + ) + + # Commentless endif for old-style guard + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + ["#ifndef %s_" % expected_guard, "#define %s_" % expected_guard, "#endif"], + error_collector, + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard + ), + error_collector.ResultList(), + ) + + # No header guard errors + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + [ + "#ifndef %s" % expected_guard, + "#define %s" % expected_guard, + "#endif // %s" % expected_guard, + ], + error_collector, + ) + for line in error_collector.ResultList(): + if line.find("build/header_guard") != -1: + self.fail("Unexpected error: %s" % line) + + # No header guard errors for old-style guard + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + [ + "#ifndef %s_" % expected_guard, + "#define %s_" % expected_guard, + "#endif // %s_" % expected_guard, + ], + error_collector, + ) + for line in error_collector.ResultList(): + if line.find("build/header_guard") != -1: + self.fail("Unexpected error: %s" % line) + + old_verbose_level = cpplint._cpplint_state.verbose_level + try: + cpplint._cpplint_state.verbose_level = 0 + # Warn on old-style guard if verbosity is 0. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + [ + "#ifndef %s_" % expected_guard, + "#define %s_" % expected_guard, + "#endif // %s_" % expected_guard, + ], + error_collector, + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + "#ifndef header guard has wrong style, please use: %s" + " [build/header_guard] [0]" % expected_guard + ), + error_collector.ResultList(), + ) + finally: + cpplint._cpplint_state.verbose_level = old_verbose_level + + # Completely incorrect header guard + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, "h", ["#ifndef FOO", "#define FOO", "#endif // FOO"], error_collector + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + "#ifndef header guard has wrong style, please use: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard + ), + error_collector.ResultList(), + ) + + # incorrect header guard with nolint + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, + "h", + ["#ifndef FOO // NOLINT", "#define FOO", "#endif // FOO NOLINT"], + error_collector, + ) + self.assertEqual( + 0, + error_collector.ResultList().count( + "#ifndef header guard has wrong style, please use: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + self.assertEqual( + 0, + error_collector.ResultList().count( + '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard + ), + error_collector.ResultList(), + ) + + # Special case for flymake + for test_file in ["mydir/foo_flymake.h", "mydir/.flymake/foo.h"]: + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + test_file, "h", ["// Copyright 2014 Your Company.", ""], error_collector + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + "No #ifndef header guard found, suggested CPP variable is: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + + # Cuda guard + file_path = "mydir/foo.cuh" + expected_guard = self.GetBuildHeaderGuardPreprocessorSymbol(file_path) + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, "cuh", ["#ifndef FOO", "#define FOO", "#endif // FOO"], error_collector + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + "#ifndef header guard has wrong style, please use: %s" + " [build/header_guard] [5]" % expected_guard + ), + error_collector.ResultList(), + ) + self.assertEqual( + 1, + error_collector.ResultList().count( + '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard + ), + error_collector.ResultList(), + ) + + def testPragmaOnce(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "mydir/foo.h", + "h", + ["// Copyright 2014 Your Company.", "#pragma once", ""], + error_collector, + ) + self.assertEqual([], error_collector.ResultList()) + + def testBuildHeaderGuardWithRoot(self): + temp_directory = os.path.realpath(tempfile.mkdtemp()) + try: + test_directory = os.path.join(temp_directory, "test") + os.makedirs(test_directory) + os.makedirs(os.path.join(test_directory, ".svn")) + header_directory = os.path.join(test_directory, "cpplint") + os.makedirs(header_directory) + self.doTestBuildHeaderGuardWithRoot(header_directory) + finally: + shutil.rmtree(temp_directory) + + def doTestBuildHeaderGuardWithRoot(self, header_directory): + # note: Tested file paths must be real, otherwise + # the repository name lookup will fail. + file_path = os.path.join(header_directory, "cpplint_test_header.h") + open(file_path, "a").close() + file_info = cpplint.FileInfo(file_path) + if file_info.FullName() == file_info.RepositoryName(): + # When FileInfo cannot deduce the root directory of the repository, + # FileInfo.RepositoryName returns the same value as FileInfo.FullName. + # This can happen when this source file was obtained without .svn or + # .git directory. (e.g. using 'svn export' or 'git archive'). + # Skip this test in such a case because --root flag makes sense only + # when the root directory of the repository is properly deduced. + return + + self.assertEqual( + "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + # + # test --root flags: + # this changes the cpp header guard prefix + # + + # left-strip the header guard by using a root dir inside of the repo dir. + # relative directory + cpplint._root = "cpplint" + self.assertEqual("CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path)) + + nested_header_directory = os.path.join(header_directory, "nested") + nested_file_path = os.path.join(nested_header_directory, "cpplint_test_header.h") + os.makedirs(nested_header_directory) + open(nested_file_path, "a").close() + + cpplint._root = os.path.join("cpplint", "nested") + actual = cpplint.GetHeaderGuardCPPVariable(nested_file_path) + self.assertEqual("CPPLINT_TEST_HEADER_H_", actual) + + # absolute directory + # (note that CPPLINT.cfg root=setting is always made absolute) + cpplint._root = header_directory + self.assertEqual("CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path)) + + cpplint._root = nested_header_directory + self.assertEqual( + "CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(nested_file_path) + ) + + # --root flag is ignored if an non-existent directory is specified. + cpplint._root = "NON_EXISTENT_DIR" + self.assertEqual( + "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + + # prepend to the header guard by using a root dir that is more outer + # than the repo dir + + # (using absolute paths) + # (note that CPPLINT.cfg root=setting is always made absolute) + this_files_path = os.path.dirname(os.path.abspath(file_path)) + (styleguide_path, this_files_dir) = os.path.split(this_files_path) + (styleguide_parent_path, styleguide_dir_name) = os.path.split(styleguide_path) + # parent dir of styleguide + cpplint._root = styleguide_parent_path + self.assertIsNotNone(styleguide_parent_path) + # do not hardcode the 'styleguide' repository name, it could be anything. + expected_prefix = re.sub(r"[^a-zA-Z0-9]", "_", styleguide_dir_name).upper() + "_" + # do not have 'styleguide' repo in '/' + self.assertEqual( + "%sCPPLINT_CPPLINT_TEST_HEADER_H_" % (expected_prefix), + cpplint.GetHeaderGuardCPPVariable(file_path), + ) + + # To run the 'relative path' tests, we must be in the directory of this test file. + cur_dir = os.getcwd() + os.chdir(this_files_path) + + # (using relative paths) + styleguide_rel_path = os.path.relpath(styleguide_path, this_files_path) + # '..' + cpplint._root = styleguide_rel_path + self.assertEqual( + "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + + styleguide_rel_path = os.path.relpath(styleguide_parent_path, this_files_path) # '../..' + cpplint._root = styleguide_rel_path + self.assertEqual( + "%sCPPLINT_CPPLINT_TEST_HEADER_H_" % (expected_prefix), + cpplint.GetHeaderGuardCPPVariable(file_path), + ) + + cpplint._root = None + + # Restore previous CWD. + os.chdir(cur_dir) + + def testIncludeItsHeader(self): + temp_directory = os.path.realpath(tempfile.mkdtemp()) + cur_dir = os.getcwd() + try: + test_directory = os.path.join(temp_directory, "test") + os.makedirs(test_directory) + file_path = os.path.join(test_directory, "foo.h") + open(file_path, "a").close() + file_path = os.path.join(test_directory, "Bar.h") + open(file_path, "a").close() + + os.chdir(temp_directory) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData("test/foo.cc", "cc", [""], error_collector) + + if platform.system() == "Windows": + test_directory = test_directory.replace("\\", "/") + fmt = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h [build/include] [5]" + expected = fmt.format(fn="foo", dir=test_directory) + self.assertEqual(1, error_collector.Results().count(expected)) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test/foo.cc", "cc", [r'#include "test/foo.h"', ""], error_collector + ) + self.assertEqual(0, error_collector.Results().count(expected)) + + # Unix directory aliases are not allowed, and should trigger the + # "include itse header file" error + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test/foo.cc", "cc", [r'#include "./test/foo.h"', ""], error_collector + ) + fmt = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h{unix_text}" + expected = ( + fmt.format( + fn="foo", + dir=test_directory, + unix_text=". Relative paths like . and .. are not allowed.", + ) + + " [build/include] [5]" + ) + self.assertEqual(1, error_collector.Results().count(expected)) + + # This should continue to work + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test/Bar.cc", "cc", [r'#include "test/Bar.h"', ""], error_collector + ) + fmt = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h [build/include] [5]" + expected = fmt.format(fn="Bar", dir=test_directory) + self.assertEqual(0, error_collector.Results().count(expected)) + + # Since Bar.cc & Bar.h look 3rd party-ish, it should be ok without the include dir + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData("test/Bar.cc", "cc", [r'#include "Bar.h"', ""], error_collector) + self.assertEqual(0, error_collector.Results().count(expected)) + + # Test edge case in which multiple files have the same base name + open(os.path.join(test_directory, "foo.hpp"), "a").close() + cpplint.ProcessFileData( + "test/foo.cc", "cc", [r'#include "foo.hpp"', ""], error_collector + ) + self.assertEqual(0, error_collector.Results().count(expected)) + + finally: + # Restore previous CWD. + os.chdir(cur_dir) + shutil.rmtree(temp_directory) + + def testPathSplitToList(self): + self.assertEqual([""], cpplint.PathSplitToList(os.path.join(""))) + + self.assertEqual(["."], cpplint.PathSplitToList(os.path.join("."))) + + self.assertEqual([".."], cpplint.PathSplitToList(os.path.join(".."))) + + self.assertEqual(["..", "a", "b"], cpplint.PathSplitToList(os.path.join("..", "a", "b"))) + + self.assertEqual( + ["a", "b", "c", "d"], cpplint.PathSplitToList(os.path.join("a", "b", "c", "d")) + ) + + def testBuildHeaderGuardWithRepository(self): + temp_directory = os.path.realpath(tempfile.mkdtemp()) + temp_directory2 = os.path.realpath(tempfile.mkdtemp()) + + # On Windows, os.path.relpath fails when the input is on + # a different drive than the current drive. + # In GitHub Actions CI, TEMP is set to C: drive, while the + # repository clone is on D: drive. + current_directory = os.getcwd() + try: + os.chdir(temp_directory) + + os.makedirs(os.path.join(temp_directory, ".svn")) + trunk_dir = os.path.join(temp_directory, "trunk") + os.makedirs(trunk_dir) + header_directory = os.path.join(trunk_dir, "cpplint") + os.makedirs(header_directory) + file_path = os.path.join(header_directory, "cpplint_test_header.h") + open(file_path, "a").close() + + # search for .svn if _repository is not specified + self.assertEqual( + "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + + # use the provided repository root for header guards + cpplint._repository = os.path.relpath(trunk_dir) + self.assertEqual( + "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + cpplint._repository = os.path.abspath(trunk_dir) + self.assertEqual( + "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + + # ignore _repository if it doesn't exist + cpplint._repository = os.path.join(temp_directory, "NON_EXISTENT") + self.assertEqual( + "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + + # ignore _repository if it exists but file isn't in it + cpplint._repository = os.path.relpath(temp_directory2) + self.assertEqual( + "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + ) + + # _root should be relative to _repository + cpplint._repository = os.path.relpath(trunk_dir) + cpplint._root = "cpplint" + self.assertEqual("CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path)) + + finally: + os.chdir(current_directory) + shutil.rmtree(temp_directory) + shutil.rmtree(temp_directory2) + cpplint._repository = None + cpplint._root = None + + def testBuildInclude(self): + # Test that include statements have slashes in them. + self.TestLint( + '#include "foo.h"', + "Include the directory when naming header files [build/include_subdir] [4]", + ) + self.TestLint( + '#include "bar.hh"', + "Include the directory when naming header files [build/include_subdir] [4]", + ) + self.TestLint('#include "baz.aa"', "") + self.TestLint('#include "dir/foo.h"', "") + self.TestLint('#include "Python.h"', "") + self.TestLint('#include "lua.h"', "") + + def testHppInclude(self): + code = "\n".join(["#include ", "#include "]) + self.TestLanguageRulesCheck("foo.h", code, "") + + def testBuildPrintfFormat(self): + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + r'printf("\%%d", value);', + r'snprintf(buffer, sizeof(buffer), "\[%d", value);', + r'fprintf(file, "\(%d", value);', + r'vsnprintf(buffer, sizeof(buffer), "\\\{%d", ap);', + ], + error_collector, + ) + self.assertEqual( + 4, + error_collector.Results().count( + "%, [, (, and { are undefined character escapes. Unescape them." + " [build/printf_format] [3]" + ), + ) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "foo.cc", + "cc", + [ + "// Copyright 2014 Your Company.", + "#include ", + r'printf("\\%%%d", value);', + r'printf(R"(\[)");', + r'printf(R"(\[%s)", R"(\])");', + "", + ], + error_collector, + ) + self.assertEqual("", error_collector.Results()) + + def testRuntimePrintfFormat(self): + self.TestLint( + r'fprintf(file, "%q", value);', + "%q in format strings is deprecated. Use %ll instead. [runtime/printf_format] [3]", + ) + + self.TestLint( + r'aprintf(file, "The number is %12q", value);', + "%q in format strings is deprecated. Use %ll instead. [runtime/printf_format] [3]", + ) + + self.TestLint( + r'printf(file, "The number is" "%-12q", value);', + "%q in format strings is deprecated. Use %ll instead. [runtime/printf_format] [3]", + ) + + self.TestLint( + r'printf(file, "The number is" "%+12q", value);', + "%q in format strings is deprecated. Use %ll instead. [runtime/printf_format] [3]", + ) + + self.TestLint( + r'printf(file, "The number is" "% 12q", value);', + "%q in format strings is deprecated. Use %ll instead. [runtime/printf_format] [3]", + ) + + self.TestLint( + r'snprintf(file, "Never mix %d and %1$d parameters!", value);', + "%N$ formats are unconventional. Try rewriting to avoid them." + " [runtime/printf_format] [2]", + ) + + def TestLintLogCodeOnError(self, code, expected_message): + # Special TestLint which logs the input code on error. + result = self.PerformSingleLineLint(code) + if result != expected_message: + self.fail( + 'For code: "%s"\nGot: "%s"\nExpected: "%s"' % (code, result, expected_message) + ) + + def testBuildStorageClass(self): + qualifiers = [None, "const", "volatile"] + signs = [None, "signed", "unsigned"] + types = [ + "void", + "char", + "int", + "float", + "double", + "schar", + "int8_t", + "uint8_t", + "int16_t", + "uint16_t", + "int32_t", + "uint32_t", + "int64_t", + "uint64_t", + ] + storage_classes = ["extern", "register", "static", "typedef"] + + build_storage_class_error_message = ( + "Storage-class specifier (static, extern, typedef, etc) should be " + "at the beginning of the declaration. [build/storage_class] [5]" + ) + + # Some explicit cases. Legal in C++, deprecated in C99. + self.TestLint("const int static foo = 5;", build_storage_class_error_message) + + self.TestLint("char static foo;", build_storage_class_error_message) + + self.TestLint("double const static foo = 2.0;", build_storage_class_error_message) + + self.TestLint("uint64_t typedef unsigned_long_long;", build_storage_class_error_message) + + self.TestLint("int register foo = 0;", build_storage_class_error_message) + + # Since there are a very large number of possibilities, randomly + # construct declarations. + # Make sure that the declaration is logged if there's an error. + # Seed generator with an integer for absolute reproducibility. + random.seed(25) + for _i in range(10): + # Build up random list of non-storage-class declaration specs. + other_decl_specs = [ + random.choice(qualifiers), + random.choice(signs), + random.choice(types), + ] + # remove None + other_decl_specs = [x for x in other_decl_specs if x is not None] + + # shuffle + random.shuffle(other_decl_specs) + + # insert storage class after the first + storage_class = random.choice(storage_classes) + insertion_point = random.randint(1, len(other_decl_specs)) + decl_specs = ( + other_decl_specs[0:insertion_point] + + [storage_class] + + other_decl_specs[insertion_point:] + ) + + self.TestLintLogCodeOnError( + " ".join(decl_specs) + ";", build_storage_class_error_message + ) + + # but no error if storage class is first + self.TestLintLogCodeOnError(storage_class + " " + " ".join(other_decl_specs), "") + + def testLegalCopyright(self): + legal_copyright_message = ( + "No copyright message found. " + 'You should have a line: "Copyright [year] "' + " [legal/copyright] [5]" + ) + + copyright_line = "// Copyright 2014 Google Inc. All Rights Reserved." + + file_path = "mydir/googleclient/foo.cc" + + # There should be a copyright message in the first 10 lines + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData(file_path, "cc", [], error_collector) + self.assertEqual(1, error_collector.ResultList().count(legal_copyright_message)) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, "cc", ["" for unused_i in range(10)] + [copyright_line], error_collector + ) + self.assertEqual(1, error_collector.ResultList().count(legal_copyright_message)) + + # Test that warning isn't issued if Copyright line appears early enough. + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData(file_path, "cc", [copyright_line], error_collector) + for message in error_collector.ResultList(): + if message.find("legal/copyright") != -1: + self.fail("Unexpected error: %s" % message) + + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + file_path, "cc", ["" for unused_i in range(9)] + [copyright_line], error_collector + ) + for message in error_collector.ResultList(): + if message.find("legal/copyright") != -1: + self.fail("Unexpected error: %s" % message) + + def testInvalidIncrement(self): + self.TestLint( + "*count++;", + "Changing pointer instead of value (or unused value of " + "operator*). [runtime/invalid_increment] [5]", + ) + + def testSnprintfSize(self): + self.TestLint("vsnprintf(NULL, 0, format)", "") + self.TestLint( + "snprintf(fisk, 1, format)", + "If you can, use sizeof(fisk) instead of 1 as the 2nd arg " + "to snprintf. [runtime/printf] [3]", + ) - def Helper(self, package, extension, lines, count): - filename = package + '/foo.' + extension - lines = lines[:] - - # Header files need to have an ifdef guard wrapped around their code. - if extension.startswith('h'): - guard = filename.upper().replace('/', '_').replace('.', '_') + '_' - lines.insert(0, '#ifndef ' + guard) - lines.insert(1, '#define ' + guard) - lines.append('#endif // ' + guard) - - # All files need a final blank line. - lines.append('') - - # Process the file and check resulting error count. - collector = ErrorCollector(self.assertTrue) - cpplint.ProcessFileData(filename, extension, lines, collector) - error_list = collector.ResultList() - self.assertEqual(count, len(error_list), error_list) - - def TestCxxFeature(self, code, expected_error): - lines = code.split('\n') - collector = ErrorCollector(self.assertTrue) - cpplint.RemoveMultiLineComments('foo.h', lines, collector) - clean_lines = cpplint.CleansedLines(lines) - cpplint.FlagCxxHeaders('foo.cc', clean_lines, 0, collector) - self.assertEqual(expected_error, collector.Results()) - - def testBlockedHeaders(self): - self.TestCxxFeature('#include ', - ' is an unapproved C++11 header.' - ' [build/c++11] [5]') - self.TestCxxFeature('#include ', - ' is an unapproved C++11 header.' - ' [build/c++11] [5]') - self.TestCxxFeature('#include ', - ' is an unapproved C++17 header.' - ' [build/c++17] [5]') - - def testExplicitMakePair(self): - self.TestLint('make_pair', '') - self.TestLint('make_pair(42, 42)', '') - self.TestLint('make_pair<', - 'For C++11-compatibility, omit template arguments from' - ' make_pair OR use pair directly OR if appropriate,' - ' construct a pair directly' - ' [build/explicit_make_pair] [4]') - self.TestLint('make_pair <', - 'For C++11-compatibility, omit template arguments from' - ' make_pair OR use pair directly OR if appropriate,' - ' construct a pair directly' - ' [build/explicit_make_pair] [4]') - self.TestLint('my_make_pair', '') +class CxxTest(CpplintTestBase): + def Helper(self, package, extension, lines, count): + filename = package + "/foo." + extension + lines = lines[:] + + # Header files need to have an ifdef guard wrapped around their code. + if extension.startswith("h"): + guard = filename.upper().replace("/", "_").replace(".", "_") + "_" + lines.insert(0, "#ifndef " + guard) + lines.insert(1, "#define " + guard) + lines.append("#endif // " + guard) + + # All files need a final blank line. + lines.append("") + + # Process the file and check resulting error count. + collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData(filename, extension, lines, collector) + error_list = collector.ResultList() + self.assertEqual(count, len(error_list), error_list) + + def TestCxxFeature(self, code, expected_error): + lines = code.split("\n") + collector = ErrorCollector(self.assertTrue) + cpplint.RemoveMultiLineComments("foo.h", lines, collector) + clean_lines = cpplint.CleansedLines(lines) + cpplint.FlagCxxHeaders("foo.cc", clean_lines, 0, collector) + self.assertEqual(expected_error, collector.Results()) + + def testBlockedHeaders(self): + self.TestCxxFeature( + "#include ", " is an unapproved C++11 header. [build/c++11] [5]" + ) + self.TestCxxFeature( + "#include ", " is an unapproved C++11 header. [build/c++11] [5]" + ) + self.TestCxxFeature( + "#include ", + " is an unapproved C++17 header. [build/c++17] [5]", + ) + + def testExplicitMakePair(self): + self.TestLint("make_pair", "") + self.TestLint("make_pair(42, 42)", "") + self.TestLint( + "make_pair<", + "For C++11-compatibility, omit template arguments from" + " make_pair OR use pair directly OR if appropriate," + " construct a pair directly" + " [build/explicit_make_pair] [4]", + ) + self.TestLint( + "make_pair <", + "For C++11-compatibility, omit template arguments from" + " make_pair OR use pair directly OR if appropriate," + " construct a pair directly" + " [build/explicit_make_pair] [4]", + ) + self.TestLint("my_make_pair", "") -class CleansedLinesTest(unittest.TestCase): - def testInit(self): - lines = ['Line 1', - 'Line 2', - 'Line 3 // Comment test', - 'Line 4 /* Comment test */', - 'Line 5 "foo"'] - - clean_lines = cpplint.CleansedLines(lines) - self.assertEqual(lines, clean_lines.raw_lines) - self.assertEqual(5, clean_lines.NumLines()) - - self.assertEqual(['Line 1', - 'Line 2', - 'Line 3', - 'Line 4', - 'Line 5 "foo"'], - clean_lines.lines) - - self.assertEqual(['Line 1', - 'Line 2', - 'Line 3', - 'Line 4', - 'Line 5 ""'], - clean_lines.elided) - - def testInitEmpty(self): - clean_lines = cpplint.CleansedLines([]) - self.assertEqual([], clean_lines.raw_lines) - self.assertEqual(0, clean_lines.NumLines()) - - def testCollapseStrings(self): - collapse = cpplint.CleansedLines._CollapseStrings - self.assertEqual('""', collapse('""')) # "" (empty) - self.assertEqual('"""', collapse('"""')) # """ (bad) - self.assertEqual('""', collapse('"xyz"')) # "xyz" (string) - self.assertEqual('""', collapse('"\\\""')) # "\"" (string) - self.assertEqual('""', collapse('"\'"')) # "'" (string) - self.assertEqual('"\"', collapse('"\"')) # "\" (bad) - self.assertEqual('""', collapse('"\\\\"')) # "\\" (string) - self.assertEqual('"', collapse('"\\\\\\"')) # "\\\" (bad) - self.assertEqual('""', collapse('"\\\\\\\\"')) # "\\\\" (string) - - self.assertEqual('\'\'', collapse('\'\'')) # '' (empty) - self.assertEqual('\'\'', collapse('\'a\'')) # 'a' (char) - self.assertEqual('\'\'', collapse('\'\\\'\'')) # '\'' (char) - self.assertEqual('\'', collapse('\'\\\'')) # '\' (bad) - self.assertEqual('', collapse('\\012')) # '\012' (char) - self.assertEqual('', collapse('\\xfF0')) # '\xfF0' (char) - self.assertEqual('', collapse('\\n')) # '\n' (char) - self.assertEqual(r'\#', collapse('\\#')) # '\#' (bad) - - self.assertEqual('"" + ""', collapse('"\'" + "\'"')) - self.assertEqual("'', ''", collapse("'\"', '\"'")) - self.assertEqual('""[0b10]', collapse('"a\'b"[0b1\'0]')) - - self.assertEqual('42', collapse("4'2")) - self.assertEqual('0b0101', collapse("0b0'1'0'1")) - self.assertEqual('1048576', collapse("1'048'576")) - self.assertEqual('0X100000', collapse("0X10'0000")) - self.assertEqual('0004000000', collapse("0'004'000'000")) - self.assertEqual('1.602176565e-19', collapse("1.602'176'565e-19")) - self.assertEqual('\'\' + 0xffff', collapse("'i' + 0xf'f'f'f")) - self.assertEqual('sizeof\'\' == 1', collapse("sizeof'x' == 1")) - self.assertEqual('0x.03p100', collapse('0x.0\'3p1\'0\'0')) - self.assertEqual('123.45', collapse('1\'23.4\'5')) - - self.assertEqual('StringReplace(body, "", "");', - collapse('StringReplace(body, "\\\\", "\\\\\\\\");')) - self.assertEqual('\'\' ""', - collapse('\'"\' "foo"')) +class CleansedLinesTest(unittest.TestCase): + def testInit(self): + lines = [ + "Line 1", + "Line 2", + "Line 3 // Comment test", + "Line 4 /* Comment test */", + 'Line 5 "foo"', + ] + + clean_lines = cpplint.CleansedLines(lines) + self.assertEqual(lines, clean_lines.raw_lines) + self.assertEqual(5, clean_lines.NumLines()) + + self.assertEqual( + ["Line 1", "Line 2", "Line 3", "Line 4", 'Line 5 "foo"'], clean_lines.lines + ) + + self.assertEqual(["Line 1", "Line 2", "Line 3", "Line 4", 'Line 5 ""'], clean_lines.elided) + + def testInitEmpty(self): + clean_lines = cpplint.CleansedLines([]) + self.assertEqual([], clean_lines.raw_lines) + self.assertEqual(0, clean_lines.NumLines()) + + def testCollapseStrings(self): + collapse = cpplint.CleansedLines._CollapseStrings + self.assertEqual('""', collapse('""')) # "" (empty) + self.assertEqual('"""', collapse('"""')) # """ (bad) + self.assertEqual('""', collapse('"xyz"')) # "xyz" (string) + self.assertEqual('""', collapse('"\\""')) # "\"" (string) + self.assertEqual('""', collapse('"\'"')) # "'" (string) + self.assertEqual('""', collapse('""')) # "\" (bad) + self.assertEqual('""', collapse('"\\\\"')) # "\\" (string) + self.assertEqual('"', collapse('"\\\\\\"')) # "\\\" (bad) + self.assertEqual('""', collapse('"\\\\\\\\"')) # "\\\\" (string) + + self.assertEqual("''", collapse("''")) # '' (empty) + self.assertEqual("''", collapse("'a'")) # 'a' (char) + self.assertEqual("''", collapse("'\\''")) # '\'' (char) + self.assertEqual("'", collapse("'\\'")) # '\' (bad) + self.assertEqual("", collapse("\\012")) # '\012' (char) + self.assertEqual("", collapse("\\xfF0")) # '\xfF0' (char) + self.assertEqual("", collapse("\\n")) # '\n' (char) + self.assertEqual(r"\#", collapse("\\#")) # '\#' (bad) + + self.assertEqual('"" + ""', collapse('"\'" + "\'"')) + self.assertEqual("'', ''", collapse("'\"', '\"'")) + self.assertEqual('""[0b10]', collapse("\"a'b\"[0b1'0]")) + + self.assertEqual("42", collapse("4'2")) + self.assertEqual("0b0101", collapse("0b0'1'0'1")) + self.assertEqual("1048576", collapse("1'048'576")) + self.assertEqual("0X100000", collapse("0X10'0000")) + self.assertEqual("0004000000", collapse("0'004'000'000")) + self.assertEqual("1.602176565e-19", collapse("1.602'176'565e-19")) + self.assertEqual("'' + 0xffff", collapse("'i' + 0xf'f'f'f")) + self.assertEqual("sizeof'' == 1", collapse("sizeof'x' == 1")) + self.assertEqual("0x.03p100", collapse("0x.0'3p1'0'0")) + self.assertEqual("123.45", collapse("1'23.4'5")) + + self.assertEqual( + 'StringReplace(body, "", "");', collapse('StringReplace(body, "\\\\", "\\\\\\\\");') + ) + self.assertEqual("'' \"\"", collapse('\'"\' "foo"')) class OrderOfIncludesTest(CpplintTestBase): - - def setUp(self): - CpplintTestBase.setUp(self) - self.include_state = cpplint._IncludeState() - os.path.abspath = lambda value: value - - def testCheckNextIncludeOrder_OtherThenCpp(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._OTHER_HEADER)) - self.assertEqual('Found C++ system header after other header', - self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - - def testCheckNextIncludeOrder_CppThenC(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - self.assertEqual('Found C system header after C++ system header', - self.include_state.CheckNextIncludeOrder( - cpplint._C_SYS_HEADER)) - - def testCheckNextIncludeOrder_OtherSysThenC(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._OTHER_SYS_HEADER)) - self.assertEqual('Found C system header after other system header', - self.include_state.CheckNextIncludeOrder( - cpplint._C_SYS_HEADER)) - - def testCheckNextIncludeOrder_OtherSysThenCpp(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._OTHER_SYS_HEADER)) - self.assertEqual('Found C++ system header after other system header', - self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - - def testCheckNextIncludeOrder_LikelyThenCpp(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._LIKELY_MY_HEADER)) - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - - def testCheckNextIncludeOrder_PossibleThenCpp(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._POSSIBLE_MY_HEADER)) - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - - def testCheckNextIncludeOrder_CppThenLikely(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - # This will eventually fail. - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._LIKELY_MY_HEADER)) - - def testCheckNextIncludeOrder_CppThenPossible(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._POSSIBLE_MY_HEADER)) - - def testCheckNextIncludeOrder_CppThenOtherSys(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._CPP_SYS_HEADER)) - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._OTHER_SYS_HEADER)) - - def testCheckNextIncludeOrder_OtherSysThenPossible(self): - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._OTHER_SYS_HEADER)) - self.assertEqual('', self.include_state.CheckNextIncludeOrder( - cpplint._POSSIBLE_MY_HEADER)) - - - def testClassifyInclude(self): - file_info = cpplint.FileInfo - classify_include = cpplint._ClassifyInclude - self.assertEqual(cpplint._C_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'stdio.h', - True)) - self.assertEqual(cpplint._C_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'sys/time.h', - True)) - self.assertEqual(cpplint._C_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'netipx/ipx.h', - True)) - self.assertEqual(cpplint._C_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'arpa/ftp.h', - True)) - self.assertEqual(cpplint._CPP_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'string', - True)) - self.assertEqual(cpplint._CPP_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'typeinfo', - True)) - self.assertEqual(cpplint._C_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'foo/foo.h', - True)) - self.assertEqual(cpplint._OTHER_SYS_HEADER, - classify_include(file_info('foo/foo.cc'), - 'foo/foo.h', - True, - "standardcfirst")) - self.assertEqual(cpplint._OTHER_HEADER, - classify_include(file_info('foo/foo.cc'), - 'string', - False)) - self.assertEqual(cpplint._OTHER_HEADER, - classify_include(file_info('foo/foo.cc'), - 'boost/any.hpp', - True)) - self.assertEqual(cpplint._OTHER_HEADER, - classify_include(file_info('foo/foo.hxx'), - 'boost/any.hpp', - True)) - self.assertEqual(cpplint._OTHER_HEADER, - classify_include(file_info('foo/foo.h++'), - 'boost/any.hpp', - True)) - self.assertEqual(cpplint._LIKELY_MY_HEADER, - classify_include(file_info('foo/foo.cc'), - 'foo/foo-inl.h', - False)) - self.assertEqual(cpplint._LIKELY_MY_HEADER, - classify_include(file_info('foo/internal/foo.cc'), - 'foo/public/foo.h', - False)) - self.assertEqual(cpplint._POSSIBLE_MY_HEADER, - classify_include(file_info('foo/internal/foo.cc'), - 'foo/other/public/foo.h', - False)) - self.assertEqual(cpplint._OTHER_HEADER, - classify_include(file_info('foo/internal/foo.cc'), - 'foo/other/public/foop.h', - False)) - - def testTryDropCommonSuffixes(self): - cpplint._hpp_headers = set() - cpplint._valid_extensions = set() - self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo-inl.h')) - self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo-inl.hxx')) - self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo-inl.h++')) - self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo-inl.hpp')) - self.assertEqual('foo/bar/foo', - cpplint._DropCommonSuffixes('foo/bar/foo_inl.h')) - self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo.cc')) - self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo.cxx')) - self.assertEqual('foo/foo', cpplint._DropCommonSuffixes('foo/foo.c')) - self.assertEqual('foo/foo_unusualinternal', - cpplint._DropCommonSuffixes('foo/foo_unusualinternal.h')) - self.assertEqual('foo/foo_unusualinternal', - cpplint._DropCommonSuffixes('foo/foo_unusualinternal.hpp')) - self.assertEqual('', - cpplint._DropCommonSuffixes('_test.cc')) - self.assertEqual('', - cpplint._DropCommonSuffixes('_test.c')) - self.assertEqual('', - cpplint._DropCommonSuffixes('_test.c++')) - self.assertEqual('test', - cpplint._DropCommonSuffixes('test.c')) - self.assertEqual('test', - cpplint._DropCommonSuffixes('test.cc')) - self.assertEqual('test', - cpplint._DropCommonSuffixes('test.c++')) - - def testRegression(self): - def Format(includes): - include_list = [] - for item in includes: - if item.startswith(('"', '<')): - include_list.append('#include %s\n' % item) - else: - include_list.append(item + '\n') - return ''.join(include_list) - - # Test singleton cases first. - self.TestLanguageRulesCheck('foo/foo.cc', Format(['"foo/foo.h"']), '') - self.TestLanguageRulesCheck('foo/foo.cc', Format(['']), '') - self.TestLanguageRulesCheck('foo/foo.cc', Format(['']), '') - self.TestLanguageRulesCheck('foo/foo.cc', Format(['"foo/foo-inl.h"']), '') - self.TestLanguageRulesCheck('foo/foo.cc', Format(['"bar/bar-inl.h"']), '') - self.TestLanguageRulesCheck('foo/foo.cc', Format(['"bar/bar.h"']), '') - - # Test everything in a good and new order. - self.TestLanguageRulesCheck('foo/foo.cc', - Format(['"foo/foo.h"', - '"foo/foo-inl.h"', - '', - '', - '', - '"bar/bar-inl.h"', - '"bar/bar.h"']), - '') - - # Test bad orders. - self.TestLanguageRulesCheck( - 'foo/foo.cc', - Format(['', '']), - 'Found C system header after C++ system header.' - ' Should be: foo.h, c system, c++ system, other.' - ' [build/include_order] [4]') - self.TestLanguageRulesCheck( - 'foo/foo.cc', - Format(['"foo/bar-inl.h"', - '"foo/foo-inl.h"']), - '') - self.TestLanguageRulesCheck( - 'foo/foo.cc', - Format(['"foo/e.h"', - '"foo/b.h"', # warning here (e>b) - '"foo/c.h"', - '"foo/d.h"', - '"foo/a.h"']), # warning here (d>a) - ['Include "foo/b.h" not in alphabetical order' - ' [build/include_alpha] [4]', - 'Include "foo/a.h" not in alphabetical order' - ' [build/include_alpha] [4]']) - # -inl.h headers are no longer special. - self.TestLanguageRulesCheck('foo/foo.cc', - Format(['"foo/foo-inl.h"', '']), - '') - self.TestLanguageRulesCheck('foo/foo.cc', - Format(['"foo/bar.h"', '"foo/bar-inl.h"']), - '') - # Test componentized header. OK to have my header in ../public dir. - self.TestLanguageRulesCheck('foo/internal/foo.cc', - Format(['"foo/public/foo.h"', '']), - '') - # OK to have my header in other dir (not stylistically, but - # cpplint isn't as good as a human). - self.TestLanguageRulesCheck('foo/internal/foo.cc', - Format(['"foo/other/public/foo.h"', - '']), - '') - self.TestLanguageRulesCheck('foo/foo.cc', - Format(['"foo/foo.h"', - '', - '"base/google.h"', - '"base/flags.h"']), - 'Include "base/flags.h" not in alphabetical ' - 'order [build/include_alpha] [4]') - # According to the style, -inl.h should come before .h, but we don't - # complain about that. - self.TestLanguageRulesCheck('foo/foo.cc', - Format(['"foo/foo-inl.h"', - '"foo/foo.h"', - '"base/google.h"', - '"base/google-inl.h"']), - '') - # Allow project includes to be separated by blank lines - self.TestLanguageRulesCheck('a/a.cc', - Format(['"a/a.h"', - '', - '"base/google.h"', - '', - '"b/c.h"', - '', - 'MACRO', - '"a/b.h"']), - '') - self.TestLanguageRulesCheck('a/a.cc', - Format(['"a/a.h"', - '', - '"base/google.h"', - '"a/b.h"']), - 'Include "a/b.h" not in alphabetical ' - 'order [build/include_alpha] [4]') - - # Test conditional includes - self.TestLanguageRulesCheck( - 'a/a.cc', - ''.join(['#include \n', - '#include "base/port.h"\n', - '#include \n']), - ('Found C++ system header after other header. ' - 'Should be: a.h, c system, c++ system, other. ' - '[build/include_order] [4]')) - self.TestLanguageRulesCheck( - 'a/a.cc', - ''.join(['#include \n', - '#include "base/port.h"\n', - '#ifdef LANG_CXX11\n', - '#include \n', - '#endif // LANG_CXX11\n']), - '') - self.TestLanguageRulesCheck( - 'a/a.cc', - ''.join(['#include \n', - '#ifdef LANG_CXX11\n', - '#include "base/port.h"\n', - '#include \n', - '#endif // LANG_CXX11\n']), - ('Found C++ system header after other header. ' - 'Should be: a.h, c system, c++ system, other. ' - '[build/include_order] [4]')) - - # Third party headers are exempt from order checks - self.TestLanguageRulesCheck('foo/foo.cc', - Format(['', '"Python.h"', '']), - '') + def setUp(self): + CpplintTestBase.setUp(self) + self.include_state = cpplint._IncludeState() + os.path.abspath = lambda value: value + + def testCheckNextIncludeOrder_OtherThenCpp(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_HEADER)) + self.assertEqual( + "Found C++ system header after other header", + self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER), + ) + + def testCheckNextIncludeOrder_CppThenC(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + self.assertEqual( + "Found C system header after C++ system header", + self.include_state.CheckNextIncludeOrder(cpplint._C_SYS_HEADER), + ) + + def testCheckNextIncludeOrder_OtherSysThenC(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) + self.assertEqual( + "Found C system header after other system header", + self.include_state.CheckNextIncludeOrder(cpplint._C_SYS_HEADER), + ) + + def testCheckNextIncludeOrder_OtherSysThenCpp(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) + self.assertEqual( + "Found C++ system header after other system header", + self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER), + ) + + def testCheckNextIncludeOrder_LikelyThenCpp(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._LIKELY_MY_HEADER)) + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + + def testCheckNextIncludeOrder_PossibleThenCpp(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER)) + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + + def testCheckNextIncludeOrder_CppThenLikely(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + # This will eventually fail. + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._LIKELY_MY_HEADER)) + + def testCheckNextIncludeOrder_CppThenPossible(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER)) + + def testCheckNextIncludeOrder_CppThenOtherSys(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) + + def testCheckNextIncludeOrder_OtherSysThenPossible(self): + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) + self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER)) + + def testClassifyInclude(self): + file_info = cpplint.FileInfo + classify_include = cpplint._ClassifyInclude + self.assertEqual( + cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "stdio.h", True) + ) + self.assertEqual( + cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "sys/time.h", True) + ) + self.assertEqual( + cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "netipx/ipx.h", True) + ) + self.assertEqual( + cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "arpa/ftp.h", True) + ) + self.assertEqual( + cpplint._CPP_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "string", True) + ) + self.assertEqual( + cpplint._CPP_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "typeinfo", True) + ) + self.assertEqual( + cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "foo/foo.h", True) + ) + self.assertEqual( + cpplint._OTHER_SYS_HEADER, + classify_include(file_info("foo/foo.cc"), "foo/foo.h", True, "standardcfirst"), + ) + self.assertEqual( + cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.cc"), "string", False) + ) + self.assertEqual( + cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.cc"), "boost/any.hpp", True) + ) + self.assertEqual( + cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.hxx"), "boost/any.hpp", True) + ) + self.assertEqual( + cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.h++"), "boost/any.hpp", True) + ) + self.assertEqual( + cpplint._LIKELY_MY_HEADER, + classify_include(file_info("foo/foo.cc"), "foo/foo-inl.h", False), + ) + self.assertEqual( + cpplint._LIKELY_MY_HEADER, + classify_include(file_info("foo/internal/foo.cc"), "foo/public/foo.h", False), + ) + self.assertEqual( + cpplint._POSSIBLE_MY_HEADER, + classify_include(file_info("foo/internal/foo.cc"), "foo/other/public/foo.h", False), + ) + self.assertEqual( + cpplint._OTHER_HEADER, + classify_include(file_info("foo/internal/foo.cc"), "foo/other/public/foop.h", False), + ) + + def testTryDropCommonSuffixes(self): + cpplint._hpp_headers = set() + cpplint._valid_extensions = set() + self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.h")) + self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.hxx")) + self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.h++")) + self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.hpp")) + self.assertEqual("foo/bar/foo", cpplint._DropCommonSuffixes("foo/bar/foo_inl.h")) + self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo.cc")) + self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo.cxx")) + self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo.c")) + self.assertEqual( + "foo/foo_unusualinternal", cpplint._DropCommonSuffixes("foo/foo_unusualinternal.h") + ) + self.assertEqual( + "foo/foo_unusualinternal", cpplint._DropCommonSuffixes("foo/foo_unusualinternal.hpp") + ) + self.assertEqual("", cpplint._DropCommonSuffixes("_test.cc")) + self.assertEqual("", cpplint._DropCommonSuffixes("_test.c")) + self.assertEqual("", cpplint._DropCommonSuffixes("_test.c++")) + self.assertEqual("test", cpplint._DropCommonSuffixes("test.c")) + self.assertEqual("test", cpplint._DropCommonSuffixes("test.cc")) + self.assertEqual("test", cpplint._DropCommonSuffixes("test.c++")) + + def testRegression(self): + def Format(includes): + include_list = [] + for item in includes: + if item.startswith(('"', "<")): + include_list.append("#include %s\n" % item) + else: + include_list.append(item + "\n") + return "".join(include_list) + + # Test singleton cases first. + self.TestLanguageRulesCheck("foo/foo.cc", Format(['"foo/foo.h"']), "") + self.TestLanguageRulesCheck("foo/foo.cc", Format([""]), "") + self.TestLanguageRulesCheck("foo/foo.cc", Format([""]), "") + self.TestLanguageRulesCheck("foo/foo.cc", Format(['"foo/foo-inl.h"']), "") + self.TestLanguageRulesCheck("foo/foo.cc", Format(['"bar/bar-inl.h"']), "") + self.TestLanguageRulesCheck("foo/foo.cc", Format(['"bar/bar.h"']), "") + + # Test everything in a good and new order. + self.TestLanguageRulesCheck( + "foo/foo.cc", + Format( + [ + '"foo/foo.h"', + '"foo/foo-inl.h"', + "", + "", + "", + '"bar/bar-inl.h"', + '"bar/bar.h"', + ] + ), + "", + ) + + # Test bad orders. + self.TestLanguageRulesCheck( + "foo/foo.cc", + Format(["", ""]), + "Found C system header after C++ system header." + " Should be: foo.h, c system, c++ system, other." + " [build/include_order] [4]", + ) + self.TestLanguageRulesCheck( + "foo/foo.cc", Format(['"foo/bar-inl.h"', '"foo/foo-inl.h"']), "" + ) + self.TestLanguageRulesCheck( + "foo/foo.cc", + Format( + [ + '"foo/e.h"', + '"foo/b.h"', # warning here (e>b) + '"foo/c.h"', + '"foo/d.h"', + '"foo/a.h"', + ] + ), # warning here (d>a) + [ + 'Include "foo/b.h" not in alphabetical order [build/include_alpha] [4]', + 'Include "foo/a.h" not in alphabetical order [build/include_alpha] [4]', + ], + ) + # -inl.h headers are no longer special. + self.TestLanguageRulesCheck("foo/foo.cc", Format(['"foo/foo-inl.h"', ""]), "") + self.TestLanguageRulesCheck("foo/foo.cc", Format(['"foo/bar.h"', '"foo/bar-inl.h"']), "") + # Test componentized header. OK to have my header in ../public dir. + self.TestLanguageRulesCheck( + "foo/internal/foo.cc", Format(['"foo/public/foo.h"', ""]), "" + ) + # OK to have my header in other dir (not stylistically, but + # cpplint isn't as good as a human). + self.TestLanguageRulesCheck( + "foo/internal/foo.cc", Format(['"foo/other/public/foo.h"', ""]), "" + ) + self.TestLanguageRulesCheck( + "foo/foo.cc", + Format(['"foo/foo.h"', "", '"base/google.h"', '"base/flags.h"']), + 'Include "base/flags.h" not in alphabetical order [build/include_alpha] [4]', + ) + # According to the style, -inl.h should come before .h, but we don't + # complain about that. + self.TestLanguageRulesCheck( + "foo/foo.cc", + Format(['"foo/foo-inl.h"', '"foo/foo.h"', '"base/google.h"', '"base/google-inl.h"']), + "", + ) + # Allow project includes to be separated by blank lines + self.TestLanguageRulesCheck( + "a/a.cc", + Format( + ['"a/a.h"', "", '"base/google.h"', "", '"b/c.h"', "", "MACRO", '"a/b.h"'] + ), + "", + ) + self.TestLanguageRulesCheck( + "a/a.cc", + Format(['"a/a.h"', "", '"base/google.h"', '"a/b.h"']), + 'Include "a/b.h" not in alphabetical order [build/include_alpha] [4]', + ) + + # Test conditional includes + self.TestLanguageRulesCheck( + "a/a.cc", + "".join( + [ + "#include \n", + '#include "base/port.h"\n', + "#include \n", + ] + ), + ( + "Found C++ system header after other header. " + "Should be: a.h, c system, c++ system, other. " + "[build/include_order] [4]" + ), + ) + self.TestLanguageRulesCheck( + "a/a.cc", + "".join( + [ + "#include \n", + '#include "base/port.h"\n', + "#ifdef LANG_CXX11\n", + "#include \n", + "#endif // LANG_CXX11\n", + ] + ), + "", + ) + self.TestLanguageRulesCheck( + "a/a.cc", + "".join( + [ + "#include \n", + "#ifdef LANG_CXX11\n", + '#include "base/port.h"\n', + "#include \n", + "#endif // LANG_CXX11\n", + ] + ), + ( + "Found C++ system header after other header. " + "Should be: a.h, c system, c++ system, other. " + "[build/include_order] [4]" + ), + ) + + # Third party headers are exempt from order checks + self.TestLanguageRulesCheck( + "foo/foo.cc", Format(["", '"Python.h"', ""]), "" + ) class CheckForFunctionLengthsTest(CpplintTestBase): + def setUp(self): + # Reducing these thresholds for the tests speeds up tests significantly. + CpplintTestBase.setUp(self) + self.old_normal_trigger = cpplint._FunctionState._NORMAL_TRIGGER + self.old_test_trigger = cpplint._FunctionState._TEST_TRIGGER - def setUp(self): - # Reducing these thresholds for the tests speeds up tests significantly. - CpplintTestBase.setUp(self) - self.old_normal_trigger = cpplint._FunctionState._NORMAL_TRIGGER - self.old_test_trigger = cpplint._FunctionState._TEST_TRIGGER + cpplint._FunctionState._NORMAL_TRIGGER = 10 + cpplint._FunctionState._TEST_TRIGGER = 25 - cpplint._FunctionState._NORMAL_TRIGGER = 10 - cpplint._FunctionState._TEST_TRIGGER = 25 + def tearDown(self): + cpplint._FunctionState._NORMAL_TRIGGER = self.old_normal_trigger + cpplint._FunctionState._TEST_TRIGGER = self.old_test_trigger - def tearDown(self): - cpplint._FunctionState._NORMAL_TRIGGER = self.old_normal_trigger - cpplint._FunctionState._TEST_TRIGGER = self.old_test_trigger + def TestFunctionLengthsCheck(self, code, expected_message): + """Check warnings for long function bodies are as expected. - def TestFunctionLengthsCheck(self, code, expected_message): - """Check warnings for long function bodies are as expected. - - Args: - code: C++ source code expected to generate a warning message. - expected_message: Message expected to be generated by the C++ code. - """ - self.assertEqual(expected_message, - self.PerformFunctionLengthsCheck(code)) - - def TriggerLines(self, error_level): - """Return number of lines needed to trigger a function length warning. + Args: + code: C++ source code expected to generate a warning message. + expected_message: Message expected to be generated by the C++ code. + """ + self.assertEqual(expected_message, self.PerformFunctionLengthsCheck(code)) - Args: - error_level: --v setting for cpplint. + def TriggerLines(self, error_level): + """Return number of lines needed to trigger a function length warning. - Returns: - Number of lines needed to trigger a function length warning. - """ - return cpplint._FunctionState._NORMAL_TRIGGER * 2**error_level + Args: + error_level: --v setting for cpplint. - def TestLines(self, error_level): - """Return number of lines needed to trigger a test function length warning. + Returns: + Number of lines needed to trigger a function length warning. + """ + return cpplint._FunctionState._NORMAL_TRIGGER * 2**error_level - Args: - error_level: --v setting for cpplint. + def TestLines(self, error_level): + """Return number of lines needed to trigger a test function length warning. - Returns: - Number of lines needed to trigger a test function length warning. - """ - return cpplint._FunctionState._TEST_TRIGGER * 2**error_level + Args: + error_level: --v setting for cpplint. - def TestFunctionLengthCheckDefinition(self, lines, error_level): - """Generate long function definition and check warnings are as expected. + Returns: + Number of lines needed to trigger a test function length warning. + """ + return cpplint._FunctionState._TEST_TRIGGER * 2**error_level - Args: - lines: Number of lines to generate. - error_level: --v setting for cpplint. - """ - trigger_level = self.TriggerLines(cpplint._VerboseLevel()) - self.TestFunctionLengthsCheck( - 'void test(int x)' + self.FunctionBody(lines), - ('Small and focused functions are preferred: ' - 'test() has %d non-comment lines ' - '(error triggered by exceeding %d lines).' - ' [readability/fn_size] [%d]' - % (lines, trigger_level, error_level))) - - def TestFunctionLengthCheckDefinitionOK(self, lines): - """Generate shorter function definition and check no warning is produced. + def TestFunctionLengthCheckDefinition(self, lines, error_level): + """Generate long function definition and check warnings are as expected. - Args: - lines: Number of lines to generate. - """ - self.TestFunctionLengthsCheck( - 'void test(int x)' + self.FunctionBody(lines), - '') + Args: + lines: Number of lines to generate. + error_level: --v setting for cpplint. + """ + trigger_level = self.TriggerLines(cpplint._VerboseLevel()) + self.TestFunctionLengthsCheck( + "void test(int x)" + self.FunctionBody(lines), + ( + "Small and focused functions are preferred: " + "test() has %d non-comment lines " + "(error triggered by exceeding %d lines)." + " [readability/fn_size] [%d]" % (lines, trigger_level, error_level) + ), + ) + + def TestFunctionLengthCheckDefinitionOK(self, lines): + """Generate shorter function definition and check no warning is produced. + + Args: + lines: Number of lines to generate. + """ + self.TestFunctionLengthsCheck("void test(int x)" + self.FunctionBody(lines), "") - def TestFunctionLengthCheckAtErrorLevel(self, error_level): - """Generate and check function at the trigger level for --v setting. + def TestFunctionLengthCheckAtErrorLevel(self, error_level): + """Generate and check function at the trigger level for --v setting. - Args: - error_level: --v setting for cpplint. - """ - self.TestFunctionLengthCheckDefinition(self.TriggerLines(error_level), - error_level) + Args: + error_level: --v setting for cpplint. + """ + self.TestFunctionLengthCheckDefinition(self.TriggerLines(error_level), error_level) - def TestFunctionLengthCheckBelowErrorLevel(self, error_level): - """Generate and check function just below the trigger level for --v setting. + def TestFunctionLengthCheckBelowErrorLevel(self, error_level): + """Generate and check function just below the trigger level for --v setting. - Args: - error_level: --v setting for cpplint. - """ - self.TestFunctionLengthCheckDefinition(self.TriggerLines(error_level)-1, - error_level-1) + Args: + error_level: --v setting for cpplint. + """ + self.TestFunctionLengthCheckDefinition(self.TriggerLines(error_level) - 1, error_level - 1) - def TestFunctionLengthCheckAboveErrorLevel(self, error_level): - """Generate and check function just above the trigger level for --v setting. + def TestFunctionLengthCheckAboveErrorLevel(self, error_level): + """Generate and check function just above the trigger level for --v setting. - Args: - error_level: --v setting for cpplint. - """ - self.TestFunctionLengthCheckDefinition(self.TriggerLines(error_level)+1, - error_level) - - def FunctionBody(self, number_of_lines): - return ' {\n' + ' this_is_just_a_test();\n'*number_of_lines + '}' - - def FunctionBodyWithBlankLines(self, number_of_lines): - return ' {\n' + ' this_is_just_a_test();\n\n'*number_of_lines + '}' - - def FunctionBodyWithNoLints(self, number_of_lines): - return (' {\n' + - ' this_is_just_a_test(); // NOLINT\n'*number_of_lines + '}') - - # Test line length checks. - def testFunctionLengthCheckDeclaration(self): - self.TestFunctionLengthsCheck( - 'void test();', # Not a function definition - '') - - def testFunctionLengthCheckDeclarationWithBlockFollowing(self): - self.TestFunctionLengthsCheck( - ('void test();\n' - + self.FunctionBody(66)), # Not a function definition - '') - - def testFunctionLengthCheckClassDefinition(self): - self.TestFunctionLengthsCheck( # Not a function definition - 'class Test' + self.FunctionBody(66) + ';', - '') - - def testFunctionLengthCheckTrivial(self): - self.TestFunctionLengthsCheck( - 'void test() {}', # Not counted - '') - - def testFunctionLengthCheckEmpty(self): - self.TestFunctionLengthsCheck( - 'void test() {\n}', - '') - - def testFunctionLengthCheckDefinitionBelowSeverity0(self): - old_verbosity = cpplint._SetVerboseLevel(0) - self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(0)-1) - cpplint._SetVerboseLevel(old_verbosity) - - def testFunctionLengthCheckDefinitionAtSeverity0(self): - old_verbosity = cpplint._SetVerboseLevel(0) - self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(0)) - cpplint._SetVerboseLevel(old_verbosity) - - def testFunctionLengthCheckDefinitionAboveSeverity0(self): - old_verbosity = cpplint._SetVerboseLevel(0) - self.TestFunctionLengthCheckAboveErrorLevel(0) - cpplint._SetVerboseLevel(old_verbosity) - - def testFunctionLengthCheckDefinitionBelowSeverity1v0(self): - old_verbosity = cpplint._SetVerboseLevel(0) - self.TestFunctionLengthCheckBelowErrorLevel(1) - cpplint._SetVerboseLevel(old_verbosity) - - def testFunctionLengthCheckDefinitionAtSeverity1v0(self): - old_verbosity = cpplint._SetVerboseLevel(0) - self.TestFunctionLengthCheckAtErrorLevel(1) - cpplint._SetVerboseLevel(old_verbosity) - - def testFunctionLengthCheckDefinitionBelowSeverity1(self): - self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(1)-1) - - def testFunctionLengthCheckDefinitionAtSeverity1(self): - self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(1)) - - def testFunctionLengthCheckDefinitionAboveSeverity1(self): - self.TestFunctionLengthCheckAboveErrorLevel(1) - - def testFunctionLengthCheckDefinitionSeverity1PlusBlanks(self): - error_level = 1 - error_lines = self.TriggerLines(error_level) + 1 - trigger_level = self.TriggerLines(cpplint._VerboseLevel()) - self.TestFunctionLengthsCheck( - 'void test_blanks(int x)' + self.FunctionBody(error_lines), - ('Small and focused functions are preferred: ' - 'test_blanks() has %d non-comment lines ' - '(error triggered by exceeding %d lines).' - ' [readability/fn_size] [%d]') - % (error_lines, trigger_level, error_level)) - - def testFunctionLengthCheckComplexDefinitionSeverity1(self): - error_level = 1 - error_lines = self.TriggerLines(error_level) + 1 - trigger_level = self.TriggerLines(cpplint._VerboseLevel()) - self.TestFunctionLengthsCheck( - ('my_namespace::my_other_namespace::MyVeryLongTypeName*\n' - 'my_namespace::my_other_namespace::MyFunction(int arg1, char* arg2)' - + self.FunctionBody(error_lines)), - ('Small and focused functions are preferred: ' - 'my_namespace::my_other_namespace::MyFunction()' - ' has %d non-comment lines ' - '(error triggered by exceeding %d lines).' - ' [readability/fn_size] [%d]') - % (error_lines, trigger_level, error_level)) - - def testFunctionLengthCheckDefinitionSeverity1ForTest(self): - error_level = 1 - error_lines = self.TestLines(error_level) + 1 - trigger_level = self.TestLines(cpplint._VerboseLevel()) - self.TestFunctionLengthsCheck( - 'TEST_F(Test, Mutator)' + self.FunctionBody(error_lines), - ('Small and focused functions are preferred: ' - 'TEST_F(Test, Mutator) has %d non-comment lines ' - '(error triggered by exceeding %d lines).' - ' [readability/fn_size] [%d]') - % (error_lines, trigger_level, error_level)) - - def testFunctionLengthCheckDefinitionSeverity1ForSplitLineTest(self): - error_level = 1 - error_lines = self.TestLines(error_level) + 1 - trigger_level = self.TestLines(cpplint._VerboseLevel()) - self.TestFunctionLengthsCheck( - ('TEST_F(GoogleUpdateRecoveryRegistryProtectedTest,\n' - ' FixGoogleUpdate_AllValues_MachineApp)' # note: 4 spaces - + self.FunctionBody(error_lines)), - ('Small and focused functions are preferred: ' - 'TEST_F(GoogleUpdateRecoveryRegistryProtectedTest, ' # 1 space - 'FixGoogleUpdate_AllValues_MachineApp) has %d non-comment lines ' - '(error triggered by exceeding %d lines).' - ' [readability/fn_size] [%d]') - % (error_lines+1, trigger_level, error_level)) - - def testFunctionLengthCheckDefinitionSeverity1ForBadTestDoesntBreak(self): - error_level = 1 - error_lines = self.TestLines(error_level) + 1 - trigger_level = self.TestLines(cpplint._VerboseLevel()) - self.TestFunctionLengthsCheck( - ('TEST_F(' - + self.FunctionBody(error_lines)), - ('Small and focused functions are preferred: ' - 'TEST_F has %d non-comment lines ' - '(error triggered by exceeding %d lines).' - ' [readability/fn_size] [%d]') - % (error_lines, trigger_level, error_level)) - - def testFunctionLengthCheckDefinitionSeverity1WithEmbeddedNoLints(self): - error_level = 1 - error_lines = self.TriggerLines(error_level)+1 - trigger_level = self.TriggerLines(cpplint._VerboseLevel()) - self.TestFunctionLengthsCheck( - 'void test(int x)' + self.FunctionBodyWithNoLints(error_lines), - ('Small and focused functions are preferred: ' - 'test() has %d non-comment lines ' - '(error triggered by exceeding %d lines).' - ' [readability/fn_size] [%d]') - % (error_lines, trigger_level, error_level)) - - def testFunctionLengthCheckDefinitionSeverity1WithNoLint(self): - self.TestFunctionLengthsCheck( - ('void test(int x)' + self.FunctionBody(self.TriggerLines(1)) - + ' // NOLINT -- long function'), - '') - - def testFunctionLengthCheckDefinitionBelowSeverity2(self): - self.TestFunctionLengthCheckBelowErrorLevel(2) - - def testFunctionLengthCheckDefinitionSeverity2(self): - self.TestFunctionLengthCheckAtErrorLevel(2) - - def testFunctionLengthCheckDefinitionAboveSeverity2(self): - self.TestFunctionLengthCheckAboveErrorLevel(2) - - def testFunctionLengthCheckDefinitionBelowSeverity3(self): - self.TestFunctionLengthCheckBelowErrorLevel(3) - - def testFunctionLengthCheckDefinitionSeverity3(self): - self.TestFunctionLengthCheckAtErrorLevel(3) - - def testFunctionLengthCheckDefinitionAboveSeverity3(self): - self.TestFunctionLengthCheckAboveErrorLevel(3) - - def testFunctionLengthCheckDefinitionBelowSeverity4(self): - self.TestFunctionLengthCheckBelowErrorLevel(4) - - def testFunctionLengthCheckDefinitionSeverity4(self): - self.TestFunctionLengthCheckAtErrorLevel(4) - - def testFunctionLengthCheckDefinitionAboveSeverity4(self): - self.TestFunctionLengthCheckAboveErrorLevel(4) - - def testFunctionLengthCheckDefinitionBelowSeverity5(self): - self.TestFunctionLengthCheckBelowErrorLevel(5) - - def testFunctionLengthCheckDefinitionAtSeverity5(self): - self.TestFunctionLengthCheckAtErrorLevel(5) - - def testFunctionLengthCheckDefinitionAboveSeverity5(self): - self.TestFunctionLengthCheckAboveErrorLevel(5) - - def testFunctionLengthCheckDefinitionHugeLines(self): - # 5 is the limit - self.TestFunctionLengthCheckDefinition(self.TriggerLines(10), 5) - - def testFunctionLengthNotDeterminable(self): - # Macro invocation without terminating semicolon. - self.TestFunctionLengthsCheck( - 'MACRO(arg)', - '') - - # Macro with underscores - self.TestFunctionLengthsCheck( - 'MACRO_WITH_UNDERSCORES(arg1, arg2, arg3)', - '') - - self.TestFunctionLengthsCheck( - 'NonMacro(arg)', - 'Lint failed to find start of function body.' - ' [readability/fn_size] [5]') - - def testFunctionLengthCheckWithNamespace(self): - old_verbosity = cpplint._SetVerboseLevel(1) - self.TestFunctionLengthsCheck( - ('namespace {\n' - 'void CodeCoverageCL35256059() {\n' + - (' X++;\n' * 3000) + - '}\n' - '} // namespace\n'), - ('Small and focused functions are preferred: ' - 'CodeCoverageCL35256059() has 3000 non-comment lines ' - '(error triggered by exceeding 20 lines).' - ' [readability/fn_size] [5]')) - cpplint._SetVerboseLevel(old_verbosity) + Args: + error_level: --v setting for cpplint. + """ + self.TestFunctionLengthCheckDefinition(self.TriggerLines(error_level) + 1, error_level) + + def FunctionBody(self, number_of_lines): + return " {\n" + " this_is_just_a_test();\n" * number_of_lines + "}" + + def FunctionBodyWithBlankLines(self, number_of_lines): + return " {\n" + " this_is_just_a_test();\n\n" * number_of_lines + "}" + + def FunctionBodyWithNoLints(self, number_of_lines): + return " {\n" + " this_is_just_a_test(); // NOLINT\n" * number_of_lines + "}" + + # Test line length checks. + def testFunctionLengthCheckDeclaration(self): + self.TestFunctionLengthsCheck( + "void test();", # Not a function definition + "", + ) + + def testFunctionLengthCheckDeclarationWithBlockFollowing(self): + self.TestFunctionLengthsCheck( + ("void test();\n" + self.FunctionBody(66)), # Not a function definition + "", + ) + + def testFunctionLengthCheckClassDefinition(self): + self.TestFunctionLengthsCheck( # Not a function definition + "class Test" + self.FunctionBody(66) + ";", "" + ) + + def testFunctionLengthCheckTrivial(self): + self.TestFunctionLengthsCheck( + "void test() {}", # Not counted + "", + ) + + def testFunctionLengthCheckEmpty(self): + self.TestFunctionLengthsCheck("void test() {\n}", "") + + def testFunctionLengthCheckDefinitionBelowSeverity0(self): + old_verbosity = cpplint._SetVerboseLevel(0) + self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(0) - 1) + cpplint._SetVerboseLevel(old_verbosity) + + def testFunctionLengthCheckDefinitionAtSeverity0(self): + old_verbosity = cpplint._SetVerboseLevel(0) + self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(0)) + cpplint._SetVerboseLevel(old_verbosity) + + def testFunctionLengthCheckDefinitionAboveSeverity0(self): + old_verbosity = cpplint._SetVerboseLevel(0) + self.TestFunctionLengthCheckAboveErrorLevel(0) + cpplint._SetVerboseLevel(old_verbosity) + + def testFunctionLengthCheckDefinitionBelowSeverity1v0(self): + old_verbosity = cpplint._SetVerboseLevel(0) + self.TestFunctionLengthCheckBelowErrorLevel(1) + cpplint._SetVerboseLevel(old_verbosity) + + def testFunctionLengthCheckDefinitionAtSeverity1v0(self): + old_verbosity = cpplint._SetVerboseLevel(0) + self.TestFunctionLengthCheckAtErrorLevel(1) + cpplint._SetVerboseLevel(old_verbosity) + + def testFunctionLengthCheckDefinitionBelowSeverity1(self): + self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(1) - 1) + + def testFunctionLengthCheckDefinitionAtSeverity1(self): + self.TestFunctionLengthCheckDefinitionOK(self.TriggerLines(1)) + + def testFunctionLengthCheckDefinitionAboveSeverity1(self): + self.TestFunctionLengthCheckAboveErrorLevel(1) + + def testFunctionLengthCheckDefinitionSeverity1PlusBlanks(self): + error_level = 1 + error_lines = self.TriggerLines(error_level) + 1 + trigger_level = self.TriggerLines(cpplint._VerboseLevel()) + self.TestFunctionLengthsCheck( + "void test_blanks(int x)" + self.FunctionBody(error_lines), + ( + "Small and focused functions are preferred: " + "test_blanks() has %d non-comment lines " + "(error triggered by exceeding %d lines)." + " [readability/fn_size] [%d]" + ) + % (error_lines, trigger_level, error_level), + ) + + def testFunctionLengthCheckComplexDefinitionSeverity1(self): + error_level = 1 + error_lines = self.TriggerLines(error_level) + 1 + trigger_level = self.TriggerLines(cpplint._VerboseLevel()) + self.TestFunctionLengthsCheck( + ( + "my_namespace::my_other_namespace::MyVeryLongTypeName*\n" + "my_namespace::my_other_namespace::MyFunction(int arg1, char* arg2)" + + self.FunctionBody(error_lines) + ), + ( + "Small and focused functions are preferred: " + "my_namespace::my_other_namespace::MyFunction()" + " has %d non-comment lines " + "(error triggered by exceeding %d lines)." + " [readability/fn_size] [%d]" + ) + % (error_lines, trigger_level, error_level), + ) + + def testFunctionLengthCheckDefinitionSeverity1ForTest(self): + error_level = 1 + error_lines = self.TestLines(error_level) + 1 + trigger_level = self.TestLines(cpplint._VerboseLevel()) + self.TestFunctionLengthsCheck( + "TEST_F(Test, Mutator)" + self.FunctionBody(error_lines), + ( + "Small and focused functions are preferred: " + "TEST_F(Test, Mutator) has %d non-comment lines " + "(error triggered by exceeding %d lines)." + " [readability/fn_size] [%d]" + ) + % (error_lines, trigger_level, error_level), + ) + + def testFunctionLengthCheckDefinitionSeverity1ForSplitLineTest(self): + error_level = 1 + error_lines = self.TestLines(error_level) + 1 + trigger_level = self.TestLines(cpplint._VerboseLevel()) + self.TestFunctionLengthsCheck( + ( + "TEST_F(GoogleUpdateRecoveryRegistryProtectedTest,\n" + " FixGoogleUpdate_AllValues_MachineApp)" # note: 4 spaces + + self.FunctionBody(error_lines) + ), + ( + "Small and focused functions are preferred: " + "TEST_F(GoogleUpdateRecoveryRegistryProtectedTest, " # 1 space + "FixGoogleUpdate_AllValues_MachineApp) has %d non-comment lines " + "(error triggered by exceeding %d lines)." + " [readability/fn_size] [%d]" + ) + % (error_lines + 1, trigger_level, error_level), + ) + + def testFunctionLengthCheckDefinitionSeverity1ForBadTestDoesntBreak(self): + error_level = 1 + error_lines = self.TestLines(error_level) + 1 + trigger_level = self.TestLines(cpplint._VerboseLevel()) + self.TestFunctionLengthsCheck( + ("TEST_F(" + self.FunctionBody(error_lines)), + ( + "Small and focused functions are preferred: " + "TEST_F has %d non-comment lines " + "(error triggered by exceeding %d lines)." + " [readability/fn_size] [%d]" + ) + % (error_lines, trigger_level, error_level), + ) + + def testFunctionLengthCheckDefinitionSeverity1WithEmbeddedNoLints(self): + error_level = 1 + error_lines = self.TriggerLines(error_level) + 1 + trigger_level = self.TriggerLines(cpplint._VerboseLevel()) + self.TestFunctionLengthsCheck( + "void test(int x)" + self.FunctionBodyWithNoLints(error_lines), + ( + "Small and focused functions are preferred: " + "test() has %d non-comment lines " + "(error triggered by exceeding %d lines)." + " [readability/fn_size] [%d]" + ) + % (error_lines, trigger_level, error_level), + ) + + def testFunctionLengthCheckDefinitionSeverity1WithNoLint(self): + self.TestFunctionLengthsCheck( + ( + "void test(int x)" + + self.FunctionBody(self.TriggerLines(1)) + + " // NOLINT -- long function" + ), + "", + ) + + def testFunctionLengthCheckDefinitionBelowSeverity2(self): + self.TestFunctionLengthCheckBelowErrorLevel(2) + + def testFunctionLengthCheckDefinitionSeverity2(self): + self.TestFunctionLengthCheckAtErrorLevel(2) + + def testFunctionLengthCheckDefinitionAboveSeverity2(self): + self.TestFunctionLengthCheckAboveErrorLevel(2) + + def testFunctionLengthCheckDefinitionBelowSeverity3(self): + self.TestFunctionLengthCheckBelowErrorLevel(3) + + def testFunctionLengthCheckDefinitionSeverity3(self): + self.TestFunctionLengthCheckAtErrorLevel(3) + + def testFunctionLengthCheckDefinitionAboveSeverity3(self): + self.TestFunctionLengthCheckAboveErrorLevel(3) + + def testFunctionLengthCheckDefinitionBelowSeverity4(self): + self.TestFunctionLengthCheckBelowErrorLevel(4) + + def testFunctionLengthCheckDefinitionSeverity4(self): + self.TestFunctionLengthCheckAtErrorLevel(4) + + def testFunctionLengthCheckDefinitionAboveSeverity4(self): + self.TestFunctionLengthCheckAboveErrorLevel(4) + + def testFunctionLengthCheckDefinitionBelowSeverity5(self): + self.TestFunctionLengthCheckBelowErrorLevel(5) + + def testFunctionLengthCheckDefinitionAtSeverity5(self): + self.TestFunctionLengthCheckAtErrorLevel(5) + + def testFunctionLengthCheckDefinitionAboveSeverity5(self): + self.TestFunctionLengthCheckAboveErrorLevel(5) + + def testFunctionLengthCheckDefinitionHugeLines(self): + # 5 is the limit + self.TestFunctionLengthCheckDefinition(self.TriggerLines(10), 5) + + def testFunctionLengthNotDeterminable(self): + # Macro invocation without terminating semicolon. + self.TestFunctionLengthsCheck("MACRO(arg)", "") + + # Macro with underscores + self.TestFunctionLengthsCheck("MACRO_WITH_UNDERSCORES(arg1, arg2, arg3)", "") + + self.TestFunctionLengthsCheck( + "NonMacro(arg)", + "Lint failed to find start of function body. [readability/fn_size] [5]", + ) + + def testFunctionLengthCheckWithNamespace(self): + old_verbosity = cpplint._SetVerboseLevel(1) + self.TestFunctionLengthsCheck( + ( + "namespace {\n" + "void CodeCoverageCL35256059() {\n" + (" X++;\n" * 3000) + "}\n" + "} // namespace\n" + ), + ( + "Small and focused functions are preferred: " + "CodeCoverageCL35256059() has 3000 non-comment lines " + "(error triggered by exceeding 20 lines)." + " [readability/fn_size] [5]" + ), + ) + cpplint._SetVerboseLevel(old_verbosity) def TrimExtraIndent(text_block): - """Trim a uniform amount of whitespace off of each line in a string. + """Trim a uniform amount of whitespace off of each line in a string. - Compute the minimum indent on all non blank lines and trim that from each, so - that the block of text has no extra indentation. + Compute the minimum indent on all non blank lines and trim that from each, so + that the block of text has no extra indentation. - Args: - text_block: a multiline string + Args: + text_block: a multiline string - Returns: - text_block with the common whitespace indent of each line removed. - """ + Returns: + text_block with the common whitespace indent of each line removed. + """ - def CountLeadingWhitespace(s): - count = 0 - for c in s: - if not c.isspace(): - break - count += 1 - return count - # find the minimum indent (except for blank lines) - min_indent = min([CountLeadingWhitespace(line) - for line in text_block.split('\n') if line]) - return '\n'.join([line[min_indent:] for line in text_block.split('\n')]) + def CountLeadingWhitespace(s): + count = 0 + for c in s: + if not c.isspace(): + break + count += 1 + return count + # find the minimum indent (except for blank lines) + min_indent = min([CountLeadingWhitespace(line) for line in text_block.split("\n") if line]) + return "\n".join([line[min_indent:] for line in text_block.split("\n")]) -class CloseExpressionTest(unittest.TestCase): - def setUp(self): - self.lines = cpplint.CleansedLines( - # 1 2 3 4 5 - # 0123456789012345678901234567890123456789012345678901234567890 - ['// Line 0', - 'inline RCULocked::ReadPtr::ReadPtr(const RCULocked* rcu) {', - ' DCHECK(!(data & kFlagMask)) << "Error";', - '}', - '// Line 4', - 'RCULocked::WritePtr::WritePtr(RCULocked* rcu)', - ' : lock_(&rcu_->mutex_) {', - '}', - '// Line 8', - 'template ', - 'typename std::enable_if<', - ' std::is_array::value && (std::extent::value > 0)>::type', - 'MakeUnique(A&&... a) = delete;', - '// Line 13', - 'auto x = []() {};', - '// Line 15', - 'template ', - 'friend bool operator==(const reffed_ptr& a,', - ' const reffed_ptr& b) {', - ' return a.get() == b.get();', - '}', - '// Line 21']) - - def testCloseExpression(self): - # List of positions to test: - # (start line, start position, end line, end position + 1) - positions = [(1, 16, 1, 19), - (1, 37, 1, 59), - (1, 60, 3, 1), - (2, 8, 2, 29), - (2, 30, 22, -1), # Left shift operator - (9, 9, 9, 36), - (10, 23, 11, 59), - (11, 54, 22, -1), # Greater than operator - (14, 9, 14, 11), - (14, 11, 14, 13), - (14, 14, 14, 16), - (17, 22, 18, 46), - (18, 47, 20, 1)] - for p in positions: - (_, line, column) = cpplint.CloseExpression(self.lines, p[0], p[1]) - self.assertEqual((p[2], p[3]), (line, column)) - - def testReverseCloseExpression(self): - # List of positions to test: - # (end line, end position, start line, start position) - positions = [(1, 18, 1, 16), - (1, 58, 1, 37), - (2, 27, 2, 10), - (2, 28, 2, 8), - (6, 18, 0, -1), # -> operator - (9, 35, 9, 9), - (11, 54, 0, -1), # Greater than operator - (11, 57, 11, 31), - (14, 10, 14, 9), - (14, 12, 14, 11), - (14, 15, 14, 14), - (18, 45, 17, 22), - (20, 0, 18, 47)] - for p in positions: - (_, line, column) = cpplint.ReverseCloseExpression(self.lines, p[0], p[1]) - self.assertEqual((p[2], p[3]), (line, column)) +class CloseExpressionTest(unittest.TestCase): + def setUp(self): + self.lines = cpplint.CleansedLines( + # 1 2 3 4 5 + # 0123456789012345678901234567890123456789012345678901234567890 + [ + "// Line 0", + "inline RCULocked::ReadPtr::ReadPtr(const RCULocked* rcu) {", + ' DCHECK(!(data & kFlagMask)) << "Error";', + "}", + "// Line 4", + "RCULocked::WritePtr::WritePtr(RCULocked* rcu)", + " : lock_(&rcu_->mutex_) {", + "}", + "// Line 8", + "template ", + "typename std::enable_if<", + " std::is_array::value && (std::extent::value > 0)>::type", + "MakeUnique(A&&... a) = delete;", + "// Line 13", + "auto x = []() {};", + "// Line 15", + "template ", + "friend bool operator==(const reffed_ptr& a,", + " const reffed_ptr& b) {", + " return a.get() == b.get();", + "}", + "// Line 21", + ] + ) + + def testCloseExpression(self): + # List of positions to test: + # (start line, start position, end line, end position + 1) + positions = [ + (1, 16, 1, 19), + (1, 37, 1, 59), + (1, 60, 3, 1), + (2, 8, 2, 29), + (2, 30, 22, -1), # Left shift operator + (9, 9, 9, 36), + (10, 23, 11, 59), + (11, 54, 22, -1), # Greater than operator + (14, 9, 14, 11), + (14, 11, 14, 13), + (14, 14, 14, 16), + (17, 22, 18, 46), + (18, 47, 20, 1), + ] + for p in positions: + (_, line, column) = cpplint.CloseExpression(self.lines, p[0], p[1]) + self.assertEqual((p[2], p[3]), (line, column)) + + def testReverseCloseExpression(self): + # List of positions to test: + # (end line, end position, start line, start position) + positions = [ + (1, 18, 1, 16), + (1, 58, 1, 37), + (2, 27, 2, 10), + (2, 28, 2, 8), + (6, 18, 0, -1), # -> operator + (9, 35, 9, 9), + (11, 54, 0, -1), # Greater than operator + (11, 57, 11, 31), + (14, 10, 14, 9), + (14, 12, 14, 11), + (14, 15, 14, 14), + (18, 45, 17, 22), + (20, 0, 18, 47), + ] + for p in positions: + (_, line, column) = cpplint.ReverseCloseExpression(self.lines, p[0], p[1]) + self.assertEqual((p[2], p[3]), (line, column)) class NestingStateTest(unittest.TestCase): - - def setUp(self): - self.nesting_state = cpplint.NestingState() - self.error_collector = ErrorCollector(self.assertTrue) - - def UpdateWithLines(self, lines): - clean_lines = cpplint.CleansedLines(lines) - for line in range(clean_lines.NumLines()): - self.nesting_state.Update('test.cc', - clean_lines, line, self.error_collector) - - def testEmpty(self): - self.UpdateWithLines([]) - self.assertEqual(self.nesting_state.stack, []) - - def testNamespace(self): - self.UpdateWithLines(['namespace {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], - cpplint._NamespaceInfo)) - self.assertTrue(self.nesting_state.stack[0].seen_open_brace) - self.assertEqual(self.nesting_state.stack[0].name, '') - - self.UpdateWithLines(['namespace outer { namespace inner']) - self.assertEqual(len(self.nesting_state.stack), 3) - self.assertTrue(self.nesting_state.stack[0].seen_open_brace) - self.assertTrue(self.nesting_state.stack[1].seen_open_brace) - self.assertFalse(self.nesting_state.stack[2].seen_open_brace) - self.assertEqual(self.nesting_state.stack[0].name, '') - self.assertEqual(self.nesting_state.stack[1].name, 'outer') - self.assertEqual(self.nesting_state.stack[2].name, 'inner') - - self.UpdateWithLines(['{']) - self.assertTrue(self.nesting_state.stack[2].seen_open_brace) - - self.UpdateWithLines(['}', '}}']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testDecoratedClass(self): - self.UpdateWithLines(['class Decorated_123 API A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'A') - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertEqual(self.nesting_state.stack[0].class_indent, 0) - self.UpdateWithLines(['}']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testInnerClass(self): - self.UpdateWithLines(['class A::B::C {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'A::B::C') - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertEqual(self.nesting_state.stack[0].class_indent, 0) - self.UpdateWithLines(['}']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testClass(self): - self.UpdateWithLines(['class A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'A') - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertEqual(self.nesting_state.stack[0].class_indent, 0) - - self.UpdateWithLines(['};', - 'struct B : public A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'B') - self.assertTrue(self.nesting_state.stack[0].is_derived) - - self.UpdateWithLines(['};', - 'class C', - ': public A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'C') - self.assertTrue(self.nesting_state.stack[0].is_derived) - - self.UpdateWithLines(['};', - 'template']) - self.assertEqual(len(self.nesting_state.stack), 0) - - self.UpdateWithLines(['class D {', ' class E {']) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'D') - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[1].name, 'E') - self.assertFalse(self.nesting_state.stack[1].is_derived) - self.assertEqual(self.nesting_state.stack[1].class_indent, 2) - self.assertEqual(self.nesting_state.InnermostClass().name, 'E') - - self.UpdateWithLines(['}', '}']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testClassAccess(self): - self.UpdateWithLines(['class A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].access, 'private') - - self.UpdateWithLines([' public:']) - self.assertEqual(self.nesting_state.stack[0].access, 'public') - self.UpdateWithLines([' protracted:']) - self.assertEqual(self.nesting_state.stack[0].access, 'public') - self.UpdateWithLines([' protected:']) - self.assertEqual(self.nesting_state.stack[0].access, 'protected') - self.UpdateWithLines([' private:']) - self.assertEqual(self.nesting_state.stack[0].access, 'private') - - self.UpdateWithLines([' struct B {']) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[1].access, 'public') - self.assertEqual(self.nesting_state.stack[0].access, 'private') - - self.UpdateWithLines([' protected :']) - self.assertEqual(self.nesting_state.stack[1].access, 'protected') - self.assertEqual(self.nesting_state.stack[0].access, 'private') - - self.UpdateWithLines([' }', '}']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testStruct(self): - self.UpdateWithLines(['struct A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'A') - self.assertFalse(self.nesting_state.stack[0].is_derived) - - self.UpdateWithLines(['}', - 'void Func(struct B arg) {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertFalse(isinstance(self.nesting_state.stack[0], - cpplint._ClassInfo)) - - self.UpdateWithLines(['}']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testPreprocessor(self): - self.assertEqual(len(self.nesting_state.pp_stack), 0) - self.UpdateWithLines(['#if MACRO1']) - self.assertEqual(len(self.nesting_state.pp_stack), 1) - self.UpdateWithLines(['#endif']) - self.assertEqual(len(self.nesting_state.pp_stack), 0) - - self.UpdateWithLines(['#ifdef MACRO2']) - self.assertEqual(len(self.nesting_state.pp_stack), 1) - self.UpdateWithLines(['#else']) - self.assertEqual(len(self.nesting_state.pp_stack), 1) - self.UpdateWithLines(['#ifdef MACRO3']) - self.assertEqual(len(self.nesting_state.pp_stack), 2) - self.UpdateWithLines(['#elif MACRO4']) - self.assertEqual(len(self.nesting_state.pp_stack), 2) - self.UpdateWithLines(['#endif']) - self.assertEqual(len(self.nesting_state.pp_stack), 1) - self.UpdateWithLines(['#endif']) - self.assertEqual(len(self.nesting_state.pp_stack), 0) - - self.UpdateWithLines(['#ifdef MACRO5', - 'class A {', - '#elif MACRO6', - 'class B {', - '#else', - 'class C {', - '#endif']) - self.assertEqual(len(self.nesting_state.pp_stack), 0) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'A') - self.UpdateWithLines(['};']) - self.assertEqual(len(self.nesting_state.stack), 0) - - self.UpdateWithLines(['class D', - '#ifdef MACRO7']) - self.assertEqual(len(self.nesting_state.pp_stack), 1) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'D') - self.assertFalse(self.nesting_state.stack[0].is_derived) - - self.UpdateWithLines(['#elif MACRO8', - ': public E']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[0].name, 'D') - self.assertTrue(self.nesting_state.stack[0].is_derived) - self.assertFalse(self.nesting_state.stack[0].seen_open_brace) - - self.UpdateWithLines(['#else', - '{']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[0].name, 'D') - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertTrue(self.nesting_state.stack[0].seen_open_brace) - - self.UpdateWithLines(['#endif']) - self.assertEqual(len(self.nesting_state.pp_stack), 0) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[0].name, 'D') - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertFalse(self.nesting_state.stack[0].seen_open_brace) - - self.UpdateWithLines([';']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testTemplate(self): - self.UpdateWithLines(['template >']) - self.assertEqual(len(self.nesting_state.stack), 0) - self.UpdateWithLines(['class A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'A') - - self.UpdateWithLines(['};', - 'template class B>', - 'class C']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'C') - self.UpdateWithLines([';']) - self.assertEqual(len(self.nesting_state.stack), 0) - - self.UpdateWithLines(['class D : public Tmpl']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'D') - - self.UpdateWithLines(['{', '};']) - self.assertEqual(len(self.nesting_state.stack), 0) - - self.UpdateWithLines(['template ', - 'static void Func() {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertFalse(isinstance(self.nesting_state.stack[0], - cpplint._ClassInfo)) - self.UpdateWithLines(['}', - 'template class K {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'K') - - def testTemplateDefaultArg(self): - self.UpdateWithLines([ - 'template > class unique_ptr {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(self.nesting_state.stack[0], isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - - def testTemplateInnerClass(self): - self.UpdateWithLines(['class A {', - ' public:']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - - self.UpdateWithLines([' template ', - ' class C >', - ' : public A {']) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) - - def testArguments(self): - self.UpdateWithLines(['class A {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'A') - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - - self.UpdateWithLines([' void Func(', - ' struct X arg1,']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.UpdateWithLines([' struct X *arg2);']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - - self.UpdateWithLines(['};']) - self.assertEqual(len(self.nesting_state.stack), 0) - - self.UpdateWithLines(['struct B {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, 'B') - - self.UpdateWithLines(['#ifdef MACRO', - ' void Func(', - ' struct X arg1']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.UpdateWithLines(['#else']) - - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - self.UpdateWithLines([' void Func(', - ' struct X arg1']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - - self.UpdateWithLines(['#endif']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.UpdateWithLines([' struct X *arg2);']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - - self.UpdateWithLines(['};']) - self.assertEqual(len(self.nesting_state.stack), 0) - - def testInlineAssembly(self): - self.UpdateWithLines(['void CopyRow_SSE2(const uint8_t* src, uint8_t* dst,', - ' int count) {']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._NO_ASM) - - self.UpdateWithLines([' asm volatile (']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, - cpplint._INSIDE_ASM) - - self.UpdateWithLines([' "sub %0,%1 \\n"', - ' "1: \\n"', - ' "movdqa (%0),%%xmm0 \\n"', - ' "movdqa 0x10(%0),%%xmm1 \\n"', - ' "movdqa %%xmm0,(%0,%1) \\n"', - ' "movdqa %%xmm1,0x10(%0,%1) \\n"', - ' "lea 0x20(%0),%0 \\n"', - ' "sub $0x20,%2 \\n"', - ' "jg 1b \\n"', - ' : "+r"(src), // %0', - ' "+r"(dst), // %1', - ' "+r"(count) // %2', - ' :', - ' : "memory", "cc"']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, - cpplint._INSIDE_ASM) - - self.UpdateWithLines(['#if defined(__SSE2__)', - ' , "xmm0", "xmm1"']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, - cpplint._INSIDE_ASM) - - self.UpdateWithLines(['#endif']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, - cpplint._INSIDE_ASM) - - self.UpdateWithLines([' );']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._END_ASM) - - self.UpdateWithLines(['__asm {']) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, - cpplint._BLOCK_ASM) - - self.UpdateWithLines(['}']) - self.assertEqual(len(self.nesting_state.stack), 1) - - self.UpdateWithLines(['}']) - self.assertEqual(len(self.nesting_state.stack), 0) + def setUp(self): + self.nesting_state = cpplint.NestingState() + self.error_collector = ErrorCollector(self.assertTrue) + + def UpdateWithLines(self, lines): + clean_lines = cpplint.CleansedLines(lines) + for line in range(clean_lines.NumLines()): + self.nesting_state.Update("test.cc", clean_lines, line, self.error_collector) + + def testEmpty(self): + self.UpdateWithLines([]) + self.assertEqual(self.nesting_state.stack, []) + + def testNamespace(self): + self.UpdateWithLines(["namespace {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._NamespaceInfo)) + self.assertTrue(self.nesting_state.stack[0].seen_open_brace) + self.assertEqual(self.nesting_state.stack[0].name, "") + + self.UpdateWithLines(["namespace outer { namespace inner"]) + self.assertEqual(len(self.nesting_state.stack), 3) + self.assertTrue(self.nesting_state.stack[0].seen_open_brace) + self.assertTrue(self.nesting_state.stack[1].seen_open_brace) + self.assertFalse(self.nesting_state.stack[2].seen_open_brace) + self.assertEqual(self.nesting_state.stack[0].name, "") + self.assertEqual(self.nesting_state.stack[1].name, "outer") + self.assertEqual(self.nesting_state.stack[2].name, "inner") + + self.UpdateWithLines(["{"]) + self.assertTrue(self.nesting_state.stack[2].seen_open_brace) + + self.UpdateWithLines(["}", "}}"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testDecoratedClass(self): + self.UpdateWithLines(["class Decorated_123 API A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "A") + self.assertFalse(self.nesting_state.stack[0].is_derived) + self.assertEqual(self.nesting_state.stack[0].class_indent, 0) + self.UpdateWithLines(["}"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testInnerClass(self): + self.UpdateWithLines(["class A::B::C {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "A::B::C") + self.assertFalse(self.nesting_state.stack[0].is_derived) + self.assertEqual(self.nesting_state.stack[0].class_indent, 0) + self.UpdateWithLines(["}"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testClass(self): + self.UpdateWithLines(["class A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "A") + self.assertFalse(self.nesting_state.stack[0].is_derived) + self.assertEqual(self.nesting_state.stack[0].class_indent, 0) + + self.UpdateWithLines(["};", "struct B : public A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "B") + self.assertTrue(self.nesting_state.stack[0].is_derived) + + self.UpdateWithLines(["};", "class C", ": public A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "C") + self.assertTrue(self.nesting_state.stack[0].is_derived) + + self.UpdateWithLines(["};", "template"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + self.UpdateWithLines(["class D {", " class E {"]) + self.assertEqual(len(self.nesting_state.stack), 2) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "D") + self.assertFalse(self.nesting_state.stack[0].is_derived) + self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[1].name, "E") + self.assertFalse(self.nesting_state.stack[1].is_derived) + self.assertEqual(self.nesting_state.stack[1].class_indent, 2) + self.assertEqual(self.nesting_state.InnermostClass().name, "E") + + self.UpdateWithLines(["}", "}"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testClassAccess(self): + self.UpdateWithLines(["class A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].access, "private") + + self.UpdateWithLines([" public:"]) + self.assertEqual(self.nesting_state.stack[0].access, "public") + self.UpdateWithLines([" protracted:"]) + self.assertEqual(self.nesting_state.stack[0].access, "public") + self.UpdateWithLines([" protected:"]) + self.assertEqual(self.nesting_state.stack[0].access, "protected") + self.UpdateWithLines([" private:"]) + self.assertEqual(self.nesting_state.stack[0].access, "private") + + self.UpdateWithLines([" struct B {"]) + self.assertEqual(len(self.nesting_state.stack), 2) + self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[1].access, "public") + self.assertEqual(self.nesting_state.stack[0].access, "private") + + self.UpdateWithLines([" protected :"]) + self.assertEqual(self.nesting_state.stack[1].access, "protected") + self.assertEqual(self.nesting_state.stack[0].access, "private") + + self.UpdateWithLines([" }", "}"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testStruct(self): + self.UpdateWithLines(["struct A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "A") + self.assertFalse(self.nesting_state.stack[0].is_derived) + + self.UpdateWithLines(["}", "void Func(struct B arg) {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertFalse(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + + self.UpdateWithLines(["}"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testPreprocessor(self): + self.assertEqual(len(self.nesting_state.pp_stack), 0) + self.UpdateWithLines(["#if MACRO1"]) + self.assertEqual(len(self.nesting_state.pp_stack), 1) + self.UpdateWithLines(["#endif"]) + self.assertEqual(len(self.nesting_state.pp_stack), 0) + + self.UpdateWithLines(["#ifdef MACRO2"]) + self.assertEqual(len(self.nesting_state.pp_stack), 1) + self.UpdateWithLines(["#else"]) + self.assertEqual(len(self.nesting_state.pp_stack), 1) + self.UpdateWithLines(["#ifdef MACRO3"]) + self.assertEqual(len(self.nesting_state.pp_stack), 2) + self.UpdateWithLines(["#elif MACRO4"]) + self.assertEqual(len(self.nesting_state.pp_stack), 2) + self.UpdateWithLines(["#endif"]) + self.assertEqual(len(self.nesting_state.pp_stack), 1) + self.UpdateWithLines(["#endif"]) + self.assertEqual(len(self.nesting_state.pp_stack), 0) + + self.UpdateWithLines( + [ + "#ifdef MACRO5", + "class A {", + "#elif MACRO6", + "class B {", + "#else", + "class C {", + "#endif", + ] + ) + self.assertEqual(len(self.nesting_state.pp_stack), 0) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "A") + self.UpdateWithLines(["};"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + self.UpdateWithLines(["class D", "#ifdef MACRO7"]) + self.assertEqual(len(self.nesting_state.pp_stack), 1) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "D") + self.assertFalse(self.nesting_state.stack[0].is_derived) + + self.UpdateWithLines(["#elif MACRO8", ": public E"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[0].name, "D") + self.assertTrue(self.nesting_state.stack[0].is_derived) + self.assertFalse(self.nesting_state.stack[0].seen_open_brace) + + self.UpdateWithLines(["#else", "{"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[0].name, "D") + self.assertFalse(self.nesting_state.stack[0].is_derived) + self.assertTrue(self.nesting_state.stack[0].seen_open_brace) + + self.UpdateWithLines(["#endif"]) + self.assertEqual(len(self.nesting_state.pp_stack), 0) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[0].name, "D") + self.assertFalse(self.nesting_state.stack[0].is_derived) + self.assertFalse(self.nesting_state.stack[0].seen_open_brace) + + self.UpdateWithLines([";"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testTemplate(self): + self.UpdateWithLines(["template >"]) + self.assertEqual(len(self.nesting_state.stack), 0) + self.UpdateWithLines(["class A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "A") + + self.UpdateWithLines( + ["};", "template class B>", "class C"] + ) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "C") + self.UpdateWithLines([";"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + self.UpdateWithLines(["class D : public Tmpl"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "D") + + self.UpdateWithLines(["{", "};"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + self.UpdateWithLines( + [ + "template ", + "static void Func() {", + ] + ) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertFalse(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.UpdateWithLines(["}", "template class K {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "K") + + def testTemplateDefaultArg(self): + self.UpdateWithLines(["template > class unique_ptr {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue( + self.nesting_state.stack[0], isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + ) + + def testTemplateInnerClass(self): + self.UpdateWithLines(["class A {", " public:"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + + self.UpdateWithLines([" template ", " class C >", " : public A {"]) + self.assertEqual(len(self.nesting_state.stack), 2) + self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) + + def testArguments(self): + self.UpdateWithLines(["class A {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "A") + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + + self.UpdateWithLines([" void Func(", " struct X arg1,"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + self.UpdateWithLines([" struct X *arg2);"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + + self.UpdateWithLines(["};"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + self.UpdateWithLines(["struct B {"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + self.assertEqual(self.nesting_state.stack[0].name, "B") + + self.UpdateWithLines(["#ifdef MACRO", " void Func(", " struct X arg1"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + self.UpdateWithLines(["#else"]) + + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + self.UpdateWithLines([" void Func(", " struct X arg1"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + + self.UpdateWithLines(["#endif"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + self.UpdateWithLines([" struct X *arg2);"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + + self.UpdateWithLines(["};"]) + self.assertEqual(len(self.nesting_state.stack), 0) + + def testInlineAssembly(self): + self.UpdateWithLines( + [ + "void CopyRow_SSE2(const uint8_t* src, uint8_t* dst,", + " int count) {", + ] + ) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._NO_ASM) + + self.UpdateWithLines([" asm volatile ("]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + + self.UpdateWithLines( + [ + ' "sub %0,%1 \\n"', + ' "1: \\n"', + ' "movdqa (%0),%%xmm0 \\n"', + ' "movdqa 0x10(%0),%%xmm1 \\n"', + ' "movdqa %%xmm0,(%0,%1) \\n"', + ' "movdqa %%xmm1,0x10(%0,%1) \\n"', + ' "lea 0x20(%0),%0 \\n"', + ' "sub $0x20,%2 \\n"', + ' "jg 1b \\n"', + ' : "+r"(src), // %0', + ' "+r"(dst), // %1', + ' "+r"(count) // %2', + " :", + ' : "memory", "cc"', + ] + ) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + + self.UpdateWithLines(["#if defined(__SSE2__)", ' , "xmm0", "xmm1"']) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + + self.UpdateWithLines(["#endif"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + + self.UpdateWithLines([" );"]) + self.assertEqual(len(self.nesting_state.stack), 1) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._END_ASM) + + self.UpdateWithLines(["__asm {"]) + self.assertEqual(len(self.nesting_state.stack), 2) + self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._BLOCK_ASM) + + self.UpdateWithLines(["}"]) + self.assertEqual(len(self.nesting_state.stack), 1) + + self.UpdateWithLines(["}"]) + self.assertEqual(len(self.nesting_state.stack), 0) class QuietTest(unittest.TestCase): + def setUp(self): + self.temp_dir = os.path.realpath(tempfile.mkdtemp()) + self.this_dir_path = os.path.abspath(self.temp_dir) + self.python_executable = sys.executable or "python" + self.cpplint_test_h = os.path.join(self.this_dir_path, "cpplint_test_header.h") + open(self.cpplint_test_h, "w").close() + + def tearDown(self): + shutil.rmtree(self.temp_dir) + + def _runCppLint(self, *args): + cpplint_abspath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "cpplint.py") + + cmd_line = [self.python_executable, cpplint_abspath] + list(args) + [self.cpplint_test_h] + + return_code = 0 + try: + output = subprocess.check_output(cmd_line, stderr=subprocess.STDOUT) + except subprocess.CalledProcessError as err: + return_code = err.returncode + output = err.output + if isinstance(output, bytes): + output = output.decode("utf-8") + return (return_code, output) + + def testNonQuietWithErrors(self): + # This will fail: the test header is missing a copyright and header guard. + (return_code, output) = self._runCppLint() + self.assertEqual(1, return_code) + # Always-on behavior: Print error messages as they come up. + self.assertIn("[legal/copyright]", output) + self.assertIn("[build/header_guard]", output) + # If --quiet was unspecified: Print 'Done processing' and 'Total errors..' + self.assertIn("Done processing", output) + self.assertIn("Total errors found:", output) + + def testQuietWithErrors(self): + # When there are errors, behavior is identical to not passing --quiet. + (return_code, output) = self._runCppLint("--quiet") + self.assertEqual(1, return_code) + self.assertIn("[legal/copyright]", output) + self.assertIn("[build/header_guard]", output) + # Even though --quiet was used, print these since there were errors. + self.assertIn("Done processing", output) + self.assertIn("Total errors found:", output) + + def testNonQuietWithoutErrors(self): + # This will succeed. We filtered out all the known errors for that file. + (return_code, output) = self._runCppLint( + "--filter=" + "-legal/copyright," + "-build/header_guard" + ) + self.assertEqual(0, return_code, output) + # No cpplint errors are printed since there were no errors. + self.assertNotIn("[legal/copyright]", output) + self.assertNotIn("[build/header_guard]", output) + # Print 'Done processing' since + # --quiet was not specified. + self.assertIn("Done processing", output) + + def testQuietWithoutErrors(self): + # This will succeed. We filtered out all the known errors for that file. + (return_code, output) = self._runCppLint( + "--quiet", "--filter=" + "-legal/copyright," + "-build/header_guard" + ) + self.assertEqual(0, return_code, output) + # No cpplint errors are printed since there were no errors. + self.assertNotIn("[legal/copyright]", output) + self.assertNotIn("[build/header_guard]", output) + # --quiet was specified and there were no errors: + # skip the printing of 'Done processing' and 'Total errors..' + self.assertNotIn("Done processing", output) + self.assertNotIn("Total errors found:", output) + # Output with no errors must be completely blank! + self.assertEqual("", output) - def setUp(self): - self.temp_dir = os.path.realpath(tempfile.mkdtemp()) - self.this_dir_path = os.path.abspath(self.temp_dir) - self.python_executable = sys.executable or 'python' - self.cpplint_test_h = os.path.join(self.this_dir_path, - 'cpplint_test_header.h') - open(self.cpplint_test_h, 'w').close() - - def tearDown(self): - shutil.rmtree(self.temp_dir) - - def _runCppLint(self, *args): - cpplint_abspath = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'cpplint.py') - - cmd_line = [self.python_executable, cpplint_abspath] + \ - list(args) + \ - [self.cpplint_test_h] - - return_code = 0 - try: - output = subprocess.check_output(cmd_line, - stderr=subprocess.STDOUT) - except subprocess.CalledProcessError as err: - return_code = err.returncode - output = err.output - if isinstance(output, bytes): - output = output.decode('utf-8') - return (return_code, output) - - def testNonQuietWithErrors(self): - # This will fail: the test header is missing a copyright and header guard. - (return_code, output) = self._runCppLint() - self.assertEqual(1, return_code) - # Always-on behavior: Print error messages as they come up. - self.assertIn("[legal/copyright]", output) - self.assertIn("[build/header_guard]", output) - # If --quiet was unspecified: Print 'Done processing' and 'Total errors..' - self.assertIn("Done processing", output) - self.assertIn("Total errors found:", output) - - def testQuietWithErrors(self): - # When there are errors, behavior is identical to not passing --quiet. - (return_code, output) = self._runCppLint('--quiet') - self.assertEqual(1, return_code) - self.assertIn("[legal/copyright]", output) - self.assertIn("[build/header_guard]", output) - # Even though --quiet was used, print these since there were errors. - self.assertIn("Done processing", output) - self.assertIn("Total errors found:", output) - - def testNonQuietWithoutErrors(self): - # This will succeed. We filtered out all the known errors for that file. - (return_code, output) = self._runCppLint('--filter=' + - '-legal/copyright,' + - '-build/header_guard') - self.assertEqual(0, return_code, output) - # No cpplint errors are printed since there were no errors. - self.assertNotIn("[legal/copyright]", output) - self.assertNotIn("[build/header_guard]", output) - # Print 'Done processing' since - # --quiet was not specified. - self.assertIn("Done processing", output) - - def testQuietWithoutErrors(self): - # This will succeed. We filtered out all the known errors for that file. - (return_code, output) = self._runCppLint('--quiet', - '--filter=' + - '-legal/copyright,' + - '-build/header_guard') - self.assertEqual(0, return_code, output) - # No cpplint errors are printed since there were no errors. - self.assertNotIn("[legal/copyright]", output) - self.assertNotIn("[build/header_guard]", output) - # --quiet was specified and there were no errors: - # skip the printing of 'Done processing' and 'Total errors..' - self.assertNotIn("Done processing", output) - self.assertNotIn("Total errors found:", output) - # Output with no errors must be completely blank! - self.assertEqual("", output) # class FileFilterTest(unittest.TestCase): # def testFilterExcludedFiles(self): # self.assertEqual([], _FilterExcludedFiles([])) + # pylint: disable=C6409 def setUp(): - """Runs before all tests are executed. - """ - # Enable all filters, so we don't miss anything that is off by default. - cpplint._DEFAULT_FILTERS = [] - cpplint._cpplint_state.SetFilters('') + """Runs before all tests are executed.""" + # Enable all filters, so we don't miss anything that is off by default. + cpplint._DEFAULT_FILTERS = [] + cpplint._cpplint_state.SetFilters("") # pylint: disable=C6409 def tearDown(): - """A global check to make sure all error-categories have been tested. + """A global check to make sure all error-categories have been tested. - The main tearDown() routine is the only code we can guarantee will be - run after all other tests have been executed. - """ - try: - if _run_verifyallcategoriesseen: - ErrorCollector(None).VerifyAllCategoriesAreSeen() - except NameError: - # If nobody set the global _run_verifyallcategoriesseen, then - # we assume we should silently not run the test - pass + The main tearDown() routine is the only code we can guarantee will be + run after all other tests have been executed. + """ + try: + if _run_verifyallcategoriesseen: + ErrorCollector(None).VerifyAllCategoriesAreSeen() + except NameError: + # If nobody set the global _run_verifyallcategoriesseen, then + # we assume we should silently not run the test + pass @pytest.fixture(autouse=True) def run_around_tests(): - setUp() - yield - tearDown() - - -if __name__ == '__main__': - # We don't want to run the VerifyAllCategoriesAreSeen() test unless - # we're running the full test suite: if we only run one test, - # obviously we're not going to see all the error categories. So we - # only run VerifyAllCategoriesAreSeen() when no commandline flags - # are passed in. - global _run_verifyallcategoriesseen - _run_verifyallcategoriesseen = (len(sys.argv) == 1) - - setUp() - unittest.main() - tearDown() + setUp() + yield + tearDown() + + +if __name__ == "__main__": + # We don't want to run the VerifyAllCategoriesAreSeen() test unless + # we're running the full test suite: if we only run one test, + # obviously we're not going to see all the error categories. So we + # only run VerifyAllCategoriesAreSeen() when no commandline flags + # are passed in. + global _run_verifyallcategoriesseen + _run_verifyallcategoriesseen = len(sys.argv) == 1 + + setUp() + unittest.main() + tearDown() From ac52a793fdca04b2dda4d1eeb5f61af757d4886f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 12 Mar 2025 09:51:39 +0100 Subject: [PATCH 25/63] Non-Python files --- .flake8 | 4 +++- .pre-commit-config.yaml | 1 + pyproject.toml | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.flake8 b/.flake8 index ca2967e..44d344c 100644 --- a/.flake8 +++ b/.flake8 @@ -8,6 +8,8 @@ ignore = E302,E305, # closing bracket does not match indentation of opening bracket's line E123, + # whitespace before ':' + E203, # multiple spaces before operator E221, # line break before binary operator @@ -36,4 +38,4 @@ ignore = E226, # test for membership should be 'not in' E713, -max-line-length=120 +max-line-length=100 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9dc30df..32293fb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,6 +18,7 @@ repos: rev: v0.9.10 hooks: - id: ruff + - id: ruff-format - repo: https://github.com/pycqa/flake8 rev: 7.1.2 diff --git a/pyproject.toml b/pyproject.toml index 8eb77cc..951958b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ dynamic.version = { attr = "cpplint.__VERSION__" } [tool.ruff] target-version = "py38" -line-length = 116 +line-length = 100 lint.select = [ "A", # flake8-builtins "AIR", # Airflow @@ -155,23 +155,23 @@ class-rgx = "[A-Z_][a-zA-Z0-9]+$" [tool.pylint.messages-control] disable = [ + "anomalous-unicode-escape-in-string", + "bad-continuation", + "bad-option-value", + "consider-merging-isinstance", + "consider-using-dict-comprehension", + "consider-using-in", + "consider-using-min-builtin", + "fixme", "global-statement", - "multiple-statements", "missing-docstring", + "multiple-statements", "no-else-return", "no-self-use", - "consider-merging-isinstance", - "consider-using-min-builtin", - "bad-continuation", - "fixme", - "bad-option-value", - "anomalous-unicode-escape-in-string", + "too-many-positional-arguments", + "unnecessary-pass", "unused-argument", "useless-object-inheritance", - "consider-using-dict-comprehension", - "consider-using-in", - "unnecessary-pass", - "too-many-positional-arguments", ] [tool.pylint.reports] @@ -180,7 +180,7 @@ reports = false score = false [tool.pylint.format] -indent-string = ' ' +indent-string = ' ' indent-after-paren = 4 max-module-lines = 10000 From 26a8d689d99ce2c97a89015d968e25e3d76f8965 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 12 Mar 2025 10:09:15 +0100 Subject: [PATCH 26/63] ruff rules UP for pyupgrade --- cpplint.py | 20 ++++++++++---------- cpplint_clitest.py | 5 ++--- cpplint_unittest.py | 29 ++++++++++------------------- pyproject.toml | 30 +++++++++++++++--------------- 4 files changed, 37 insertions(+), 47 deletions(-) diff --git a/cpplint.py b/cpplint.py index 6556c97..f9edf3c 100755 --- a/cpplint.py +++ b/cpplint.py @@ -1214,7 +1214,7 @@ def _IsSourceExtension(s): return s in GetNonHeaderExtensions() -class _IncludeState(object): +class _IncludeState: """Tracks line numbers for includes, and the order in which includes appear. include_list contains list of lists of (header, line number) pairs. @@ -1392,7 +1392,7 @@ def CheckNextIncludeOrder(self, header_type): return "" -class _CppLintState(object): +class _CppLintState: """Maintains module-wide state..""" def __init__(self): @@ -1637,7 +1637,7 @@ def _RestoreFilters(): _cpplint_state.RestoreFilters() -class _FunctionState(object): +class _FunctionState: """Tracks current function name and the number of lines in its body.""" _NORMAL_TRIGGER = 250 # for --v=0, 500 for --v=1, etc. @@ -1705,7 +1705,7 @@ class _IncludeError(Exception): pass -class FileInfo(object): +class FileInfo: """Provides utility functions for filenames. FileInfo provides easy access to the components of a file's path @@ -2104,7 +2104,7 @@ def ReplaceAlternateTokens(line): return line -class CleansedLines(object): +class CleansedLines: """Holds 4 copies of all lines with different preprocessing applied to them. 1) elided member contains lines without strings and comments. @@ -2973,7 +2973,7 @@ def IsForwardClassDeclaration(clean_lines, linenum): return re.match(r"^\s*(\btemplate\b)*.*class\s+\w+;\s*$", clean_lines[linenum]) -class _BlockInfo(object): +class _BlockInfo: """Stores information about a generic block of code.""" def __init__(self, linenum, seen_open_brace): @@ -3188,7 +3188,7 @@ def CheckEnd(self, filename, clean_lines, linenum, error): ) -class _PreprocessorInfo(object): +class _PreprocessorInfo: """Stores checkpoints of nesting stacks when #if/#else is seen.""" def __init__(self, stack_before_if): @@ -3202,7 +3202,7 @@ def __init__(self, stack_before_if): self.seen_else = False -class NestingState(object): +class NestingState: """Holds states related to parsing braces.""" def __init__(self): @@ -7417,7 +7417,7 @@ def ProcessConfigOverrides(filename): f"Invalid configuration option ({name}) in file {cfg_file}\n" ) - except IOError: + except OSError: _cpplint_state.PrintError( f"Skipping config file '{cfg_file}': Can't open for reading\n" ) @@ -7478,7 +7478,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=None): else: lf_lines.append(linenum + 1) - except IOError: + except OSError: # TODO: Maybe make this have an exit code of 2 after all is done _cpplint_state.PrintError(f"Skipping input '{filename}': Can't open for reading\n") _RestoreFilters() diff --git a/cpplint_clitest.py b/cpplint_clitest.py index f20d54d..75a9733 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8; -*- # # Copyright (c) 2009 Google Inc. All rights reserved. # @@ -162,8 +161,8 @@ def _run_and_compare(self, definition_file, args, expected_status, expected_out, # command to reproduce, do not forget first two lines have special meaning print("\ncd " + cwd + " && " + cmd + " " + args + " 2> ") (status, out, err) = run_shell_command(cmd, args, cwd) - self.assertEqual(expected_status, status, "bad command status %s" % status) - prefix = "Failed check in %s comparing to %s for command: %s" % (cwd, definition_file, cmd) + self.assertEqual(expected_status, status, f"bad command status {status}") + prefix = f"Failed check in {cwd} comparing to {definition_file} for command: {cmd}" compare("\n".join(expected_err), err.decode("utf8"), prefix=prefix, show_whitespace=True) compare("\n".join(expected_out), out.decode("utf8"), prefix=prefix, show_whitespace=True) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 33d3fc8..bae157d 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: utf-8; -*- # # Copyright (c) 2009 Google Inc. All rights reserved. # @@ -51,15 +50,13 @@ def codecs_latin_encode(x): - if sys.version_info < (3,): - return x return codecs.latin_1_encode(x)[0] # This class works as an error collector and replaces cpplint.Error # function for the unit tests. We also verify each category we see # is in cpplint._ERROR_CATEGORIES, to help keep that list up to date. -class ErrorCollector(object): +class ErrorCollector: # These are a global list, covering all categories seen ever. _ERROR_CATEGORIES = cpplint._ERROR_CATEGORIES _SEEN_ERROR_CATEGORIES = {} @@ -110,7 +107,7 @@ def RemoveIfPresent(self, substr): # This class is a lame mock of codecs. We do not verify filename, mode, or # encoding, but for the current use case it is not needed. -class MockIo(object): +class MockIo: def __init__(self, mock_file): # wrap list to allow "with open(mock)" class EnterableList(list): @@ -357,7 +354,7 @@ def testNestingInNamespace(self): # Test get line width. def testGetLineWidth(self): self.assertEqual(0, cpplint.GetLineWidth("")) - self.assertEqual(10, cpplint.GetLineWidth(str("x") * 10)) + self.assertEqual(10, cpplint.GetLineWidth("x" * 10)) self.assertEqual(16, cpplint.GetLineWidth("\u90fd|\u9053|\u5e9c|\u770c|\u652f\u5e81")) self.assertEqual(16, cpplint.GetLineWidth("都|道|府|県|支庁")) self.assertEqual(5 + 13 + 9, cpplint.GetLineWidth("d𝐱/dt" + "f : t ⨯ 𝐱 → ℝ" + "t ⨯ 𝐱 → ℝ")) @@ -1056,21 +1053,17 @@ def testMockMethod(self): self.assertEqual( 0, error_collector.Results().count( - ( - "Using deprecated casting style. " - "Use static_cast(...) instead " - "[readability/casting] [4]" - ) + "Using deprecated casting style. " + "Use static_cast(...) instead " + "[readability/casting] [4]" ), ) self.assertEqual( 1, error_collector.Results().count( - ( - "Using deprecated casting style. " - "Use static_cast(...) instead " - "[readability/casting] [4]" - ) + "Using deprecated casting style. " + "Use static_cast(...) instead " + "[readability/casting] [4]" ), ) @@ -4842,9 +4835,7 @@ def testRecursiveExclude(self): expected = [os.path.join("src", "one.cc")] cpplint._excludes = None - actual = cpplint.ParseArguments( - ["--recursive", "--exclude=src{0}t*".format(os.sep), "src"] - ) + actual = cpplint.ParseArguments(["--recursive", f"--exclude=src{os.sep}t*", "src"]) self.assertEqual(set(expected), set(actual)) expected = [os.path.join("src", "one.cc")] diff --git a/pyproject.toml b/pyproject.toml index 951958b..641c92c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,6 +103,7 @@ lint.select = [ "TC", # flake8-type-checking "TID", # flake8-tidy-imports "TRY", # tryceratops + "UP", # pyupgrade "W", # pycodestyle "YTT", # flake8-2020 # "ANN", # flake8-annotations @@ -124,7 +125,6 @@ lint.select = [ # "SLF", # flake8-self # "T20", # flake8-print # "TD", # flake8-todos - # "UP", # pyupgrade ] lint.ignore = [ "FBT003", # flake8-boolean-trap @@ -133,7 +133,7 @@ lint.ignore = [ "PIE790", # Unnecessary `pass` statement ] lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401", "PLR5501", "PLW0603", "PLW2901" ] -lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "PLW0604" ] +lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "PLW0604", "UP031" ] lint.mccabe.max-complexity = 29 lint.pylint.allow-magic-value-types = [ "int", "str" ] lint.pylint.max-args = 10 # Default is 5 @@ -145,13 +145,13 @@ lint.pylint.max-returns = 9 # Default is 9 lint.pylint.max-statements = 74 # Default is 50 [tool.pylint.basic] +argument-rgx = "[a-z_][a-z0-9_]{0,49}$" +class-rgx = "[A-Z_][a-zA-Z0-9]+$" +const-rgx = "[a-zA-Z_][A-Za-z0-9_]{2,49}$" +function-rgx = "[A-Z_][A-Za-z0-9]{2,49}$|main" include-naming-hint = true method-rgx = "[A-Z_][A-Za-z0-9]{2,49}$|__init__|__str__|__contains__" -function-rgx = "[A-Z_][A-Za-z0-9]{2,49}$|main" -const-rgx = "[a-zA-Z_][A-Za-z0-9_]{2,49}$" variable-rgx = "[a-z_][a-z0-9_]{0,49}$" -argument-rgx = "[a-z_][a-z0-9_]{0,49}$" -class-rgx = "[A-Z_][a-zA-Z0-9]+$" [tool.pylint.messages-control] disable = [ @@ -180,25 +180,25 @@ reports = false score = false [tool.pylint.format] -indent-string = ' ' indent-after-paren = 4 +indent-string = ' ' max-module-lines = 10000 [tool.pylint.design] -max-locals = 25 -max-line-length = 100 +max-args = 20 max-attributes = 10 +max-bool-expr = 10 max-branches = 30 -max-args = 20 -max-statements = 75 +max-line-length = 100 +max-locals = 25 max-returns = 10 +max-statements = 75 min-public-methods = 0 -max-bool-expr = 10 [tool.pytest.ini_options] +# fail if coverage is under 90% +addopts = "--color=yes --cov-fail-under=90 --cov=cpplint" python_files = [ "*test.py" ] -testpaths = [ "." ] required_plugins = [ "pytest-cov", "pytest-timeout" ] +testpaths = [ "." ] timeout = 60 -# fail if coverage is under 90% -addopts = "--color=yes --cov-fail-under=90 --cov=cpplint" From 3fbade34cb62bb5cb24e655cf1dc8132a1fc6563 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 14 Mar 2025 15:33:14 +0100 Subject: [PATCH 27/63] pre-commit autoupdate 2025-03-14 (#338) % `pre-commit autoupdate` ``` [https://github.com/codespell-project/codespell] already up to date! [https://github.com/astral-sh/ruff-pre-commit] updating v0.9.10 -> v0.10.0 [https://github.com/pycqa/flake8] already up to date! [https://github.com/tox-dev/pyproject-fmt] already up to date! [https://github.com/abravalheri/validate-pyproject] updating v0.23 -> v0.24 ``` % `pre-commit run --all-files` https://astral.sh/blog/ruff-v0.10.0 --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 32293fb..7a3923f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.10 + rev: v0.10.0 hooks: - id: ruff - id: ruff-format @@ -31,6 +31,6 @@ repos: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.23 + rev: v0.24 hooks: - id: validate-pyproject From af3009285932cdd1a4736a6317cfd5f4d97951d9 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 15 Mar 2025 01:38:55 +0100 Subject: [PATCH 28/63] Ruff rules SIM for simplification (#337) https://docs.astral.sh/ruff/rules/#flake8-simplify-sim --- cpplint.py | 119 +++++++++++++++++++-------------------------- cpplint_clitest.py | 7 ++- pyproject.toml | 13 ++--- 3 files changed, 59 insertions(+), 80 deletions(-) diff --git a/cpplint.py b/cpplint.py index f9edf3c..b396eae 100755 --- a/cpplint.py +++ b/cpplint.py @@ -1326,11 +1326,10 @@ def IsInAlphabeticalOrder(self, clean_lines, linenum, header_path): # # If previous line was a blank line, assume that the headers are # intentionally sorted the way they are. - if self._last_header > header_path and re.match( - r"^\s*#\s*include\b", clean_lines.elided[linenum - 1] - ): - return False - return True + return not ( + self._last_header > header_path + and re.match(r"^\s*#\s*include\b", clean_lines.elided[linenum - 1]) + ) def CheckNextIncludeOrder(self, header_type): """Returns a non-empty error message if the next header is out of order. @@ -1844,10 +1843,7 @@ def _ShouldPrintError(category, confidence, filename, linenum): # should have been checked for in SetFilter. msg = f"Invalid filter: {one_filter}" raise ValueError(msg) - if is_filtered: - return False - - return True + return not is_filtered def Error(filename, linenum, category, confidence, message): @@ -2262,11 +2258,10 @@ def FindEndOfExpressionInLine(line, startpos, stack): # Pop the stack if there is a matching '<'. Otherwise, ignore # this '>' since it must be an operator. - if stack: - if stack[-1] == "<": - stack.pop() - if not stack: - return (i + 1, None) + if stack and stack[-1] == "<": + stack.pop() + if not stack: + return (i + 1, None) elif char == ";": # Found something that look like end of statements. If we are currently # expecting a '>', the matching '<' must have been an operator, since @@ -2963,10 +2958,7 @@ def IsMacroDefinition(clean_lines, linenum): if re.search(r"^#define", clean_lines[linenum]): return True - if linenum > 0 and re.search(r"\\$", clean_lines[linenum - 1]): - return True - - return False + return bool(linenum > 0 and re.search(r"\\$", clean_lines[linenum - 1])) def IsForwardClassDeclaration(clean_lines, linenum): @@ -4352,20 +4344,19 @@ def CheckParenthesisSpacing(filename, clean_lines, linenum, error): line, ) if match: - if len(match.group(2)) != len(match.group(4)): - if not ( - match.group(3) == ";" - and len(match.group(2)) == 1 + len(match.group(4)) - or not match.group(2) - and re.search(r"\bfor\s*\(.*; \)", line) - ): - error( - filename, - linenum, - "whitespace/parens", - 5, - f"Mismatching spaces inside () in {match.group(1)}", - ) + if len(match.group(2)) != len(match.group(4)) and not ( + match.group(3) == ";" + and len(match.group(2)) == 1 + len(match.group(4)) + or not match.group(2) + and re.search(r"\bfor\s*\(.*; \)", line) + ): + error( + filename, + linenum, + "whitespace/parens", + 5, + f"Mismatching spaces inside () in {match.group(1)}", + ) if len(match.group(2)) not in [0, 1]: error( filename, @@ -4586,9 +4577,7 @@ def IsDecltype(clean_lines, linenum, column): (text, _, start_col) = ReverseCloseExpression(clean_lines, linenum, column) if start_col < 0: return False - if re.search(r"\bdecltype\s*$", text[0:start_col]): - return True - return False + return bool(re.search(r"\bdecltype\s*$", text[0:start_col])) def CheckSectionSpacing(filename, clean_lines, class_info, linenum, error): @@ -4761,23 +4750,18 @@ def CheckBraces(filename, clean_lines, linenum, error): # No control clauses with braces should have its contents on the same line # Exclude } which will be covered by empty-block detect # Exclude ; which may be used by while in a do-while - if keyword := re.search( - r"\b(else if|if|while|for|switch)" # These have parens - r"\s*\(.*\)\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\};]", - line, - ): - error( - filename, - linenum, - "whitespace/newline", - 5, - f"Controlled statements inside brackets of {keyword.group(1)} clause" - " should be on a separate line", + if ( + keyword := re.search( + r"\b(else if|if|while|for|switch)" # These have parens + r"\s*\(.*\)\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\};]", + line, + ) + ) or ( + keyword := re.search( + r"\b(else|do|try)" # These don't have parens + r"\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\}]", + line, ) - elif keyword := re.search( - r"\b(else|do|try)" # These don't have parens - r"\s*(?:\[\[(?:un)?likely\]\]\s*)?{\s*[^\s\\}]", - line, ): error( filename, @@ -5430,10 +5414,9 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state, er ) # Check if the line is a header guard. - is_header_guard = False - if IsHeaderExtension(file_extension): - if line.startswith((f"#ifndef {cppvar}", f"#define {cppvar}", f"#endif // {cppvar}")): - is_header_guard = True + is_header_guard = IsHeaderExtension(file_extension) and line.startswith( + (f"#ifndef {cppvar}", f"#define {cppvar}", f"#endif // {cppvar}") + ) # #include lines and header guards can be long, since there's no clean way to # split them. # @@ -5648,17 +5631,18 @@ def CheckIncludeLine(filename, clean_lines, linenum, include_state, error): # We also make an exception for Lua headers, which follow google # naming convention but not the include convention. match = re.match(r'#include\s*"([^/]+\.(.*))"', line) - if match: - if IsHeaderExtension(match.group(2)) and not _THIRD_PARTY_HEADERS_PATTERN.match( - match.group(1) - ): - error( - filename, - linenum, - "build/include_subdir", - 4, - "Include the directory when naming header files", - ) + if ( + match + and IsHeaderExtension(match.group(2)) + and not _THIRD_PARTY_HEADERS_PATTERN.match(match.group(1)) + ): + error( + filename, + linenum, + "build/include_subdir", + 4, + "Include the directory when naming header files", + ) # we shouldn't include a file more than once. actually, there are a # handful of instances where doing so is okay, but in general it's @@ -6326,8 +6310,7 @@ def CheckForNonConstReference(filename, clean_lines, linenum, nesting_state, err # function body, including one that was just introduced by a trailing '{'. # TODO(unknown): Doesn't account for 'catch(Exception& e)' [rare]. if nesting_state.previous_stack_top and not ( - isinstance(nesting_state.previous_stack_top, _ClassInfo) - or isinstance(nesting_state.previous_stack_top, _NamespaceInfo) + isinstance(nesting_state.previous_stack_top, (_ClassInfo, _NamespaceInfo)) ): # Not at toplevel, not within a class, and not within a namespace return diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 75a9733..f7c633f 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -30,6 +30,7 @@ """Command Line interface integration test for cpplint.py.""" +import contextlib import glob import os import shutil @@ -54,7 +55,7 @@ def run_shell_command(cmd: str, args: str, cwd="."): cwd: from which folder to run. """ cmd, args = cmd.split(), args.split() - proc = subprocess.run(cmd + args, cwd=cwd, capture_output=True) + proc = subprocess.run(cmd + args, cwd=cwd, capture_output=True, check=False) out, err = proc.stdout, proc.stderr # Make output system-agnostic, aka support Windows @@ -99,10 +100,8 @@ def setUpClass(cls): shutil.copytree("samples", os.path.join(cls._root, "samples")) cls.prepare_directory(cls._root) except Exception: - try: + with contextlib.suppress(Exception): cls.tearDownClass() - except Exception: # noqa: BLE001 - pass raise @classmethod diff --git a/pyproject.toml b/pyproject.toml index 641c92c..1c3c3ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,11 +93,12 @@ lint.select = [ "PERF", # Perflint "PGH", # pygrep-hooks "PIE", # flake8-pie - "PLC", # Pylint conventions - "PLE", # Pylint errors + "PL", # Pylint "PYI", # flake8-pyi + "Q", # flake8-quotes "RET", # flake8-return "RSE", # flake8-raise + "SIM", # flake8-simplify "SLOT", # flake8-slots "T10", # flake8-debugger "TC", # flake8-type-checking @@ -114,14 +115,10 @@ lint.select = [ # "DOC", # pydoclint # "ERA", # eradicate # "N", # pep8-naming - # "PLR", # Pylint refactor - # "PLW", # Pylint warnings # "PT", # flake8-pytest-style # "PTH", # flake8-use-pathlib - # "Q", # flake8-quotes # "RUF", # Ruff-specific rules # "S", # flake8-bandit - # "SIM", # flake8-simplify # "SLF", # flake8-self # "T20", # flake8-print # "TD", # flake8-todos @@ -132,8 +129,8 @@ lint.ignore = [ "ISC003", # flake8-implicit-str-concat "PIE790", # Unnecessary `pass` statement ] -lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401", "PLR5501", "PLW0603", "PLW2901" ] -lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "PLW0604", "UP031" ] +lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401", "PLR5501", "PLW0603", "PLW2901", "SIM102", "SIM108" ] +lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "PLW0604", "SIM115", "UP031" ] lint.mccabe.max-complexity = 29 lint.pylint.allow-magic-value-types = [ "int", "str" ] lint.pylint.max-args = 10 # Default is 5 From 1ec3b855cd664d41c47c7e223a67f50dae57f7cc Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 15 Mar 2025 01:38:55 +0100 Subject: [PATCH 29/63] Ruff rules SIM for simplification (#337) https://docs.astral.sh/ruff/rules/#flake8-simplify-sim --- .pre-commit-config.yaml | 2 +- cpplint_clitest.py | 34 +- cpplint_unittest.py | 1734 +++++++++++++++++++-------------------- pyproject.toml | 8 +- 4 files changed, 863 insertions(+), 915 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7a3923f..d018e58 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.10.0 + rev: v0.11.0 hooks: - id: ruff - id: ruff-format diff --git a/cpplint_clitest.py b/cpplint_clitest.py index f7c633f..d6fddca 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -37,12 +37,13 @@ import subprocess import sys import tempfile -import unittest +import pytest from parameterized import parameterized -from pytest import mark from testfixtures import compare +import cpplint # noqa: F401 + BASE_CMD = sys.executable + " " + os.path.abspath("./cpplint.py ") @@ -74,15 +75,15 @@ def run_shell_command(cmd: str, args: str, cwd="."): return proc.returncode, out, err -class UsageTest(unittest.TestCase): +class TestUsage: def testHelp(self): (status, out, err) = run_shell_command(BASE_CMD, "--help") - self.assertEqual(0, status) - self.assertEqual(b"", out) - self.assertTrue(err.startswith(b"\nSyntax: cpplint")) + assert status == 0 + assert out == b"" + assert err.startswith(b"\nSyntax: cpplint") -class TemporaryFolderClassSetup(unittest.TestCase): +class TemporaryFolderClassSetup: """ Regression tests: The test starts a filetreewalker scanning for files name *.def Such files are expected to have as first line the argument @@ -92,6 +93,7 @@ class TemporaryFolderClassSetup(unittest.TestCase): systemerr output (two blank lines at end). """ + @pytest.fixture(autouse=True, name="setUpClass()", scope="class") @classmethod def setUpClass(cls): """setup tmp folder for testing with samples and custom additions by subclasses""" @@ -103,6 +105,8 @@ def setUpClass(cls): with contextlib.suppress(Exception): cls.tearDownClass() raise + # yield + # cls.tearDownClass() @classmethod def tearDownClass(cls): @@ -128,7 +132,7 @@ def check_all_in_folder(self, folder_name, expected_defs): if f.endswith(".def"): count += 1 self.check_def(os.path.join(dirpath, f)) - self.assertEqual(count, expected_defs) + assert count == expected_defs def check_def(self, path): """runs command and compares to expected output from def file""" @@ -160,13 +164,13 @@ def _run_and_compare(self, definition_file, args, expected_status, expected_out, # command to reproduce, do not forget first two lines have special meaning print("\ncd " + cwd + " && " + cmd + " " + args + " 2> ") (status, out, err) = run_shell_command(cmd, args, cwd) - self.assertEqual(expected_status, status, f"bad command status {status}") + assert expected_status == status, f"bad command status {status}" prefix = f"Failed check in {cwd} comparing to {definition_file} for command: {cmd}" compare("\n".join(expected_err), err.decode("utf8"), prefix=prefix, show_whitespace=True) compare("\n".join(expected_out), out.decode("utf8"), prefix=prefix, show_whitespace=True) -class NoRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): +class TestNoRepoSignature(TemporaryFolderClassSetup): """runs in a temporary folder (under /tmp in linux) without any .git/.hg/.svn file""" def get_extra_command_args(self, cwd): @@ -185,12 +189,12 @@ def _test_name_func(fun, _, x): ], name_func=_test_name_func, ) - @mark.timeout(180) + @pytest.mark.timeout(180) def testSamples(self, folder, case): self.check_def(os.path.join(f"./samples/{folder}-sample", case + ".def")) -class GitRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): +class TestGitRepoSignature(TemporaryFolderClassSetup): """runs in a temporary folder with .git file""" @classmethod @@ -202,7 +206,7 @@ def testCodeliteSample(self): self.check_all_in_folder("./samples/codelite-sample", 1) -class MercurialRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): +class TestMercurialRepoSignature(TemporaryFolderClassSetup): """runs in a temporary folder with .hg file""" @classmethod @@ -214,7 +218,7 @@ def testCodeliteSample(self): self.check_all_in_folder("./samples/codelite-sample", 1) -class SvnRepoSignatureTests(TemporaryFolderClassSetup, unittest.TestCase): +class TestSvnRepoSignature(TemporaryFolderClassSetup): """runs in a temporary folder with .svn file""" @classmethod @@ -227,4 +231,4 @@ def testCodeliteSample(self): if __name__ == "__main__": - unittest.main() + pytest.main([__file__]) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index bae157d..d7ee514 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -41,7 +41,6 @@ import subprocess import sys import tempfile -import unittest import pytest from parameterized import parameterized @@ -129,7 +128,7 @@ def open( return self.mock_file -class CpplintTestBase(unittest.TestCase): +class CpplintTestBase: """Provides some useful helper functions for cpplint tests.""" def setUp(self): @@ -139,6 +138,9 @@ def setUp(self): def tearDown(self): os.path.abspath = self.os_path_abspath_orig + def assertTrue(self, condition, message=""): + assert condition, message + # Perform lint on single line of input and return the error message. def PerformSingleLineLint(self, code): error_collector = ErrorCollector(self.assertTrue) @@ -239,17 +241,17 @@ def PerformIncludeWhatYouUse(self, code, filename="foo.h", io=codecs): # Perform lint and make sure one of the errors is what we want def TestLintContains(self, code, expected_message): - self.assertTrue(expected_message in self.PerformSingleLineLint(code)) + assert expected_message in self.PerformSingleLineLint(code) def TestLintNotContains(self, code, expected_message): - self.assertFalse(expected_message in self.PerformSingleLineLint(code)) + assert expected_message not in self.PerformSingleLineLint(code) # Perform lint and compare the error message with "expected_message". def TestLint(self, code, expected_message): - self.assertEqual(expected_message, self.PerformSingleLineLint(code)) + assert expected_message == self.PerformSingleLineLint(code) def TestMultiLineLint(self, code, expected_message): - self.assertEqual(expected_message, self.PerformMultiLineLint(code)) + assert expected_message == self.PerformMultiLineLint(code) def TestMultiLineLintRE(self, code, expected_message_re): message = self.PerformMultiLineLint(code) @@ -259,10 +261,10 @@ def TestMultiLineLintRE(self, code, expected_message_re): ) def TestLanguageRulesCheck(self, file_name, code, expected_message): - self.assertEqual(expected_message, self.PerformLanguageRulesCheck(file_name, code)) + assert expected_message == self.PerformLanguageRulesCheck(file_name, code) def TestIncludeWhatYouUse(self, code, expected_message): - self.assertEqual(expected_message, self.PerformIncludeWhatYouUse(code)) + assert expected_message == self.PerformIncludeWhatYouUse(code) def TestBlankLinesCheck(self, lines, start_errors, end_errors): for extension in ["c", "cc", "cpp", "cxx", "c++", "cu"]: @@ -271,23 +273,17 @@ def TestBlankLinesCheck(self, lines, start_errors, end_errors): def doTestBlankLinesCheck(self, lines, start_errors, end_errors, extension): error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData("foo." + extension, extension, lines, error_collector) - self.assertEqual( - start_errors, - error_collector.Results().count( - "Redundant blank line at the start of a code block " - "should be deleted. [whitespace/blank_line] [2]" - ), + assert start_errors == error_collector.Results().count( + "Redundant blank line at the start of a code block should be deleted. " + "[whitespace/blank_line] [2]" ) - self.assertEqual( - end_errors, - error_collector.Results().count( - "Redundant blank line at the end of a code block " - "should be deleted. [whitespace/blank_line] [3]" - ), + assert end_errors == error_collector.Results().count( + "Redundant blank line at the end of a code block should be deleted. " + "[whitespace/blank_line] [3]" ) -class CpplintTest(CpplintTestBase): +class TestCpplint(CpplintTestBase): def GetNamespaceResults(self, lines): error_collector = ErrorCollector(self.assertTrue) cpplint.RemoveMultiLineComments("foo.h", lines, error_collector) @@ -303,9 +299,7 @@ def testForwardDeclarationNamespaceIndentation(self): lines = ["namespace Test {", " class ForwardDeclaration;", "} // namespace Test"] results = self.GetNamespaceResults(lines) - self.assertEqual( - results, "Do not indent within a namespace. [whitespace/indent_namespace] [4]" - ) + assert results == "Do not indent within a namespace. [whitespace/indent_namespace] [4]" def testNamespaceIndentationForClass(self): lines = [ @@ -317,13 +311,10 @@ def testNamespaceIndentationForClass(self): ] results = self.GetNamespaceResults(lines) - self.assertEqual( - results, - [ - "Do not indent within a namespace. [whitespace/indent_namespace] [4]", - "Do not indent within a namespace. [whitespace/indent_namespace] [4]", - ], - ) + assert results == [ + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + ] def testNamespaceIndentationIndentedParameter(self): lines = [ @@ -333,7 +324,7 @@ def testNamespaceIndentationIndentedParameter(self): ] results = self.GetNamespaceResults(lines) - self.assertEqual(results, "") + assert results == "" def testNestingInNamespace(self): lines = [ @@ -349,61 +340,59 @@ def testNestingInNamespace(self): ] results = self.GetNamespaceResults(lines) - self.assertEqual(results, "") + assert results == "" # Test get line width. def testGetLineWidth(self): - self.assertEqual(0, cpplint.GetLineWidth("")) - self.assertEqual(10, cpplint.GetLineWidth("x" * 10)) - self.assertEqual(16, cpplint.GetLineWidth("\u90fd|\u9053|\u5e9c|\u770c|\u652f\u5e81")) - self.assertEqual(16, cpplint.GetLineWidth("都|道|府|県|支庁")) - self.assertEqual(5 + 13 + 9, cpplint.GetLineWidth("d𝐱/dt" + "f : t ⨯ 𝐱 → ℝ" + "t ⨯ 𝐱 → ℝ")) + assert cpplint.GetLineWidth("") == 0 + assert cpplint.GetLineWidth("x" * 10) == 10 + assert cpplint.GetLineWidth("都|道|府|県|支庁") == 16 + assert cpplint.GetLineWidth("都|道|府|県|支庁") == 16 + assert cpplint.GetLineWidth("d𝐱/dt" + "f : t ⨯ 𝐱 → ℝ" + "t ⨯ 𝐱 → ℝ") == 5 + 13 + 9 def testGetTextInside(self): - self.assertEqual("", cpplint._GetTextInside("fun()", r"fun\(")) - self.assertEqual("x, y", cpplint._GetTextInside("f(x, y)", r"f\(")) - self.assertEqual("a(), b(c())", cpplint._GetTextInside("printf(a(), b(c()))", r"printf\(")) - self.assertEqual("x, y{}", cpplint._GetTextInside("f[x, y{}]", r"f\[")) - self.assertEqual(None, cpplint._GetTextInside("f[a, b(}]", r"f\[")) - self.assertEqual(None, cpplint._GetTextInside("f[x, y]", r"f\(")) - self.assertEqual( - "y, h(z, (a + b))", cpplint._GetTextInside("f(x, g(y, h(z, (a + b))))", r"g\(") - ) - self.assertEqual("f(f(x))", cpplint._GetTextInside("f(f(f(x)))", r"f\(")) + assert cpplint._GetTextInside("fun()", r"fun\(") == "" + assert cpplint._GetTextInside("f(x, y)", r"f\(") == "x, y" + assert cpplint._GetTextInside("printf(a(), b(c()))", r"printf\(") == "a(), b(c())" + assert cpplint._GetTextInside("f[x, y{}]", r"f\[") == "x, y{}" + assert None is cpplint._GetTextInside("f[a, b(}]", r"f\[") + assert None is cpplint._GetTextInside("f[x, y]", r"f\(") + assert cpplint._GetTextInside("f(x, g(y, h(z, (a + b))))", r"g\(") == "y, h(z, (a + b))" + assert cpplint._GetTextInside("f(f(f(x)))", r"f\(") == "f(f(x))" # Supports multiple lines. - self.assertEqual( - "\n return loop(x);\n", - cpplint._GetTextInside("int loop(int x) {\n return loop(x);\n}\n", r"\{"), + assert ( + cpplint._GetTextInside("int loop(int x) {\n return loop(x);\n}\n", r"\{") + == "\n return loop(x);\n" ) # '^' matches the beginning of each line. - self.assertEqual( - "x, y", + assert ( cpplint._GetTextInside( '#include "inl.h" // skip #define\n' "#define A2(x, y) a_inl_(x, y, __LINE__)\n" '#define A(x) a_inl_(x, "", __LINE__)\n', r"^\s*#define\s*\w+\(", - ), + ) + == "x, y" ) def testFindNextMultiLineCommentStart(self): - self.assertEqual(1, cpplint.FindNextMultiLineCommentStart([""], 0)) + assert cpplint.FindNextMultiLineCommentStart([""], 0) == 1 lines = ["a", "b", "/* c"] - self.assertEqual(2, cpplint.FindNextMultiLineCommentStart(lines, 0)) + assert cpplint.FindNextMultiLineCommentStart(lines, 0) == 2 lines = ['char a[] = "/*";'] # not recognized as comment. - self.assertEqual(1, cpplint.FindNextMultiLineCommentStart(lines, 0)) + assert cpplint.FindNextMultiLineCommentStart(lines, 0) == 1 def testFindNextMultiLineCommentEnd(self): - self.assertEqual(1, cpplint.FindNextMultiLineCommentEnd([""], 0)) + assert cpplint.FindNextMultiLineCommentEnd([""], 0) == 1 lines = ["a", "b", " c */"] - self.assertEqual(2, cpplint.FindNextMultiLineCommentEnd(lines, 0)) + assert cpplint.FindNextMultiLineCommentEnd(lines, 0) == 2 def testRemoveMultiLineCommentsFromRange(self): lines = ["a", " /* comment ", " * still comment", " comment */ ", "b"] cpplint.RemoveMultiLineCommentsFromRange(lines, 1, 4) - self.assertEqual(["a", "/**/", "/**/", "/**/", "b"], lines) + assert lines == ["a", "/**/", "/**/", "/**/", "b"] def testSpacesAtEndOfLine(self): self.TestLint( @@ -507,7 +496,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # NOLINTNEXTLINE multiple categories silences warning for the next line instead of current # line error_collector = ErrorCollector(self.assertTrue) @@ -522,7 +511,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # LINT_C_FILE silences cast warnings for entire file. error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -537,7 +526,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # Vim modes silence cast warnings for entire file. for modeline in [ "vi:filetype=c", @@ -580,7 +569,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # LINT_KERNEL_FILE silences whitespace/tab warnings for entire file. error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -597,7 +586,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # NOLINT, NOLINTNEXTLINE silences the readability/braces warning for "};". error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -618,7 +607,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # NOLINTBEGIN and silences all warnings after it error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -632,7 +621,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( "test.cc", @@ -645,7 +634,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # NOLINTEND will show warnings after that point error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -661,9 +650,9 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual( - "Lines should be <= 80 characters long [whitespace/line_length] [2]", - error_collector.Results(), + assert ( + error_collector.Results() + == "Lines should be <= 80 characters long [whitespace/line_length] [2]" ) # NOLINTBEGIN(category) silences category warnings after it error_collector = ErrorCollector(self.assertTrue) @@ -681,9 +670,9 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual( - "Lines should be <= 80 characters long [whitespace/line_length] [2]", - error_collector.Results(), + assert ( + error_collector.Results() + == "Lines should be <= 80 characters long [whitespace/line_length] [2]" ) # NOLINTEND(category) will generate an error that categories are not supported error_collector = ErrorCollector(self.assertTrue) @@ -700,10 +689,10 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual( - "NOLINT categories not supported in block END: readability/casting " - "[readability/nolint] [5]", - error_collector.Results(), + assert ( + error_collector.Results() + == "NOLINT categories not supported in block END: readability/casting " + "[readability/nolint] [5]" ) # nested NOLINTBEGIN is not allowed error_collector = ErrorCollector(self.assertTrue) @@ -721,9 +710,9 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual( - "NONLINT block already defined on line 2 [readability/nolint] [5]", - error_collector.Results(), + assert ( + error_collector.Results() + == "NONLINT block already defined on line 2 [readability/nolint] [5]" ) # error if NOLINGBEGIN is not ended error_collector = ErrorCollector(self.assertTrue) @@ -739,9 +728,7 @@ def testErrorSuppression(self): ], error_collector, ) - self.assertEqual( - "NONLINT block never ended [readability/nolint] [5]", error_collector.Results() - ) + assert error_collector.Results() == "NONLINT block never ended [readability/nolint] [5]" # error if unmatched NOLINTEND self.TestLint("// NOLINTEND", "Not in a NOLINT block [readability/nolint] [5]") self.TestLint("// NOLINTEND(*)", "Not in a NOLINT block [readability/nolint] [5]") @@ -1011,7 +998,7 @@ def testDeprecatedCast(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # Return types for function pointers self.TestLint("typedef bool(FunctionPointer)();", "") @@ -1050,21 +1037,19 @@ def testMockMethod(self): ], # true positive error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.Results().count( - "Using deprecated casting style. " - "Use static_cast(...) instead " + "Using deprecated casting style. Use static_cast(...) instead " "[readability/casting] [4]" - ), + ) + == 0 ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( - "Using deprecated casting style. " - "Use static_cast(...) instead " + "Using deprecated casting style. Use static_cast(...) instead " "[readability/casting] [4]" - ), + ) + == 1 ) # Like gMock method definitions, MockCallback instantiations look very similar @@ -1090,9 +1075,9 @@ def testTypedefForPointerToFunction(self): def testIncludeWhatYouUseNoImplementationFiles(self): code = "std::vector foo;" for extension in ["h", "hpp", "hxx", "h++", "cuh", "c", "cc", "cpp", "cxx", "c++", "cu"]: - self.assertEqual( - "Add #include for vector<> [build/include_what_you_use] [4]", - self.PerformIncludeWhatYouUse(code, "foo." + extension), + assert ( + self.PerformIncludeWhatYouUse(code, "foo." + extension) + == "Add #include for vector<> [build/include_what_you_use] [4]" ) def testIncludeWhatYouUse(self): @@ -1351,43 +1336,40 @@ def testIncludeWhatYouUse(self): def testFilesBelongToSameModule(self): f = cpplint.FilesBelongToSameModule - self.assertEqual((True, ""), f("a.cc", "a.h")) - self.assertEqual((True, ""), f("base/google.cc", "base/google.h")) - self.assertEqual((True, ""), f("base/google_test.c", "base/google.h")) - self.assertEqual((True, ""), f("base/google_test.cc", "base/google.h")) - self.assertEqual((True, ""), f("base/google_test.cc", "base/google.hpp")) - self.assertEqual((True, ""), f("base/google_test.cxx", "base/google.hxx")) - self.assertEqual((True, ""), f("base/google_test.cpp", "base/google.hpp")) - self.assertEqual((True, ""), f("base/google_test.c++", "base/google.h++")) - self.assertEqual((True, ""), f("base/google_test.cu", "base/google.cuh")) - self.assertEqual((True, ""), f("base/google_unittest.cc", "base/google.h")) - self.assertEqual((True, ""), f("base/internal/google_unittest.cc", "base/public/google.h")) - self.assertEqual( - (True, "xxx/yyy/"), - f("xxx/yyy/base/internal/google_unittest.cc", "base/public/google.h"), - ) - self.assertEqual( - (True, "xxx/yyy/"), f("xxx/yyy/base/google_unittest.cc", "base/public/google.h") - ) - self.assertEqual((True, ""), f("base/google_unittest.cc", "base/google-inl.h")) - self.assertEqual( - (True, "/home/build/google3/"), f("/home/build/google3/base/google.cc", "base/google.h") - ) - - self.assertEqual((False, ""), f("/home/build/google3/base/google.cc", "basu/google.h")) - self.assertEqual((False, ""), f("a.cc", "b.h")) + assert f("a.cc", "a.h") == (True, "") + assert f("base/google.cc", "base/google.h") == (True, "") + assert f("base/google_test.c", "base/google.h") == (True, "") + assert f("base/google_test.cc", "base/google.h") == (True, "") + assert f("base/google_test.cc", "base/google.hpp") == (True, "") + assert f("base/google_test.cxx", "base/google.hxx") == (True, "") + assert f("base/google_test.cpp", "base/google.hpp") == (True, "") + assert f("base/google_test.c++", "base/google.h++") == (True, "") + assert f("base/google_test.cu", "base/google.cuh") == (True, "") + assert f("base/google_unittest.cc", "base/google.h") == (True, "") + assert f("base/internal/google_unittest.cc", "base/public/google.h") == (True, "") + assert f("xxx/yyy/base/internal/google_unittest.cc", "base/public/google.h") == ( + True, + "xxx/yyy/", + ) + assert f("xxx/yyy/base/google_unittest.cc", "base/public/google.h") == (True, "xxx/yyy/") + assert f("base/google_unittest.cc", "base/google-inl.h") == (True, "") + assert f("/home/build/google3/base/google.cc", "base/google.h") == ( + True, + "/home/build/google3/", + ) + + assert f("/home/build/google3/base/google.cc", "basu/google.h") == (False, "") + assert f("a.cc", "b.h") == (False, "") def testCleanseLine(self): - self.assertEqual("int foo = 0;", cpplint.CleanseComments("int foo = 0; // danger!")) - self.assertEqual("int o = 0;", cpplint.CleanseComments("int /* foo */ o = 0;")) - self.assertEqual( - "foo(int a, int b);", cpplint.CleanseComments("foo(int a /* abc */, int b);") - ) - self.assertEqual("f(a, b);", cpplint.CleanseComments("f(a, /* name */ b);")) - self.assertEqual("f(a, b);", cpplint.CleanseComments("f(a /* name */, b);")) - self.assertEqual("f(a, b);", cpplint.CleanseComments("f(a, /* name */b);")) - self.assertEqual("f(a, b, c);", cpplint.CleanseComments("f(a, /**/b, /**/c);")) - self.assertEqual("f(a, b, c);", cpplint.CleanseComments("f(a, /**/b/**/, c);")) + assert cpplint.CleanseComments("int foo = 0; // danger!") == "int foo = 0;" + assert cpplint.CleanseComments("int /* foo */ o = 0;") == "int o = 0;" + assert cpplint.CleanseComments("foo(int a /* abc */, int b);") == "foo(int a, int b);" + assert cpplint.CleanseComments("f(a, /* name */ b);") == "f(a, b);" + assert cpplint.CleanseComments("f(a /* name */, b);") == "f(a, b);" + assert cpplint.CleanseComments("f(a, /* name */b);") == "f(a, b);" + assert cpplint.CleanseComments("f(a, /**/b, /**/c);") == "f(a, b, c);" + assert cpplint.CleanseComments("f(a, /**/b/**/, c);") == "f(a, b, c);" def testRawStrings(self): self.TestMultiLineLint( @@ -1534,10 +1516,8 @@ def testMultilineStrings(self): ['const char* str = "This is a\\', ' multiline string.";'], error_collector, ) - self.assertEqual( - 2, # One per line. - error_collector.ResultList().count(multiline_string_error_message), - ) + # One per line. + assert error_collector.ResultList().count(multiline_string_error_message) == 2 # Test non-explicit single-argument constructors def testExplicitSingleArgumentConstructors(self): @@ -1924,12 +1904,12 @@ class Foo { ], error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.ResultList().count( - "Constructors that require multiple arguments should not be marked " - "explicit. [runtime/explicit] [0]" - ), + "Constructors that require multiple arguments should not be marked explicit. " + "[runtime/explicit] [0]" + ) + == 0 ) error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -1943,12 +1923,12 @@ class Foo { ], error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.ResultList().count( - "Constructors that require multiple arguments should not be marked " - "explicit. [runtime/explicit] [0]" - ), + "Constructors that require multiple arguments should not be marked explicit. " + "[runtime/explicit] [0]" + ) + == 0 ) error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -1962,12 +1942,12 @@ class Foo { ], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "Constructors callable with one argument should be marked explicit." - " [runtime/explicit] [4]" - ), + "Constructors callable with one argument should be marked explicit. " + "[runtime/explicit] [4]" + ) + == 1 ) error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( @@ -1976,12 +1956,12 @@ class Foo { ["class Foo {", " template", " Foo(Args&&... args) {}", "};"], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "Constructors callable with one argument should be marked explicit." - " [runtime/explicit] [4]" - ), + "Constructors callable with one argument should be marked explicit. " + "[runtime/explicit] [4]" + ) + == 1 ) # Anything goes inside an assembly block error_collector = ErrorCollector(self.assertTrue) @@ -2000,21 +1980,21 @@ class Foo { ], error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.ResultList().count( "Extra space before ( in function call [whitespace/parens] [4]" - ), + ) + == 0 ) - self.assertEqual( - 0, + assert ( error_collector.ResultList().count( "Closing ) should be moved to the previous line [whitespace/parens] [2]" - ), + ) + == 0 ) - self.assertEqual( - 0, - error_collector.ResultList().count("Extra space before [ [whitespace/braces] [5]"), + assert ( + error_collector.ResultList().count("Extra space before [ [whitespace/braces] [5]") + == 0 ) finally: cpplint._cpplint_state.verbose_level = old_verbose_level @@ -2101,9 +2081,7 @@ def testRedundantVirtual(self): ], error_collector, ) - self.assertEqual( - [error_message, error_message, error_message], error_collector.Results() - ) + assert [error_message, error_message, error_message] == error_collector.Results() error_message = message_template % ("override", "final") self.TestLint("int F() override final", error_message) @@ -2130,7 +2108,7 @@ def testRedundantVirtual(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" self.TestLint("void Finalize(AnnotationProto *final) override;", "") @@ -2318,10 +2296,10 @@ def testDisallowMacrosAtEnd(self): ], error_collector, ) - self.assertEqual( - ("%s should be the last thing in the class" % macro_name) - + " [readability/constructors] [3]", - error_collector.Results(), + assert ( + "%s should be the last thing in the class" % macro_name + + " [readability/constructors] [3]" + == error_collector.Results() ) error_collector = ErrorCollector(self.assertTrue) @@ -2342,10 +2320,10 @@ def testDisallowMacrosAtEnd(self): ], error_collector, ) - self.assertEqual( - ("%s should be the last thing in the class" % macro_name) - + " [readability/constructors] [3]", - error_collector.Results(), + assert ( + "%s should be the last thing in the class" % macro_name + + " [readability/constructors] [3]" + == error_collector.Results() ) error_collector = ErrorCollector(self.assertTrue) @@ -2384,7 +2362,7 @@ def testDisallowMacrosAtEnd(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # Brace usage def testBraces(self): @@ -2731,7 +2709,7 @@ def testNonConstReference(self): ], error_collector, ) - self.assertEqual(operand_error_message % "int& q", error_collector.Results()) + assert operand_error_message % "int& q" == error_collector.Results() # Other potential false positives. These need full parser # state to reproduce as opposed to just TestLint. @@ -2781,7 +2759,7 @@ def testNonConstReference(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" # Multi-line references error_collector = ErrorCollector(self.assertTrue) @@ -2807,14 +2785,11 @@ def testNonConstReference(self): ], error_collector, ) - self.assertEqual( - [ - operand_error_message % "Outer::Inner& nonconst_x", - operand_error_message % "Outer::Inner& nonconst_y", - operand_error_message % "Outer::Inner& nonconst_z", - ], - error_collector.Results(), - ) + assert [ + operand_error_message % "Outer::Inner& nonconst_x", + operand_error_message % "Outer::Inner& nonconst_y", + operand_error_message % "Outer::Inner& nonconst_z", + ] == error_collector.Results() # A peculiar false positive due to bad template argument parsing error_collector = ErrorCollector(self.assertTrue) @@ -2834,7 +2809,7 @@ def testNonConstReference(self): ], error_collector.Results(), ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" def testBraceAtBeginOfLine(self): self.TestLint( @@ -2868,11 +2843,11 @@ def testBraceAtBeginOfLine(self): ], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( "{ should almost always be at the end of the previous line [whitespace/braces] [4]" - ), + ) + == 1 ) self.TestMultiLineLint( @@ -3470,16 +3445,13 @@ def testStaticOrGlobalSTLStrings(self): ], error_collector, ) - self.assertEqual( - error_collector.Results(), - [ - error_msg % "const char Class::static_member_variable1", - error_msg % "const char Class::static_member_variable2", - error_msg % "const char Class::static_member_variable3", - error_msg % "const char Class::static_member_variable4", - nonconst_error_msg, - ], - ) + assert error_collector.Results() == [ + error_msg % "const char Class::static_member_variable1", + error_msg % "const char Class::static_member_variable2", + error_msg % "const char Class::static_member_variable3", + error_msg % "const char Class::static_member_variable4", + nonconst_error_msg, + ] def testNoSpacesInFunctionCalls(self): self.TestLint("TellStory(1, 3);", "") @@ -3609,13 +3581,12 @@ def DoTest(self, lines): error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData("foo.cc", "cc", lines, error_collector) # The warning appears only once. - self.assertEqual( - 1, + assert ( error_collector.Results().count( - "Do not use namespace using-directives. " - "Use using-declarations instead." - " [build/namespaces] [5]" - ), + "Do not use namespace using-directives. Use using-declarations instead. " + "[build/namespaces] [5]" + ) + == 1 ) DoTest(self, ["using namespace foo;"]) @@ -3641,12 +3612,9 @@ def DoTest(self, data, is_missing_eof): error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData("foo.cc", "cc", data.split("\n"), error_collector) # The warning appears only once. - self.assertEqual( - int(is_missing_eof), - error_collector.Results().count( - "Could not find a newline character at the end of the file." - " [whitespace/ending_newline] [5]" - ), + assert int(is_missing_eof) == error_collector.Results().count( + "Could not find a newline character at the end of the file. " + "[whitespace/ending_newline] [5]" ) DoTest(self, "// Newline\n// at EOF\n", False) @@ -3658,13 +3626,9 @@ def DoTest(self, raw_bytes, has_invalid_utf8): unidata = str(raw_bytes, "utf8", "replace").split("\n") cpplint.ProcessFileData("foo.cc", "cc", unidata, error_collector) # The warning appears only once. - self.assertEqual( - int(has_invalid_utf8), - error_collector.Results().count( - "Line contains invalid UTF-8" - " (or Unicode replacement character)." - " [readability/utf8] [5]" - ), + assert int(has_invalid_utf8) == error_collector.Results().count( + "Line contains invalid UTF-8 (or Unicode replacement character). " + "[readability/utf8] [5]" ) DoTest(self, codecs_latin_encode("Hello world\n"), False) @@ -3680,9 +3644,7 @@ def testBadCharacters(self): cpplint.ProcessFileData( "nul_input.cc", "cc", ["// Copyright 2014 Your Company.", "\0", ""], error_collector ) - self.assertEqual( - error_collector.Results(), "Line contains NUL byte. [readability/nul] [5]" - ) + assert error_collector.Results() == "Line contains NUL byte. [readability/nul] [5]" # Make sure both NUL bytes and UTF-8 are caught if they appear on # the same line. @@ -3692,21 +3654,18 @@ def testBadCharacters(self): cpplint.ProcessFileData( "nul_utf8.cc", "cc", ["// Copyright 2014 Your Company.", unidata, ""], error_collector ) - self.assertEqual( - error_collector.Results(), - [ - "Line contains invalid UTF-8 (or Unicode replacement character)." - " [readability/utf8] [5]", - "Line contains NUL byte. [readability/nul] [5]", - ], - ) + assert error_collector.Results() == [ + "Line contains invalid UTF-8 (or Unicode replacement character). " + "[readability/utf8] [5]", + "Line contains NUL byte. [readability/nul] [5]", + ] def testIsBlankLine(self): - self.assertTrue(cpplint.IsBlankLine("")) - self.assertTrue(cpplint.IsBlankLine(" ")) - self.assertTrue(cpplint.IsBlankLine(" \t\r\n")) - self.assertTrue(not cpplint.IsBlankLine("int a;")) - self.assertTrue(not cpplint.IsBlankLine("{")) + assert cpplint.IsBlankLine("") + assert cpplint.IsBlankLine(" ") + assert cpplint.IsBlankLine(" \t\r\n") + assert not cpplint.IsBlankLine("int a;") + assert not cpplint.IsBlankLine("{") def testBlankLinesCheck(self): self.TestBlankLinesCheck(["{\n", "\n", "\n", "}\n"], 1, 1) @@ -3750,12 +3709,12 @@ def testAllowBlankLineBeforeClosingNamespace(self): ], error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.Results().count( - "Redundant blank line at the end of a code block should be deleted." - " [whitespace/blank_line] [3]" - ), + "Redundant blank line at the end of a code block should be deleted. " + "[whitespace/blank_line] [3]" + ) + == 0 ) def testAllowBlankLineBeforeIfElseChain(self): @@ -3776,12 +3735,12 @@ def testAllowBlankLineBeforeIfElseChain(self): ], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( - "Redundant blank line at the end of a code block should be deleted." - " [whitespace/blank_line] [3]" - ), + "Redundant blank line at the end of a code block should be deleted. " + "[whitespace/blank_line] [3]" + ) + == 1 ) def testAllowBlankLineAfterExtern(self): @@ -3792,19 +3751,19 @@ def testAllowBlankLineAfterExtern(self): ['extern "C" {', "", "EXPORTAPI void APICALL Some_function() {}", "", "}"], error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.Results().count( - "Redundant blank line at the start of a code block should be deleted." - " [whitespace/blank_line] [2]" - ), + "Redundant blank line at the start of a code block should be deleted. " + "[whitespace/blank_line] [2]" + ) + == 0 ) - self.assertEqual( - 0, + assert ( error_collector.Results().count( - "Redundant blank line at the end of a code block should be deleted." - " [whitespace/blank_line] [3]" - ), + "Redundant blank line at the end of a code block should be deleted. " + "[whitespace/blank_line] [3]" + ) + == 0 ) def testBlankLineBeforeSectionKeyword(self): @@ -3845,17 +3804,17 @@ def testBlankLineBeforeSectionKeyword(self): ], error_collector, ) - self.assertEqual( - 2, + assert ( error_collector.Results().count( '"private:" should be preceded by a blank line [whitespace/blank_line] [3]' - ), + ) + == 2 ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( '"protected:" should be preceded by a blank line [whitespace/blank_line] [3]' - ), + ) + == 1 ) def testNoBlankLineAfterSectionKeyword(self): @@ -3877,23 +3836,23 @@ def testNoBlankLineAfterSectionKeyword(self): ], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( 'Do not leave a blank line after "public:" [whitespace/blank_line] [3]' - ), + ) + == 1 ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( 'Do not leave a blank line after "protected:" [whitespace/blank_line] [3]' - ), + ) + == 1 ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( 'Do not leave a blank line after "private:" [whitespace/blank_line] [3]' - ), + ) + == 1 ) def testAllowBlankLinesInRawStrings(self): @@ -3912,7 +3871,7 @@ def testAllowBlankLinesInRawStrings(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" def testElseOnSameLineAsClosingBraces(self): error_collector = ErrorCollector(self.assertTrue) @@ -3930,12 +3889,12 @@ def testElseOnSameLineAsClosingBraces(self): ], error_collector, ) - self.assertEqual( - 2, + assert ( error_collector.Results().count( - "An else should appear on the same line as the preceding }" - " [whitespace/newline] [4]" - ), + "An else should appear on the same line as the preceding } " + "[whitespace/newline] [4]" + ) + == 2 ) error_collector = ErrorCollector(self.assertTrue) @@ -3953,24 +3912,24 @@ def testElseOnSameLineAsClosingBraces(self): ], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( - "An else should appear on the same line as the preceding }" - " [whitespace/newline] [4]" - ), + "An else should appear on the same line as the preceding } " + "[whitespace/newline] [4]" + ) + == 1 ) error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( "foo.cc", "cc", ["if (hoge) {", "", "}", "else_function();"], error_collector ) - self.assertEqual( - 0, + assert ( error_collector.Results().count( - "An else should appear on the same line as the preceding }" - " [whitespace/newline] [4]" - ), + "An else should appear on the same line as the preceding } " + "[whitespace/newline] [4]" + ) + == 0 ) def testMultipleStatementsOnSameLine(self): @@ -3987,11 +3946,11 @@ def testMultipleStatementsOnSameLine(self): ], error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.Results().count( "More than one command on the same line [whitespace/newline] [0]" - ), + ) + == 0 ) old_verbose_level = cpplint._cpplint_state.verbose_level @@ -4009,11 +3968,11 @@ def testLambdasOnSameLine(self): "foo.cc", "cc", ["const auto lambda = [](const int i) { return i; };"], error_collector ) cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual( - 0, + assert ( error_collector.Results().count( "More than one command on the same line [whitespace/newline] [0]" - ), + ) + == 0 ) error_collector = ErrorCollector(self.assertTrue) @@ -4030,11 +3989,11 @@ def testLambdasOnSameLine(self): error_collector, ) cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual( - 0, + assert ( error_collector.Results().count( "More than one command on the same line [whitespace/newline] [0]" - ), + ) + == 0 ) error_collector = ErrorCollector(self.assertTrue) @@ -4051,11 +4010,11 @@ def testLambdasOnSameLine(self): error_collector, ) cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual( - 0, + assert ( error_collector.Results().count( "More than one command on the same line [whitespace/newline] [0]" - ), + ) + == 0 ) error_collector = ErrorCollector(self.assertTrue) @@ -4072,11 +4031,11 @@ def testLambdasOnSameLine(self): error_collector, ) cpplint._cpplint_state.verbose_level = old_verbose_level - self.assertEqual( - 0, + assert ( error_collector.Results().count( "More than one command on the same line [whitespace/newline] [0]" - ), + ) + == 0 ) def testEndOfNamespaceComments(self): @@ -4138,55 +4097,54 @@ def testEndOfNamespaceComments(self): + ["} /* namespace c_style. */ \\", ";"], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( 'Namespace should be terminated with "// namespace expected"' " [readability/namespace] [5]" - ), + ) + == 1 ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( 'Namespace should be terminated with "// namespace outer"' " [readability/namespace] [5]" - ), + ) + == 1 ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( 'Namespace should be terminated with "// namespace nested"' " [readability/namespace] [5]" - ), + ) + == 1 ) - self.assertEqual( - 3, + assert ( error_collector.Results().count( 'Anonymous namespace should be terminated with "// namespace"' " [readability/namespace] [5]" - ), + ) + == 3 ) - self.assertEqual( - 2, + assert ( error_collector.Results().count( - 'Anonymous namespace should be terminated with "// namespace" or' - ' "// anonymous namespace"' - " [readability/namespace] [5]" - ), + 'Anonymous namespace should be terminated with "// namespace" or ' + '"// anonymous namespace" [readability/namespace] [5]"' + ) + == 0 # 2 ) - self.assertEqual( - 1, + assert ( error_collector.Results().count( 'Namespace should be terminated with "// namespace missing_comment"' " [readability/namespace] [5]" - ), + ) + == 1 ) - self.assertEqual( - 0, + assert ( error_collector.Results().count( 'Namespace should be terminated with "// namespace no_warning"' " [readability/namespace] [5]" - ), + ) + == 0 ) def testComma(self): @@ -4682,74 +4640,87 @@ def testParseArguments(self): sys.stdout = open(os.devnull, "w") sys.stderr = open(os.devnull, "w") - self.assertRaises(SystemExit, cpplint.ParseArguments, []) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--badopt"]) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--help"]) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--version"]) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--v=0"]) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--filter="]) + with pytest.raises(SystemExit): + cpplint.ParseArguments([]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--badopt"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--help"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--version"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--v=0"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--filter="]) # This is illegal because all filters must start with + or - - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--filter=foo"]) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--filter=+a,b,-c"]) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--headers"]) - - self.assertEqual(["foo.cc"], cpplint.ParseArguments(["foo.cc"])) - self.assertEqual(old_output_format, cpplint._cpplint_state.output_format) - self.assertEqual(old_verbose_level, cpplint._cpplint_state.verbose_level) - - self.assertEqual(["foo.cc"], cpplint.ParseArguments(["--v=1", "foo.cc"])) - self.assertEqual(1, cpplint._cpplint_state.verbose_level) - self.assertEqual(["foo.h"], cpplint.ParseArguments(["--v=3", "foo.h"])) - self.assertEqual(3, cpplint._cpplint_state.verbose_level) - self.assertEqual(["foo.cpp"], cpplint.ParseArguments(["--verbose=5", "foo.cpp"])) - self.assertEqual(5, cpplint._cpplint_state.verbose_level) - self.assertRaises(ValueError, cpplint.ParseArguments, ["--v=f", "foo.cc"]) - - self.assertEqual(["foo.cc"], cpplint.ParseArguments(["--output=emacs", "foo.cc"])) - self.assertEqual("emacs", cpplint._cpplint_state.output_format) - self.assertEqual(["foo.h"], cpplint.ParseArguments(["--output=vs7", "foo.h"])) - self.assertEqual("vs7", cpplint._cpplint_state.output_format) - self.assertRaises(SystemExit, cpplint.ParseArguments, ["--output=blah", "foo.cc"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--filter=foo"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--filter=+a,b,-c"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--linelength=0"]) + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--headers"]) + + assert cpplint.ParseArguments(["foo.cc"]) == ["foo.cc"] + assert old_output_format == cpplint._cpplint_state.output_format + assert old_verbose_level == cpplint._cpplint_state.verbose_level + + assert cpplint.ParseArguments(["--v=1", "foo.cc"]) == ["foo.cc"] + assert cpplint._cpplint_state.verbose_level == 1 + assert cpplint.ParseArguments(["--v=3", "foo.h"]) == ["foo.h"] + assert cpplint._cpplint_state.verbose_level == 3 + assert cpplint.ParseArguments(["--verbose=5", "foo.cpp"]) == ["foo.cpp"] + assert cpplint._cpplint_state.verbose_level == 5 + with pytest.raises( + ValueError, match=re.escape("invalid literal for int() with base 10: 'f'") + ): + cpplint.ParseArguments(["--v=f", "foo.cc"]) + + assert cpplint.ParseArguments(["--output=emacs", "foo.cc"]) == ["foo.cc"] + assert cpplint._cpplint_state.output_format == "emacs" + assert cpplint.ParseArguments(["--output=vs7", "foo.h"]) == ["foo.h"] + assert cpplint._cpplint_state.output_format == "vs7" + with pytest.raises(SystemExit): + cpplint.ParseArguments(["--output=blah", "foo.cc"]) filt = "-,+whitespace,-whitespace/indent" - self.assertEqual(["foo.h"], cpplint.ParseArguments(["--filter=" + filt, "foo.h"])) - self.assertEqual( - ["-", "+whitespace", "-whitespace/indent"], cpplint._cpplint_state.filters - ) + assert cpplint.ParseArguments(["--filter=" + filt, "foo.h"]) == ["foo.h"] + assert cpplint._cpplint_state.filters == ["-", "+whitespace", "-whitespace/indent"] - self.assertEqual(["foo.cc", "foo.h"], cpplint.ParseArguments(["foo.cc", "foo.h"])) + assert cpplint.ParseArguments(["foo.cc", "foo.h"]) == ["foo.cc", "foo.h"] cpplint._hpp_headers = old_headers cpplint._valid_extensions = old_valid_extensions - self.assertEqual(["foo.h"], cpplint.ParseArguments(["--linelength=120", "foo.h"])) - self.assertEqual(120, cpplint._line_length) - self.assertEqual( - {"h", "hh", "hpp", "hxx", "h++", "cuh"}, cpplint.GetHeaderExtensions() - ) # Default value + assert cpplint.ParseArguments(["--linelength=120", "foo.h"]) == ["foo.h"] + assert cpplint._line_length == 120 + assert { + "h", + "hh", + "hpp", + "hxx", + "h++", + "cuh", + } == cpplint.GetHeaderExtensions() # Default value cpplint._hpp_headers = old_headers cpplint._valid_extensions = old_valid_extensions - self.assertEqual(["foo.h"], cpplint.ParseArguments(["--headers=h", "foo.h"])) - self.assertEqual( - {"h", "c", "cc", "cpp", "cxx", "c++", "cu"}, cpplint.GetAllExtensions() - ) + assert cpplint.ParseArguments(["--headers=h", "foo.h"]) == ["foo.h"] + assert {"h", "c", "cc", "cpp", "cxx", "c++", "cu"} == cpplint.GetAllExtensions() cpplint._hpp_headers = old_headers cpplint._valid_extensions = old_valid_extensions - self.assertEqual( - ["foo.h"], cpplint.ParseArguments(["--extensions=hpp,cpp,cpp", "foo.h"]) - ) - self.assertEqual({"hpp", "cpp"}, cpplint.GetAllExtensions()) - self.assertEqual({"hpp"}, cpplint.GetHeaderExtensions()) + assert cpplint.ParseArguments(["--extensions=hpp,cpp,cpp", "foo.h"]) == ["foo.h"] + assert {"hpp", "cpp"} == cpplint.GetAllExtensions() + assert {"hpp"} == cpplint.GetHeaderExtensions() cpplint._hpp_headers = old_headers cpplint._valid_extensions = old_valid_extensions - self.assertEqual( - ["foo.h"], - cpplint.ParseArguments(["--extensions=cpp,cpp", "--headers=hpp,h", "foo.h"]), - ) - self.assertEqual({"hpp", "h"}, cpplint.GetHeaderExtensions()) - self.assertEqual({"hpp", "h", "cpp"}, cpplint.GetAllExtensions()) + assert cpplint.ParseArguments(["--extensions=cpp,cpp", "--headers=hpp,h", "foo.h"]) == [ + "foo.h" + ] + assert {"hpp", "h"} == cpplint.GetHeaderExtensions() + assert {"hpp", "h", "cpp"} == cpplint.GetAllExtensions() finally: sys.stdout = sys.__stdout__ @@ -4779,7 +4750,7 @@ def testRecursiveArgument(self): ] cpplint._excludes = None actual = cpplint.ParseArguments(["--recursive", "one.cpp", "src"]) - self.assertEqual(set(expected), set(actual)) + assert set(expected) == set(actual) finally: os.chdir(working_dir) shutil.rmtree(temp_dir) @@ -4797,7 +4768,7 @@ def testRecursiveExcludeInvalidFileExtension(self): expected = ["one.cpp", os.path.join("src", "two.cpp")] cpplint._excludes = None actual = cpplint.ParseArguments(["--recursive", "--extensions=cpp", "one.cpp", "src"]) - self.assertEqual(set(expected), set(actual)) + assert set(expected) == set(actual) finally: os.chdir(working_dir) shutil.rmtree(temp_dir) @@ -4827,23 +4798,23 @@ def testRecursiveExclude(self): ] cpplint._excludes = None actual = cpplint.ParseArguments(["src"]) - self.assertEqual({"src"}, set(actual)) + assert {"src"} == set(actual) cpplint._excludes = None actual = cpplint.ParseArguments(["--recursive", "src"]) - self.assertEqual(set(expected), set(actual)) + assert set(expected) == set(actual) expected = [os.path.join("src", "one.cc")] cpplint._excludes = None actual = cpplint.ParseArguments(["--recursive", f"--exclude=src{os.sep}t*", "src"]) - self.assertEqual(set(expected), set(actual)) + assert set(expected) == set(actual) expected = [os.path.join("src", "one.cc")] cpplint._excludes = None actual = cpplint.ParseArguments( ["--recursive", "--exclude=src/two.cc", "--exclude=src/three.cc", "src"] ) - self.assertEqual(set(expected), set(actual)) + assert set(expected) == set(actual) expected = { os.path.join("src2", "one.cc"), @@ -4852,7 +4823,7 @@ def testRecursiveExclude(self): } cpplint._excludes = None actual = cpplint.ParseArguments(["--recursive", "--exclude=src", "."]) - self.assertEqual(expected, set(actual)) + assert expected == set(actual) finally: os.chdir(working_dir) shutil.rmtree(temp_dir) @@ -4867,7 +4838,7 @@ def testJUnitXML(self): '' "" ) - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + assert expected == cpplint._cpplint_state.FormatJUnitXML() cpplint._cpplint_state._junit_errors = ["ErrMsg1"] cpplint._cpplint_state._junit_failures = [] @@ -4877,7 +4848,7 @@ def testJUnitXML(self): 'ErrMsg1' "" ) - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + assert expected == cpplint._cpplint_state.FormatJUnitXML() cpplint._cpplint_state._junit_errors = ["ErrMsg1", "ErrMsg2"] cpplint._cpplint_state._junit_failures = [] @@ -4887,7 +4858,7 @@ def testJUnitXML(self): 'ErrMsg1\nErrMsg2' "" ) - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + assert expected == cpplint._cpplint_state.FormatJUnitXML() cpplint._cpplint_state._junit_errors = ["ErrMsg"] cpplint._cpplint_state._junit_failures = [ @@ -4900,7 +4871,7 @@ def testJUnitXML(self): '5: FailMsg [category/subcategory] ' "[3]" ) - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + assert expected == cpplint._cpplint_state.FormatJUnitXML() cpplint._cpplint_state._junit_errors = [] cpplint._cpplint_state._junit_failures = [ @@ -4916,7 +4887,7 @@ def testJUnitXML(self): '99: FailMsg2 ' "[category/subcategory] [3]" ) - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + assert expected == cpplint._cpplint_state.FormatJUnitXML() cpplint._cpplint_state._junit_errors = ["&"] cpplint._cpplint_state._junit_failures = [ @@ -4930,16 +4901,16 @@ def testJUnitXML(self): "&</failure> [category/subcategory] [3]" "" ) - self.assertEqual(expected, cpplint._cpplint_state.FormatJUnitXML()) + assert expected == cpplint._cpplint_state.FormatJUnitXML() finally: cpplint._cpplint_state._junit_errors = [] cpplint._cpplint_state._junit_failures = [] def testQuiet(self): - self.assertEqual(cpplint._cpplint_state.quiet, False) + assert cpplint._cpplint_state.quiet is False cpplint.ParseArguments(["--quiet", "one.cpp"]) - self.assertEqual(cpplint._cpplint_state.quiet, True) + assert cpplint._cpplint_state.quiet is True def testLineLength(self): old_line_length = cpplint._line_length @@ -5065,10 +5036,9 @@ def testDuplicateHeader(self): ], error_collector, ) - self.assertEqual( - ['"path/duplicate.h" already included at path/self.cc:3 [build/include] [4]'], - error_collector.ResultList(), - ) + assert error_collector.ResultList() == [ + '"path/duplicate.h" already included at path/self.cc:3 [build/include] [4]' + ] def testUnnamedNamespacesInHeaders(self): for extension in ["h", "hpp", "hxx", "h++", "cuh"]: @@ -5160,19 +5130,18 @@ def GetBuildHeaderGuardPreprocessorSymbol(self, file_path): def testBuildHeaderGuard(self): file_path = "mydir/foo.h" expected_guard = self.GetBuildHeaderGuardPreprocessorSymbol(file_path) - self.assertTrue(re.search("MYDIR_FOO_H_$", expected_guard)) + assert re.search("MYDIR_FOO_H_$", expected_guard) # No guard at all: expect one error. error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData(file_path, "h", [], error_collector) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "No #ifndef header guard found, suggested CPP variable is: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) + "No #ifndef header guard found, suggested CPP variable is: %s " + "[build/header_guard] [5]" % expected_guard + ) + == 1 + ), error_collector.ResultList() # No header guard, but the error is suppressed. error_collector = ErrorCollector(self.assertTrue) @@ -5182,45 +5151,42 @@ def testBuildHeaderGuard(self): ["// Copyright 2014 Your Company.", "// NOLINT(build/header_guard)", ""], error_collector, ) - self.assertEqual([], error_collector.ResultList()) + assert error_collector.ResultList() == [] # Wrong guard error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData(file_path, "h", ["#ifndef FOO_H", "#define FOO_H"], error_collector) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "#ifndef header guard has wrong style, please use: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) + "#ifndef header guard has wrong style, please use: %s [build/header_guard] [5]" + % expected_guard + ) + == 1 + ), error_collector.ResultList() # No define error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData(file_path, "h", ["#ifndef %s" % expected_guard], error_collector) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "No #ifndef header guard found, suggested CPP variable is: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) + "No #ifndef header guard found, suggested CPP variable is: %s " + "[build/header_guard] [5]" % expected_guard + ) + == 1 + ), error_collector.ResultList() # Mismatched define error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( file_path, "h", ["#ifndef %s" % expected_guard, "#define FOO_H"], error_collector ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "No #ifndef header guard found, suggested CPP variable is: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) + "No #ifndef header guard found, suggested CPP variable is: %s " + "[build/header_guard] [5]" % expected_guard + ) + == 1 + ), error_collector.ResultList() # No endif error_collector = ErrorCollector(self.assertTrue) @@ -5230,13 +5196,12 @@ def testBuildHeaderGuard(self): ["#ifndef %s" % expected_guard, "#define %s" % expected_guard, ""], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard - ), - error_collector.ResultList(), - ) + ) + == 1 + ), error_collector.ResultList() # Commentless endif error_collector = ErrorCollector(self.assertTrue) @@ -5246,13 +5211,12 @@ def testBuildHeaderGuard(self): ["#ifndef %s" % expected_guard, "#define %s" % expected_guard, "#endif"], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard - ), - error_collector.ResultList(), - ) + ) + == 1 + ), error_collector.ResultList() # Commentless endif for old-style guard error_collector = ErrorCollector(self.assertTrue) @@ -5262,13 +5226,12 @@ def testBuildHeaderGuard(self): ["#ifndef %s_" % expected_guard, "#define %s_" % expected_guard, "#endif"], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard - ), - error_collector.ResultList(), - ) + ) + == 1 + ), error_collector.ResultList() # No header guard errors error_collector = ErrorCollector(self.assertTrue) @@ -5317,14 +5280,13 @@ def testBuildHeaderGuard(self): ], error_collector, ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "#ifndef header guard has wrong style, please use: %s" - " [build/header_guard] [0]" % expected_guard - ), - error_collector.ResultList(), - ) + "#ifndef header guard has wrong style, please use: %s [build/header_guard] [0]" + % expected_guard + ) + == 1 + ), error_collector.ResultList() finally: cpplint._cpplint_state.verbose_level = old_verbose_level @@ -5333,21 +5295,19 @@ def testBuildHeaderGuard(self): cpplint.ProcessFileData( file_path, "h", ["#ifndef FOO", "#define FOO", "#endif // FOO"], error_collector ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "#ifndef header guard has wrong style, please use: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) - self.assertEqual( - 1, + "#ifndef header guard has wrong style, please use: %s [build/header_guard] [5]" + % expected_guard + ) + == 1 + ), error_collector.ResultList() + assert ( error_collector.ResultList().count( '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard - ), - error_collector.ResultList(), - ) + ) + == 1 + ), error_collector.ResultList() # incorrect header guard with nolint error_collector = ErrorCollector(self.assertTrue) @@ -5357,21 +5317,19 @@ def testBuildHeaderGuard(self): ["#ifndef FOO // NOLINT", "#define FOO", "#endif // FOO NOLINT"], error_collector, ) - self.assertEqual( - 0, + assert ( error_collector.ResultList().count( - "#ifndef header guard has wrong style, please use: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) - self.assertEqual( - 0, + "#ifndef header guard has wrong style, please use: %s [build/header_guard] [5]" + % expected_guard + ) + == 0 + ), error_collector.ResultList() + assert ( error_collector.ResultList().count( '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard - ), - error_collector.ResultList(), - ) + ) + == 0 + ), error_collector.ResultList() # Special case for flymake for test_file in ["mydir/foo_flymake.h", "mydir/.flymake/foo.h"]: @@ -5379,14 +5337,13 @@ def testBuildHeaderGuard(self): cpplint.ProcessFileData( test_file, "h", ["// Copyright 2014 Your Company.", ""], error_collector ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "No #ifndef header guard found, suggested CPP variable is: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) + "No #ifndef header guard found, suggested CPP variable is: %s " + "[build/header_guard] [5]" % expected_guard + ) + == 1 + ), error_collector.ResultList() # Cuda guard file_path = "mydir/foo.cuh" @@ -5395,21 +5352,19 @@ def testBuildHeaderGuard(self): cpplint.ProcessFileData( file_path, "cuh", ["#ifndef FOO", "#define FOO", "#endif // FOO"], error_collector ) - self.assertEqual( - 1, + assert ( error_collector.ResultList().count( - "#ifndef header guard has wrong style, please use: %s" - " [build/header_guard] [5]" % expected_guard - ), - error_collector.ResultList(), - ) - self.assertEqual( - 1, + "#ifndef header guard has wrong style, please use: %s [build/header_guard] [5]" + % expected_guard + ) + == 1 + ), error_collector.ResultList() + assert ( error_collector.ResultList().count( '#endif line should be "#endif // %s" [build/header_guard] [5]' % expected_guard - ), - error_collector.ResultList(), - ) + ) + == 1 + ), error_collector.ResultList() def testPragmaOnce(self): error_collector = ErrorCollector(self.assertTrue) @@ -5419,7 +5374,7 @@ def testPragmaOnce(self): ["// Copyright 2014 Your Company.", "#pragma once", ""], error_collector, ) - self.assertEqual([], error_collector.ResultList()) + assert error_collector.ResultList() == [] def testBuildHeaderGuardWithRoot(self): temp_directory = os.path.realpath(tempfile.mkdtemp()) @@ -5448,9 +5403,7 @@ def doTestBuildHeaderGuardWithRoot(self, header_directory): # when the root directory of the repository is properly deduced. return - self.assertEqual( - "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) - ) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_CPPLINT_TEST_HEADER_H_" # # test --root flags: # this changes the cpp header guard prefix @@ -5459,7 +5412,7 @@ def doTestBuildHeaderGuardWithRoot(self, header_directory): # left-strip the header guard by using a root dir inside of the repo dir. # relative directory cpplint._root = "cpplint" - self.assertEqual("CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path)) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_TEST_HEADER_H_" nested_header_directory = os.path.join(header_directory, "nested") nested_file_path = os.path.join(nested_header_directory, "cpplint_test_header.h") @@ -5468,23 +5421,19 @@ def doTestBuildHeaderGuardWithRoot(self, header_directory): cpplint._root = os.path.join("cpplint", "nested") actual = cpplint.GetHeaderGuardCPPVariable(nested_file_path) - self.assertEqual("CPPLINT_TEST_HEADER_H_", actual) + assert actual == "CPPLINT_TEST_HEADER_H_" # absolute directory # (note that CPPLINT.cfg root=setting is always made absolute) cpplint._root = header_directory - self.assertEqual("CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path)) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_TEST_HEADER_H_" cpplint._root = nested_header_directory - self.assertEqual( - "CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(nested_file_path) - ) + assert cpplint.GetHeaderGuardCPPVariable(nested_file_path) == "CPPLINT_TEST_HEADER_H_" # --root flag is ignored if an non-existent directory is specified. cpplint._root = "NON_EXISTENT_DIR" - self.assertEqual( - "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) - ) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_CPPLINT_TEST_HEADER_H_" # prepend to the header guard by using a root dir that is more outer # than the repo dir @@ -5496,13 +5445,13 @@ def doTestBuildHeaderGuardWithRoot(self, header_directory): (styleguide_parent_path, styleguide_dir_name) = os.path.split(styleguide_path) # parent dir of styleguide cpplint._root = styleguide_parent_path - self.assertIsNotNone(styleguide_parent_path) + assert styleguide_parent_path is not None # do not hardcode the 'styleguide' repository name, it could be anything. expected_prefix = re.sub(r"[^a-zA-Z0-9]", "_", styleguide_dir_name).upper() + "_" # do not have 'styleguide' repo in '/' - self.assertEqual( - "%sCPPLINT_CPPLINT_TEST_HEADER_H_" % (expected_prefix), - cpplint.GetHeaderGuardCPPVariable(file_path), + assert ( + "%sCPPLINT_CPPLINT_TEST_HEADER_H_" % expected_prefix + == cpplint.GetHeaderGuardCPPVariable(file_path) ) # To run the 'relative path' tests, we must be in the directory of this test file. @@ -5513,15 +5462,13 @@ def doTestBuildHeaderGuardWithRoot(self, header_directory): styleguide_rel_path = os.path.relpath(styleguide_path, this_files_path) # '..' cpplint._root = styleguide_rel_path - self.assertEqual( - "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) - ) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_CPPLINT_TEST_HEADER_H_" styleguide_rel_path = os.path.relpath(styleguide_parent_path, this_files_path) # '../..' cpplint._root = styleguide_rel_path - self.assertEqual( - "%sCPPLINT_CPPLINT_TEST_HEADER_H_" % (expected_prefix), - cpplint.GetHeaderGuardCPPVariable(file_path), + assert ( + "%sCPPLINT_CPPLINT_TEST_HEADER_H_" % expected_prefix + == cpplint.GetHeaderGuardCPPVariable(file_path) ) cpplint._root = None @@ -5549,13 +5496,13 @@ def testIncludeItsHeader(self): test_directory = test_directory.replace("\\", "/") fmt = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h [build/include] [5]" expected = fmt.format(fn="foo", dir=test_directory) - self.assertEqual(1, error_collector.Results().count(expected)) + assert error_collector.Results().count(expected) == 1 error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( "test/foo.cc", "cc", [r'#include "test/foo.h"', ""], error_collector ) - self.assertEqual(0, error_collector.Results().count(expected)) + assert error_collector.Results().count(expected) == 0 # Unix directory aliases are not allowed, and should trigger the # "include itse header file" error @@ -5572,7 +5519,7 @@ def testIncludeItsHeader(self): ) + " [build/include] [5]" ) - self.assertEqual(1, error_collector.Results().count(expected)) + assert error_collector.Results().count(expected) == 1 # This should continue to work error_collector = ErrorCollector(self.assertTrue) @@ -5581,19 +5528,19 @@ def testIncludeItsHeader(self): ) fmt = "{dir}/{fn}.cc should include its header file {dir}/{fn}.h [build/include] [5]" expected = fmt.format(fn="Bar", dir=test_directory) - self.assertEqual(0, error_collector.Results().count(expected)) + assert error_collector.Results().count(expected) == 0 # Since Bar.cc & Bar.h look 3rd party-ish, it should be ok without the include dir error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData("test/Bar.cc", "cc", [r'#include "Bar.h"', ""], error_collector) - self.assertEqual(0, error_collector.Results().count(expected)) + assert error_collector.Results().count(expected) == 0 # Test edge case in which multiple files have the same base name open(os.path.join(test_directory, "foo.hpp"), "a").close() cpplint.ProcessFileData( "test/foo.cc", "cc", [r'#include "foo.hpp"', ""], error_collector ) - self.assertEqual(0, error_collector.Results().count(expected)) + assert error_collector.Results().count(expected) == 0 finally: # Restore previous CWD. @@ -5601,17 +5548,15 @@ def testIncludeItsHeader(self): shutil.rmtree(temp_directory) def testPathSplitToList(self): - self.assertEqual([""], cpplint.PathSplitToList(os.path.join(""))) + assert cpplint.PathSplitToList(os.path.join("")) == [""] - self.assertEqual(["."], cpplint.PathSplitToList(os.path.join("."))) + assert cpplint.PathSplitToList(os.path.join(".")) == ["."] - self.assertEqual([".."], cpplint.PathSplitToList(os.path.join(".."))) + assert cpplint.PathSplitToList(os.path.join("..")) == [".."] - self.assertEqual(["..", "a", "b"], cpplint.PathSplitToList(os.path.join("..", "a", "b"))) + assert cpplint.PathSplitToList(os.path.join("..", "a", "b")) == ["..", "a", "b"] - self.assertEqual( - ["a", "b", "c", "d"], cpplint.PathSplitToList(os.path.join("a", "b", "c", "d")) - ) + assert cpplint.PathSplitToList(os.path.join("a", "b", "c", "d")) == ["a", "b", "c", "d"] def testBuildHeaderGuardWithRepository(self): temp_directory = os.path.realpath(tempfile.mkdtemp()) @@ -5634,36 +5579,35 @@ def testBuildHeaderGuardWithRepository(self): open(file_path, "a").close() # search for .svn if _repository is not specified - self.assertEqual( - "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + assert ( + cpplint.GetHeaderGuardCPPVariable(file_path) + == "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_" ) # use the provided repository root for header guards cpplint._repository = os.path.relpath(trunk_dir) - self.assertEqual( - "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) - ) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_CPPLINT_TEST_HEADER_H_" cpplint._repository = os.path.abspath(trunk_dir) - self.assertEqual( - "CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) - ) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_CPPLINT_TEST_HEADER_H_" # ignore _repository if it doesn't exist cpplint._repository = os.path.join(temp_directory, "NON_EXISTENT") - self.assertEqual( - "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + assert ( + cpplint.GetHeaderGuardCPPVariable(file_path) + == "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_" ) # ignore _repository if it exists but file isn't in it cpplint._repository = os.path.relpath(temp_directory2) - self.assertEqual( - "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path) + assert ( + cpplint.GetHeaderGuardCPPVariable(file_path) + == "TRUNK_CPPLINT_CPPLINT_TEST_HEADER_H_" ) # _root should be relative to _repository cpplint._repository = os.path.relpath(trunk_dir) cpplint._root = "cpplint" - self.assertEqual("CPPLINT_TEST_HEADER_H_", cpplint.GetHeaderGuardCPPVariable(file_path)) + assert cpplint.GetHeaderGuardCPPVariable(file_path) == "CPPLINT_TEST_HEADER_H_" finally: os.chdir(current_directory) @@ -5704,12 +5648,12 @@ def testBuildPrintfFormat(self): ], error_collector, ) - self.assertEqual( - 4, + assert ( error_collector.Results().count( - "%, [, (, and { are undefined character escapes. Unescape them." - " [build/printf_format] [3]" - ), + "%, [, (, and { are undefined character escapes. Unescape them. " + "[build/printf_format] [3]" + ) + == 4 ) error_collector = ErrorCollector(self.assertTrue) @@ -5726,7 +5670,7 @@ def testBuildPrintfFormat(self): ], error_collector, ) - self.assertEqual("", error_collector.Results()) + assert error_collector.Results() == "" def testRuntimePrintfFormat(self): self.TestLint( @@ -5853,13 +5797,13 @@ def testLegalCopyright(self): # There should be a copyright message in the first 10 lines error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData(file_path, "cc", [], error_collector) - self.assertEqual(1, error_collector.ResultList().count(legal_copyright_message)) + assert error_collector.ResultList().count(legal_copyright_message) == 1 error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( file_path, "cc", ["" for unused_i in range(10)] + [copyright_line], error_collector ) - self.assertEqual(1, error_collector.ResultList().count(legal_copyright_message)) + assert error_collector.ResultList().count(legal_copyright_message) == 1 # Test that warning isn't issued if Copyright line appears early enough. error_collector = ErrorCollector(self.assertTrue) @@ -5892,7 +5836,7 @@ def testSnprintfSize(self): ) -class CxxTest(CpplintTestBase): +class TestCxx(CpplintTestBase): def Helper(self, package, extension, lines, count): filename = package + "/foo." + extension lines = lines[:] @@ -5911,7 +5855,7 @@ def Helper(self, package, extension, lines, count): collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData(filename, extension, lines, collector) error_list = collector.ResultList() - self.assertEqual(count, len(error_list), error_list) + assert count == len(error_list), error_list def TestCxxFeature(self, code, expected_error): lines = code.split("\n") @@ -5919,7 +5863,7 @@ def TestCxxFeature(self, code, expected_error): cpplint.RemoveMultiLineComments("foo.h", lines, collector) clean_lines = cpplint.CleansedLines(lines) cpplint.FlagCxxHeaders("foo.cc", clean_lines, 0, collector) - self.assertEqual(expected_error, collector.Results()) + assert expected_error == collector.Results() def testBlockedHeaders(self): self.TestCxxFeature( @@ -5953,7 +5897,7 @@ def testExplicitMakePair(self): self.TestLint("my_make_pair", "") -class CleansedLinesTest(unittest.TestCase): +class TestCleansedLines: def testInit(self): lines = [ "Line 1", @@ -5964,201 +5908,193 @@ def testInit(self): ] clean_lines = cpplint.CleansedLines(lines) - self.assertEqual(lines, clean_lines.raw_lines) - self.assertEqual(5, clean_lines.NumLines()) + assert lines == clean_lines.raw_lines + assert clean_lines.NumLines() == 5 - self.assertEqual( - ["Line 1", "Line 2", "Line 3", "Line 4", 'Line 5 "foo"'], clean_lines.lines - ) + assert clean_lines.lines == ["Line 1", "Line 2", "Line 3", "Line 4", 'Line 5 "foo"'] - self.assertEqual(["Line 1", "Line 2", "Line 3", "Line 4", 'Line 5 ""'], clean_lines.elided) + assert clean_lines.elided == ["Line 1", "Line 2", "Line 3", "Line 4", 'Line 5 ""'] def testInitEmpty(self): clean_lines = cpplint.CleansedLines([]) - self.assertEqual([], clean_lines.raw_lines) - self.assertEqual(0, clean_lines.NumLines()) + assert clean_lines.raw_lines == [] + assert clean_lines.NumLines() == 0 def testCollapseStrings(self): collapse = cpplint.CleansedLines._CollapseStrings - self.assertEqual('""', collapse('""')) # "" (empty) - self.assertEqual('"""', collapse('"""')) # """ (bad) - self.assertEqual('""', collapse('"xyz"')) # "xyz" (string) - self.assertEqual('""', collapse('"\\""')) # "\"" (string) - self.assertEqual('""', collapse('"\'"')) # "'" (string) - self.assertEqual('""', collapse('""')) # "\" (bad) - self.assertEqual('""', collapse('"\\\\"')) # "\\" (string) - self.assertEqual('"', collapse('"\\\\\\"')) # "\\\" (bad) - self.assertEqual('""', collapse('"\\\\\\\\"')) # "\\\\" (string) - - self.assertEqual("''", collapse("''")) # '' (empty) - self.assertEqual("''", collapse("'a'")) # 'a' (char) - self.assertEqual("''", collapse("'\\''")) # '\'' (char) - self.assertEqual("'", collapse("'\\'")) # '\' (bad) - self.assertEqual("", collapse("\\012")) # '\012' (char) - self.assertEqual("", collapse("\\xfF0")) # '\xfF0' (char) - self.assertEqual("", collapse("\\n")) # '\n' (char) - self.assertEqual(r"\#", collapse("\\#")) # '\#' (bad) - - self.assertEqual('"" + ""', collapse('"\'" + "\'"')) - self.assertEqual("'', ''", collapse("'\"', '\"'")) - self.assertEqual('""[0b10]', collapse("\"a'b\"[0b1'0]")) - - self.assertEqual("42", collapse("4'2")) - self.assertEqual("0b0101", collapse("0b0'1'0'1")) - self.assertEqual("1048576", collapse("1'048'576")) - self.assertEqual("0X100000", collapse("0X10'0000")) - self.assertEqual("0004000000", collapse("0'004'000'000")) - self.assertEqual("1.602176565e-19", collapse("1.602'176'565e-19")) - self.assertEqual("'' + 0xffff", collapse("'i' + 0xf'f'f'f")) - self.assertEqual("sizeof'' == 1", collapse("sizeof'x' == 1")) - self.assertEqual("0x.03p100", collapse("0x.0'3p1'0'0")) - self.assertEqual("123.45", collapse("1'23.4'5")) - - self.assertEqual( - 'StringReplace(body, "", "");', collapse('StringReplace(body, "\\\\", "\\\\\\\\");') - ) - self.assertEqual("'' \"\"", collapse('\'"\' "foo"')) - - -class OrderOfIncludesTest(CpplintTestBase): + assert collapse('""') == '""' # "" (empty) + assert collapse('"""') == '"""' # """ (bad) + assert collapse('"xyz"') == '""' # "xyz" (string) + assert collapse('"\\""') == '""' # "\"" (string) + assert collapse('"\'"') == '""' # "'" (string) + assert collapse('""') == '""' # "\" (bad) + assert collapse('"\\\\"') == '""' # "\\" (string) + assert collapse('"\\\\\\"') == '"' # "\\\" (bad) + assert collapse('"\\\\\\\\"') == '""' # "\\\\" (string) + + assert collapse("''") == "''" # '' (empty) + assert collapse("'a'") == "''" # 'a' (char) + assert collapse("'\\''") == "''" # '\'' (char) + assert collapse("'\\'") == "'" # '\' (bad) + assert collapse("\\012") == "" # '\012' (char) + assert collapse("\\xfF0") == "" # '\xfF0' (char) + assert collapse("\\n") == "" # '\n' (char) + assert collapse("\\#") == r"\#" # '\#' (bad) + + assert collapse('"\'" + "\'"') == '"" + ""' + assert collapse("'\"', '\"'") == "'', ''" + assert collapse("\"a'b\"[0b1'0]") == '""[0b10]' + + assert collapse("4'2") == "42" + assert collapse("0b0'1'0'1") == "0b0101" + assert collapse("1'048'576") == "1048576" + assert collapse("0X10'0000") == "0X100000" + assert collapse("0'004'000'000") == "0004000000" + assert collapse("1.602'176'565e-19") == "1.602176565e-19" + assert collapse("'i' + 0xf'f'f'f") == "'' + 0xffff" + assert collapse("sizeof'x' == 1") == "sizeof'' == 1" + assert collapse("0x.0'3p1'0'0") == "0x.03p100" + assert collapse("1'23.4'5") == "123.45" + + assert ( + collapse('StringReplace(body, "\\\\", "\\\\\\\\");') == 'StringReplace(body, "", "");' + ) + assert collapse('\'"\' "foo"') == "'' \"\"" + + +class TestOrderOfIncludes(CpplintTestBase): + @pytest.fixture(autouse=True) def setUp(self): CpplintTestBase.setUp(self) self.include_state = cpplint._IncludeState() os.path.abspath = lambda value: value def testCheckNextIncludeOrder_OtherThenCpp(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_HEADER)) - self.assertEqual( - "Found C++ system header after other header", - self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER), + assert self.include_state.CheckNextIncludeOrder(cpplint._OTHER_HEADER) == "" + assert ( + self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) + == "Found C++ system header after other header" ) def testCheckNextIncludeOrder_CppThenC(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) - self.assertEqual( - "Found C system header after C++ system header", - self.include_state.CheckNextIncludeOrder(cpplint._C_SYS_HEADER), + assert self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) == "" + assert ( + self.include_state.CheckNextIncludeOrder(cpplint._C_SYS_HEADER) + == "Found C system header after C++ system header" ) def testCheckNextIncludeOrder_OtherSysThenC(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) - self.assertEqual( - "Found C system header after other system header", - self.include_state.CheckNextIncludeOrder(cpplint._C_SYS_HEADER), + assert self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER) == "" + assert ( + self.include_state.CheckNextIncludeOrder(cpplint._C_SYS_HEADER) + == "Found C system header after other system header" ) def testCheckNextIncludeOrder_OtherSysThenCpp(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) - self.assertEqual( - "Found C++ system header after other system header", - self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER), + assert self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER) == "" + assert ( + self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) + == "Found C++ system header after other system header" ) def testCheckNextIncludeOrder_LikelyThenCpp(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._LIKELY_MY_HEADER)) - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + assert self.include_state.CheckNextIncludeOrder(cpplint._LIKELY_MY_HEADER) == "" + assert self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) == "" def testCheckNextIncludeOrder_PossibleThenCpp(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER)) - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + assert self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER) == "" + assert self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) == "" def testCheckNextIncludeOrder_CppThenLikely(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) + assert self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) == "" # This will eventually fail. - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._LIKELY_MY_HEADER)) + assert self.include_state.CheckNextIncludeOrder(cpplint._LIKELY_MY_HEADER) == "" def testCheckNextIncludeOrder_CppThenPossible(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER)) + assert self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) == "" + assert self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER) == "" def testCheckNextIncludeOrder_CppThenOtherSys(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER)) - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) + assert self.include_state.CheckNextIncludeOrder(cpplint._CPP_SYS_HEADER) == "" + assert self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER) == "" def testCheckNextIncludeOrder_OtherSysThenPossible(self): - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER)) - self.assertEqual("", self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER)) + assert self.include_state.CheckNextIncludeOrder(cpplint._OTHER_SYS_HEADER) == "" + assert self.include_state.CheckNextIncludeOrder(cpplint._POSSIBLE_MY_HEADER) == "" def testClassifyInclude(self): file_info = cpplint.FileInfo classify_include = cpplint._ClassifyInclude - self.assertEqual( - cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "stdio.h", True) - ) - self.assertEqual( - cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "sys/time.h", True) - ) - self.assertEqual( - cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "netipx/ipx.h", True) - ) - self.assertEqual( - cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "arpa/ftp.h", True) - ) - self.assertEqual( - cpplint._CPP_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "string", True) + assert classify_include(file_info("foo/foo.cc"), "stdio.h", True) == cpplint._C_SYS_HEADER + assert ( + classify_include(file_info("foo/foo.cc"), "sys/time.h", True) == cpplint._C_SYS_HEADER ) - self.assertEqual( - cpplint._CPP_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "typeinfo", True) + assert ( + classify_include(file_info("foo/foo.cc"), "netipx/ipx.h", True) == cpplint._C_SYS_HEADER ) - self.assertEqual( - cpplint._C_SYS_HEADER, classify_include(file_info("foo/foo.cc"), "foo/foo.h", True) + assert ( + classify_include(file_info("foo/foo.cc"), "arpa/ftp.h", True) == cpplint._C_SYS_HEADER ) - self.assertEqual( - cpplint._OTHER_SYS_HEADER, - classify_include(file_info("foo/foo.cc"), "foo/foo.h", True, "standardcfirst"), + assert classify_include(file_info("foo/foo.cc"), "string", True) == cpplint._CPP_SYS_HEADER + assert ( + classify_include(file_info("foo/foo.cc"), "typeinfo", True) == cpplint._CPP_SYS_HEADER ) - self.assertEqual( - cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.cc"), "string", False) + assert classify_include(file_info("foo/foo.cc"), "foo/foo.h", True) == cpplint._C_SYS_HEADER + assert ( + classify_include(file_info("foo/foo.cc"), "foo/foo.h", True, "standardcfirst") + == cpplint._OTHER_SYS_HEADER ) - self.assertEqual( - cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.cc"), "boost/any.hpp", True) + assert classify_include(file_info("foo/foo.cc"), "string", False) == cpplint._OTHER_HEADER + assert ( + classify_include(file_info("foo/foo.cc"), "boost/any.hpp", True) + == cpplint._OTHER_HEADER ) - self.assertEqual( - cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.hxx"), "boost/any.hpp", True) + assert ( + classify_include(file_info("foo/foo.hxx"), "boost/any.hpp", True) + == cpplint._OTHER_HEADER ) - self.assertEqual( - cpplint._OTHER_HEADER, classify_include(file_info("foo/foo.h++"), "boost/any.hpp", True) + assert ( + classify_include(file_info("foo/foo.h++"), "boost/any.hpp", True) + == cpplint._OTHER_HEADER ) - self.assertEqual( - cpplint._LIKELY_MY_HEADER, - classify_include(file_info("foo/foo.cc"), "foo/foo-inl.h", False), + assert ( + classify_include(file_info("foo/foo.cc"), "foo/foo-inl.h", False) + == cpplint._LIKELY_MY_HEADER ) - self.assertEqual( - cpplint._LIKELY_MY_HEADER, - classify_include(file_info("foo/internal/foo.cc"), "foo/public/foo.h", False), + assert ( + classify_include(file_info("foo/internal/foo.cc"), "foo/public/foo.h", False) + == cpplint._LIKELY_MY_HEADER ) - self.assertEqual( - cpplint._POSSIBLE_MY_HEADER, - classify_include(file_info("foo/internal/foo.cc"), "foo/other/public/foo.h", False), + assert ( + classify_include(file_info("foo/internal/foo.cc"), "foo/other/public/foo.h", False) + == cpplint._POSSIBLE_MY_HEADER ) - self.assertEqual( - cpplint._OTHER_HEADER, - classify_include(file_info("foo/internal/foo.cc"), "foo/other/public/foop.h", False), + assert ( + classify_include(file_info("foo/internal/foo.cc"), "foo/other/public/foop.h", False) + == cpplint._OTHER_HEADER ) def testTryDropCommonSuffixes(self): cpplint._hpp_headers = set() cpplint._valid_extensions = set() - self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.h")) - self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.hxx")) - self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.h++")) - self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo-inl.hpp")) - self.assertEqual("foo/bar/foo", cpplint._DropCommonSuffixes("foo/bar/foo_inl.h")) - self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo.cc")) - self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo.cxx")) - self.assertEqual("foo/foo", cpplint._DropCommonSuffixes("foo/foo.c")) - self.assertEqual( - "foo/foo_unusualinternal", cpplint._DropCommonSuffixes("foo/foo_unusualinternal.h") - ) - self.assertEqual( - "foo/foo_unusualinternal", cpplint._DropCommonSuffixes("foo/foo_unusualinternal.hpp") - ) - self.assertEqual("", cpplint._DropCommonSuffixes("_test.cc")) - self.assertEqual("", cpplint._DropCommonSuffixes("_test.c")) - self.assertEqual("", cpplint._DropCommonSuffixes("_test.c++")) - self.assertEqual("test", cpplint._DropCommonSuffixes("test.c")) - self.assertEqual("test", cpplint._DropCommonSuffixes("test.cc")) - self.assertEqual("test", cpplint._DropCommonSuffixes("test.c++")) + assert cpplint._DropCommonSuffixes("foo/foo-inl.h") == "foo/foo" + assert cpplint._DropCommonSuffixes("foo/foo-inl.hxx") == "foo/foo" + assert cpplint._DropCommonSuffixes("foo/foo-inl.h++") == "foo/foo" + assert cpplint._DropCommonSuffixes("foo/foo-inl.hpp") == "foo/foo" + assert cpplint._DropCommonSuffixes("foo/bar/foo_inl.h") == "foo/bar/foo" + assert cpplint._DropCommonSuffixes("foo/foo.cc") == "foo/foo" + assert cpplint._DropCommonSuffixes("foo/foo.cxx") == "foo/foo" + assert cpplint._DropCommonSuffixes("foo/foo.c") == "foo/foo" + assert cpplint._DropCommonSuffixes("foo/foo_unusualinternal.h") == "foo/foo_unusualinternal" + assert ( + cpplint._DropCommonSuffixes("foo/foo_unusualinternal.hpp") == "foo/foo_unusualinternal" + ) + assert cpplint._DropCommonSuffixes("_test.cc") == "" + assert cpplint._DropCommonSuffixes("_test.c") == "" + assert cpplint._DropCommonSuffixes("_test.c++") == "" + assert cpplint._DropCommonSuffixes("test.c") == "test" + assert cpplint._DropCommonSuffixes("test.cc") == "test" + assert cpplint._DropCommonSuffixes("test.c++") == "test" def testRegression(self): def Format(includes): @@ -6313,7 +6249,8 @@ def Format(includes): ) -class CheckForFunctionLengthsTest(CpplintTestBase): +class TestCheckForFunctionLengths(CpplintTestBase): + @pytest.fixture(autouse=True) def setUp(self): # Reducing these thresholds for the tests speeds up tests significantly. CpplintTestBase.setUp(self) @@ -6334,7 +6271,7 @@ def TestFunctionLengthsCheck(self, code, expected_message): code: C++ source code expected to generate a warning message. expected_message: Message expected to be generated by the C++ code. """ - self.assertEqual(expected_message, self.PerformFunctionLengthsCheck(code)) + assert expected_message == self.PerformFunctionLengthsCheck(code) def TriggerLines(self, error_level): """Return number of lines needed to trigger a function length warning. @@ -6684,7 +6621,8 @@ def CountLeadingWhitespace(s): return "\n".join([line[min_indent:] for line in text_block.split("\n")]) -class CloseExpressionTest(unittest.TestCase): +class TestCloseExpression: + @pytest.fixture(autouse=True) def setUp(self): self.lines = cpplint.CleansedLines( # 1 2 3 4 5 @@ -6735,7 +6673,7 @@ def testCloseExpression(self): ] for p in positions: (_, line, column) = cpplint.CloseExpression(self.lines, p[0], p[1]) - self.assertEqual((p[2], p[3]), (line, column)) + assert (p[2], p[3]) == (line, column) def testReverseCloseExpression(self): # List of positions to test: @@ -6757,14 +6695,18 @@ def testReverseCloseExpression(self): ] for p in positions: (_, line, column) = cpplint.ReverseCloseExpression(self.lines, p[0], p[1]) - self.assertEqual((p[2], p[3]), (line, column)) + assert (p[2], p[3]) == (line, column) -class NestingStateTest(unittest.TestCase): +class TestNestingState: + @pytest.fixture(autouse=True) def setUp(self): self.nesting_state = cpplint.NestingState() self.error_collector = ErrorCollector(self.assertTrue) + def assertTrue(self, condition, message=""): + assert condition, message + def UpdateWithLines(self, lines): clean_lines = cpplint.CleansedLines(lines) for line in range(clean_lines.NumLines()): @@ -6772,148 +6714,148 @@ def UpdateWithLines(self, lines): def testEmpty(self): self.UpdateWithLines([]) - self.assertEqual(self.nesting_state.stack, []) + assert self.nesting_state.stack == [] def testNamespace(self): self.UpdateWithLines(["namespace {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._NamespaceInfo)) - self.assertTrue(self.nesting_state.stack[0].seen_open_brace) - self.assertEqual(self.nesting_state.stack[0].name, "") + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._NamespaceInfo) + assert self.nesting_state.stack[0].seen_open_brace + assert self.nesting_state.stack[0].name == "" self.UpdateWithLines(["namespace outer { namespace inner"]) - self.assertEqual(len(self.nesting_state.stack), 3) - self.assertTrue(self.nesting_state.stack[0].seen_open_brace) - self.assertTrue(self.nesting_state.stack[1].seen_open_brace) - self.assertFalse(self.nesting_state.stack[2].seen_open_brace) - self.assertEqual(self.nesting_state.stack[0].name, "") - self.assertEqual(self.nesting_state.stack[1].name, "outer") - self.assertEqual(self.nesting_state.stack[2].name, "inner") + assert len(self.nesting_state.stack) == 3 + assert self.nesting_state.stack[0].seen_open_brace + assert self.nesting_state.stack[1].seen_open_brace + assert not self.nesting_state.stack[2].seen_open_brace + assert self.nesting_state.stack[0].name == "" + assert self.nesting_state.stack[1].name == "outer" + assert self.nesting_state.stack[2].name == "inner" self.UpdateWithLines(["{"]) - self.assertTrue(self.nesting_state.stack[2].seen_open_brace) + assert self.nesting_state.stack[2].seen_open_brace self.UpdateWithLines(["}", "}}"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testDecoratedClass(self): self.UpdateWithLines(["class Decorated_123 API A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "A") - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertEqual(self.nesting_state.stack[0].class_indent, 0) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "A" + assert not self.nesting_state.stack[0].is_derived + assert self.nesting_state.stack[0].class_indent == 0 self.UpdateWithLines(["}"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testInnerClass(self): self.UpdateWithLines(["class A::B::C {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "A::B::C") - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertEqual(self.nesting_state.stack[0].class_indent, 0) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "A::B::C" + assert not self.nesting_state.stack[0].is_derived + assert self.nesting_state.stack[0].class_indent == 0 self.UpdateWithLines(["}"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testClass(self): self.UpdateWithLines(["class A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "A") - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertEqual(self.nesting_state.stack[0].class_indent, 0) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "A" + assert not self.nesting_state.stack[0].is_derived + assert self.nesting_state.stack[0].class_indent == 0 self.UpdateWithLines(["};", "struct B : public A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "B") - self.assertTrue(self.nesting_state.stack[0].is_derived) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "B" + assert self.nesting_state.stack[0].is_derived self.UpdateWithLines(["};", "class C", ": public A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "C") - self.assertTrue(self.nesting_state.stack[0].is_derived) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "C" + assert self.nesting_state.stack[0].is_derived self.UpdateWithLines(["};", "template"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 self.UpdateWithLines(["class D {", " class E {"]) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "D") - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[1].name, "E") - self.assertFalse(self.nesting_state.stack[1].is_derived) - self.assertEqual(self.nesting_state.stack[1].class_indent, 2) - self.assertEqual(self.nesting_state.InnermostClass().name, "E") + assert len(self.nesting_state.stack) == 2 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "D" + assert not self.nesting_state.stack[0].is_derived + assert isinstance(self.nesting_state.stack[1], cpplint._ClassInfo) + assert self.nesting_state.stack[1].name == "E" + assert not self.nesting_state.stack[1].is_derived + assert self.nesting_state.stack[1].class_indent == 2 + assert self.nesting_state.InnermostClass().name == "E" self.UpdateWithLines(["}", "}"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testClassAccess(self): self.UpdateWithLines(["class A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].access, "private") + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].access == "private" self.UpdateWithLines([" public:"]) - self.assertEqual(self.nesting_state.stack[0].access, "public") + assert self.nesting_state.stack[0].access == "public" self.UpdateWithLines([" protracted:"]) - self.assertEqual(self.nesting_state.stack[0].access, "public") + assert self.nesting_state.stack[0].access == "public" self.UpdateWithLines([" protected:"]) - self.assertEqual(self.nesting_state.stack[0].access, "protected") + assert self.nesting_state.stack[0].access == "protected" self.UpdateWithLines([" private:"]) - self.assertEqual(self.nesting_state.stack[0].access, "private") + assert self.nesting_state.stack[0].access == "private" self.UpdateWithLines([" struct B {"]) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[1].access, "public") - self.assertEqual(self.nesting_state.stack[0].access, "private") + assert len(self.nesting_state.stack) == 2 + assert isinstance(self.nesting_state.stack[1], cpplint._ClassInfo) + assert self.nesting_state.stack[1].access == "public" + assert self.nesting_state.stack[0].access == "private" self.UpdateWithLines([" protected :"]) - self.assertEqual(self.nesting_state.stack[1].access, "protected") - self.assertEqual(self.nesting_state.stack[0].access, "private") + assert self.nesting_state.stack[1].access == "protected" + assert self.nesting_state.stack[0].access == "private" self.UpdateWithLines([" }", "}"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testStruct(self): self.UpdateWithLines(["struct A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "A") - self.assertFalse(self.nesting_state.stack[0].is_derived) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "A" + assert not self.nesting_state.stack[0].is_derived self.UpdateWithLines(["}", "void Func(struct B arg) {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertFalse(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + assert len(self.nesting_state.stack) == 1 + assert not isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) self.UpdateWithLines(["}"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testPreprocessor(self): - self.assertEqual(len(self.nesting_state.pp_stack), 0) + assert len(self.nesting_state.pp_stack) == 0 self.UpdateWithLines(["#if MACRO1"]) - self.assertEqual(len(self.nesting_state.pp_stack), 1) + assert len(self.nesting_state.pp_stack) == 1 self.UpdateWithLines(["#endif"]) - self.assertEqual(len(self.nesting_state.pp_stack), 0) + assert len(self.nesting_state.pp_stack) == 0 self.UpdateWithLines(["#ifdef MACRO2"]) - self.assertEqual(len(self.nesting_state.pp_stack), 1) + assert len(self.nesting_state.pp_stack) == 1 self.UpdateWithLines(["#else"]) - self.assertEqual(len(self.nesting_state.pp_stack), 1) + assert len(self.nesting_state.pp_stack) == 1 self.UpdateWithLines(["#ifdef MACRO3"]) - self.assertEqual(len(self.nesting_state.pp_stack), 2) + assert len(self.nesting_state.pp_stack) == 2 self.UpdateWithLines(["#elif MACRO4"]) - self.assertEqual(len(self.nesting_state.pp_stack), 2) + assert len(self.nesting_state.pp_stack) == 2 self.UpdateWithLines(["#endif"]) - self.assertEqual(len(self.nesting_state.pp_stack), 1) + assert len(self.nesting_state.pp_stack) == 1 self.UpdateWithLines(["#endif"]) - self.assertEqual(len(self.nesting_state.pp_stack), 0) + assert len(self.nesting_state.pp_stack) == 0 self.UpdateWithLines( [ @@ -6926,66 +6868,66 @@ def testPreprocessor(self): "#endif", ] ) - self.assertEqual(len(self.nesting_state.pp_stack), 0) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "A") + assert len(self.nesting_state.pp_stack) == 0 + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "A" self.UpdateWithLines(["};"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 self.UpdateWithLines(["class D", "#ifdef MACRO7"]) - self.assertEqual(len(self.nesting_state.pp_stack), 1) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "D") - self.assertFalse(self.nesting_state.stack[0].is_derived) + assert len(self.nesting_state.pp_stack) == 1 + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "D" + assert not self.nesting_state.stack[0].is_derived self.UpdateWithLines(["#elif MACRO8", ": public E"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[0].name, "D") - self.assertTrue(self.nesting_state.stack[0].is_derived) - self.assertFalse(self.nesting_state.stack[0].seen_open_brace) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[0].name == "D" + assert self.nesting_state.stack[0].is_derived + assert not self.nesting_state.stack[0].seen_open_brace self.UpdateWithLines(["#else", "{"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[0].name, "D") - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertTrue(self.nesting_state.stack[0].seen_open_brace) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[0].name == "D" + assert not self.nesting_state.stack[0].is_derived + assert self.nesting_state.stack[0].seen_open_brace self.UpdateWithLines(["#endif"]) - self.assertEqual(len(self.nesting_state.pp_stack), 0) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[0].name, "D") - self.assertFalse(self.nesting_state.stack[0].is_derived) - self.assertFalse(self.nesting_state.stack[0].seen_open_brace) + assert len(self.nesting_state.pp_stack) == 0 + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[0].name == "D" + assert not self.nesting_state.stack[0].is_derived + assert not self.nesting_state.stack[0].seen_open_brace self.UpdateWithLines([";"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testTemplate(self): self.UpdateWithLines(["template >"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 self.UpdateWithLines(["class A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "A") + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "A" self.UpdateWithLines( ["};", "template class B>", "class C"] ) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "C") + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "C" self.UpdateWithLines([";"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 self.UpdateWithLines(["class D : public Tmpl"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "D") + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "D" self.UpdateWithLines(["{", "};"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 self.UpdateWithLines( [ @@ -6996,71 +6938,71 @@ def testTemplate(self): "static void Func() {", ] ) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertFalse(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + assert len(self.nesting_state.stack) == 1 + assert not isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) self.UpdateWithLines(["}", "template class K {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "K") + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "K" def testTemplateDefaultArg(self): self.UpdateWithLines(["template > class unique_ptr {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue( - self.nesting_state.stack[0], isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[0], isinstance( + self.nesting_state.stack[0], cpplint._ClassInfo ) def testTemplateInnerClass(self): self.UpdateWithLines(["class A {", " public:"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) self.UpdateWithLines([" template ", " class C >", " : public A {"]) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertTrue(isinstance(self.nesting_state.stack[1], cpplint._ClassInfo)) + assert len(self.nesting_state.stack) == 2 + assert isinstance(self.nesting_state.stack[1], cpplint._ClassInfo) def testArguments(self): self.UpdateWithLines(["class A {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "A") - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "A" + assert self.nesting_state.stack[-1].open_parentheses == 0 self.UpdateWithLines([" void Func(", " struct X arg1,"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 self.UpdateWithLines([" struct X *arg2);"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 0 self.UpdateWithLines(["};"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 self.UpdateWithLines(["struct B {"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertTrue(isinstance(self.nesting_state.stack[0], cpplint._ClassInfo)) - self.assertEqual(self.nesting_state.stack[0].name, "B") + assert len(self.nesting_state.stack) == 1 + assert isinstance(self.nesting_state.stack[0], cpplint._ClassInfo) + assert self.nesting_state.stack[0].name == "B" self.UpdateWithLines(["#ifdef MACRO", " void Func(", " struct X arg1"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 self.UpdateWithLines(["#else"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 0 self.UpdateWithLines([" void Func(", " struct X arg1"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 self.UpdateWithLines(["#endif"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 self.UpdateWithLines([" struct X *arg2);"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 0 self.UpdateWithLines(["};"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 def testInlineAssembly(self): self.UpdateWithLines( @@ -7069,14 +7011,14 @@ def testInlineAssembly(self): " int count) {", ] ) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._NO_ASM) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 0 + assert self.nesting_state.stack[-1].inline_asm == cpplint._NO_ASM self.UpdateWithLines([" asm volatile ("]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 + assert self.nesting_state.stack[-1].inline_asm == cpplint._INSIDE_ASM self.UpdateWithLines( [ @@ -7096,38 +7038,39 @@ def testInlineAssembly(self): ' : "memory", "cc"', ] ) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 + assert self.nesting_state.stack[-1].inline_asm == cpplint._INSIDE_ASM self.UpdateWithLines(["#if defined(__SSE2__)", ' , "xmm0", "xmm1"']) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 + assert self.nesting_state.stack[-1].inline_asm == cpplint._INSIDE_ASM self.UpdateWithLines(["#endif"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 1) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._INSIDE_ASM) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 1 + assert self.nesting_state.stack[-1].inline_asm == cpplint._INSIDE_ASM self.UpdateWithLines([" );"]) - self.assertEqual(len(self.nesting_state.stack), 1) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._END_ASM) + assert len(self.nesting_state.stack) == 1 + assert self.nesting_state.stack[-1].open_parentheses == 0 + assert self.nesting_state.stack[-1].inline_asm == cpplint._END_ASM self.UpdateWithLines(["__asm {"]) - self.assertEqual(len(self.nesting_state.stack), 2) - self.assertEqual(self.nesting_state.stack[-1].open_parentheses, 0) - self.assertEqual(self.nesting_state.stack[-1].inline_asm, cpplint._BLOCK_ASM) + assert len(self.nesting_state.stack) == 2 + assert self.nesting_state.stack[-1].open_parentheses == 0 + assert self.nesting_state.stack[-1].inline_asm == cpplint._BLOCK_ASM self.UpdateWithLines(["}"]) - self.assertEqual(len(self.nesting_state.stack), 1) + assert len(self.nesting_state.stack) == 1 self.UpdateWithLines(["}"]) - self.assertEqual(len(self.nesting_state.stack), 0) + assert len(self.nesting_state.stack) == 0 -class QuietTest(unittest.TestCase): +class TestQuiet: + @pytest.fixture(autouse=True) def setUp(self): self.temp_dir = os.path.realpath(tempfile.mkdtemp()) self.this_dir_path = os.path.abspath(self.temp_dir) @@ -7156,52 +7099,52 @@ def _runCppLint(self, *args): def testNonQuietWithErrors(self): # This will fail: the test header is missing a copyright and header guard. (return_code, output) = self._runCppLint() - self.assertEqual(1, return_code) + assert return_code == 1 # Always-on behavior: Print error messages as they come up. - self.assertIn("[legal/copyright]", output) - self.assertIn("[build/header_guard]", output) + assert "[legal/copyright]" in output + assert "[build/header_guard]" in output # If --quiet was unspecified: Print 'Done processing' and 'Total errors..' - self.assertIn("Done processing", output) - self.assertIn("Total errors found:", output) + assert "Done processing" in output + assert "Total errors found:" in output def testQuietWithErrors(self): # When there are errors, behavior is identical to not passing --quiet. (return_code, output) = self._runCppLint("--quiet") - self.assertEqual(1, return_code) - self.assertIn("[legal/copyright]", output) - self.assertIn("[build/header_guard]", output) + assert return_code == 1 + assert "[legal/copyright]" in output + assert "[build/header_guard]" in output # Even though --quiet was used, print these since there were errors. - self.assertIn("Done processing", output) - self.assertIn("Total errors found:", output) + assert "Done processing" in output + assert "Total errors found:" in output def testNonQuietWithoutErrors(self): # This will succeed. We filtered out all the known errors for that file. (return_code, output) = self._runCppLint( "--filter=" + "-legal/copyright," + "-build/header_guard" ) - self.assertEqual(0, return_code, output) + assert return_code == 0, output # No cpplint errors are printed since there were no errors. - self.assertNotIn("[legal/copyright]", output) - self.assertNotIn("[build/header_guard]", output) + assert "[legal/copyright]" not in output + assert "[build/header_guard]" not in output # Print 'Done processing' since # --quiet was not specified. - self.assertIn("Done processing", output) + assert "Done processing" in output def testQuietWithoutErrors(self): # This will succeed. We filtered out all the known errors for that file. (return_code, output) = self._runCppLint( "--quiet", "--filter=" + "-legal/copyright," + "-build/header_guard" ) - self.assertEqual(0, return_code, output) + assert return_code == 0, output # No cpplint errors are printed since there were no errors. - self.assertNotIn("[legal/copyright]", output) - self.assertNotIn("[build/header_guard]", output) + assert "[legal/copyright]" not in output + assert "[build/header_guard]" not in output # --quiet was specified and there were no errors: # skip the printing of 'Done processing' and 'Total errors..' - self.assertNotIn("Done processing", output) - self.assertNotIn("Total errors found:", output) + assert "Done processing" not in output + assert "Total errors found:" not in output # Output with no errors must be completely blank! - self.assertEqual("", output) + assert output == "" # class FileFilterTest(unittest.TestCase): @@ -7246,9 +7189,10 @@ def run_around_tests(): # obviously we're not going to see all the error categories. So we # only run VerifyAllCategoriesAreSeen() when no commandline flags # are passed in. + global _run_verifyallcategoriesseen _run_verifyallcategoriesseen = len(sys.argv) == 1 setUp() - unittest.main() + pytest.main([__file__]) tearDown() diff --git a/pyproject.toml b/pyproject.toml index 1c3c3ee..e64d1cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -94,6 +94,7 @@ lint.select = [ "PGH", # pygrep-hooks "PIE", # flake8-pie "PL", # Pylint + "PT", # flake8-pytest-style "PYI", # flake8-pyi "Q", # flake8-quotes "RET", # flake8-return @@ -115,7 +116,6 @@ lint.select = [ # "DOC", # pydoclint # "ERA", # eradicate # "N", # pep8-naming - # "PT", # flake8-pytest-style # "PTH", # flake8-use-pathlib # "RUF", # Ruff-specific rules # "S", # flake8-bandit @@ -132,14 +132,14 @@ lint.ignore = [ lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401", "PLR5501", "PLW0603", "PLW2901", "SIM102", "SIM108" ] lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "PLW0604", "SIM115", "UP031" ] lint.mccabe.max-complexity = 29 -lint.pylint.allow-magic-value-types = [ "int", "str" ] +lint.pylint.allow-magic-value-types = [ "bytes", "int", "str" ] lint.pylint.max-args = 10 # Default is 5 lint.pylint.max-bool-expr = 8 # Default is 5 lint.pylint.max-branches = 30 # Default is 12 lint.pylint.max-locals = 16 # Default is 15 lint.pylint.max-public-methods = 130 # Default is 20 lint.pylint.max-returns = 9 # Default is 9 -lint.pylint.max-statements = 74 # Default is 50 +lint.pylint.max-statements = 79 # Default is 50 [tool.pylint.basic] argument-rgx = "[a-z_][a-z0-9_]{0,49}$" @@ -189,7 +189,7 @@ max-branches = 30 max-line-length = 100 max-locals = 25 max-returns = 10 -max-statements = 75 +max-statements = 79 min-public-methods = 0 [tool.pytest.ini_options] From d0bbd53b9f90af2d930fbef9f4e0396395727f07 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 16 Mar 2025 13:40:32 -0400 Subject: [PATCH 30/63] fix unittests category verification for PT and deduplicate setup/teardown --- cpplint_unittest.py | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index d7ee514..165f1bb 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -7160,39 +7160,18 @@ def setUp(): cpplint._cpplint_state.SetFilters("") -# pylint: disable=C6409 -def tearDown(): - """A global check to make sure all error-categories have been tested. - - The main tearDown() routine is the only code we can guarantee will be - run after all other tests have been executed. - """ - try: - if _run_verifyallcategoriesseen: - ErrorCollector(None).VerifyAllCategoriesAreSeen() - except NameError: - # If nobody set the global _run_verifyallcategoriesseen, then - # we assume we should silently not run the test - pass - - -@pytest.fixture(autouse=True) -def run_around_tests(): +@pytest.fixture(autouse=True, scope="session") +def run_around_tests(pytestconfig: pytest.Config): setUp() yield - tearDown() - - -if __name__ == "__main__": # We don't want to run the VerifyAllCategoriesAreSeen() test unless # we're running the full test suite: if we only run one test, # obviously we're not going to see all the error categories. So we - # only run VerifyAllCategoriesAreSeen() when no commandline flags - # are passed in. + # only run VerifyAllCategoriesAreSeen() when we don't filter for + # specific tests. + if pytestconfig.getoption("-k", default=None) is None: + ErrorCollector(None).VerifyAllCategoriesAreSeen() - global _run_verifyallcategoriesseen - _run_verifyallcategoriesseen = len(sys.argv) == 1 - setUp() +if __name__ == "__main__": pytest.main([__file__]) - tearDown() From 0391a42e6362bf9f11697095ebeae09319014deb Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 16 Mar 2025 14:15:22 -0400 Subject: [PATCH 31/63] add missing build/deprecated test and remove unused readability/strings category --- cpplint.py | 1 - cpplint_unittest.py | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cpplint.py b/cpplint.py index b396eae..eeca895 100755 --- a/cpplint.py +++ b/cpplint.py @@ -323,7 +323,6 @@ "readability/namespace", "readability/nolint", "readability/nul", - "readability/strings", "readability/todo", "readability/utf8", "runtime/arrays", diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 165f1bb..66751a3 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -5115,6 +5115,18 @@ def testBuildForwardDecl(self): " [build/forward_decl] [5]", ) + def testBuildDeprecated(self): + self.TestLint( + "a ? and ?= b", + ">? and Date: Mon, 17 Mar 2025 00:17:25 +0100 Subject: [PATCH 32/63] ruff rule N805: First argument of a method should be named `self` (#339) This code is not deleting the function (method) but is instead deleting the class! https://docs.astral.sh/ruff/rules/invalid-first-argument-name-for-method --------- Co-authored-by: Aaron Liu --- cpplint_clitest.py | 6 +----- pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index d6fddca..4185000 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -176,10 +176,6 @@ class TestNoRepoSignature(TemporaryFolderClassSetup): def get_extra_command_args(self, cwd): return f" --repository {self._root} " - def _test_name_func(fun, _, x): - del fun - return f"test{x.args[0].capitalize()}Sample-{x.args[1]}" - @parameterized.expand( [ (folder, case[:-4]) @@ -187,7 +183,7 @@ def _test_name_func(fun, _, x): for case in os.listdir(f"./samples/{folder}-sample") if case.endswith(".def") ], - name_func=_test_name_func, + name_func=lambda fun, _, x: f"test{x.args[0].capitalize()}Sample-{x.args[1]}", ) @pytest.mark.timeout(180) def testSamples(self, folder, case): diff --git a/pyproject.toml b/pyproject.toml index e64d1cd..cb381d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,6 +88,7 @@ lint.select = [ "INT", # flake8-gettext "ISC", # flake8-implicit-str-concat "LOG", # flake8-logging + "N", # pep8-naming "NPY", # NumPy-specific rules "PD", # pandas-vet "PERF", # Perflint @@ -115,7 +116,6 @@ lint.select = [ # "D", # pydocstyle # "DOC", # pydoclint # "ERA", # eradicate - # "N", # pep8-naming # "PTH", # flake8-use-pathlib # "RUF", # Ruff-specific rules # "S", # flake8-bandit @@ -127,6 +127,7 @@ lint.ignore = [ "FBT003", # flake8-boolean-trap "FIX002", # flake8-fixme "ISC003", # flake8-implicit-str-concat + "N802", # invalid-function-name "PIE790", # Unnecessary `pass` statement ] lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401", "PLR5501", "PLW0603", "PLW2901", "SIM102", "SIM108" ] From f44f0796e0416f818e4483af8408dc249a8950fc Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 16 Mar 2025 19:33:31 -0400 Subject: [PATCH 33/63] misc git cleanup (#340) Remove my pathetic attempt at a debug print from unit tests Ignore reformatting commit from git blame gitignore pycharm and uv.lock evidently i was not feeling well --------- Co-authored-by: Christian Clauss --- .git-blame-ignore-revs | 3 +++ .gitignore | 3 +++ cpplint_unittest.py | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..9a63ffd --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,3 @@ +# .git-blame-ignore-revs +# Reformatted repo with ruff +94f5e443bfa80e576ded32585f0058d09a6a7fbc diff --git a/.gitignore b/.gitignore index 712f99b..7098c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,9 @@ ipython_config.py # VSCode .vscode/ +# JetBrains PyCharm +.idea/ + # pyenv .python-version diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 66751a3..c407fb6 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -7181,10 +7181,8 @@ def run_around_tests(pytestconfig: pytest.Config): # obviously we're not going to see all the error categories. So we # only run VerifyAllCategoriesAreSeen() when we don't filter for # specific tests. - assert pytestconfig.getoption("-k", default=None) in [None, ""] - if pytestconfig.getoption("-k", default=None) in [None, ""]: + if pytestconfig.getoption("-k", default=None) in {None, ""}: ErrorCollector(None).VerifyAllCategoriesAreSeen() - print("IIIIIIIIII saw the TV glow") if __name__ == "__main__": From 0f95a9a757000f461aab6f80216a6ce0d842a77f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 18 Mar 2025 13:49:01 +0100 Subject: [PATCH 34/63] cpplint_clitest.py: Function names should be lowercase (#342) % `ruff rule N802 ` # https://docs.astral.sh/ruff/rules/invalid-function-name --------- Co-authored-by: Aaron Liu --- cpplint_clitest.py | 12 ++++++------ pyproject.toml | 14 +++++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 4185000..91c69cc 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -76,7 +76,7 @@ def run_shell_command(cmd: str, args: str, cwd="."): class TestUsage: - def testHelp(self): + def test_help(self): (status, out, err) = run_shell_command(BASE_CMD, "--help") assert status == 0 assert out == b"" @@ -183,10 +183,10 @@ def get_extra_command_args(self, cwd): for case in os.listdir(f"./samples/{folder}-sample") if case.endswith(".def") ], - name_func=lambda fun, _, x: f"test{x.args[0].capitalize()}Sample-{x.args[1]}", + name_func=lambda fun, _, x: f"test_{x.args[0]}_sample-{x.args[1]}", ) @pytest.mark.timeout(180) - def testSamples(self, folder, case): + def test_samples(self, folder, case): self.check_def(os.path.join(f"./samples/{folder}-sample", case + ".def")) @@ -198,7 +198,7 @@ def prepare_directory(cls, root): with open(os.path.join(root, ".git"), "a"): pass - def testCodeliteSample(self): + def test_codelite_sample(self): self.check_all_in_folder("./samples/codelite-sample", 1) @@ -210,7 +210,7 @@ def prepare_directory(cls, root): with open(os.path.join(root, ".hg"), "a"): pass - def testCodeliteSample(self): + def test_codelite_sample(self): self.check_all_in_folder("./samples/codelite-sample", 1) @@ -222,7 +222,7 @@ def prepare_directory(cls, root): with open(os.path.join(root, ".svn"), "a"): pass - def testCodeliteSample(self): + def test_codelite_sample(self): self.check_all_in_folder("./samples/codelite-sample", 1) diff --git a/pyproject.toml b/pyproject.toml index cb381d6..9316c89 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -127,11 +127,19 @@ lint.ignore = [ "FBT003", # flake8-boolean-trap "FIX002", # flake8-fixme "ISC003", # flake8-implicit-str-concat - "N802", # invalid-function-name "PIE790", # Unnecessary `pass` statement ] -lint.per-file-ignores."cpplint.py" = [ "ICN001", "PERF401", "PLR5501", "PLW0603", "PLW2901", "SIM102", "SIM108" ] -lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "PLW0604", "SIM115", "UP031" ] +lint.per-file-ignores."cpplint.py" = [ + "ICN001", + "N802", + "PERF401", + "PLR5501", + "PLW0603", + "PLW2901", + "SIM102", + "SIM108", +] +lint.per-file-ignores."cpplint_unittest.py" = [ "FLY002", "N802", "PLW0604", "SIM115", "UP031" ] lint.mccabe.max-complexity = 29 lint.pylint.allow-magic-value-types = [ "bytes", "int", "str" ] lint.pylint.max-args = 10 # Default is 5 From d0456bd2a0cfd20a15168739ea6182be85cb31ba Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 18 Mar 2025 20:12:39 +0100 Subject: [PATCH 35/63] Mypy: static type checker for Python (#345) # https://mypy-lang.org --- cpplint.py | 28 +++++++++++++++------------- cpplint_clitest.py | 10 ++++++---- cpplint_unittest.py | 6 ++++-- pyproject.toml | 1 + tox.ini | 3 +++ 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/cpplint.py b/cpplint.py index eeca895..241317c 100755 --- a/cpplint.py +++ b/cpplint.py @@ -41,6 +41,8 @@ same line, but it is far from perfect (in either direction). """ +from __future__ import annotations + import codecs import collections import copy @@ -57,7 +59,7 @@ import xml.etree.ElementTree # if empty, use defaults -_valid_extensions = set() +_valid_extensions: set[str] = set() __VERSION__ = "2.0.1" @@ -830,7 +832,7 @@ ] # Replacement macros for CHECK/DCHECK/EXPECT_TRUE/EXPECT_FALSE -_CHECK_REPLACEMENT = {macro_var: {} for macro_var in _CHECK_MACROS} +_CHECK_REPLACEMENT: dict[str, dict[str, str]] = {macro_var: {} for macro_var in _CHECK_MACROS} for op, replacement in [ ("==", "EQ"), @@ -934,7 +936,7 @@ # {str, set(int)}: a map from error categories to sets of linenumbers # on which those errors are expected and should be suppressed. -_error_suppressions = {} +_error_suppressions: dict[str, set[int]] = {} # The root directory used for deriving header guard CPP variable. # This is set by --root flag. @@ -964,7 +966,7 @@ # Treat all headers starting with 'h' equally: .h, .hpp, .hxx etc. # This is set by --headers flag. -_hpp_headers = set() +_hpp_headers: set[str] = set() class ErrorSuppressions: @@ -1034,7 +1036,7 @@ def Clear(self): self._open_block_suppression = None -_error_suppressions = ErrorSuppressions() +_error_suppressions = ErrorSuppressions() # type: ignore[assignment] def ProcessHppHeadersOption(val): @@ -6609,7 +6611,7 @@ def ExpectingFunctionArgs(clean_lines, linenum): ) -_HEADERS_CONTAINING_TEMPLATES = ( +_HEADERS_CONTAINING_TEMPLATES: tuple[tuple[str, tuple[str, ...]], ...] = ( ("", ("deque",)), ( "", @@ -6705,7 +6707,7 @@ def ExpectingFunctionArgs(clean_lines, linenum): ("", ("slist",)), ) -_HEADERS_MAYBE_TEMPLATES = ( +_HEADERS_MAYBE_TEMPLATES: tuple[tuple[str, tuple[str, ...]], ...] = ( ( "", ( @@ -6721,7 +6723,7 @@ def ExpectingFunctionArgs(clean_lines, linenum): ) # Non templated types or global objects -_HEADERS_TYPES_OR_OBJS = ( +_HEADERS_TYPES_OR_OBJS: tuple[tuple[str, tuple[str, ...]], ...] = ( # String and others are special -- it is a non-templatized type in STL. ("", ("string",)), ("", ("cin", "cout", "cerr", "clog", "wcin", "wcout", "wcerr", "wclog")), @@ -6729,7 +6731,7 @@ def ExpectingFunctionArgs(clean_lines, linenum): ) # Non templated functions -_HEADERS_FUNCTIONS = ( +_HEADERS_FUNCTIONS: tuple[tuple[str, tuple[str, ...]], ...] = ( ( "", ( @@ -6780,7 +6782,7 @@ def ExpectingFunctionArgs(clean_lines, linenum): ), ) -_re_pattern_headers_maybe_templates = [] +_re_pattern_headers_maybe_templates: list[tuple[re.Pattern, str, str]] = [] for _header, _templates in _HEADERS_MAYBE_TEMPLATES: # Match max(..., ...), max(..., ...), but not foo->max, foo.max or # 'type::max()'. @@ -6796,7 +6798,7 @@ def ExpectingFunctionArgs(clean_lines, linenum): ) # Other scripts may reach in and modify this pattern. -_re_pattern_templates = [] +_re_pattern_templates: list[tuple[re.Pattern, str, str]] = [] for _header, _templates in _HEADERS_CONTAINING_TEMPLATES: _re_pattern_templates.extend( ( @@ -6807,14 +6809,14 @@ def ExpectingFunctionArgs(clean_lines, linenum): for _template in _templates ) -_re_pattern_types_or_objs = [] +_re_pattern_types_or_objs: list[tuple[re.Pattern, object | type, str]] = [] for _header, _types_or_objs in _HEADERS_TYPES_OR_OBJS: _re_pattern_types_or_objs.extend( (re.compile(r"\b" + _type_or_obj + r"\b"), _type_or_obj, _header) for _type_or_obj in _types_or_objs ) -_re_pattern_functions = [] +_re_pattern_functions: list[tuple[re.Pattern, str, str]] = [] for _header, _functions in _HEADERS_FUNCTIONS: # Match printf(..., ...), but not foo->printf, foo.printf or # 'type::printf()'. diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 91c69cc..d262e85 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -30,6 +30,8 @@ """Command Line interface integration test for cpplint.py.""" +from __future__ import annotations + import contextlib import glob import os @@ -39,15 +41,15 @@ import tempfile import pytest -from parameterized import parameterized -from testfixtures import compare +from parameterized import parameterized # type: ignore[import-untyped] +from testfixtures import compare # type: ignore[import-untyped] import cpplint # noqa: F401 BASE_CMD = sys.executable + " " + os.path.abspath("./cpplint.py ") -def run_shell_command(cmd: str, args: str, cwd="."): +def run_shell_command(cmd: str, args: str, cwd: str = ".") -> tuple[int, bytes, bytes]: """Executes a command Args: @@ -55,7 +57,7 @@ def run_shell_command(cmd: str, args: str, cwd="."): args: A string with arguments to the command. cwd: from which folder to run. """ - cmd, args = cmd.split(), args.split() + cmd, args = cmd.split(), args.split() # type: ignore[assignment] proc = subprocess.run(cmd + args, cwd=cwd, capture_output=True, check=False) out, err = proc.stdout, proc.stderr diff --git a/cpplint_unittest.py b/cpplint_unittest.py index c407fb6..d4b489c 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -32,6 +32,8 @@ # TODO(unknown): Add a good test that tests UpdateIncludeState. +from __future__ import annotations + import codecs import os import platform @@ -43,7 +45,7 @@ import tempfile import pytest -from parameterized import parameterized +from parameterized import parameterized # type: ignore[import-untyped] import cpplint @@ -58,7 +60,7 @@ def codecs_latin_encode(x): class ErrorCollector: # These are a global list, covering all categories seen ever. _ERROR_CATEGORIES = cpplint._ERROR_CATEGORIES - _SEEN_ERROR_CATEGORIES = {} + _SEEN_ERROR_CATEGORIES: dict[str, str] = {} def __init__(self, assert_fn): """assert_fn: a function to call when we notice a problem.""" diff --git a/pyproject.toml b/pyproject.toml index 9316c89..a701d4c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,6 +41,7 @@ dynamic = [ "version" ] dependencies = [ ] optional-dependencies.dev = [ + "mypy", "parameterized", "pylint>=2.11", "pytest", diff --git a/tox.ini b/tox.ini index db55440..62d43e6 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,12 @@ envlist = py38, py39, py3.10, py311, py312, py313, pypy3 skip_missing_interpreters = true + [testenv] +allowlist_externals = sh extras = dev commands = {envpython} -m pytest {posargs:} {envpython} -m pylint cpplint.py + sh -c 'mypy *.py' From d2730618b4cb4c149a099094c93b466f78de9379 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 21 Mar 2025 22:48:51 +0100 Subject: [PATCH 36/63] CONTRIBUTING.rst: Default branch is develop, add pre-commit (#349) --- CONTRIBUTING.rst | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index fe310c8..f482e48 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -36,6 +36,11 @@ Alternatively, you can locally install patches like this:: pip install -e .[dev] # for usage without virtualenv, add --user +Please install pre-commit locally to run the linters before committing:: + + pipx install pre-commit + pre-commit install + Pull requests ------------- @@ -66,9 +71,9 @@ You can test your changes under your local python environment by running the tes pytest # lint the code pylint cpplint.py - flake8 + pre-commit run --all-files -Alternatively, you can run `tox` to automatically run all tests and lints. Use `-e ` followed by the python runner and version (which you must have installed) to automatically generate the testing environment and run the above tests and lints in it. For example, `tox -e py39` does the steps in Python 3.9, `tox -e py312` does the steps in Python 3.12, and `tox -e pypy3` does the steps using the latest version of the pypy interpreter. +Alternatively, you can run `tox` to automatically run all tests and lints. Use `-e ` followed by the python runner and version (which you must have installed) to automatically generate the testing environment and run the above tests and lints in it. For example, `tox -e py39` does the steps in Python 3.9, `tox -e py313` does the steps in Python 3.13, and `tox -e pypy3` does the steps using the latest version of the pypy interpreter. Releasing ========= @@ -116,14 +121,14 @@ To incorporate google's changes: git fetch google gh-pages ## Merge workflow (clean, no new commits) - git checkout master -b updates + git checkout develop -b updates git merge google/gh-pages # this will have a lot of conflicts # ... solve conflicts git merge -- continue ## Rebase workflow (dirty, creates new commits) git checkout -b updates FETCH_HEAD - git rebase master # this will have a lot of conflicts, most of which can be solved with the next command (run repeatedly) + git rebase develop # this will have a lot of conflicts, most of which can be solved with the next command (run repeatedly) # solve conflicts with files deleted in our fork (this is idempotent and safe to be called. when cpplint.py has conflicts, it will do nothing) git status | grep 'new file:' | awk '{print $3}' | xargs -r git rm --cached ; git status | grep 'deleted by us' | awk '{print $4}' | xargs -r git rm git status --untracked-files=no | grep 'nothing to commit' && git rebase --skip @@ -132,7 +137,7 @@ To incorporate google's changes: # check github action git push origin --delete updates - git rebase updates master + git rebase updates develop git branch -D updates git push @@ -156,5 +161,5 @@ To compare this for with upstream (after git fetch): .. code-block:: bash - git diff google/gh-pages:cpplint/cpplint.py master:cpplint.py - git diff google/gh-pages:cpplint/cpplint_unittest.py master:cpplint_unittest.py + git diff google/gh-pages:cpplint/cpplint.py develop:cpplint.py + git diff google/gh-pages:cpplint/cpplint_unittest.py develop:cpplint_unittest.py From 2a017e074fbf775a9988f51e093279a72725767e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 23 Mar 2025 13:49:45 +0100 Subject: [PATCH 37/63] cpplint_clitest.py: Remove unnecessary class (#352) Pytest functions are easier to read and maintain than classes. ``` ============================= 222 passed in 19.71s ============================= ``` --- cpplint_clitest.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index d262e85..f37bc55 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -77,12 +77,11 @@ def run_shell_command(cmd: str, args: str, cwd: str = ".") -> tuple[int, bytes, return proc.returncode, out, err -class TestUsage: - def test_help(self): - (status, out, err) = run_shell_command(BASE_CMD, "--help") - assert status == 0 - assert out == b"" - assert err.startswith(b"\nSyntax: cpplint") +def test_help(): + (status, out, err) = run_shell_command(BASE_CMD, "--help") + assert status == 0 + assert out == b"" + assert err.startswith(b"\nSyntax: cpplint") class TemporaryFolderClassSetup: From 9107df4b45e04dd281eadd9bf3287aed95a2bad7 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 23 Mar 2025 09:02:19 -0400 Subject: [PATCH 38/63] Fix test refactoring (#350) Replace self.fail()s Fix edge case of verifying categories when running pytest on a specific function through module notation Fix indented parameter test Make _Seen_Error_Categories a set Make clitest setup and teardown conform to naming --- cpplint_clitest.py | 10 +++++----- cpplint_unittest.py | 39 +++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index f37bc55..1ada03e 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -94,9 +94,9 @@ class TemporaryFolderClassSetup: systemerr output (two blank lines at end). """ - @pytest.fixture(autouse=True, name="setUpClass()", scope="class") + @pytest.fixture(autouse=True, name="set_up()", scope="class") @classmethod - def setUpClass(cls): + def set_up(cls): """setup tmp folder for testing with samples and custom additions by subclasses""" try: cls._root = os.path.realpath(tempfile.mkdtemp()) @@ -104,13 +104,13 @@ def setUpClass(cls): cls.prepare_directory(cls._root) except Exception: with contextlib.suppress(Exception): - cls.tearDownClass() + cls.tear_down() raise # yield - # cls.tearDownClass() + # cls.tear_down() @classmethod - def tearDownClass(cls): + def tear_down(cls): if cls._root: # pass shutil.rmtree(cls._root) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index d4b489c..502f55a 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -60,7 +60,7 @@ def codecs_latin_encode(x): class ErrorCollector: # These are a global list, covering all categories seen ever. _ERROR_CATEGORIES = cpplint._ERROR_CATEGORIES - _SEEN_ERROR_CATEGORIES: dict[str, str] = {} + _SEEN_ERROR_CATEGORIES: set[str] = set() def __init__(self, assert_fn): """assert_fn: a function to call when we notice a problem.""" @@ -74,7 +74,7 @@ def __call__(self, filename, linenum, category, confidence, message): 'Message "%s" has category "%s",' " which is not in _ERROR_CATEGORIES" % (message, category), ) - self._SEEN_ERROR_CATEGORIES[category] = 1 + self._SEEN_ERROR_CATEGORIES.add(category) if cpplint._ShouldPrintError(category, confidence, filename, linenum): self._errors.append("%s [%s] [%d]" % (message, category, confidence)) @@ -257,10 +257,7 @@ def TestMultiLineLint(self, code, expected_message): def TestMultiLineLintRE(self, code, expected_message_re): message = self.PerformMultiLineLint(code) - if not re.search(expected_message_re, message): - self.fail( - "Message was:\n" + message + 'Expected match to "' + expected_message_re + '"' - ) + assert re.search(expected_message_re, message) def TestLanguageRulesCheck(self, file_name, code, expected_message): assert expected_message == self.PerformLanguageRulesCheck(file_name, code) @@ -321,7 +318,8 @@ def testNamespaceIndentationForClass(self): def testNamespaceIndentationIndentedParameter(self): lines = [ "namespace Test {", - "void foo( SuperLongTypeName d = 418) { }", + "void foo(SuperLongTypeName d = 418,", + " SuperLongTypeName e = 2.71) { }", "} // namespace Test", ] @@ -5260,8 +5258,7 @@ def testBuildHeaderGuard(self): error_collector, ) for line in error_collector.ResultList(): - if line.find("build/header_guard") != -1: - self.fail("Unexpected error: %s" % line) + assert "build/header_guard" not in line # No header guard errors for old-style guard error_collector = ErrorCollector(self.assertTrue) @@ -5276,8 +5273,7 @@ def testBuildHeaderGuard(self): error_collector, ) for line in error_collector.ResultList(): - if line.find("build/header_guard") != -1: - self.fail("Unexpected error: %s" % line) + assert "build/header_guard" not in line old_verbose_level = cpplint._cpplint_state.verbose_level try: @@ -5721,10 +5717,9 @@ def testRuntimePrintfFormat(self): def TestLintLogCodeOnError(self, code, expected_message): # Special TestLint which logs the input code on error. result = self.PerformSingleLineLint(code) - if result != expected_message: - self.fail( - 'For code: "%s"\nGot: "%s"\nExpected: "%s"' % (code, result, expected_message) - ) + assert result == expected_message, ( + f'For code: "{code}"\nGot: "{result}"\nExpected: "{expected_message}"' + ) def testBuildStorageClass(self): qualifiers = [None, "const", "volatile"] @@ -5822,17 +5817,15 @@ def testLegalCopyright(self): # Test that warning isn't issued if Copyright line appears early enough. error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData(file_path, "cc", [copyright_line], error_collector) - for message in error_collector.ResultList(): - if message.find("legal/copyright") != -1: - self.fail("Unexpected error: %s" % message) + for line in error_collector.ResultList(): + assert "legal/copyright" not in line error_collector = ErrorCollector(self.assertTrue) cpplint.ProcessFileData( file_path, "cc", ["" for unused_i in range(9)] + [copyright_line], error_collector ) - for message in error_collector.ResultList(): - if message.find("legal/copyright") != -1: - self.fail("Unexpected error: %s" % message) + for line in error_collector.ResultList(): + assert "legal/copyright" not in line def testInvalidIncrement(self): self.TestLint( @@ -7183,7 +7176,9 @@ def run_around_tests(pytestconfig: pytest.Config): # obviously we're not going to see all the error categories. So we # only run VerifyAllCategoriesAreSeen() when we don't filter for # specific tests. - if pytestconfig.getoption("-k", default=None) in {None, ""}: + if pytestconfig.getoption("-k", default=None) in {None, ""} and not any( + "::" in arg for arg in pytestconfig.args + ): ErrorCollector(None).VerifyAllCategoriesAreSeen() From 75d2d993523d0d5a09aa0c2ed4ffbd7647767d85 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 24 Mar 2025 21:22:25 -0400 Subject: [PATCH 39/63] suppress C++-only categories on C file extensions (#318) ".h" files don't, because many C++ headers also use this extension Closes #71 --------- Co-authored-by: Christian Clauss --- CHANGELOG.rst | 3 ++- cpplint.py | 20 +++++++------------- cpplint_unittest.py | 11 +++++++++++ samples/vlc-sample/simple.def | 4 +--- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d22b664..a481c65 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -8,7 +8,8 @@ Changelog Yet another overdue... hotfix. Sorry this took so long. * The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) -* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* Files that end in ".c", ".C", or ".cu" will now also automatically suppress C++-only categories. Previously, `// NO_LINT_C` was required. (https://github.com/cpplint/cpplint/pull/308) +* build/include-what-you-use now recognizes c-style headers such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) * Ruff was ran on the project to improve performance and reader comprehension thanks to @cclauss. 2.0 (2024-10-06) diff --git a/cpplint.py b/cpplint.py index 241317c..2670796 100755 --- a/cpplint.py +++ b/cpplint.py @@ -934,10 +934,6 @@ "Missing space after ,": r"s/,\([^ ]\)/, \1/g", } -# {str, set(int)}: a map from error categories to sets of linenumbers -# on which those errors are expected and should be suppressed. -_error_suppressions: dict[str, set[int]] = {} - # The root directory used for deriving header guard CPP variable. # This is set by --root flag. _root = None @@ -1036,7 +1032,9 @@ def Clear(self): self._open_block_suppression = None -_error_suppressions = ErrorSuppressions() # type: ignore[assignment] +# {str, set(int)}: a map from error categories to sets of linenumbers +# on which those errors are expected and should be suppressed. +_error_suppressions = ErrorSuppressions() def ProcessHppHeadersOption(val): @@ -1166,12 +1164,7 @@ def ProcessCategory(category): ) -def ProcessGlobalSuppresions(lines): - """Deprecated; use ProcessGlobalSuppressions.""" - ProcessGlobalSuppressions(lines) - - -def ProcessGlobalSuppressions(lines): +def ProcessGlobalSuppressions(filename: str, lines: list[str]) -> None: """Updates the list of global error suppressions. Parses any lint directives in the file that have global effect. @@ -1179,9 +1172,10 @@ def ProcessGlobalSuppressions(lines): Args: lines: An array of strings, each representing a line of the file, with the last element being empty if the file is terminated with a newline. + filename: str, the name of the input file. """ for line in lines: - if _SEARCH_C_FILE.search(line): + if _SEARCH_C_FILE.search(line) or filename.lower().endswith((".c", ".cu")): for category in _DEFAULT_C_SUPPRESSED_CATEGORIES: _error_suppressions.AddGlobalSuppression(category) if _SEARCH_KERNEL_FILE.search(line): @@ -7279,7 +7273,7 @@ def ProcessFileData(filename, file_extension, lines, error, extra_check_function ResetNolintSuppressions() CheckForCopyright(filename, lines, error) - ProcessGlobalSuppressions(lines) + ProcessGlobalSuppressions(filename, lines) RemoveMultiLineComments(filename, lines, error) clean_lines = CleansedLines(lines) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 502f55a..241c131 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -470,6 +470,17 @@ def testErrorSuppression(self): # All categories suppressed: (two aliases) self.TestLint("long a = (int64_t) 65; // NOLINT", "") self.TestLint("long a = (int64_t) 65; // NOLINT(*)", "") + + # Linting a C file + error_collector = ErrorCollector(self.assertTrue) + cpplint.ProcessFileData( + "test.c", + "c", + ["// Copyright 2014 Your Majesty.", "int64_t a = (int64_t) 65;", ""], + error_collector, + ) + assert error_collector.Results() == "" + # Malformed NOLINT directive: self.TestLint( "long a = 65; // NOLINT(foo)", diff --git a/samples/vlc-sample/simple.def b/samples/vlc-sample/simple.def index 174819e..05de643 100644 --- a/samples/vlc-sample/simple.def +++ b/samples/vlc-sample/simple.def @@ -4,7 +4,7 @@ src/* Done processing src/libvlc.c Done processing src/libvlc.h Done processing src/missing.c -Total errors found: 601 +Total errors found: 599 src/libvlc.c:41: Found C system header after other header. Should be: libvlc.h, c system, c++ system, other. [build/include_order] [4] src/libvlc.c:47: Found C system header after other header. Should be: libvlc.h, c system, c++ system, other. [build/include_order] [4] @@ -19,7 +19,6 @@ src/libvlc.c:86: Extra space before ( in function call [whitespace/parens] [4] src/libvlc.c:86: Extra space before ) [whitespace/parens] [2] src/libvlc.c:92: Extra space after ( in function call [whitespace/parens] [4] src/libvlc.c:93: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/libvlc.c:98: Using C-style cast. Use reinterpret_cast(...) instead [readability/casting] [4] src/libvlc.c:99: Extra space before ) [whitespace/parens] [2] src/libvlc.c:100: Missing space before ( in if( [whitespace/parens] [5] src/libvlc.c:103: Extra space before ( in function call [whitespace/parens] [4] @@ -74,7 +73,6 @@ src/libvlc.c:219: Extra space before ) [whitespace/parens] [2] src/libvlc.c:220: Missing space before ( in if( [whitespace/parens] [5] src/libvlc.c:221: { should almost always be at the end of the previous line [whitespace/braces] [4] src/libvlc.c:222: Extra space after ( in function call [whitespace/parens] [4] -src/libvlc.c:222: Using C-style cast. Use static_cast(...) instead [readability/casting] [4] src/libvlc.c:223: Extra space after ( in function call [whitespace/parens] [4] src/libvlc.c:223: Extra space before ) [whitespace/parens] [2] src/libvlc.c:224: Extra space after ( in function call [whitespace/parens] [4] From 1ab3d2f3e85255d3a58352b3c972c22d95ff92b5 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 30 Mar 2025 10:49:55 +0200 Subject: [PATCH 40/63] All TODOs should have a username --- cpplint.py | 6 +++--- cpplint_clitest.py | 2 +- pyproject.toml | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cpplint.py b/cpplint.py index 2670796..2705f87 100755 --- a/cpplint.py +++ b/cpplint.py @@ -4245,7 +4245,7 @@ def CheckOperatorSpacing(filename, clean_lines, linenum, error): # many false positives due to RValue references. match = re.search(r"[^<>=!\s](==|!=|<=|>=|\|\|)[^<>=!\s,;\)]", line) if match: - # TODO: support alternate operators + # TODO(unknown): support alternate operators error( filename, linenum, "whitespace/operators", 3, f"Missing spaces around {match.group(1)}" ) @@ -4767,7 +4767,7 @@ def CheckBraces(filename, clean_lines, linenum, error): " should be on a separate line", ) - # TODO: Err on if...else and do...while statements without braces; + # TODO(unknown): Err on if...else and do...while statements without braces; # style guide has changed since the below comment was written # Check single-line if/else bodies. The style guide says 'curly braces are not @@ -7457,7 +7457,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=None): lf_lines.append(linenum + 1) except OSError: - # TODO: Maybe make this have an exit code of 2 after all is done + # TODO(unknown): Maybe make this have an exit code of 2 after all is done _cpplint_state.PrintError(f"Skipping input '{filename}': Can't open for reading\n") _RestoreFilters() return diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 1ada03e..8b1d388 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -63,7 +63,7 @@ def run_shell_command(cmd: str, args: str, cwd: str = ".") -> tuple[int, bytes, # Make output system-agnostic, aka support Windows if os.sep == "\\": - # TODO: Support scenario with multiple input names + # TODO(unknown): Support scenario with multiple input names # We currently only support the last arguments as the input name # to prevent accidentally replacing sed tests. # Fixing would likely need coding an internal "replace slashes" option for cpplint itself. diff --git a/pyproject.toml b/pyproject.toml index a701d4c..f028050 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -105,6 +105,7 @@ lint.select = [ "SLOT", # flake8-slots "T10", # flake8-debugger "TC", # flake8-type-checking + "TD", # flake8-todos "TID", # flake8-tidy-imports "TRY", # tryceratops "UP", # pyupgrade @@ -122,13 +123,13 @@ lint.select = [ # "S", # flake8-bandit # "SLF", # flake8-self # "T20", # flake8-print - # "TD", # flake8-todos ] lint.ignore = [ "FBT003", # flake8-boolean-trap "FIX002", # flake8-fixme "ISC003", # flake8-implicit-str-concat "PIE790", # Unnecessary `pass` statement + "TD003", # flake8-todos ] lint.per-file-ignores."cpplint.py" = [ "ICN001", From 47f66759c8c400b87e35767de56d0c3119b97268 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 31 Mar 2025 18:36:37 +0000 Subject: [PATCH 41/63] actually add usernames to todos --- cpplint.py | 48 +++++++++++++++++++++++----------------------- cpplint_clitest.py | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cpplint.py b/cpplint.py index 2705f87..9a032f8 100755 --- a/cpplint.py +++ b/cpplint.py @@ -2004,7 +2004,7 @@ def CleanseRawStrings(raw_lines): lines_without_raw_strings.append(line) - # TODO(unknown): if delimiter is not None here, we might want to + # TODO(google): if delimiter is not None here, we might want to # emit a warning for unterminated string. return lines_without_raw_strings @@ -2276,7 +2276,7 @@ def CloseExpression(clean_lines, linenum, pos): If lines[linenum][pos] points to a '(' or '{' or '[' or '<', finds the linenum/pos that correspond to the closing of the expression. - TODO(unknown): cpplint spends a fair bit of time matching parentheses. + TODO(google): cpplint spends a fair bit of time matching parentheses. Ideally we would want to index all opening and closing parentheses once and have CloseExpression be just a simple lookup, but due to preprocessor tricks, this is not so easy. @@ -3115,7 +3115,7 @@ def CheckEnd(self, filename, clean_lines, linenum, error): # lines. However, do apply checks if there is already an end of # namespace comment and it's incorrect. # - # TODO(unknown): We always want to check end of namespace comments + # TODO(google): We always want to check end of namespace comments # if a namespace is large, but sometimes we also want to apply the # check if a short namespace contained nontrivial things (something # other than forward declarations). There is currently no logic on @@ -3353,7 +3353,7 @@ def UpdatePreprocessor(self, line): # Restore the stack to how it was before the #if self.stack = copy.deepcopy(self.pp_stack[-1].stack_before_if) else: - # TODO(unknown): unexpected #else, issue warning? + # TODO(google): unexpected #else, issue warning? pass elif re.match(r"^\s*#\s*endif\b", line): # End of #if or #else blocks. @@ -3368,10 +3368,10 @@ def UpdatePreprocessor(self, line): # Drop the corresponding #if self.pp_stack.pop() else: - # TODO(unknown): unexpected #endif, issue warning? + # TODO(google): unexpected #endif, issue warning? pass - # TODO(unknown): Update() is too long, but we will refactor later. + # TODO(google): Update() is too long, but we will refactor later. def Update(self, filename, clean_lines, linenum, error): """Update nesting state with current line. @@ -3667,7 +3667,7 @@ def CheckForNonStandardConstructs(filename, clean_lines, linenum, nesting_state, ) if re.search(r"^\s*const\s*string\s*&\s*\w+\s*;", line): - # TODO(unknown): Could it be expanded safely to arbitrary references, + # TODO(google): Could it be expanded safely to arbitrary references, # without triggering too many false positives? The first # attempt triggered 5 warnings for mostly benign code in the regtest, hence # the restriction. @@ -3845,7 +3845,7 @@ def CheckSpacingForFunctionCall(filename, clean_lines, linenum, error): and not re.search(r"\w\s+\((\w+::)*\*\w+\)\(", fncall) and not re.search(r"\bcase\s+\(", fncall) ): - # TODO(unknown): Space after an operator function seem to be a common + # TODO(google): Space after an operator function seem to be a common # error, silence those for now by restricting them to highest verbosity. if re.search(r"\boperator_*\b", line): error( @@ -4096,7 +4096,7 @@ def CheckSpacing(filename, clean_lines, linenum, nesting_state, error): elided = clean_lines.elided prev_line = elided[linenum - 1] prevbrace = prev_line.rfind("{") - # TODO(unknown): Don't complain if line before blank line, and line after, + # TODO(google): Don't complain if line before blank line, and line after, # both start with alnums and are indented the same amount. # This ignores whitespace at the start of a namespace block # because those are not usually indented. @@ -4230,7 +4230,7 @@ def CheckOperatorSpacing(filename, clean_lines, linenum, error): # It's ok not to have spaces around binary operators like + - * /, but if # there's too little whitespace, we get concerned. It's hard to tell, - # though, so we punt on this one for now. TODO. + # though, so we punt on this one for now. TODO(google). # You should always have whitespace around binary operators. # @@ -4245,7 +4245,7 @@ def CheckOperatorSpacing(filename, clean_lines, linenum, error): # many false positives due to RValue references. match = re.search(r"[^<>=!\s](==|!=|<=|>=|\|\|)[^<>=!\s,;\)]", line) if match: - # TODO(unknown): support alternate operators + # TODO(google): support alternate operators error( filename, linenum, "whitespace/operators", 3, f"Missing spaces around {match.group(1)}" ) @@ -4392,7 +4392,7 @@ def CheckCommaSpacing(filename, clean_lines, linenum, error): # You should always have a space after a semicolon # except for few corner cases - # TODO(unknown): clarify if 'if (1) { return 1;}' is requires one more + # TODO(google): clarify if 'if (1) { return 1;}' is requires one more # space after ; if re.search(r";[^\s};\\)/]", line): error(filename, linenum, "whitespace/semicolon", 3, "Missing space after ;") @@ -4767,7 +4767,7 @@ def CheckBraces(filename, clean_lines, linenum, error): " should be on a separate line", ) - # TODO(unknown): Err on if...else and do...while statements without braces; + # TODO(aaronliu0130): Err on if...else and do...while statements without braces; # style guide has changed since the below comment was written # Check single-line if/else bodies. The style guide says 'curly braces are not @@ -5288,7 +5288,7 @@ def CheckAltTokens(filename, clean_lines, linenum, error): # it provides a way to workaround this warning for people who use # multi-line comments in preprocessor macros. # - # TODO(unknown): remove this once cpplint has better support for + # TODO(google): remove this once cpplint has better support for # multi-line comments. if line.find("/*") >= 0 or line.find("*/") >= 0: return @@ -5740,7 +5740,7 @@ def _GetTextInside(text, start_pattern): The extracted text. None if either the opening string or ending punctuation could not be found. """ - # TODO(unknown): Audit cpplint.py to see what places could be profitably + # TODO(google): Audit cpplint.py to see what places could be profitably # rewritten to use _GetTextInside (and use inferior regexp matching today). # Give opening punctuation to get the matching close-punctuation. @@ -5853,10 +5853,10 @@ def CheckLanguage( CheckPrintf(filename, clean_lines, linenum, error) if IsHeaderExtension(file_extension): - # TODO(unknown): check that 1-arg constructors are explicit. + # TODO(google): check that 1-arg constructors are explicit. # How to tell it's a constructor? # (handled in CheckForNonStandardConstructs for now) - # TODO(unknown): check that classes declare or disable copy/assign + # TODO(google): check that classes declare or disable copy/assign # (level 1 error) pass @@ -5879,7 +5879,7 @@ def CheckLanguage( ) # Check if some verboten operator overloading is going on - # TODO(unknown): catch out-of-line unary operator&: + # TODO(google): catch out-of-line unary operator&: # class X {}; # int operator&(const X& x) { return 42; } // unary operator& # The trick is it's hard to tell apart from binary operator&: @@ -5907,7 +5907,7 @@ def CheckLanguage( # Check for potential format string bugs like printf(foo). # We constrain the pattern not to pick things like DocidForPrintf(foo). # Not perfect but it can catch printf(foo.c_str()) and printf(foo->c_str()) - # TODO(unknown): Catch the following case. Need to change the calling + # TODO(google): Catch the following case. Need to change the calling # convention of the whole function to process multiple line to handle it. # printf( # boy_this_is_a_really_long_variable_that_cannot_fit_on_the_prev_line); @@ -6047,8 +6047,8 @@ def CheckGlobalStatic(filename, clean_lines, linenum, error): # This is dangerous because the C++ language does not guarantee that # globals with constructors are initialized before the first access, and # also because globals can be destroyed when some threads are still running. - # TODO(unknown): Generalize this to also find static unique_ptr instances. - # TODO(unknown): File bugs for clang-tidy to find these. + # TODO(google): Generalize this to also find static unique_ptr instances. + # TODO(google): File bugs for clang-tidy to find these. match = re.match( r"((?:|static +)(?:|const +))(?::*std::)?string( +const)? +" r"([a-zA-Z0-9_:]+)\b(.*)", @@ -6303,7 +6303,7 @@ def CheckForNonConstReference(filename, clean_lines, linenum, nesting_state, err # inside declarators: reference parameter # We will exclude the first two cases by checking that we are not inside a # function body, including one that was just introduced by a trailing '{'. - # TODO(unknown): Doesn't account for 'catch(Exception& e)' [rare]. + # TODO(google): Doesn't account for 'catch(Exception& e)' [rare]. if nesting_state.previous_stack_top and not ( isinstance(nesting_state.previous_stack_top, (_ClassInfo, _NamespaceInfo)) ): @@ -7010,7 +7010,7 @@ def CheckRedundantVirtual(filename, clean_lines, linenum, error): # Look for the next opening parenthesis. This is the start of the # parameter list (possibly on the next line shortly after virtual). - # TODO(unknown): doesn't work if there are virtual functions with + # TODO(google): doesn't work if there are virtual functions with # decltype() or other things that use parentheses, but csearch suggests # that this is rare. end_col = -1 @@ -7457,7 +7457,7 @@ def ProcessFile(filename, vlevel, extra_check_functions=None): lf_lines.append(linenum + 1) except OSError: - # TODO(unknown): Maybe make this have an exit code of 2 after all is done + # TODO(aaronliu0130): Maybe make this have an exit code of 2 after all is done _cpplint_state.PrintError(f"Skipping input '{filename}': Can't open for reading\n") _RestoreFilters() return diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 8b1d388..2694712 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -63,7 +63,7 @@ def run_shell_command(cmd: str, args: str, cwd: str = ".") -> tuple[int, bytes, # Make output system-agnostic, aka support Windows if os.sep == "\\": - # TODO(unknown): Support scenario with multiple input names + # TODO(aaronliu0130): Support scenario with multiple input names # We currently only support the last arguments as the input name # to prevent accidentally replacing sed tests. # Fixing would likely need coding an internal "replace slashes" option for cpplint itself. From b66973c112f1bc175ae7b4a6d8f226c07c9add7f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 1 Apr 2025 20:59:06 +0200 Subject: [PATCH 42/63] Drop flake8 in favor of ruff (#356) --- .flake8 | 41 ----------------------------------------- .pre-commit-config.yaml | 9 ++------- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 .flake8 diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 44d344c..0000000 --- a/.flake8 +++ /dev/null @@ -1,41 +0,0 @@ -[flake8] -ignore = - # indentation is not a multiple of four, - E111,E114, - # visually indented line with same indent as next logical line, - E129, - # expected 2 blank lines, found 1 - E302,E305, - # closing bracket does not match indentation of opening bracket's line - E123, - # whitespace before ':' - E203, - # multiple spaces before operator - E221, - # line break before binary operator - W503, - # line break after binary operator - W504, - # multiple statements on one line - E701, - # continuation line under-indented for hanging indent - E121, - # closing bracket does not match visual indentation - E124, - # continuation line with same indent as next logical line - E125, - # continuation line over-indented for visual indent - E127, - # continuation line under-indented for visual indent - E128, - # unexpected indentation - E116, - # continuation line unaligned for hanging indent - E131, - # too many blank lines - E303, - # missing whitespace around arithmetic operator - E226, - # test for membership should be 'not in' - E713, -max-line-length=100 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d018e58..ac66464 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,22 +15,17 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.0 + rev: v0.11.2 hooks: - id: ruff - id: ruff-format - - repo: https://github.com/pycqa/flake8 - rev: 7.1.2 - hooks: - - id: flake8 - - repo: https://github.com/tox-dev/pyproject-fmt rev: v2.5.1 hooks: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.24 + rev: v0.24.1 hooks: - id: validate-pyproject From d5200204449645b6a14fee01b909e3315ea3884c Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 2 Apr 2025 08:23:27 +0200 Subject: [PATCH 43/63] pre-commit: Add pre-commit-hooks and auto-walrus (#351) https://github.com/pre-commit/pre-commit-hooks https://github.com/MarcoGorelli/auto-walrus The three TODOs can be done in follow-on pull requests. --- .pre-commit-config.yaml | 39 +++++++++++++++++++++++++++++++++++++++ cpplint.py | 27 +++++++++------------------ cpplint_unittest.py | 3 +-- 3 files changed, 49 insertions(+), 20 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ac66464..c5553dc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,6 +5,45 @@ # Then in the project root directory run `pre-commit install` repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: check-added-large-files + - id: check-ast + - id: check-builtin-literals + - id: check-case-conflict + - id: check-docstring-first + - id: check-executables-have-shebangs + - id: check-json + - id: check-merge-conflict + - id: check-shebang-scripts-are-executable + - id: check-symlinks + - id: check-toml + - id: check-vcs-permalinks + - id: check-xml + - id: check-yaml + - id: debug-statements + - id: destroyed-symlinks + - id: detect-private-key + # - id: end-of-file-fixer # TODO(cclauss): Causes some tests to fail. + - id: file-contents-sorter + - id: fix-byte-order-marker + - id: forbid-new-submodules + - id: forbid-submodules + # - id: mixed-line-ending # TODO(cclauss): Causes some tests to fail. + # args: + # - --fix=lf + - id: name-tests-test + - id: pretty-format-json + - id: requirements-txt-fixer + - id: sort-simple-yaml + # - id: trailing-whitespace # TODO(cclauss): Causes some tests to fail. + + - repo: https://github.com/MarcoGorelli/auto-walrus + rev: 0.3.4 + hooks: + - id: auto-walrus + - repo: https://github.com/codespell-project/codespell rev: v2.4.1 hooks: diff --git a/cpplint.py b/cpplint.py index 9a032f8..6e2cf5d 100755 --- a/cpplint.py +++ b/cpplint.py @@ -1103,8 +1103,7 @@ def ParseNolintSuppressions(filename, raw_line, linenum, error): linenum: int, the number of the current line. error: function, an error handler. """ - matched = re.search(r"\bNOLINT(NEXTLINE|BEGIN|END)?\b(\([^)]+\))?", raw_line) - if matched: + if matched := re.search(r"\bNOLINT(NEXTLINE|BEGIN|END)?\b(\([^)]+\))?", raw_line): no_lint_type = matched.group(1) if no_lint_type == "NEXTLINE": @@ -2460,8 +2459,7 @@ def GetIndentLevel(line): Returns: An integer count of leading spaces, possibly zero. """ - indent = re.match(r"^( *)\S", line) - if indent: + if indent := re.match(r"^( *)\S", line): return len(indent.group(1)) return 0 @@ -3935,8 +3933,7 @@ def CheckForFunctionLengths(filename, clean_lines, linenum, function_state, erro starting_func = False regexp = r"(\w(\w|::|\*|\&|\s)*)\(" # decls * & space::name( ... - match_result = re.match(regexp, line) - if match_result: + if match_result := re.match(regexp, line): # If the name is all caps and underscores, figure it's a macro and # ignore it, unless it's TEST or TEST_F. function_name = match_result.group(1).split()[-1] @@ -4410,8 +4407,7 @@ def _IsType(clean_lines, nesting_state, expr): True, if token looks like a type. """ # Keep only the last token in the expression - last_word = re.match(r"^.*(\b\S+)$", expr) - if last_word: + if last_word := re.match(r"^.*(\b\S+)$", expr): token = last_word.group(1) else: token = expr @@ -4479,9 +4475,8 @@ def CheckBracesSpacing(filename, clean_lines, linenum, nesting_state, error): # And since you should never have braces at the beginning of a line, # this is an easy test. Except that braces used for initialization don't # follow the same rule; we often don't want spaces before those. - match = re.match(r"^(.*[^ ({>]){", line) - if match: + if match := re.match(r"^(.*[^ ({>]){", line): # Try a bit harder to check for brace initialization. This # happens in one of the following forms: # Constructor() : initializer_list_{} { ... } @@ -5017,8 +5012,7 @@ def CheckEmptyBlockBody(filename, clean_lines, linenum, error): # We also check "if" blocks here, since an empty conditional block # is likely an error. line = clean_lines.elided[linenum] - matched = re.match(r"\s*(for|while|if)\s*\(", line) - if matched: + if matched := re.match(r"\s*(for|while|if)\s*\(", line): # Find the end of the conditional expression. (end_line, end_linenum, end_pos) = CloseExpression(clean_lines, linenum, line.find("(")) @@ -5911,8 +5905,7 @@ def CheckLanguage( # convention of the whole function to process multiple line to handle it. # printf( # boy_this_is_a_really_long_variable_that_cannot_fit_on_the_prev_line); - printf_args = _GetTextInside(line, r"(?i)\b(string)?printf\s*\(") - if printf_args: + if printf_args := _GetTextInside(line, r"(?i)\b(string)?printf\s*\("): match = re.match(r"([\w.\->()]+)$", printf_args) if match and match.group(1) != "__VA_ARGS__": function_name = re.search(r"\b((?:string)?printf)\s*\(", line, re.IGNORECASE).group(1) @@ -6858,8 +6851,7 @@ def FilesBelongToSameModule(filename_cc, filename_h): return (False, "") filename_cc = filename_cc[: -(len(fileinfo_cc.Extension()))] - matched_test_suffix = re.search(_TEST_FILE_SUFFIX, fileinfo_cc.BaseName()) - if matched_test_suffix: + if matched_test_suffix := re.search(_TEST_FILE_SUFFIX, fileinfo_cc.BaseName()): filename_cc = filename_cc[: -len(matched_test_suffix.group(1))] filename_cc = filename_cc.replace("/public/", "/") @@ -7067,8 +7059,7 @@ def CheckRedundantOverrideOrFinal(filename, clean_lines, linenum, error): # the declarator ends and where the virt-specifier starts to avoid # false positives. line = clean_lines.elided[linenum] - declarator_end = line.rfind(")") - if declarator_end >= 0: + if (declarator_end := line.rfind(")")) >= 0: fragment = line[declarator_end:] else: if linenum > 1 and clean_lines.elided[linenum - 1].rfind(")") >= 0: diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 241c131..079c7d3 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -5727,8 +5727,7 @@ def testRuntimePrintfFormat(self): def TestLintLogCodeOnError(self, code, expected_message): # Special TestLint which logs the input code on error. - result = self.PerformSingleLineLint(code) - assert result == expected_message, ( + assert (result := self.PerformSingleLineLint(code)) == expected_message, ( f'For code: "{code}"\nGot: "{result}"\nExpected: "{expected_message}"' ) From e9e17f035d9667b8b7ff44d5a02164c511388fbf Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Wed, 2 Apr 2025 13:02:29 +0200 Subject: [PATCH 44/63] Add a GitHub Action to publish to PyPI (#347) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implement PyPI’s [trusted publishing](https://docs.pypi.org/trusted-publishers/) and use the [sigstore/gh-action-sigstore-python GitHub Action](https://github.com/marketplace/actions/gh-action-sigstore-python) to sign the distribution packages. This script is from https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows An alternative would be to use https://docs.astral.sh/uv/guides/package running under https://github.com/astral-sh/setup-uv --- .github/dependabot.yml | 13 ++++ .github/workflows/release.yml | 120 ++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..be006de --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +# Keep GitHub Actions up to date with GitHub's Dependabot... +# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot +# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + groups: + github-actions: + patterns: + - "*" # Group all Actions updates into a single larger pull request + schedule: + interval: weekly diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..edf2366 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,120 @@ +name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI + +on: push + +jobs: + build: + name: Build distribution 📦 + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.x" + - name: Install pypa/build + run: >- + python3 -m + pip install + build + --user + - name: Build a binary wheel and a source tarball + run: python3 -m build + - name: Store the distribution packages + uses: actions/upload-artifact@v4 + with: + name: python-package-distributions + path: dist/ + + publish-to-pypi: + name: >- + Publish Python 🐍 distribution 📦 to PyPI + if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes + needs: + - build + runs-on: ubuntu-latest + environment: + name: pypi + url: https://pypi.org/p/cpplint + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: python-package-distributions + path: dist/ + - name: Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + + github-release: + name: >- + Sign the Python 🐍 distribution 📦 with Sigstore + and upload them to GitHub Release + needs: + - publish-to-pypi + runs-on: ubuntu-latest + + permissions: + contents: write # IMPORTANT: mandatory for making GitHub Releases + id-token: write # IMPORTANT: mandatory for sigstore + + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: python-package-distributions + path: dist/ + - name: Sign the dists with Sigstore + uses: sigstore/gh-action-sigstore-python@v3.0.0 + with: + inputs: >- + ./dist/*.tar.gz + ./dist/*.whl + - name: Create GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + run: >- + gh release create + "$GITHUB_REF_NAME" + --repo "$GITHUB_REPOSITORY" + --notes "" + - name: Upload artifact signatures to GitHub Release + env: + GITHUB_TOKEN: ${{ github.token }} + # Upload to GitHub Release using the `gh` CLI. + # `dist/` contains the built packages, and the + # sigstore-produced signatures and certificates. + run: >- + gh release upload + "$GITHUB_REF_NAME" dist/** + --repo "$GITHUB_REPOSITORY" + + publish-to-testpypi: + name: Publish Python 🐍 distribution 📦 to TestPyPI + needs: + - build + runs-on: ubuntu-latest + + environment: + name: testpypi + url: https://test.pypi.org/p/cpplint + + permissions: + id-token: write # IMPORTANT: mandatory for trusted publishing + + steps: + - name: Download all the dists + uses: actions/download-artifact@v4 + with: + name: python-package-distributions + path: dist/ + # TODO(cclauss): Uncomment this job step when we have admin access to test.pypi.org + # - name: Publish distribution 📦 to TestPyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # repository-url: https://test.pypi.org/legacy/ From b8d33cfc04854d57e067a4e9d258bf9145717729 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Wed, 2 Apr 2025 08:20:45 -0400 Subject: [PATCH 45/63] chore: bump 2.0.1 release date again (#335) Bump the date again before releasing 2.0.1, then squash and merge and release (remember to create a new tag and follow the testing process in CONTRIBUTING.rst). --------- Co-authored-by: Christian Clauss --- .github/workflows/ci.yml | 2 +- CHANGELOG.rst | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32fc77b..adca99d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ on: pull_request: paths-ignore: "*.rst" push: - paths-ignore: "*.rst" + # paths-ignore: "*.rst" branches: [master, develop] concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a481c65..571eb2f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,17 +2,25 @@ Changelog ********* -2.0.1 (2025-03-09) +2.0.1 (2025-04-02) ================== Yet another overdue... hotfix. Sorry this took so long. -* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) -* Files that end in ".c", ".C", or ".cu" will now also automatically suppress C++-only categories. Previously, `// NO_LINT_C` was required. (https://github.com/cpplint/cpplint/pull/308) -* build/include-what-you-use now recognizes c-style headers such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) -* Ruff was ran on the project to improve performance and reader comprehension thanks to @cclauss. - -2.0 (2024-10-06) +* The false positive for indented function parameters in namespaces was eradicated by @norab0130 in https://github.com/cpplint/cpplint/pull/304 +* IWYU: treat stdio.h the same way as cstdio by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/319 +* README.rst: Add instructions for pre-commit by @cclauss in https://github.com/cpplint/cpplint/pull/320 +* PEP 621: Migrate from setup.{py, cfg} to pyproject.toml by @cclauss in https://github.com/cpplint/cpplint/pull/315 +* Prepare for release 2.0.1 and update changelog by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/322 +* Refactor tests and metadata by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/317 +* misc git cleanup by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/340 +* Mypy: static type checker for Python by @cclauss in https://github.com/cpplint/cpplint/pull/345 +* CONTRIBUTING.rst: Default branch is develop, add pre-commit by @cclauss in https://github.com/cpplint/cpplint/pull/349 +* Fix test refactoring by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/350 +* suppress C++-only categories on C file extensions by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/318 +* Add a GitHub Action to publish to PyPI by @cclauss in https://github.com/cpplint/cpplint/pull/347 + +2.0.0 (2024-10-06) ================ A large long-overdue modernization of the codebase! From 99f2940e8cac51834f880e4bf61733522065d6a5 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 6 Apr 2025 08:13:53 +0200 Subject: [PATCH 46/63] GitHub Actions: on workflow_dispatch * https://github.com/cpplint/cpplint/pull/358#issuecomment-2781238730 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adca99d..17acf31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: push: # paths-ignore: "*.rst" branches: [master, develop] + workflow_dispatch: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true From 777a8a7ca2f207c2a591788b9dea7fca188004e1 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 13:33:54 -0400 Subject: [PATCH 47/63] Drop Python 3.8 | bump version (#334) Pylint released their update on dedeprecating the getopt and optparse modules.Should merge this after we release 2.0.1. --------- Co-authored-by: Christian Clauss --- .github/workflows/ci.yml | 6 +++--- CHANGELOG.rst | 7 ++++++- cpplint.py | 10 ++++------ cpplint_clitest.py | 2 -- cpplint_unittest.py | 2 -- pyproject.toml | 7 ++----- tox.ini | 2 +- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17acf31..59087fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,8 +21,8 @@ jobs: strategy: fail-fast: false matrix: - # Python 3.8 is EOL. Also adapt tox.ini - python-version: ['3.8', 'pypy3.11', '3.x'] + # Also adapt tox.ini on change + python-version: ['3.9', 'pypy3.11', '3.x'] # macOS on ARM, Ubuntu on x86, Windows on X86 os: [macos-latest, ubuntu-latest, windows-latest] steps: @@ -39,6 +39,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install --editable .[dev] + pip install --editable ".[dev]" - name: Test with tox run: tox -e py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 571eb2f..022d292 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,7 +2,12 @@ Changelog ********* -2.0.1 (2025-04-02) +2.1.0 (TBA) +=========== + +* Python versions less than 3.9 are no longer supported. + +2.0.1 (2025-03-09) ================== Yet another overdue... hotfix. Sorry this took so long. diff --git a/cpplint.py b/cpplint.py index 6e2cf5d..0184417 100755 --- a/cpplint.py +++ b/cpplint.py @@ -41,12 +41,12 @@ same line, but it is far from perfect (in either direction). """ -from __future__ import annotations +from __future__ import annotations # PEP 604 not in 3.9 import codecs import collections import copy -import getopt # pylint: disable=deprecated-module +import getopt import glob import itertools import math # for log @@ -6858,8 +6858,7 @@ def FilesBelongToSameModule(filename_cc, filename_h): filename_cc = filename_cc.replace("/internal/", "/") filename_h = filename_h[: -(len(fileinfo_h.Extension()))] - if filename_h.endswith("-inl"): - filename_h = filename_h[: -len("-inl")] + filename_h = filename_h.removesuffix("-inl") filename_h = filename_h.replace("/public/", "/") filename_h = filename_h.replace("/internal/", "/") @@ -7701,8 +7700,7 @@ def _ExpandDirectories(filenames): for root, _, files in os.walk(filename): for loopfile in files: fullname = os.path.join(root, loopfile) - if fullname.startswith("." + os.path.sep): - fullname = fullname[len("." + os.path.sep) :] + fullname = fullname.removeprefix("." + os.path.sep) expanded.add(fullname) return [ diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 2694712..824a07e 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -30,8 +30,6 @@ """Command Line interface integration test for cpplint.py.""" -from __future__ import annotations - import contextlib import glob import os diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 079c7d3..d0bda8e 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -32,8 +32,6 @@ # TODO(unknown): Add a good test that tests UpdateIncludeState. -from __future__ import annotations - import codecs import os import platform diff --git a/pyproject.toml b/pyproject.toml index f028050..32bccef 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ authors = [ { name = "Andrew Davis", email = "theandrewdavis@gmail.com" }, { name = "cpplint developers" }, ] -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Console", @@ -29,7 +29,6 @@ classifiers = [ "Natural Language :: English", "Programming Language :: C++", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -43,7 +42,7 @@ dependencies = [ ] optional-dependencies.dev = [ "mypy", "parameterized", - "pylint>=2.11", + "pylint>=3.3.4", "pytest", "pytest-cov", "pytest-timeout", @@ -59,8 +58,6 @@ include-package-data = false dynamic.version = { attr = "cpplint.__VERSION__" } [tool.ruff] -target-version = "py38" - line-length = 100 lint.select = [ "A", # flake8-builtins diff --git a/tox.ini b/tox.ini index 62d43e6..f7e3911 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38, py39, py3.10, py311, py312, py313, pypy3 +envlist = py39, py310, py311, py312, py313, pypy3 skip_missing_interpreters = true From bbba111d0a886e45eb7610bb57b95edd42666f53 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 13:43:03 -0400 Subject: [PATCH 48/63] Some test refactoring (#357) * increase default pytest timeout to 481s for debugging room * [remove duplicate boost sample for testing inspect headers](https://github.com/cpplint/cpplint/commit/1e39bffccec7c31e7c34ea990ec7ca905cc7da67) * [use pytest parametrized instead of parameterized & google todo credit](https://github.com/cpplint/cpplint/commit/c0eb131751a00bbaa3d74f9569081f50afa8737d) * add script to update CLI test definitions --------- Co-authored-by: Christian Clauss --- cpplint_clitest.py | 7 +- cpplint_unittest.py | 9 +- pyproject.toml | 3 +- regen-defs.zsh | 48 +++++++ samples/boost-sample/exclude.def | 129 ------------------ ...nspect.def => headers_inspect_exclude.def} | 2 +- 6 files changed, 57 insertions(+), 141 deletions(-) create mode 100755 regen-defs.zsh delete mode 100644 samples/boost-sample/exclude.def rename samples/boost-sample/{headers_inspect.def => headers_inspect_exclude.def} (99%) diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 824a07e..b20566f 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -39,7 +39,6 @@ import tempfile import pytest -from parameterized import parameterized # type: ignore[import-untyped] from testfixtures import compare # type: ignore[import-untyped] import cpplint # noqa: F401 @@ -55,7 +54,7 @@ def run_shell_command(cmd: str, args: str, cwd: str = ".") -> tuple[int, bytes, args: A string with arguments to the command. cwd: from which folder to run. """ - cmd, args = cmd.split(), args.split() # type: ignore[assignment] + cmd, args = cmd.split(), args.replace('"', "").split() # type: ignore[assignment] proc = subprocess.run(cmd + args, cwd=cwd, capture_output=True, check=False) out, err = proc.stdout, proc.stderr @@ -175,14 +174,14 @@ class TestNoRepoSignature(TemporaryFolderClassSetup): def get_extra_command_args(self, cwd): return f" --repository {self._root} " - @parameterized.expand( + @pytest.mark.parametrize( + ("folder", "case"), [ (folder, case[:-4]) for folder in ["chromium", "vlc", "silly", "boost", "protobuf", "codelite", "v8"] for case in os.listdir(f"./samples/{folder}-sample") if case.endswith(".def") ], - name_func=lambda fun, _, x: f"test_{x.args[0]}_sample-{x.args[1]}", ) @pytest.mark.timeout(180) def test_samples(self, folder, case): diff --git a/cpplint_unittest.py b/cpplint_unittest.py index d0bda8e..821bc78 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -30,7 +30,7 @@ """Unit test for cpplint.py.""" -# TODO(unknown): Add a good test that tests UpdateIncludeState. +# TODO(google): Add a good test that tests UpdateIncludeState. import codecs import os @@ -43,7 +43,6 @@ import tempfile import pytest -from parameterized import parameterized # type: ignore[import-untyped] import cpplint @@ -2230,7 +2229,7 @@ def testConstStringReferenceMembers(self): "const string &turing", "const string & godel", ] - # TODO(unknown): Enable also these tests if and when we ever + # TODO(google): Enable also these tests if and when we ever # decide to check for arbitrary member references. # "const Turing & a", # "const Church& a", @@ -4604,7 +4603,7 @@ def testConditionals(self): "", ) - @parameterized.expand(["else if", "if", "while", "for", "switch"]) + @pytest.mark.parametrize("keyword", ["else if", "if", "while", "for", "switch"]) def testControlClauseWithParensNewline(self, keyword): # The % 2 part is pseudorandom whitespace-support testing self.TestLintContains( @@ -4616,7 +4615,7 @@ def testControlClauseWithParensNewline(self, keyword): f" should be on a separate line [whitespace/newline] [5]", ) - @parameterized.expand(["else", "do", "try"]) + @pytest.mark.parametrize("keyword", ["else", "do", "try"]) def testControlClauseWithoutParensNewline(self, keyword): # The % 2 part is pseudorandom whitespace-support testing self.TestLintContains( diff --git a/pyproject.toml b/pyproject.toml index 32bccef..a401639 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,6 @@ dependencies = [ ] optional-dependencies.dev = [ "mypy", - "parameterized", "pylint>=3.3.4", "pytest", "pytest-cov", @@ -206,4 +205,4 @@ addopts = "--color=yes --cov-fail-under=90 --cov=cpplint" python_files = [ "*test.py" ] required_plugins = [ "pytest-cov", "pytest-timeout" ] testpaths = [ "." ] -timeout = 60 +timeout = 481 diff --git a/regen-defs.zsh b/regen-defs.zsh new file mode 100755 index 0000000..07c1880 --- /dev/null +++ b/regen-defs.zsh @@ -0,0 +1,48 @@ +#!/bin/zsh + +# Input the path of cpplint here +cpplint="$HOME/Documents/cpplint/cpplint.py" + +cd samples/ || exit 74 # EX_IOERROR + +# Loop through all .def files in the given directories +folders=(${(f)"$(cat)"}) +for folder in $folders; do + cd "$folder-sample/" || exit 66 # EX_NOINPUT + for file in ./*.def; do + if [[ ! -s "$file" ]]; then + echo "Skipping empty file: $file" + continue + fi + echo "Processing $file..." + + # Extract the command from the first line of the file + cmd=$(head -n 1 "$file") + + # Create temporary files for stdout and stderr + stdout_file=$(mktemp) + stderr_file=$(mktemp) + + # Execute the command and capture stdout and stderr + uv run "$cpplint" $cmd > "$stdout_file" 2> "$stderr_file" + ret_code=$? + + # Count the number of lines in stdout + (( num_lines=$(wc -l < "$stdout_file") + 1 )) + + # Overwrite the original definition file + { + echo "$cmd" + echo "$ret_code" + echo "$num_lines" + cat "$stdout_file" + echo + cat "$stderr_file" + echo + } > "$file" + + # Clean up temporary files + rm "$stdout_file" "$stderr_file" + done + cd .. +done diff --git a/samples/boost-sample/exclude.def b/samples/boost-sample/exclude.def deleted file mode 100644 index 731ffad..0000000 --- a/samples/boost-sample/exclude.def +++ /dev/null @@ -1,129 +0,0 @@ ---recursive --exclude=headers/* src -1 -4 -Done processing src/inspect/unnamed_namespace_check.hpp -Done processing src/tr1/c_policy.hpp -Total errors found: 121 - -src/inspect/unnamed_namespace_check.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_INSPECT_UNNAMED_NAMESPACE_CHECK_HPP_ [build/header_guard] [5] -src/inspect/unnamed_namespace_check.hpp:11: Include the directory when naming header files [build/include_subdir] [4] -src/inspect/unnamed_namespace_check.hpp:14: Do not use unnamed namespaces in header files. See https://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Namespaces for more information. [build/namespaces_headers] [4] -src/inspect/unnamed_namespace_check.hpp:17: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:18: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:19: Closing ) should be moved to the previous line [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:21: Anonymous namespace should be terminated with "// namespace" [readability/namespace] [5] -src/inspect/unnamed_namespace_check.hpp:21: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:26: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:27: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:28: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:28: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:29: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:29: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:30: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:30: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:30: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:31: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:31: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:32: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:32: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:32: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:33: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:33: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:34: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:34: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:34: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:35: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:35: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:36: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:36: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:37: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:37: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:38: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:38: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:40: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:40: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:44: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:44: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:48: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/inspect/unnamed_namespace_check.hpp:49: Missing space before ( in for( [whitespace/parens] [5] -src/inspect/unnamed_namespace_check.hpp:50: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/inspect/unnamed_namespace_check.hpp:54: Extra space after ( in function call [whitespace/parens] [4] -src/inspect/unnamed_namespace_check.hpp:54: Extra space before ) [whitespace/parens] [2] -src/inspect/unnamed_namespace_check.hpp:57: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/inspect/unnamed_namespace_check.hpp:58: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:59: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/inspect/unnamed_namespace_check.hpp:59: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:60: At least two spaces is best between code and comments [whitespace/comments] [2] -src/inspect/unnamed_namespace_check.hpp:51: Add #include for string [build/include_what_you_use] [4] -src/tr1/c_policy.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_TR1_C_POLICY_HPP_ [build/header_guard] [5] -src/tr1/c_policy.hpp:9: Missing space before { [whitespace/braces] [5] -src/tr1/c_policy.hpp:13: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:14: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:15: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:16: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:17: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:18: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:19: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:20: public: should be indented +1 space inside struct policy [whitespace/indent] [3] -src/tr1/c_policy.hpp:21: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:22: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:23: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:24: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:25: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:26: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:27: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:28: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:30: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:32: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:34: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:35: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:36: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:37: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:38: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:39: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:44: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:45: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:46: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:47: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:48: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:49: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:50: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/tr1/c_policy.hpp:51: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:52: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:53: public: should be indented +1 space inside struct policy [whitespace/indent] [3] -src/tr1/c_policy.hpp:54: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:55: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:56: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:57: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:58: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:59: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:60: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:61: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:63: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:65: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:67: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:68: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:69: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:70: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:71: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:72: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:76: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:88: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:89: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:89: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:93: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:105: { should almost always be at the end of the previous line [whitespace/braces] [4] -src/tr1/c_policy.hpp:106: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/tr1/c_policy.hpp:106: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/tr1/c_policy.hpp:109: Namespace should be terminated with "// namespace policies" [readability/namespace] [5] -src/tr1/c_policy.hpp:109: Namespace should be terminated with "// namespace math" [readability/namespace] [5] -src/tr1/c_policy.hpp:109: Namespace should be terminated with "// namespace boost" [readability/namespace] [5] -src/tr1/c_policy.hpp:109: At least two spaces is best between code and comments [whitespace/comments] [2] -src/tr1/c_policy.hpp:111: Missing space before { [whitespace/braces] [5] -src/tr1/c_policy.hpp:122: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:123: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:124: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:125: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:126: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/tr1/c_policy.hpp:131: Namespace should be terminated with "// namespace c_policies" [readability/namespace] [5] - diff --git a/samples/boost-sample/headers_inspect.def b/samples/boost-sample/headers_inspect_exclude.def similarity index 99% rename from samples/boost-sample/headers_inspect.def rename to samples/boost-sample/headers_inspect_exclude.def index 3c1d647..61c147c 100644 --- a/samples/boost-sample/headers_inspect.def +++ b/samples/boost-sample/headers_inspect_exclude.def @@ -1,4 +1,4 @@ -src/inspect/* +--recursive "--exclude=src/tr1/*" src 1 3 Done processing src/inspect/unnamed_namespace_check.hpp From 97ab22d7b68125fb160cc19ba2179897c162baeb Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 13:52:56 -0400 Subject: [PATCH 49/63] Don't err on non-const references by default (#305) As a side note, we should probably consider not running filtered checks sometime in the future. Please squash on merge with GitHub's shiny button. --------- Co-authored-by: Christian Clauss --- CHANGELOG.rst | 5 ++++- cpplint.py | 1 + samples/codelite-sample/simple.def | 12 +----------- samples/silly-sample/cfg.def | 7 +------ samples/silly-sample/filters.def | 9 ++------- samples/silly-sample/includeorder_cfirst.def | 7 +------ samples/silly-sample/sed.def | 5 ----- samples/silly-sample/simple.def | 7 +------ 8 files changed, 11 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 022d292..8dd593a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,9 @@ Changelog =========== * Python versions less than 3.9 are no longer supported. +* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) +* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) 2.0.1 (2025-03-09) ================== @@ -26,7 +29,7 @@ Yet another overdue... hotfix. Sorry this took so long. * Add a GitHub Action to publish to PyPI by @cclauss in https://github.com/cpplint/cpplint/pull/347 2.0.0 (2024-10-06) -================ +================== A large long-overdue modernization of the codebase! diff --git a/cpplint.py b/cpplint.py index 0184417..2df82f3 100755 --- a/cpplint.py +++ b/cpplint.py @@ -411,6 +411,7 @@ _DEFAULT_FILTERS = [ "-build/include_alpha", "-readability/fn_size", + "-runtime/references", ] # The default list of categories suppressed for C (not C++) files. diff --git a/samples/codelite-sample/simple.def b/samples/codelite-sample/simple.def index 012d3bc..069767f 100644 --- a/samples/codelite-sample/simple.def +++ b/samples/codelite-sample/simple.def @@ -3,7 +3,7 @@ src/* 4 Done processing src/pptable.cpp Done processing src/pptable.h -Total errors found: 685 +Total errors found: 675 src/pptable.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/pptable.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -496,7 +496,6 @@ src/pptable.cpp:534: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:538: { should almost always be at the end of the previous line [whitespace/braces] [4] src/pptable.cpp:539: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:542: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.cpp:542: Is this a non-const reference? If so, make const or use a pointer: wxString &outStr [runtime/references] [2] src/pptable.cpp:543: { should almost always be at the end of the previous line [whitespace/braces] [4] src/pptable.cpp:544: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:545: Tab found; better to use spaces [whitespace/tab] [1] @@ -534,7 +533,6 @@ src/pptable.cpp:578: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:579: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:582: Static/global string variables are not permitted. [runtime/string] [4] src/pptable.cpp:584: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.cpp:584: Is this a non-const reference? If so, make const or use a pointer: std::string& outStr [runtime/references] [2] src/pptable.cpp:585: { should almost always be at the end of the previous line [whitespace/braces] [4] src/pptable.cpp:586: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.cpp:587: Tab found; better to use spaces [whitespace/tab] [1] @@ -621,9 +619,7 @@ src/pptable.h:30: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:31: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:32: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:49: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:49: Is this a non-const reference? If so, make const or use a pointer: wxString &output [runtime/references] [2] src/pptable.h:63: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:63: Is this a non-const reference? If so, make const or use a pointer: std::string& outStr [runtime/references] [2] src/pptable.h:69: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:70: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:71: Tab found; better to use spaces [whitespace/tab] [1] @@ -646,15 +642,10 @@ src/pptable.h:88: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:89: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:90: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:91: Tab found; better to use spaces [whitespace/tab] [1] -src/pptable.h:91: Is this a non-const reference? If so, make const or use a pointer: wxFFile &fp [runtime/references] [2] src/pptable.h:92: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:92: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:92: Is this a non-const reference? If so, make const or use a pointer: wxString& initList [runtime/references] [2] -src/pptable.h:92: Is this a non-const reference? If so, make const or use a pointer: wxArrayString &initListArr [runtime/references] [2] src/pptable.h:93: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:93: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/pptable.h:93: Is this a non-const reference? If so, make const or use a pointer: std::string& initList [runtime/references] [2] -src/pptable.h:93: Is this a non-const reference? If so, make const or use a pointer: std::vector &initListArr [runtime/references] [2] src/pptable.h:94: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:95: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:96: Tab found; better to use spaces [whitespace/tab] [1] @@ -676,7 +667,6 @@ src/pptable.h:115: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:115: Extra space before ( in function call [whitespace/parens] [4] src/pptable.h:116: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:117: Tab found; better to use spaces [whitespace/tab] [1] -src/pptable.h:117: Is this a non-const reference? If so, make const or use a pointer: wxFFile &fp [runtime/references] [2] src/pptable.h:118: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:119: Tab found; better to use spaces [whitespace/tab] [1] src/pptable.h:120: Tab found; better to use spaces [whitespace/tab] [1] diff --git a/samples/silly-sample/cfg.def b/samples/silly-sample/cfg.def index 9e3b03e..b0e424d 100644 --- a/samples/silly-sample/cfg.def +++ b/samples/silly-sample/cfg.def @@ -3,22 +3,17 @@ 4 Done processing src/sillycode.cpp Done processing src/sillycode.w -Total errors found: 26 +Total errors found: 21 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:40: If/else bodies with multiple statements require braces [readability/braces] [4] src/sillycode.cpp:66: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:76: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:85: Constructors callable with one argument should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:86: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:171: Do not use variable-length arrays. Use an appropriately named ('k' followed by CamelCase) compile-time constant for the size. [runtime/arrays] [1] src/sillycode.cpp:178: Static/global string variables are not permitted. [runtime/string] [4] src/sillycode.cpp:199: If an else has a brace on one side, it should have it on both [readability/braces] [5] diff --git a/samples/silly-sample/filters.def b/samples/silly-sample/filters.def index fcdfbaa..e0fac32 100644 --- a/samples/silly-sample/filters.def +++ b/samples/silly-sample/filters.def @@ -5,8 +5,8 @@ Done processing src/sillycode.cpp Category 'build' errors found: 5 Category 'legal' errors found: 1 Category 'readability' errors found: 4 -Category 'runtime' errors found: 12 -Total errors found: 22 +Category 'runtime' errors found: 7 +Total errors found: 17 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -14,15 +14,10 @@ src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:40: If/else bodies with multiple statements require braces [readability/braces] [4] src/sillycode.cpp:66: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:76: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:85: Constructors callable with one argument should be marked explicit. [runtime/explicit] [4] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:171: Do not use variable-length arrays. Use an appropriately named ('k' followed by CamelCase) compile-time constant for the size. [runtime/arrays] [1] src/sillycode.cpp:178: Static/global string variables are not permitted. [runtime/string] [4] src/sillycode.cpp:199: If an else has a brace on one side, it should have it on both [readability/braces] [5] diff --git a/samples/silly-sample/includeorder_cfirst.def b/samples/silly-sample/includeorder_cfirst.def index 84a3af5..a3b30a4 100644 --- a/samples/silly-sample/includeorder_cfirst.def +++ b/samples/silly-sample/includeorder_cfirst.def @@ -2,7 +2,7 @@ 1 3 Done processing src/sillycode.cpp -Total errors found: 123 +Total errors found: 118 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -13,7 +13,6 @@ src/sillycode.cpp:3: Found other system header after other header. Should be: s src/sillycode.cpp:4: Found other system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:40: Tab found; better to use spaces [whitespace/tab] [1] @@ -43,15 +42,11 @@ src/sillycode.cpp:110: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: At least two spaces is best between code and comments [whitespace/comments] [2] src/sillycode.cpp:113: public: should be indented +1 space inside class Vector2 [whitespace/indent] [3] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:119: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:120: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:120: Missing space after , [whitespace/comma] [3] src/sillycode.cpp:122: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/sillycode.cpp:122: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:124: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:125: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:125: At least two spaces is best between code and comments [whitespace/comments] [2] diff --git a/samples/silly-sample/sed.def b/samples/silly-sample/sed.def index e4a40cc..b3778ee 100644 --- a/samples/silly-sample/sed.def +++ b/samples/silly-sample/sed.def @@ -17,7 +17,6 @@ sed -i '249s/\([^ ]\){/\1 {/' src/sillycode.cpp # Missing space before { [white # src/sillycode.cpp:4: "Found C system header after other header. Should be: sillycode.h, c system, c++ system, other." [build/include_order] [4] # src/sillycode.cpp:5: "Do not use namespace using-directives. Use using-declarations instead." [build/namespaces] [5] # src/sillycode.cpp:8: "public: should be indented +1 space inside class Date" [whitespace/indent] [3] -# src/sillycode.cpp:14: "Is this a non-const reference? If so, make const or use a pointer: vector& v" [runtime/references] [2] # src/sillycode.cpp:15: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:39: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:40: "Tab found; better to use spaces" [whitespace/tab] [1] @@ -47,13 +46,9 @@ sed -i '249s/\([^ ]\){/\1 {/' src/sillycode.cpp # Missing space before { [white # src/sillycode.cpp:111: "Tab found; better to use spaces" [whitespace/tab] [1] # src/sillycode.cpp:111: "At least two spaces is best between code and comments" [whitespace/comments] [2] # src/sillycode.cpp:113: "public: should be indented +1 space inside class Vector2" [whitespace/indent] [3] -# src/sillycode.cpp:118: "Is this a non-const reference? If so, make const or use a pointer: N::X& a" [runtime/references] [2] -# src/sillycode.cpp:118: "Is this a non-const reference? If so, make const or use a pointer: N::X& b" [runtime/references] [2] # src/sillycode.cpp:119: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:120: "Tab found; better to use spaces" [whitespace/tab] [1] # src/sillycode.cpp:122: "Weird number of spaces at line-start. Are you using a 2-space indent?" [whitespace/indent] [3] -# src/sillycode.cpp:123: "Is this a non-const reference? If so, make const or use a pointer: N::X& a" [runtime/references] [2] -# src/sillycode.cpp:123: "Is this a non-const reference? If so, make const or use a pointer: N::X& b" [runtime/references] [2] # src/sillycode.cpp:124: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:125: "Tab found; better to use spaces" [whitespace/tab] [1] # src/sillycode.cpp:125: "At least two spaces is best between code and comments" [whitespace/comments] [2] diff --git a/samples/silly-sample/simple.def b/samples/silly-sample/simple.def index e9a3fee..7bc1dc6 100644 --- a/samples/silly-sample/simple.def +++ b/samples/silly-sample/simple.def @@ -3,7 +3,7 @@ src/* 4 Done processing src/sillycode.cpp Done processing src/sillycode.w -Total errors found: 126 +Total errors found: 121 src/sillycode.cpp:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/sillycode.cpp:1: Include the directory when naming header files [build/include_subdir] [4] @@ -14,7 +14,6 @@ src/sillycode.cpp:3: Found C system header after other header. Should be: silly src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] -src/sillycode.cpp:14: Is this a non-const reference? If so, make const or use a pointer: vector& v [runtime/references] [2] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:40: Tab found; better to use spaces [whitespace/tab] [1] @@ -44,15 +43,11 @@ src/sillycode.cpp:110: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:111: At least two spaces is best between code and comments [whitespace/comments] [2] src/sillycode.cpp:113: public: should be indented +1 space inside class Vector2 [whitespace/indent] [3] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:118: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:119: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:120: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:120: Missing space after , [whitespace/comma] [3] src/sillycode.cpp:122: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/sillycode.cpp:122: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& a [runtime/references] [2] -src/sillycode.cpp:123: Is this a non-const reference? If so, make const or use a pointer: N::X& b [runtime/references] [2] src/sillycode.cpp:124: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:125: Tab found; better to use spaces [whitespace/tab] [1] src/sillycode.cpp:125: At least two spaces is best between code and comments [whitespace/comments] [2] From 74ba7c452984920c33d9305b729f940dc19658cb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 18:40:10 -0400 Subject: [PATCH 50/63] [pre-commit.ci] pre-commit autoupdate (#366) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.11.2 → v0.11.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.11.2...v0.11.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c5553dc..7eb37f3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.2 + rev: v0.11.4 hooks: - id: ruff - id: ruff-format From 55670e8851b76fb6246c8d2eed500068a28976e6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 8 Apr 2025 01:14:21 +0200 Subject: [PATCH 51/63] Actions: No need to run pre-commit twice (#363) https://pre-commit.ci is running on every pull request at https://results.pre-commit.ci/repo/github/47154941 so pre-commit does not also need to be run in GitHub Actions. --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59087fe..d255e9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true jobs: - pre-commit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: pipx run pre-commit run --all-files - build-test: runs-on: ${{ matrix.os }} strategy: From 994273f77a20e0951ae2dd5d47f3049526c4768f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 8 Apr 2025 01:55:20 +0200 Subject: [PATCH 52/63] GitHub Actions: Remove filters to ensure tests are always run (#364) Fixes: #358 * #358 is too complex (which may lead to loopholes) and requires us to give special permissions to a GitHub Action that is not verified in the Marketplace. Given GitHub Actions software supply chain attacks in recent weeks, it is better to err on the side of precaution and run tests on all pull requests. --- Special permissions --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d255e9a..a0498d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,7 @@ name: Test on: pull_request: - paths-ignore: "*.rst" push: - # paths-ignore: "*.rst" branches: [master, develop] workflow_dispatch: concurrency: From 569ab6232fbf2a6b240c9429a7676432a88557ef Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 23 Mar 2025 15:42:21 -0400 Subject: [PATCH 53/63] chore: refactor part of NestingState.Update() Split out parentheses counting namespace consumption to have enough available conditional branches for next commit Add type hints # Conflicts: # cpplint.py --- cpplint.py | 101 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 42 deletions(-) diff --git a/cpplint.py b/cpplint.py index 2df82f3..9cfda55 100755 --- a/cpplint.py +++ b/cpplint.py @@ -3198,7 +3198,7 @@ def __init__(self): # - _ClassInfo: a class or struct. # - _NamespaceInfo: a namespace. # - _BlockInfo: some other type of block. - self.stack = [] + self.stack: list[_BlockInfo] = [] # Top of the previous stack before each Update(). # @@ -3209,7 +3209,7 @@ def __init__(self): # # We could save the full stack, but we only need the top. Copying # the full nesting stack would slow down cpplint by ~10%. - self.previous_stack_top = [] + self.previous_stack_top: _BlockInfo | None = None # The number of open parentheses in the previous stack top before the last update. # Used to prevent false indentation detection when e.g. a function parameter is indented. @@ -3370,8 +3370,61 @@ def UpdatePreprocessor(self, line): # TODO(google): unexpected #endif, issue warning? pass + + def _CountOpenParentheses(self, line: str): + # Count parentheses. This is to avoid adding struct arguments to + # the nesting stack. + if self.stack: + inner_block = self.stack[-1] + depth_change = line.count("(") - line.count(")") + inner_block.open_parentheses += depth_change + + # Also check if we are starting or ending an inline assembly block. + if inner_block.inline_asm in (_NO_ASM, _END_ASM): + if ( + depth_change != 0 + and inner_block.open_parentheses == 1 + and _MATCH_ASM.match(line) + ): + # Enter assembly block + inner_block.inline_asm = _INSIDE_ASM + else: + # Not entering assembly block. If previous line was _END_ASM, + # we will now shift to _NO_ASM state. + inner_block.inline_asm = _NO_ASM + elif inner_block.inline_asm == _INSIDE_ASM and inner_block.open_parentheses == 0: + # Exit assembly block + inner_block.inline_asm = _END_ASM + + def _UpdateNamesapce(self, line: str, linenum: int) -> str | None: + """ + Match start of namespace, append to stack, and consume line + Args: + line: Line to check and consume + linenum: Line number of the line to check + + Returns: + The consumed line if namespace matched; None otherwise + """ + # Match start of namespace. The "\b\s*" below catches namespace + # declarations even if it weren't followed by a whitespace, this + # is so that we don't confuse our namespace checker. The + # missing spaces will be flagged by CheckSpacing. + namespace_decl_match = re.match(r"^\s*namespace\b\s*([:\w]+)?(.*)$", line) + if not namespace_decl_match: + return None + + new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum) + self.stack.append(new_namespace) + + line = namespace_decl_match.group(2) + if line.find("{") != -1: + new_namespace.seen_open_brace = True + line = line[line.find("{") + 1 :] + return line + # TODO(google): Update() is too long, but we will refactor later. - def Update(self, filename, clean_lines, linenum, error): + def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error): """Update nesting state with current line. Args: @@ -3396,49 +3449,13 @@ def Update(self, filename, clean_lines, linenum, error): # Update pp_stack self.UpdatePreprocessor(line) - # Count parentheses. This is to avoid adding struct arguments to - # the nesting stack. - if self.stack: - inner_block = self.stack[-1] - depth_change = line.count("(") - line.count(")") - inner_block.open_parentheses += depth_change - - # Also check if we are starting or ending an inline assembly block. - if inner_block.inline_asm in (_NO_ASM, _END_ASM): - if ( - depth_change != 0 - and inner_block.open_parentheses == 1 - and _MATCH_ASM.match(line) - ): - # Enter assembly block - inner_block.inline_asm = _INSIDE_ASM - else: - # Not entering assembly block. If previous line was _END_ASM, - # we will now shift to _NO_ASM state. - inner_block.inline_asm = _NO_ASM - elif inner_block.inline_asm == _INSIDE_ASM and inner_block.open_parentheses == 0: - # Exit assembly block - inner_block.inline_asm = _END_ASM + self._CountOpenParentheses(line) # Consume namespace declaration at the beginning of the line. Do # this in a loop so that we catch same line declarations like this: # namespace proto2 { namespace bridge { class MessageSet; } } - while True: - # Match start of namespace. The "\b\s*" below catches namespace - # declarations even if it weren't followed by a whitespace, this - # is so that we don't confuse our namespace checker. The - # missing spaces will be flagged by CheckSpacing. - namespace_decl_match = re.match(r"^\s*namespace\b\s*([:\w]+)?(.*)$", line) - if not namespace_decl_match: - break - - new_namespace = _NamespaceInfo(namespace_decl_match.group(1), linenum) - self.stack.append(new_namespace) - - line = namespace_decl_match.group(2) - if line.find("{") != -1: - new_namespace.seen_open_brace = True - line = line[line.find("{") + 1 :] + while (new_line := self._UpdateNamesapce(line, linenum)) is not None: # could be empty str + line = new_line # Look for a class declaration in whatever is left of the line # after parsing namespaces. The regexp accounts for decorated classes From 48e8d85d8d266edad37c1f07f4bd590b612c4b35 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sun, 23 Mar 2025 15:48:48 -0400 Subject: [PATCH 54/63] fix(indentation_namespace): false positive for MemInitLists Fix whitespace/indentation_namespace false positive for member initializer lists (MemInitLists) Adds new _ConstructorInfo, _WrappedInfo, and _MemInitListInfo nesting stack element classes Remember last-popped nesting stack item Update descriptor.pb.cc to 2016-12-16 version (commit 183d31c) --- CHANGELOG.rst | 3 +- cpplint.py | 174 +- cpplint_unittest.py | 48 + .../boost-sample/headers_inspect_exclude.def | 3 +- samples/protobuf-sample/simple.def | 3107 ++--- samples/protobuf-sample/src/descriptor.pb.cc | 10756 ++++++++-------- 6 files changed, 6949 insertions(+), 7142 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8dd593a..2555e1c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,8 +6,7 @@ Changelog =========== * Python versions less than 3.9 are no longer supported. -* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) -* build/include-what-you-use now recognizes c-style headers, such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* The false positive for indented member initializer lists in namespaces were eradicated. (https://github.com/cpplint/cpplint/pull/353) * The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) 2.0.1 (2025-03-09) diff --git a/cpplint.py b/cpplint.py index 9cfda55..8498ee6 100755 --- a/cpplint.py +++ b/cpplint.py @@ -3097,6 +3097,14 @@ def CheckEnd(self, filename, clean_lines, linenum, error): ) +class _ConstructorInfo(_BlockInfo): + """Stores information about a constructor. + For detecting member initializer lists.""" + + def __init__(self, linenum: int): + _BlockInfo.__init__(self, linenum, seen_open_brace=False) + + class _NamespaceInfo(_BlockInfo): """Stores information about a namespace.""" @@ -3174,6 +3182,22 @@ def CheckEnd(self, filename, clean_lines, linenum, error): ) +class _WrappedInfo(_BlockInfo): + """Stores information about parentheses, initializer lists, etc. + Not exactly a block but we do need the same signature. + Needed to avoid namespace indentation false positives, + though parentheses tracking would slow us down a lot + and is effectively already done by open_parentheses.""" + + pass + + +class _MemInitListInfo(_WrappedInfo): + """Stores information about member initializer lists.""" + + pass + + class _PreprocessorInfo: """Stores checkpoints of nesting stacks when #if/#else is seen.""" @@ -3216,6 +3240,9 @@ def __init__(self): # We can't use previous_stack_top, a shallow copy whose open_parentheses value is updated. self.previous_open_parentheses = 0 + # The last stack item we popped. + self.popped_top: _BlockInfo | None = None + # Stack of _PreprocessorInfo objects. self.pp_stack = [] @@ -3370,6 +3397,9 @@ def UpdatePreprocessor(self, line): # TODO(google): unexpected #endif, issue warning? pass + def _Pop(self): + """Pop the innermost state (top of the stack) and remember the popped item.""" + self.popped_top = self.stack.pop() def _CountOpenParentheses(self, line: str): # Count parentheses. This is to avoid adding struct arguments to @@ -3423,6 +3453,22 @@ def _UpdateNamesapce(self, line: str, linenum: int) -> str | None: line = line[line.find("{") + 1 :] return line + def _UpdateConstructor(self, line: str, linenum: int, class_name: str | None = None): + """ + Check if the given line is a constructor. + Args: + line: Line to check. + class_name: If line checked is inside of a class block, a str of the class's name; + otherwise, None. + """ + if not class_name: + if not re.match(r"\s*(\w*)\s*::\s*\1\s*\(", line): + return + elif not re.match(rf"\s*{re.escape(class_name)}\s*\(", line): + return + + self.stack.append(_ConstructorInfo(linenum)) + # TODO(google): Update() is too long, but we will refactor later. def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error): """Update nesting state with current line. @@ -3492,36 +3538,56 @@ def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error) if not self.SeenOpenBrace(): self.stack[-1].CheckBegin(filename, clean_lines, linenum, error) - # Update access control if we are inside a class/struct + # Update access control if we are directly inside a class/struct if self.stack and isinstance(self.stack[-1], _ClassInfo): - classinfo = self.stack[-1] - access_match = re.match( - r"^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?" - r":(?:[^:]|$)", - line, + if self.stack[-1].seen_open_brace: + classinfo: _ClassInfo = self.stack[-1] + # Update access control + if access_match := re.match( + r"^(.*)\b(public|private|protected|signals)(\s+(?:slots\s*)?)?" + r":([^:].*|$)", + line, + ): + classinfo.access = access_match.group(2) + + # Check that access keywords are indented +1 space. Skip this + # check if the keywords are not preceded by whitespaces. + indent = access_match.group(1) + if len(indent) != classinfo.class_indent + 1 and re.match(r"^\s*$", indent): + if classinfo.is_struct: + parent = "struct " + classinfo.name + else: + parent = "class " + classinfo.name + slots = "" + if access_match.group(3): + slots = access_match.group(3) + error( + filename, + linenum, + "whitespace/indent", + 3, + f"{access_match.group(2)}{slots}:" + f" should be indented +1 space inside {parent}", + ) + + line = access_match.group(4) + else: + self._UpdateConstructor(line, linenum, class_name=classinfo.name) + else: # Not in class + self._UpdateConstructor(line, linenum) + + # If brace not open and we just finished a parenthetical definition, + # check if we're in a member initializer list following a constructor. + if ( + self.stack + and ( + isinstance(self.stack[-1], _ConstructorInfo) + or isinstance(self.previous_stack_top, _ConstructorInfo) ) - if access_match: - classinfo.access = access_match.group(2) - - # Check that access keywords are indented +1 space. Skip this - # check if the keywords are not preceded by whitespaces. - indent = access_match.group(1) - if len(indent) != classinfo.class_indent + 1 and re.match(r"^\s*$", indent): - if classinfo.is_struct: - parent = "struct " + classinfo.name - else: - parent = "class " + classinfo.name - slots = "" - if access_match.group(3): - slots = access_match.group(3) - error( - filename, - linenum, - "whitespace/indent", - 3, - f"{access_match.group(2)}{slots}:" - f" should be indented +1 space inside {parent}", - ) + and not self.stack[-1].seen_open_brace + and re.search(r"[^:]:[^:]", line) + ): + self.stack.append(_MemInitListInfo(linenum, seen_open_brace=False)) # Consume braces or semicolons from what's left of the line while True: @@ -3532,10 +3598,13 @@ def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error) token = matched.group(1) if token == "{": - # If namespace or class hasn't seen a opening brace yet, mark + # If namespace or class hasn't seen an opening brace yet, mark # namespace/class head as complete. Push a new block onto the # stack otherwise. if not self.SeenOpenBrace(): + # End of initializer list wrap if present + if isinstance(self.stack[-1], _MemInitListInfo): + self._Pop() self.stack[-1].seen_open_brace = True elif re.match(r'^extern\s*"[^"]*"\s*\{', line): self.stack.append(_ExternCInfo(linenum)) @@ -3543,23 +3612,28 @@ def Update(self, filename: str, clean_lines: CleansedLines, linenum: int, error) self.stack.append(_BlockInfo(linenum, True)) if _MATCH_ASM.match(line): self.stack[-1].inline_asm = _BLOCK_ASM - - elif token in {";", ")"}: + elif token == ";": # If we haven't seen an opening brace yet, but we already saw # a semicolon, this is probably a forward declaration. Pop # the stack for these. - # + if not self.SeenOpenBrace(): + self._Pop() + elif token == ")": # Similarly, if we haven't seen an opening brace yet, but we # already saw a closing parenthesis, then these are probably # function arguments with extra "class" or "struct" keywords. # Also pop these stack for these. - if not self.SeenOpenBrace(): - self.stack.pop() + if ( + self.stack + and not self.stack[-1].seen_open_brace + and isinstance(self.stack[-1], _ClassInfo) + ): + self._Pop() else: # token == '}' # Perform end of block checks and pop the stack. if self.stack: self.stack[-1].CheckEnd(filename, clean_lines, linenum, error) - self.stack.pop() + self._Pop() line = matched.group(2) def InnermostClass(self): @@ -7097,11 +7171,11 @@ def CheckRedundantOverrideOrFinal(filename, clean_lines, linenum, error): # Returns true if we are at a new block, and it is directly # inside of a namespace. -def IsBlockInNameSpace(nesting_state, is_forward_declaration): +def IsBlockInNameSpace(nesting_state: NestingState, is_forward_declaration: bool): # noqa: FBT001 """Checks that the new block is directly in a namespace. Args: - nesting_state: The _NestingState object that contains info about our state. + nesting_state: The NestingState object that contains info about our state. is_forward_declaration: If the class is a forward declared class. Returns: Whether or not the new block is directly in a namespace. @@ -7117,7 +7191,13 @@ def IsBlockInNameSpace(nesting_state, is_forward_declaration): if ( len(nesting_state.stack) > 1 and isinstance(nesting_state.previous_stack_top, _NamespaceInfo) - and isinstance(nesting_state.stack[-2], _NamespaceInfo) + and ( + isinstance(nesting_state.stack[-2], _NamespaceInfo) + or len(nesting_state.stack) > 2 # Accommodate for WrappedInfo + and issubclass(type(nesting_state.stack[-1]), _WrappedInfo) + and not nesting_state.stack[-2].seen_open_brace + and isinstance(nesting_state.stack[-3], _NamespaceInfo) + ) ): return True return False @@ -7141,6 +7221,10 @@ def ShouldCheckNamespaceIndentation( only works for classes and namespaces inside of a namespace. """ + # Required by all checks involving nesting_state + if not nesting_state.stack: + return False + is_forward_declaration = IsForwardClassDeclaration(raw_lines_no_comments, linenum) if not (is_namespace_indent_item or is_forward_declaration): @@ -7154,6 +7238,20 @@ def ShouldCheckNamespaceIndentation( if nesting_state.previous_stack_top and nesting_state.previous_open_parentheses > 0: return False + # Skip if we are extra-indenting a member initializer list. + if ( + isinstance(nesting_state.previous_stack_top, _ConstructorInfo) # F/N (A::A() : _a(0) {/{}) + and ( + isinstance(nesting_state.stack[-1], _MemInitListInfo) + or isinstance(nesting_state.popped_top, _MemInitListInfo) + ) + ) or ( # popping constructor after MemInitList on the same line (: _a(a) {}) + isinstance(nesting_state.previous_stack_top, _ConstructorInfo) + and isinstance(nesting_state.popped_top, _ConstructorInfo) + and re.search(r"[^:]:[^:]", raw_lines_no_comments[linenum]) + ): + return False + return IsBlockInNameSpace(nesting_state, is_forward_declaration) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 821bc78..730babd 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -323,6 +323,54 @@ def testNamespaceIndentationIndentedParameter(self): results = self.GetNamespaceResults(lines) assert results == "" + def testNamespaceIndentationMemberInitializerList(self): + lines = [ + "namespace Opossum {", + "", + "Acme::Acme(const std::shared_ptr left,", + " const std::shared_ptr nigh)", + " : _left(left), _behind(nigh) {}", + "", + "} // namespace Opossum", + ] + assert self.GetNamespaceResults(lines) == "" + + # Multiline member initializer List + lines = [ + "namespace Rosenfield {", + "class Crush : public Habitual {", + " public:", + " Crush() : _a(1),", + " _b(2)", + " {}", + "};", + "} // namespace Rosenfield", + ] + assert self.GetNamespaceResults(lines) == "" + + # Same line as constructor declaration + lines = [ + "namespace Boucher {", + " X::X() : _s(2) {}", + " A::A() : _e(12) {", + ] + assert self.GetNamespaceResults(lines) == [ + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + "Do not indent within a namespace. [whitespace/indent_namespace] [4]", + ] + + # Definition on indented line + lines = [ + "namespace Store {", + "", + " Color::Color() : my_name_is('b')", + " this_is_true(true) {", + ] + assert ( + self.GetNamespaceResults(lines) + == "Do not indent within a namespace. [whitespace/indent_namespace] [4]" + ) + def testNestingInNamespace(self): lines = [ "namespace Test {", diff --git a/samples/boost-sample/headers_inspect_exclude.def b/samples/boost-sample/headers_inspect_exclude.def index 61c147c..dec5394 100644 --- a/samples/boost-sample/headers_inspect_exclude.def +++ b/samples/boost-sample/headers_inspect_exclude.def @@ -2,7 +2,7 @@ 1 3 Done processing src/inspect/unnamed_namespace_check.hpp -Total errors found: 50 +Total errors found: 49 src/inspect/unnamed_namespace_check.hpp:0: No #ifndef header guard found, suggested CPP variable is: SAMPLES_BOOST_SAMPLE_SRC_INSPECT_UNNAMED_NAMESPACE_CHECK_HPP_ [build/header_guard] [5] src/inspect/unnamed_namespace_check.hpp:11: Include the directory when naming header files [build/include_subdir] [4] @@ -18,7 +18,6 @@ src/inspect/unnamed_namespace_check.hpp:28: Do not indent within a namespace. src/inspect/unnamed_namespace_check.hpp:28: { should almost always be at the end of the previous line [whitespace/braces] [4] src/inspect/unnamed_namespace_check.hpp:29: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:29: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/inspect/unnamed_namespace_check.hpp:30: Do not indent within a namespace. [whitespace/indent_namespace] [4] src/inspect/unnamed_namespace_check.hpp:30: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] src/inspect/unnamed_namespace_check.hpp:30: { should almost always be at the end of the previous line [whitespace/braces] [4] src/inspect/unnamed_namespace_check.hpp:31: Extra space after ( in function call [whitespace/parens] [4] diff --git a/samples/protobuf-sample/simple.def b/samples/protobuf-sample/simple.def index 963eaba..23c4688 100644 --- a/samples/protobuf-sample/simple.def +++ b/samples/protobuf-sample/simple.def @@ -4,7 +4,7 @@ src/* Done processing src/descriptor.pb.cc Done processing src/descriptor.pb.h Done processing src/descriptor_unittest.cc -Total errors found: 3111 +Total errors found: 2376 src/descriptor.pb.cc:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/descriptor.pb.cc:9: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] @@ -16,2050 +16,1315 @@ src/descriptor.pb.cc:14: Found C system header after C++ system header. Should src/descriptor.pb.cc:15: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] src/descriptor.pb.cc:16: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] src/descriptor.pb.cc:17: Found C system header after C++ system header. Should be: descriptor.pb.h, c system, c++ system, other. [build/include_order] [4] -src/descriptor.pb.cc:27: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:30: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:33: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:22: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:24: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:26: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:27: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:28: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:29: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:30: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:32: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:34: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:36: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:37: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:39: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:42: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:36: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:38: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:39: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:40: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:41: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:42: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:43: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:44: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:47: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:50: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:51: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:53: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:56: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:59: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:62: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:63: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:66: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:69: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:71: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:74: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:77: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:80: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:83: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:86: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:87: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:89: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:92: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:93: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:95: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:98: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:46: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:48: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:50: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:52: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:54: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:56: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:58: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:60: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:61: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:62: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:64: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:65: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:66: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:68: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:69: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:70: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:81: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:82: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:84: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:85: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:90: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:91: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:95: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:96: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:97: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:98: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:99: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:101: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:117: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:121: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:125: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:100: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:101: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:102: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:103: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:104: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:105: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:118: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:119: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:123: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:126: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:127: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:130: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:131: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:133: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:134: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:135: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:136: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:137: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:138: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:139: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:140: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:141: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:143: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:144: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:146: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:151: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:158: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:160: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:161: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:159: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:163: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:164: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:166: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:167: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:168: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:169: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:170: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:175: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:177: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:179: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:182: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:183: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:187: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:190: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:191: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:193: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:195: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:196: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:207: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:213: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:201: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:204: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:205: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:206: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:210: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:211: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:214: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:215: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:217: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:218: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:219: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:220: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:223: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:224: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:225: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:226: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:227: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:233: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:234: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:228: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:229: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:237: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:241: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:243: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:244: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:247: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:254: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:257: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:261: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:265: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:269: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:270: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:271: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:249: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:251: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:253: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:255: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:273: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:274: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:278: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:282: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:286: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:276: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:277: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:280: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:287: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:288: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:291: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:295: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:299: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:303: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:304: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:296: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:305: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:306: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:307: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:308: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:311: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:315: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:319: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:316: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:320: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:322: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:324: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:325: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:326: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:327: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:329: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:330: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:331: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:332: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:334: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:335: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:336: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:333: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:337: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:340: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:344: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:348: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:353: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:341: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:342: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:346: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:347: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:350: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:351: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:354: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:357: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:355: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:359: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:360: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:361: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:362: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:363: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:364: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:366: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:368: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:373: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:376: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:377: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:378: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:381: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:385: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:379: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:380: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:387: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:389: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:392: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:393: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:396: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:397: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:400: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:398: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:399: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:404: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:405: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:408: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:412: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:413: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:416: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:420: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:422: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:424: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:429: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:432: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:436: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:438: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:440: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:442: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:443: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:444: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:445: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:446: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:447: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:448: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:449: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:450: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:451: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:452: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:453: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:454: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:455: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:456: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:458: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:459: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:460: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:461: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:462: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:463: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:464: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:465: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:466: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:469: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:473: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:477: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:479: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:481: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:485: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:489: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:493: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:500: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:508: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:510: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:512: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:513: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:514: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:515: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:516: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:519: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:523: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:527: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:531: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:534: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:538: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:542: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:544: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:546: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:547: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:548: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:549: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:552: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:556: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:560: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:467: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:476: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:575: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:577: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:579: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:581: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:583: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:585: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:587: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:589: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:591: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:593: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:611: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:613: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:597: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:606: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:617: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:621: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:688: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:699: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:713: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:714: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:715: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:719: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:721: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:631: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:632: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:633: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:637: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:639: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:641: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:642: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:643: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:645: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:648: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:653: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:657: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:663: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:664: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:667: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:677: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:679: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:683: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:687: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:689: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:690: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:692: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:694: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:695: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:698: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:700: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:702: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:706: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:709: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:712: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:720: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:723: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:725: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:726: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:727: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:730: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:740: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:744: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:747: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:764: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:770: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:772: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:775: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:778: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:780: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:781: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:787: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:790: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:793: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:796: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:798: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:800: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:803: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:809: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:818: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:819: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:834: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:838: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:863: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:890: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:899: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:900: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:917: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:932: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:938: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:961: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:964: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:970: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1030: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1063: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:1064: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1099: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:1100: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1133: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1137: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1176: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1182: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1183: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1187: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1188: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1197: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1198: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1211: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1213: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1249: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:735: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:746: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:749: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:760: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:813: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:836: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:905: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:980: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1001: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1004: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1009: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1056: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1058: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:1068: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1106: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1139: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1169: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1173: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1186: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1232: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1236: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1238: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1250: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1259: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1285: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1288: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1272: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1274: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1298: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1317: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1325: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1347: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1363: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1379: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1423: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1436: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1437: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1350: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1401: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1414: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1427: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:1440: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1441: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1455: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1456: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1459: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1460: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1708: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1733: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:1756: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:1831: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:1832: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1856: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1860: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1865: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1868: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1872: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1895: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:1896: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1897: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1898: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1899: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1950: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1953: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1953: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1957: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1957: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1959: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1962: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1962: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1964: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1967: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1967: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1973: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1973: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1976: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1978: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1978: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1981: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:1983: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:1983: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:1989: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2004: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2007: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2007: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2009: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2011: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2011: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2013: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2016: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2016: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2021: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2021: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2023: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2027: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2027: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2030: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2032: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2032: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2035: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2037: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2037: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2043: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2054: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2054: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2058: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2058: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2062: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2062: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2062: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2066: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2066: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2070: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2070: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:1452: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1463: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1474: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1475: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1478: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1479: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1490: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1491: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1494: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1495: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1638: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1640: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:1740: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1773: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1786: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1869: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:1882: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1907: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1911: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1915: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1918: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1921: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1941: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1942: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1943: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1944: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:1992: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2001: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2008: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2014: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2026: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2031: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2039: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2063: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2070: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2075: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2075: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2079: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2079: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2083: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2083: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2087: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2087: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2091: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2091: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2096: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2096: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2109: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2109: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2109: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2113: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2113: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2113: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2117: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2117: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2117: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2121: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2126: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2126: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2139: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2139: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2139: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2143: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2143: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2143: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2147: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2147: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2156: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2156: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2169: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2173: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2186: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2229: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2233: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2241: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2246: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2259: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2271: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2276: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2315: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2337: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2340: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2342: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2344: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2352: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2359: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2381: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2384: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2384: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2386: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2388: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2388: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2390: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2393: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2393: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2398: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2398: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2400: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2404: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2404: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2407: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2409: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2409: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:2076: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2081: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2088: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2093: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2101: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2120: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2128: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2167: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2171: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2175: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2197: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2201: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2227: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2231: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2244: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2257: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2274: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2287: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2291: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2299: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2304: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2317: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2329: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2334: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2357: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2374: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2396: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2399: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2402: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2404: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2412: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2414: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2414: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:2420: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2434: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2442: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2443: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2444: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2463: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:2472: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2477: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2478: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2484: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2502: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:2506: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:2527: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2530: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2535: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2419: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2441: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2450: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2463: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2468: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2475: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2480: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2488: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2509: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2540: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2545: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2550: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2587: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2592: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2602: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2607: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2612: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2616: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2641: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:2654: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2657: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:2658: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2669: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2685: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2692: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2700: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] +src/descriptor.pb.cc:2574: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2577: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2583: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2596: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2631: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2636: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2646: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2648: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:2652: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2657: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2661: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2691: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:2700: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2704: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2708: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2716: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2733: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2741: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2742: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2743: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:2762: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:2771: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2776: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2777: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2781: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2783: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2801: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:2805: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:2826: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2829: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2834: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2849: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2886: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2891: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2901: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2715: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2729: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2747: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2759: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2785: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2832: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2863: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2868: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2873: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2897: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2900: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2906: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2911: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2915: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2940: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:2953: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2956: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:2957: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2968: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2919: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2954: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2959: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2969: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2971: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:2975: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:2980: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:2984: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2991: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:2999: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:3007: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3015: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3040: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3046: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3050: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3060: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3071: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3088: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3106: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3109: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3135: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3158: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3174: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3190: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3014: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:3023: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3027: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3038: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3052: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3059: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3074: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3082: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3179: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3191: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3206: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3222: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3260: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3268: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3351: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3433: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3479: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3504: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:3538: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3583: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:3584: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3612: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3635: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:3636: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3637: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3638: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3283: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3296: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3309: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3318: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3322: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3335: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3347: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3359: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3368: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3450: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3497: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3499: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:3533: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3579: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3639: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3691: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3691: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3695: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3695: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3695: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3715: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3715: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3719: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3719: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3743: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3743: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3747: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3747: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3747: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3767: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3767: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3771: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3771: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3792: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3795: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3795: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3797: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3799: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3799: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3801: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3804: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3804: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:3694: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:3707: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3733: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3756: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3757: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3758: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3759: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3760: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3806: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3809: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3809: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3815: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3815: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3818: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3820: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3820: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3823: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3825: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:3825: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:3831: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3842: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3846: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3854: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3859: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3872: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3815: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3828: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3840: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3845: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3853: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3864: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3868: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3876: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3884: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3889: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3902: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3881: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3894: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3898: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3906: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3919: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3932: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3936: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3949: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3962: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3966: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3970: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3974: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:3979: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3911: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3924: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3928: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3941: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3954: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3958: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3971: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3984: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:3988: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3992: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:3996: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4004: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4009: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4048: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4066: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4070: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4074: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4078: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4083: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4096: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4096: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4100: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4100: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4104: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4104: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4104: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4108: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4108: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4112: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4112: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4112: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4117: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4117: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4121: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4125: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4125: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4129: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4129: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4133: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4133: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4138: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4138: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4148: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4153: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:4201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4206: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:4238: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4244: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4248: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4249: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4258: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4262: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4263: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4266: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4277: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4278: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4279: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4280: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4298: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4304: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4316: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4322: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4325: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4328: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4334: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4352: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4355: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4394: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4413: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4430: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4433: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4496: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4570: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4613: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4633: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4660: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4706: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4721: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4786: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:4802: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:4818: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:4819: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4836: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4849: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4853: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4857: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4866: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4869: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4892: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:4941: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4944: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4944: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4946: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4948: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4948: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4950: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4953: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4953: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4958: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4958: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4964: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4964: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4967: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4969: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4969: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4972: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4974: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4974: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:4980: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:4998: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:4998: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5002: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5002: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5022: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5022: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5022: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5026: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5026: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5026: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5047: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5047: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5047: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5051: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:4001: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4014: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4018: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4026: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4031: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4071: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4089: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4093: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4097: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4101: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4106: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4135: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4198: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4202: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4204: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4206: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4210: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4214: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4216: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4231: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4232: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4233: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4235: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4248: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4249: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4250: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4251: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4285: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4289: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4293: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4297: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4301: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4327: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4330: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4366: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4379: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4382: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4397: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4400: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4443: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4456: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4526: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4569: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4589: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4591: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:4617: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4663: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4678: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4750: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:4764: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:4777: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4795: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4799: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4803: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4807: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4811: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4814: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4902: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4909: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4915: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4927: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4932: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4940: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4982: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:4986: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5007: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5011: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5029: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5038: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5045: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5051: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5069: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5072: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5072: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5074: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5076: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5076: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5078: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5081: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5081: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5083: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5086: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5086: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5088: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5092: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5092: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5095: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5097: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5097: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5056: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5063: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5068: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5076: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5091: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5100: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5102: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5102: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5108: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5123: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5126: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5126: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5128: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5130: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5130: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5135: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5135: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5137: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5140: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5140: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5142: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5146: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5146: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5149: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5154: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5156: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5156: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5107: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5113: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5118: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5125: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5130: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5138: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5153: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5162: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5177: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5180: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5180: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5182: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5184: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5184: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5186: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5189: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5189: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5191: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5194: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5194: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5196: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5200: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5200: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5205: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5205: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5208: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5210: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5210: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5210: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5234: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5234: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5238: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5238: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5169: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5175: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5187: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5192: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5194: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5239: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5248: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5255: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5258: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5258: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5262: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5262: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5267: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5267: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5269: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5272: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5272: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5274: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5278: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5278: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5283: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5283: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5266: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5278: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:5286: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5288: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5288: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5294: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5331: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5351: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5360: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5361: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5370: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5380: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5381: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:5396: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5402: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5413: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5427: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5430: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5489: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5536: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:5537: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5554: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5577: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:5614: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5617: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5617: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5619: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5621: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5621: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5623: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5626: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5626: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5628: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5631: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5631: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5637: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5637: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5640: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5642: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5642: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5645: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5647: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5647: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:5653: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5668: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5674: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5678: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5679: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:5688: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5699: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5716: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5722: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5734: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5753: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5756: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5779: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5794: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5886: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5911: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:5935: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:5936: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5954: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5957: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:5980: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:5981: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6023: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6026: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6026: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6028: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6030: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6030: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6032: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6035: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6035: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6037: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6040: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6040: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6046: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6046: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6049: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6051: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6054: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6056: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6056: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6062: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6073: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6077: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6085: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6090: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6129: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6157: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6160: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6161: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6162: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6183: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6200: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6206: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6218: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6222: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6240: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6262: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6276: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6322: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6338: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6354: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6365: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6397: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:6410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6413: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:6414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6431: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6437: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6445: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6460: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:6502: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6505: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6505: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6507: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6509: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6509: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6511: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6514: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6514: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:5307: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5324: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5358: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5360: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5382: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5403: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5415: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5433: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5436: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5455: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5511: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5513: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:5534: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5564: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:5577: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5595: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5598: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5655: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5664: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5671: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5677: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5689: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5694: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5702: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5723: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5740: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5776: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5778: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5790: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5800: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5821: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5834: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5852: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5855: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5875: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5887: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5949: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:5951: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:5979: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6020: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:6033: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6052: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6055: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6075: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6114: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6123: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6130: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6136: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6148: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6153: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6161: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6172: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6176: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6184: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6189: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6229: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6258: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6264: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6266: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6279: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6290: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6311: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6323: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6342: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6345: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6366: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6422: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6438: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6440: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:6455: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6466: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6503: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:6512: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6516: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6519: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6519: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6525: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6525: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6528: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6530: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6530: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6533: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6535: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6535: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6541: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6559: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6559: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6563: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6563: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6583: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6587: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6602: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6624: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6630: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6633: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6634: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6635: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6644: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6655: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6672: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6678: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6534: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6537: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6545: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6598: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6607: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6614: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6620: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6632: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6637: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6645: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6687: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6690: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6693: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6709: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6712: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6735: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6750: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6813: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6692: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6700: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6707: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6736: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6743: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6745: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6757: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6767: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6788: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6801: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6819: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6822: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:6842: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6867: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:6888: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6891: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:6892: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6910: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6913: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6936: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:6937: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6979: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6982: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6982: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6984: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6986: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6986: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6988: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6991: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6991: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:6993: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:6996: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:6996: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7002: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7002: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7005: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7007: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7007: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7010: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7012: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7012: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7029: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7033: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7037: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7041: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7046: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7066: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7085: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7110: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7116: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7120: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7130: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7131: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7145: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7146: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6854: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6916: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6918: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:6946: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:6987: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:6996: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7000: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7019: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7022: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7042: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7081: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7090: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7097: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7103: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7115: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7120: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7128: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7139: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7143: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7164: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7170: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7188: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:7192: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:7199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7202: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7205: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7208: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7227: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7230: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7285: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7299: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7314: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7387: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7392: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7151: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7156: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7176: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7179: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7196: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7236: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7238: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7242: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7244: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7259: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7260: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7272: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7273: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7274: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7295: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7307: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7311: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7315: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7324: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7337: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7340: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7389: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7402: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7447: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7452: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7456: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7505: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:7521: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:7522: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7539: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7543: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7415: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7486: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7491: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7501: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7503: At least two spaces is best between code and comments [whitespace/comments] [2] src/descriptor.pb.cc:7547: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7550: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7579: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:7624: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7627: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7627: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7629: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7631: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7631: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7633: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7636: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7636: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7638: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7641: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7641: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7647: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7647: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7650: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7652: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7652: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7655: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7657: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7657: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7663: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7678: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7681: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7681: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7683: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7685: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7685: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7687: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7690: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7690: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7692: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7695: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7695: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7697: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7701: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7701: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7704: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7706: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7706: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7709: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7711: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7711: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7711: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7717: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7732: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7735: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7735: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7737: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7739: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7739: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:7552: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7556: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7610: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:7623: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7641: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7645: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7649: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7652: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7719: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7728: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7735: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7741: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7744: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7744: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7746: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7749: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7749: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7751: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7755: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7755: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:7753: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7758: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7760: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7760: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7763: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7765: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7765: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7765: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7771: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7789: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7766: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7781: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7790: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7797: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7803: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:7808: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7833: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7833: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7837: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7837: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7857: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7857: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7861: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7861: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:7871: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7876: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:7913: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7922: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7923: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:7932: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7933: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7938: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7944: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7945: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7956: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7957: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7958: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7959: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:7960: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:7975: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8000: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:8004: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:8011: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8014: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8024: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8027: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8047: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8050: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8074: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8084: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8090: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8093: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8109: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7815: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7820: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7828: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7843: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7852: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7859: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7865: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7870: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7877: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7882: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7884: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7890: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7908: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7911: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:7928: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8026: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8028: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8030: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8032: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8034: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8036: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8038: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8040: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8042: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8044: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8046: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8048: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8059: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8060: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8061: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8062: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8063: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8064: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8075: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8076: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8077: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8078: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8079: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8080: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8112: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8116: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8120: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8124: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8128: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8132: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8137: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8138: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8141: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8156: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8186: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8216: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8275: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8335: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8342: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8350: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8365: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8370: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8142: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8155: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8158: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8189: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8194: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8197: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8240: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8253: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8266: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8279: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8292: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8305: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8318: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8332: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8371: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8375: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8380: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8385: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8390: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8452: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8460: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8468: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8484: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8489: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8494: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8499: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8509: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8514: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8551: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8427: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8434: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8442: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8462: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8467: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8472: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8477: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8482: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8487: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8539: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:8555: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8563: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8571: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8587: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:8592: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8609: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:8645: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:8671: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:8690: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8694: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8710: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8731: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8735: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8759: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:8760: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8762: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:8773: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8813: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8816: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8816: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8818: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8820: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8820: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8822: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8825: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8825: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8827: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8830: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8830: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8832: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8836: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8836: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8839: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8841: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8841: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8844: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8846: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8846: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8852: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8867: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8870: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8870: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8872: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8874: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8874: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8876: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8879: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8879: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8881: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8884: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8884: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8886: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8890: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8890: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8893: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8895: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8895: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8898: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8900: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8900: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8900: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8906: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8924: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8924: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8928: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8928: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8948: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8948: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8952: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8952: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8972: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8972: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8976: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8976: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8982: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8996: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:8996: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:8996: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:8998: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9000: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9000: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9000: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8597: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8602: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8607: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8612: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8617: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8665: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8746: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:8779: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8782: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8784: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:8817: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8821: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8825: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8829: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8833: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8837: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8890: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8907: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8940: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8949: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8956: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8962: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8967: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8974: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8979: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:8987: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9002: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9011: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9021: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9021: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9023: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9025: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9025: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9027: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9030: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9030: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9032: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9035: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9035: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9037: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9041: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9041: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9044: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9046: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9046: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:9024: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9029: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9036: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9041: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9043: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9049: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9051: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9051: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9057: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9075: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9075: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9079: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9079: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9099: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9099: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9103: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9103: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9123: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9123: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9127: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9127: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9147: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9147: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9171: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9171: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9175: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9175: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9192: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9195: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9195: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9197: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9199: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9199: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9201: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9204: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9204: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9206: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9209: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9209: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9211: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9215: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9215: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9218: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9220: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9220: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9223: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9225: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9225: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9225: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9246: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9249: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9249: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9251: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9253: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9253: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9255: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9258: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9258: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9263: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9263: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9265: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9269: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9269: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9272: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9274: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9274: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9277: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9279: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9279: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9279: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9285: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9296: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9300: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9304: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9313: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9332: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9341: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9342: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9363: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:9378: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9403: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:9407: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:9429: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9125: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9141: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9143: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9161: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9170: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9183: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9188: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9195: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9200: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9343: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9352: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9359: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9365: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9370: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9382: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9384: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9390: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9405: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9414: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9421: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9427: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9432: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9437: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9439: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9444: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9446: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9452: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:9467: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9482: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9492: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9498: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9541: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9546: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9551: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9556: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9581: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9586: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9591: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9596: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9611: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9642: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:9668: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:9669: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9689: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9719: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:9720: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9722: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:9731: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9766: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9766: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9770: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9770: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9790: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9790: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9794: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9794: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9814: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9814: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9818: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9818: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9838: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9838: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9842: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9842: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:9855: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9859: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9863: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9872: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:9887: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:9910: Missing space before ( in switch( [whitespace/parens] [5] -src/descriptor.pb.cc:9939: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9948: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9949: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:9972: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:9987: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10012: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:10016: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:10041: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10044: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10045: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10050: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10053: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10069: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10084: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10099: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10109: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10115: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10118: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10134: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10144: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10199: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10204: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10209: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10220: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10251: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10256: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10261: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9476: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9483: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9489: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9494: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9501: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9506: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9514: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9525: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9529: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9533: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9542: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9624: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9637: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9640: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9646: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9659: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9672: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9685: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9693: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9697: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9738: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9743: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9748: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9753: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9773: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9775: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:9779: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9784: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9789: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9794: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9809: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9858: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:9871: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9923: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:9934: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10062: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10071: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10168: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10171: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10172: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10180: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10195: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10229: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10234: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10237: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10260: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10272: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10287: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10299: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10310: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10330: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:10356: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:10413: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:10414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10416: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:10462: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10462: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10466: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10466: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10487: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10487: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10491: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10491: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10497: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10511: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10511: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10515: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10515: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10536: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10536: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10540: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10540: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10560: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10560: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10564: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10564: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10584: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10584: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10588: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10588: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:10601: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10605: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10618: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10635: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10644: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10645: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10664: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:10679: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10704: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:10708: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:10730: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10733: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10738: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10753: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10763: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10769: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10812: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10311: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10316: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10321: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10324: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10332: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10352: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10354: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:10364: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10369: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10374: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10385: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10400: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10430: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10436: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10461: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:10532: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10611: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10715: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10719: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10723: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10732: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10814: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:10817: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10842: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10847: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10862: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10883: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:10909: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:10954: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:10955: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:10957: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:10999: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:10999: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11003: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11003: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11023: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11023: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11027: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11027: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11040: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11044: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11048: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11057: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11073: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11082: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11083: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11101: If statement had no body and no else clause [whitespace/empty_if_body] [4] +src/descriptor.pb.cc:10818: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10878: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10880: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:10894: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:10972: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11003: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11007: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11011: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11020: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11113: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11116: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11135: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11143: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11147: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11155: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11165: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11171: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11214: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11188: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11193: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11215: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:11219: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11224: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11239: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11254: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11294: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:11295: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11336: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] +src/descriptor.pb.cc:11278: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] src/descriptor.pb.cc:11337: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11339: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:11380: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11380: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11384: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11384: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11397: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11401: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11405: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11430: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11439: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11440: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11458: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:11473: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11504: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11507: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11512: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11522: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11528: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11571: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11596: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11611: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11651: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:11652: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11693: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:11694: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11696: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:11737: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11737: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11741: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11741: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:11754: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11758: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11762: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11771: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11787: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11796: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11797: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:11815: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:11830: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11861: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11864: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11418: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11422: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11426: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11435: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11498: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11521: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11524: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11530: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11538: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11542: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11583: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11603: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11605: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:11609: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11624: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11669: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11710: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11766: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11770: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11774: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11783: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:11869: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11879: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11885: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11928: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11953: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:11968: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12008: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:12050: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:12051: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12053: If/else bodies with multiple statements require braces [readability/braces] [4] -src/descriptor.pb.cc:12094: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12094: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:12098: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12098: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:12111: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12115: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12119: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12128: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12144: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12152: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12153: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12154: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12163: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12174: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12175: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:12184: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12189: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12190: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12194: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12196: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11872: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11878: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11886: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11890: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11931: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11951: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11953: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:11957: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:11972: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12017: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12114: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12118: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12131: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12224: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12227: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12233: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12241: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12246: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12248: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12249: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12296: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12306: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12322: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12326: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12355: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12378: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12381: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:12382: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12393: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12399: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12410: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12417: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12434: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12464: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12473: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12474: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:12483: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12487: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12488: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12498: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12499: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12500: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12501: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:12516: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12259: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12263: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12304: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12307: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12330: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12332: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:12336: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12339: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12357: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12392: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12395: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12397: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:12456: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12506: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12520: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12522: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12540: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:12544: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:12551: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12554: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12557: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12577: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12580: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12524: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12538: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12542: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12546: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12555: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12578: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12584: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:12586: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12619: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12634: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12649: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12732: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12737: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12742: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12791: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12796: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12801: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12823: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12874: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:12898: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:12899: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12917: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12930: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12934: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:12957: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:12958: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13001: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13004: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13004: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:12594: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12604: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12612: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12617: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12622: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12633: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12647: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12650: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12671: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12716: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12726: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12728: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:12743: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12747: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12781: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12800: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12804: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12815: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12822: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12830: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12837: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12853: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12880: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12889: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12896: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12902: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12905: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12907: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12914: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12919: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12921: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12927: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12984: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12986: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12988: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12990: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12992: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:12994: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13004: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13005: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13006: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13008: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13008: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13010: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13013: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13013: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13015: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13018: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13018: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:13017: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13018: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13020: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13024: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13024: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13027: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13029: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13029: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13032: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13034: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13034: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13034: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13040: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13058: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13058: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13062: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13062: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:13019: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13037: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13050: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13054: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13058: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13076: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13079: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13083: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13087: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13091: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13096: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13084: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13113: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13116: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13116: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13118: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13120: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13120: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13122: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13125: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13125: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13127: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13130: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13130: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13130: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13132: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13136: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13136: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] +src/descriptor.pb.cc:13126: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:13139: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13141: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13141: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13144: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13146: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13146: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13146: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13152: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13170: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13170: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13174: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13174: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13174: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13194: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13194: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13198: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13198: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13198: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13218: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13218: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13222: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13222: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13239: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13242: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13242: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13244: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13246: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13246: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13251: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13251: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13253: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13256: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13256: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13258: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13262: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13262: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13265: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13267: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13267: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13270: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13272: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13272: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13272: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13278: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13293: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13296: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13296: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13298: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13300: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13300: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13302: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13305: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13305: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13307: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13310: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13310: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13312: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13316: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13316: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13319: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13321: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13321: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13324: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13326: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13326: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:13326: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13332: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13349: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13357: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13358: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13359: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13368: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13369: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13379: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13380: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13381: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:13396: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13402: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13414: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13417: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13435: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13438: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13442: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13443: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13446: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13447: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13460: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13461: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13464: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13465: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13498: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13515: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13516: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13518: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13554: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13564: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13595: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13665: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13673: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13698: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:13752: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13755: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:13756: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13776: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13780: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13788: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13803: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:13816: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13838: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13847: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13848: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:13865: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:13880: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13909: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13912: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13918: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:13978: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14011: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:14012: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14047: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:14080: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14080: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14084: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14084: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14084: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14088: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14088: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14092: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14092: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14097: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14097: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14110: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14110: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14114: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14114: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14114: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14118: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14118: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14122: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14122: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14127: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14127: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14144: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14147: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14147: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14149: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14151: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14151: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14151: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14153: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14156: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14156: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14158: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14161: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14161: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14161: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14163: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14167: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14167: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14170: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14172: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14172: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14175: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14177: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14177: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14177: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13216: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13226: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13252: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13254: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:13276: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13281: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13286: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13308: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13375: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:13388: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13407: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13411: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13415: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13444: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13480: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13484: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13488: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13492: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13497: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13514: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13523: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13530: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13536: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13541: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13548: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13553: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13555: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13561: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13583: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13607: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13648: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13657: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13664: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13670: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13675: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13682: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13687: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13689: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13695: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13710: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13719: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13726: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13732: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13737: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13744: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13749: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13757: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13781: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13790: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13792: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13794: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13796: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13803: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13804: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13813: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13814: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13832: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13847: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13851: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13865: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13868: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13872: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13873: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13876: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13877: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13888: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13889: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13892: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13922: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13937: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13938: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13940: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13974: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:13984: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14015: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14029: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14031: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:14086: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14094: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14150: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14170: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:14179: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14183: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14198: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14201: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14201: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14203: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14205: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14205: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14205: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14207: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14210: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14210: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14212: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14215: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14215: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14215: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14217: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14221: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14221: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14224: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14226: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14226: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14229: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14231: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14231: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14231: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14237: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14248: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14248: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14248: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14252: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14252: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14252: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14256: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14256: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14256: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14260: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14260: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14260: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14264: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14264: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14264: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14269: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14269: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14273: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14273: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14273: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14277: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14277: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14277: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14281: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14281: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14281: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14282: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14285: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14285: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14290: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14290: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:14307: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14311: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14319: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14324: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14342: Do not indent within a namespace. [whitespace/indent_namespace] [4] +src/descriptor.pb.cc:14204: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14208: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14213: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14238: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14265: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14295: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14325: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14334: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14341: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14347: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14350: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14351: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14352: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14361: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14373: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14374: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:14383: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14388: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14389: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14393: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14395: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14413: Are you taking an address of something dereferenced from a cast? Wrapping the dereferenced expression in parentheses will make the binding more obvious [readability/casting] [4] -src/descriptor.pb.cc:14417: Missing space after , [whitespace/comma] [3] -src/descriptor.pb.cc:14424: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14444: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14447: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14451: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14452: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14455: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14456: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14487: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14502: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14539: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14559: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14564: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14574: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14604: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14609: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14613: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14645: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] -src/descriptor.pb.cc:14675: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14678: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:14679: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14690: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14697: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14711: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14718: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14726: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] +src/descriptor.pb.cc:14352: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14359: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14364: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14366: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14387: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14394: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14396: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14403: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14409: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14412: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14414: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14421: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14426: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14428: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14434: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14445: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14449: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14453: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14457: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14461: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14470: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14478: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14479: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14567: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14570: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14575: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14622: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14624: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:14634: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14672: Lines should be <= 80 characters long [whitespace/line_length] [2] src/descriptor.pb.cc:14734: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14760: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14769: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14770: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:14787: If statement had no body and no else clause [whitespace/empty_if_body] [4] -src/descriptor.pb.cc:14802: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14808: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14831: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14834: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14840: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14900: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14933: Line ends in whitespace. Consider deleting these extra spaces. [whitespace/end_of_line] [4] -src/descriptor.pb.cc:14934: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14969: Redundant blank line at the start of a code block should be deleted. [whitespace/blank_line] [2] -src/descriptor.pb.cc:15002: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15002: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15006: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15006: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15006: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15010: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15010: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15014: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15014: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15019: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15019: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15036: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15039: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15039: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15041: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15043: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15043: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15043: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15045: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15048: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15048: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15050: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15053: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15053: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15053: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15055: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15059: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15059: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15062: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15064: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15064: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15067: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15069: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15069: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15069: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15075: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15093: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15093: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15097: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15097: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15117: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15117: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15121: Do not indent within a namespace. [whitespace/indent_namespace] [4] -src/descriptor.pb.cc:15121: Weird number of spaces at line-start. Are you using a 2-space indent? [whitespace/indent] [3] -src/descriptor.pb.cc:15138: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15142: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15146: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15150: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:15155: Lines should be <= 80 characters long [whitespace/line_length] [2] -src/descriptor.pb.cc:14981: Add #include for swap [build/include_what_you_use] [4] -src/descriptor.pb.cc:15069: Add #include for string [build/include_what_you_use] [4] +src/descriptor.pb.cc:14738: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14746: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14751: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14776: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14783: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14785: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14795: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14806: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14814: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14819: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14824: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14836: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14853: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14856: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14860: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14861: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14864: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14865: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14893: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14906: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14941: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14961: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14966: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14976: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:14978: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:15007: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15012: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15016: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15072: Redundant blank line at the end of a code block should be deleted. [whitespace/blank_line] [3] +src/descriptor.pb.cc:15081: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15085: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15096: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15104: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15115: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15122: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15137: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15166: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15196: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15205: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15212: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15218: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15221: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15223: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15230: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15235: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15237: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15243: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15348: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15369: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15372: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15377: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15424: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15426: At least two spaces is best between code and comments [whitespace/comments] [2] +src/descriptor.pb.cc:15436: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15474: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15536: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15540: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15544: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15548: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15553: Lines should be <= 80 characters long [whitespace/line_length] [2] +src/descriptor.pb.cc:15237: Add #include for string [build/include_what_you_use] [4] +src/descriptor.pb.cc:15518: Add #include for swap [build/include_what_you_use] [4] src/descriptor.pb.cc:5: samples/protobuf-sample/src/descriptor.pb.cc should include its header file samples/protobuf-sample/src/descriptor.pb.h [build/include] [5] src/descriptor.pb.h:0: No copyright message found. You should have a line: "Copyright [year] " [legal/copyright] [5] src/descriptor.pb.h:4: #ifndef header guard has wrong style, please use: SAMPLES_PROTOBUF_SAMPLE_SRC_DESCRIPTOR_PB_H_ [build/header_guard] [5] diff --git a/samples/protobuf-sample/src/descriptor.pb.cc b/samples/protobuf-sample/src/descriptor.pb.cc index 4d5c4d9..bb44544 100644 --- a/samples/protobuf-sample/src/descriptor.pb.cc +++ b/samples/protobuf-sample/src/descriptor.pb.cc @@ -19,113 +19,78 @@ namespace google { namespace protobuf { +class FileDescriptorSetDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_; +class FileDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_; +class DescriptorProto_ExtensionRangeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_; +class DescriptorProto_ReservedRangeDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_; +class DescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_; +class FieldDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_; +class OneofDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_; +class EnumDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_; +class EnumValueDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_; +class ServiceDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_; +class MethodDescriptorProtoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_; +class FileOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FileOptionsDefaultTypeInternal _FileOptions_default_instance_; +class MessageOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_; +class FieldOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_; +class OneofOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_; +class EnumOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_; +class EnumValueOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_; +class ServiceOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_; +class MethodOptionsDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_; +class UninterpretedOption_NamePartDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_; +class UninterpretedOptionDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_; +class SourceCodeInfo_LocationDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_; +class SourceCodeInfoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_; +class GeneratedCodeInfo_AnnotationDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_; +class GeneratedCodeInfoDefaultTypeInternal : public ::google::protobuf::internal::ExplicitlyConstructed {}; +GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_; namespace { -const ::google::protobuf::Descriptor* FileDescriptorSet_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FileDescriptorSet_reflection_ = NULL; -const ::google::protobuf::Descriptor* FileDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FileDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* DescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - DescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* DescriptorProto_ExtensionRange_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - DescriptorProto_ExtensionRange_reflection_ = NULL; -const ::google::protobuf::Descriptor* DescriptorProto_ReservedRange_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - DescriptorProto_ReservedRange_reflection_ = NULL; -const ::google::protobuf::Descriptor* FieldDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FieldDescriptorProto_reflection_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor_ = NULL; -const ::google::protobuf::Descriptor* OneofDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - OneofDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* EnumDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* EnumValueDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumValueDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* ServiceDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - ServiceDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* MethodDescriptorProto_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - MethodDescriptorProto_reflection_ = NULL; -const ::google::protobuf::Descriptor* FileOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FileOptions_reflection_ = NULL; -const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor_ = NULL; -const ::google::protobuf::Descriptor* MessageOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - MessageOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* FieldOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - FieldOptions_reflection_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor_ = NULL; -const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor_ = NULL; -const ::google::protobuf::Descriptor* EnumOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* EnumValueOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - EnumValueOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* ServiceOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - ServiceOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* MethodOptions_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - MethodOptions_reflection_ = NULL; -const ::google::protobuf::Descriptor* UninterpretedOption_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - UninterpretedOption_reflection_ = NULL; -const ::google::protobuf::Descriptor* UninterpretedOption_NamePart_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - UninterpretedOption_NamePart_reflection_ = NULL; -const ::google::protobuf::Descriptor* SourceCodeInfo_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - SourceCodeInfo_reflection_ = NULL; -const ::google::protobuf::Descriptor* SourceCodeInfo_Location_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - SourceCodeInfo_Location_reflection_ = NULL; -const ::google::protobuf::Descriptor* GeneratedCodeInfo_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - GeneratedCodeInfo_reflection_ = NULL; -const ::google::protobuf::Descriptor* GeneratedCodeInfo_Annotation_descriptor_ = NULL; -const ::google::protobuf::internal::GeneratedMessageReflection* - GeneratedCodeInfo_Annotation_reflection_ = NULL; +::google::protobuf::Metadata file_level_metadata[25]; +const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[6]; } // namespace -void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { - protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - const ::google::protobuf::FileDescriptor* file = - ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName( - "google/protobuf/descriptor.proto"); - GOOGLE_CHECK(file != NULL); - FileDescriptorSet_descriptor_ = file->message_type(0); - static const int FileDescriptorSet_offsets_[1] = { +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto() GOOGLE_ATTRIBUTE_COLD; +const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto() { + static const ::google::protobuf::uint32 offsets[] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, file_), - }; - FileDescriptorSet_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FileDescriptorSet_descriptor_, - FileDescriptorSet::default_instance_, - FileDescriptorSet_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _has_bits_[0]), - -1, - -1, - sizeof(FileDescriptorSet), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorSet, _internal_metadata_), - -1); - FileDescriptorProto_descriptor_ = file->message_type(1); - static const int FileDescriptorProto_offsets_[12] = { + 0, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, package_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, dependency_), @@ -138,20 +103,38 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, options_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, source_code_info_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, syntax_), - }; - FileDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FileDescriptorProto_descriptor_, - FileDescriptorProto::default_instance_, - FileDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(FileDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileDescriptorProto, _internal_metadata_), - -1); - DescriptorProto_descriptor_ = file->message_type(2); - static const int DescriptorProto_offsets_[10] = { + 0, + 1, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 3, + 4, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, start_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, end_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, start_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, end_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, field_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, extension_), @@ -162,52 +145,20 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, options_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, reserved_range_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, reserved_name_), - }; - DescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - DescriptorProto_descriptor_, - DescriptorProto::default_instance_, - DescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(DescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto, _internal_metadata_), - -1); - DescriptorProto_ExtensionRange_descriptor_ = DescriptorProto_descriptor_->nested_type(0); - static const int DescriptorProto_ExtensionRange_offsets_[2] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, start_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, end_), - }; - DescriptorProto_ExtensionRange_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - DescriptorProto_ExtensionRange_descriptor_, - DescriptorProto_ExtensionRange::default_instance_, - DescriptorProto_ExtensionRange_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _has_bits_[0]), - -1, - -1, - sizeof(DescriptorProto_ExtensionRange), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ExtensionRange, _internal_metadata_), - -1); - DescriptorProto_ReservedRange_descriptor_ = DescriptorProto_descriptor_->nested_type(1); - static const int DescriptorProto_ReservedRange_offsets_[2] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, start_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, end_), - }; - DescriptorProto_ReservedRange_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - DescriptorProto_ReservedRange_descriptor_, - DescriptorProto_ReservedRange::default_instance_, - DescriptorProto_ReservedRange_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _has_bits_[0]), - -1, - -1, - sizeof(DescriptorProto_ReservedRange), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DescriptorProto_ReservedRange, _internal_metadata_), - -1); - FieldDescriptorProto_descriptor_ = file->message_type(3); - static const int FieldDescriptorProto_offsets_[10] = { + 0, + 2, + 3, + 4, + 5, + 6, + 7, + 1, + 8, + 9, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, number_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, label_), @@ -218,108 +169,74 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, oneof_index_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, json_name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, options_), - }; - FieldDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FieldDescriptorProto_descriptor_, - FieldDescriptorProto::default_instance_, - FieldDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(FieldDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldDescriptorProto, _internal_metadata_), - -1); - FieldDescriptorProto_Type_descriptor_ = FieldDescriptorProto_descriptor_->enum_type(0); - FieldDescriptorProto_Label_descriptor_ = FieldDescriptorProto_descriptor_->enum_type(1); - OneofDescriptorProto_descriptor_ = file->message_type(4); - static const int OneofDescriptorProto_offsets_[1] = { + 0, + 6, + 8, + 9, + 1, + 2, + 3, + 7, + 4, + 5, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, name_), - }; - OneofDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - OneofDescriptorProto_descriptor_, - OneofDescriptorProto::default_instance_, - OneofDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(OneofDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, _internal_metadata_), - -1); - EnumDescriptorProto_descriptor_ = file->message_type(5); - static const int EnumDescriptorProto_offsets_[3] = { + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofDescriptorProto, options_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, options_), - }; - EnumDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumDescriptorProto_descriptor_, - EnumDescriptorProto::default_instance_, - EnumDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(EnumDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumDescriptorProto, _internal_metadata_), - -1); - EnumValueDescriptorProto_descriptor_ = file->message_type(6); - static const int EnumValueDescriptorProto_offsets_[3] = { + 0, + 2, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, number_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, options_), - }; - EnumValueDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumValueDescriptorProto_descriptor_, - EnumValueDescriptorProto::default_instance_, - EnumValueDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(EnumValueDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueDescriptorProto, _internal_metadata_), - -1); - ServiceDescriptorProto_descriptor_ = file->message_type(7); - static const int ServiceDescriptorProto_offsets_[3] = { + 0, + 2, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, method_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, options_), - }; - ServiceDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - ServiceDescriptorProto_descriptor_, - ServiceDescriptorProto::default_instance_, - ServiceDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(ServiceDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceDescriptorProto, _internal_metadata_), - -1); - MethodDescriptorProto_descriptor_ = file->message_type(8); - static const int MethodDescriptorProto_offsets_[6] = { + 0, + 2, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, input_type_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, output_type_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, options_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, client_streaming_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, server_streaming_), - }; - MethodDescriptorProto_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - MethodDescriptorProto_descriptor_, - MethodDescriptorProto::default_instance_, - MethodDescriptorProto_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _has_bits_[0]), - -1, - -1, - sizeof(MethodDescriptorProto), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodDescriptorProto, _internal_metadata_), - -1); - FileOptions_descriptor_ = file->message_type(9); - static const int FileOptions_offsets_[15] = { + 0, + 1, + 2, + 3, + 4, + 5, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_package_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_outer_classname_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, java_multiple_files_), @@ -334,41 +251,42 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, cc_enable_arenas_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, objc_class_prefix_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, csharp_namespace_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, swift_prefix_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, uninterpreted_option_), - }; - FileOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FileOptions_descriptor_, - FileOptions::default_instance_, - FileOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _extensions_), - sizeof(FileOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FileOptions, _internal_metadata_), - -1); - FileOptions_OptimizeMode_descriptor_ = FileOptions_descriptor_->enum_type(0); - MessageOptions_descriptor_ = file->message_type(10); - static const int MessageOptions_offsets_[5] = { + 0, + 1, + 6, + 7, + 8, + 14, + 2, + 9, + 10, + 11, + 12, + 13, + 3, + 4, + 5, + 15, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, message_set_wire_format_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, no_standard_descriptor_accessor_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, map_entry_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, uninterpreted_option_), - }; - MessageOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - MessageOptions_descriptor_, - MessageOptions::default_instance_, - MessageOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _extensions_), - sizeof(MessageOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MessageOptions, _internal_metadata_), - -1); - FieldOptions_descriptor_ = file->message_type(11); - static const int FieldOptions_offsets_[7] = { + 0, + 1, + 2, + 3, + 4, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, ctype_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, packed_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, jstype_), @@ -376,87 +294,67 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, weak_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, uninterpreted_option_), - }; - FieldOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - FieldOptions_descriptor_, - FieldOptions::default_instance_, - FieldOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _extensions_), - sizeof(FieldOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FieldOptions, _internal_metadata_), - -1); - FieldOptions_CType_descriptor_ = FieldOptions_descriptor_->enum_type(0); - FieldOptions_JSType_descriptor_ = FieldOptions_descriptor_->enum_type(1); - EnumOptions_descriptor_ = file->message_type(12); - static const int EnumOptions_offsets_[3] = { + 0, + 2, + 1, + 3, + 4, + 5, + 6, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, _extensions_), + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OneofOptions, uninterpreted_option_), + 0, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, allow_alias_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, uninterpreted_option_), - }; - EnumOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumOptions_descriptor_, - EnumOptions::default_instance_, - EnumOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _extensions_), - sizeof(EnumOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumOptions, _internal_metadata_), - -1); - EnumValueOptions_descriptor_ = file->message_type(13); - static const int EnumValueOptions_offsets_[2] = { + 0, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, uninterpreted_option_), - }; - EnumValueOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - EnumValueOptions_descriptor_, - EnumValueOptions::default_instance_, - EnumValueOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _extensions_), - sizeof(EnumValueOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EnumValueOptions, _internal_metadata_), - -1); - ServiceOptions_descriptor_ = file->message_type(14); - static const int ServiceOptions_offsets_[2] = { + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, deprecated_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, uninterpreted_option_), - }; - ServiceOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - ServiceOptions_descriptor_, - ServiceOptions::default_instance_, - ServiceOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _extensions_), - sizeof(ServiceOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ServiceOptions, _internal_metadata_), - -1); - MethodOptions_descriptor_ = file->message_type(15); - static const int MethodOptions_offsets_[2] = { + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _internal_metadata_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _extensions_), + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, deprecated_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, idempotency_level_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, uninterpreted_option_), - }; - MethodOptions_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - MethodOptions_descriptor_, - MethodOptions::default_instance_, - MethodOptions_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _has_bits_[0]), - -1, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _extensions_), - sizeof(MethodOptions), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MethodOptions, _internal_metadata_), - -1); - UninterpretedOption_descriptor_ = file->message_type(16); - static const int UninterpretedOption_offsets_[7] = { + 0, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, name_part_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, is_extension_), + 0, + 1, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, name_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, identifier_value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, positive_int_value_), @@ -464,421 +362,569 @@ void protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, double_value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, string_value_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, aggregate_value_), - }; - UninterpretedOption_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - UninterpretedOption_descriptor_, - UninterpretedOption::default_instance_, - UninterpretedOption_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _has_bits_[0]), - -1, - -1, - sizeof(UninterpretedOption), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption, _internal_metadata_), - -1); - UninterpretedOption_NamePart_descriptor_ = UninterpretedOption_descriptor_->nested_type(0); - static const int UninterpretedOption_NamePart_offsets_[2] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, name_part_), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, is_extension_), - }; - UninterpretedOption_NamePart_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - UninterpretedOption_NamePart_descriptor_, - UninterpretedOption_NamePart::default_instance_, - UninterpretedOption_NamePart_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _has_bits_[0]), - -1, - -1, - sizeof(UninterpretedOption_NamePart), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UninterpretedOption_NamePart, _internal_metadata_), - -1); - SourceCodeInfo_descriptor_ = file->message_type(17); - static const int SourceCodeInfo_offsets_[1] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, location_), - }; - SourceCodeInfo_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - SourceCodeInfo_descriptor_, - SourceCodeInfo::default_instance_, - SourceCodeInfo_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _has_bits_[0]), - -1, - -1, - sizeof(SourceCodeInfo), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _internal_metadata_), - -1); - SourceCodeInfo_Location_descriptor_ = SourceCodeInfo_descriptor_->nested_type(0); - static const int SourceCodeInfo_Location_offsets_[5] = { + 6, + 0, + 3, + 4, + 5, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, path_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, span_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, leading_comments_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, trailing_comments_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, leading_detached_comments_), - }; - SourceCodeInfo_Location_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - SourceCodeInfo_Location_descriptor_, - SourceCodeInfo_Location::default_instance_, - SourceCodeInfo_Location_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _has_bits_[0]), - -1, - -1, - sizeof(SourceCodeInfo_Location), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo_Location, _internal_metadata_), - -1); - GeneratedCodeInfo_descriptor_ = file->message_type(18); - static const int GeneratedCodeInfo_offsets_[1] = { - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, annotation_), - }; - GeneratedCodeInfo_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - GeneratedCodeInfo_descriptor_, - GeneratedCodeInfo::default_instance_, - GeneratedCodeInfo_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _has_bits_[0]), - -1, - -1, - sizeof(GeneratedCodeInfo), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _internal_metadata_), - -1); - GeneratedCodeInfo_Annotation_descriptor_ = GeneratedCodeInfo_descriptor_->nested_type(0); - static const int GeneratedCodeInfo_Annotation_offsets_[4] = { + 2, + 3, + 0, + 1, + 4, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SourceCodeInfo, location_), + 0, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, path_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, source_file_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, begin_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, end_), + 3, + 0, + 1, + 2, + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _has_bits_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo, annotation_), + 0, }; - GeneratedCodeInfo_Annotation_reflection_ = - ::google::protobuf::internal::GeneratedMessageReflection::NewGeneratedMessageReflection( - GeneratedCodeInfo_Annotation_descriptor_, - GeneratedCodeInfo_Annotation::default_instance_, - GeneratedCodeInfo_Annotation_offsets_, - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _has_bits_[0]), - -1, - -1, - sizeof(GeneratedCodeInfo_Annotation), - GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _internal_metadata_), - -1); -} + return offsets; +} + +static const ::google::protobuf::internal::MigrationSchema schemas[] = { + { 0, 5, sizeof(FileDescriptorSet)}, + { 6, 22, sizeof(FileDescriptorProto)}, + { 34, 40, sizeof(DescriptorProto_ExtensionRange)}, + { 42, 48, sizeof(DescriptorProto_ReservedRange)}, + { 50, 64, sizeof(DescriptorProto)}, + { 74, 88, sizeof(FieldDescriptorProto)}, + { 98, 104, sizeof(OneofDescriptorProto)}, + { 106, 113, sizeof(EnumDescriptorProto)}, + { 116, 123, sizeof(EnumValueDescriptorProto)}, + { 126, 133, sizeof(ServiceDescriptorProto)}, + { 136, 146, sizeof(MethodDescriptorProto)}, + { 152, 172, sizeof(FileOptions)}, + { 188, 197, sizeof(MessageOptions)}, + { 202, 213, sizeof(FieldOptions)}, + { 220, 225, sizeof(OneofOptions)}, + { 226, 233, sizeof(EnumOptions)}, + { 236, 242, sizeof(EnumValueOptions)}, + { 244, 250, sizeof(ServiceOptions)}, + { 252, 259, sizeof(MethodOptions)}, + { 262, 268, sizeof(UninterpretedOption_NamePart)}, + { 270, 281, sizeof(UninterpretedOption)}, + { 288, 297, sizeof(SourceCodeInfo_Location)}, + { 302, 307, sizeof(SourceCodeInfo)}, + { 308, 316, sizeof(GeneratedCodeInfo_Annotation)}, + { 320, 325, sizeof(GeneratedCodeInfo)}, +}; + +static const ::google::protobuf::internal::DefaultInstanceData file_default_instances[] = { + {reinterpret_cast(&_FileDescriptorSet_default_instance_), NULL}, + {reinterpret_cast(&_FileDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_DescriptorProto_ExtensionRange_default_instance_), NULL}, + {reinterpret_cast(&_DescriptorProto_ReservedRange_default_instance_), NULL}, + {reinterpret_cast(&_DescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_FieldDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_OneofDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_EnumDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_EnumValueDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_ServiceDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_MethodDescriptorProto_default_instance_), NULL}, + {reinterpret_cast(&_FileOptions_default_instance_), NULL}, + {reinterpret_cast(&_MessageOptions_default_instance_), NULL}, + {reinterpret_cast(&_FieldOptions_default_instance_), NULL}, + {reinterpret_cast(&_OneofOptions_default_instance_), NULL}, + {reinterpret_cast(&_EnumOptions_default_instance_), NULL}, + {reinterpret_cast(&_EnumValueOptions_default_instance_), NULL}, + {reinterpret_cast(&_ServiceOptions_default_instance_), NULL}, + {reinterpret_cast(&_MethodOptions_default_instance_), NULL}, + {reinterpret_cast(&_UninterpretedOption_NamePart_default_instance_), NULL}, + {reinterpret_cast(&_UninterpretedOption_default_instance_), NULL}, + {reinterpret_cast(&_SourceCodeInfo_Location_default_instance_), NULL}, + {reinterpret_cast(&_SourceCodeInfo_default_instance_), NULL}, + {reinterpret_cast(&_GeneratedCodeInfo_Annotation_default_instance_), NULL}, + {reinterpret_cast(&_GeneratedCodeInfo_default_instance_), NULL}, +}; namespace { -GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_); -inline void protobuf_AssignDescriptorsOnce() { - ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_, - &protobuf_AssignDesc_google_2fprotobuf_2fdescriptor_2eproto); +void protobuf_AssignDescriptors() { + protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); + ::google::protobuf::MessageFactory* factory = NULL; + AssignDescriptors( + "google/protobuf/descriptor.proto", schemas, file_default_instances, protobuf_Offsets_google_2fprotobuf_2fdescriptor_2eproto(), factory, + file_level_metadata, file_level_enum_descriptors, NULL); +} + +void protobuf_AssignDescriptorsOnce() { + static GOOGLE_PROTOBUF_DECLARE_ONCE(once); + ::google::protobuf::GoogleOnceInit(&once, &protobuf_AssignDescriptors); } +void protobuf_RegisterTypes(const ::std::string&) GOOGLE_ATTRIBUTE_COLD; void protobuf_RegisterTypes(const ::std::string&) { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FileDescriptorSet_descriptor_, &FileDescriptorSet::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FileDescriptorProto_descriptor_, &FileDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - DescriptorProto_descriptor_, &DescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - DescriptorProto_ExtensionRange_descriptor_, &DescriptorProto_ExtensionRange::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - DescriptorProto_ReservedRange_descriptor_, &DescriptorProto_ReservedRange::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FieldDescriptorProto_descriptor_, &FieldDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - OneofDescriptorProto_descriptor_, &OneofDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumDescriptorProto_descriptor_, &EnumDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumValueDescriptorProto_descriptor_, &EnumValueDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - ServiceDescriptorProto_descriptor_, &ServiceDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - MethodDescriptorProto_descriptor_, &MethodDescriptorProto::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FileOptions_descriptor_, &FileOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - MessageOptions_descriptor_, &MessageOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - FieldOptions_descriptor_, &FieldOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumOptions_descriptor_, &EnumOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - EnumValueOptions_descriptor_, &EnumValueOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - ServiceOptions_descriptor_, &ServiceOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - MethodOptions_descriptor_, &MethodOptions::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - UninterpretedOption_descriptor_, &UninterpretedOption::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - UninterpretedOption_NamePart_descriptor_, &UninterpretedOption_NamePart::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - SourceCodeInfo_descriptor_, &SourceCodeInfo::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - SourceCodeInfo_Location_descriptor_, &SourceCodeInfo_Location::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - GeneratedCodeInfo_descriptor_, &GeneratedCodeInfo::default_instance()); - ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage( - GeneratedCodeInfo_Annotation_descriptor_, &GeneratedCodeInfo_Annotation::default_instance()); + ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 25); } } // namespace void protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto() { - delete FileDescriptorSet::default_instance_; - delete FileDescriptorSet_reflection_; - delete FileDescriptorProto::default_instance_; - delete FileDescriptorProto_reflection_; - delete DescriptorProto::default_instance_; - delete DescriptorProto_reflection_; - delete DescriptorProto_ExtensionRange::default_instance_; - delete DescriptorProto_ExtensionRange_reflection_; - delete DescriptorProto_ReservedRange::default_instance_; - delete DescriptorProto_ReservedRange_reflection_; - delete FieldDescriptorProto::default_instance_; - delete FieldDescriptorProto_reflection_; - delete OneofDescriptorProto::default_instance_; - delete OneofDescriptorProto_reflection_; - delete EnumDescriptorProto::default_instance_; - delete EnumDescriptorProto_reflection_; - delete EnumValueDescriptorProto::default_instance_; - delete EnumValueDescriptorProto_reflection_; - delete ServiceDescriptorProto::default_instance_; - delete ServiceDescriptorProto_reflection_; - delete MethodDescriptorProto::default_instance_; - delete MethodDescriptorProto_reflection_; - delete FileOptions::default_instance_; - delete FileOptions_reflection_; - delete MessageOptions::default_instance_; - delete MessageOptions_reflection_; - delete FieldOptions::default_instance_; - delete FieldOptions_reflection_; - delete EnumOptions::default_instance_; - delete EnumOptions_reflection_; - delete EnumValueOptions::default_instance_; - delete EnumValueOptions_reflection_; - delete ServiceOptions::default_instance_; - delete ServiceOptions_reflection_; - delete MethodOptions::default_instance_; - delete MethodOptions_reflection_; - delete UninterpretedOption::default_instance_; - delete UninterpretedOption_reflection_; - delete UninterpretedOption_NamePart::default_instance_; - delete UninterpretedOption_NamePart_reflection_; - delete SourceCodeInfo::default_instance_; - delete SourceCodeInfo_reflection_; - delete SourceCodeInfo_Location::default_instance_; - delete SourceCodeInfo_Location_reflection_; - delete GeneratedCodeInfo::default_instance_; - delete GeneratedCodeInfo_reflection_; - delete GeneratedCodeInfo_Annotation::default_instance_; - delete GeneratedCodeInfo_Annotation_reflection_; -} - -void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() { - static bool already_here = false; - if (already_here) return; - already_here = true; + _FileDescriptorSet_default_instance_.Shutdown(); + delete file_level_metadata[0].reflection; + _FileDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[1].reflection; + _DescriptorProto_ExtensionRange_default_instance_.Shutdown(); + delete file_level_metadata[2].reflection; + _DescriptorProto_ReservedRange_default_instance_.Shutdown(); + delete file_level_metadata[3].reflection; + _DescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[4].reflection; + _FieldDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[5].reflection; + _OneofDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[6].reflection; + _EnumDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[7].reflection; + _EnumValueDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[8].reflection; + _ServiceDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[9].reflection; + _MethodDescriptorProto_default_instance_.Shutdown(); + delete file_level_metadata[10].reflection; + _FileOptions_default_instance_.Shutdown(); + delete file_level_metadata[11].reflection; + _MessageOptions_default_instance_.Shutdown(); + delete file_level_metadata[12].reflection; + _FieldOptions_default_instance_.Shutdown(); + delete file_level_metadata[13].reflection; + _OneofOptions_default_instance_.Shutdown(); + delete file_level_metadata[14].reflection; + _EnumOptions_default_instance_.Shutdown(); + delete file_level_metadata[15].reflection; + _EnumValueOptions_default_instance_.Shutdown(); + delete file_level_metadata[16].reflection; + _ServiceOptions_default_instance_.Shutdown(); + delete file_level_metadata[17].reflection; + _MethodOptions_default_instance_.Shutdown(); + delete file_level_metadata[18].reflection; + _UninterpretedOption_NamePart_default_instance_.Shutdown(); + delete file_level_metadata[19].reflection; + _UninterpretedOption_default_instance_.Shutdown(); + delete file_level_metadata[20].reflection; + _SourceCodeInfo_Location_default_instance_.Shutdown(); + delete file_level_metadata[21].reflection; + _SourceCodeInfo_default_instance_.Shutdown(); + delete file_level_metadata[22].reflection; + _GeneratedCodeInfo_Annotation_default_instance_.Shutdown(); + delete file_level_metadata[23].reflection; + _GeneratedCodeInfo_default_instance_.Shutdown(); + delete file_level_metadata[24].reflection; +} + +void protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl() { GOOGLE_PROTOBUF_VERIFY_VERSION; + ::google::protobuf::internal::InitProtobufDefaults(); + _FileDescriptorSet_default_instance_.DefaultConstruct(); + _FileDescriptorProto_default_instance_.DefaultConstruct(); + _DescriptorProto_ExtensionRange_default_instance_.DefaultConstruct(); + _DescriptorProto_ReservedRange_default_instance_.DefaultConstruct(); + _DescriptorProto_default_instance_.DefaultConstruct(); + _FieldDescriptorProto_default_instance_.DefaultConstruct(); + _OneofDescriptorProto_default_instance_.DefaultConstruct(); + _EnumDescriptorProto_default_instance_.DefaultConstruct(); + _EnumValueDescriptorProto_default_instance_.DefaultConstruct(); + _ServiceDescriptorProto_default_instance_.DefaultConstruct(); + _MethodDescriptorProto_default_instance_.DefaultConstruct(); + _FileOptions_default_instance_.DefaultConstruct(); + _MessageOptions_default_instance_.DefaultConstruct(); + _FieldOptions_default_instance_.DefaultConstruct(); + _OneofOptions_default_instance_.DefaultConstruct(); + _EnumOptions_default_instance_.DefaultConstruct(); + _EnumValueOptions_default_instance_.DefaultConstruct(); + _ServiceOptions_default_instance_.DefaultConstruct(); + _MethodOptions_default_instance_.DefaultConstruct(); + _UninterpretedOption_NamePart_default_instance_.DefaultConstruct(); + _UninterpretedOption_default_instance_.DefaultConstruct(); + _SourceCodeInfo_Location_default_instance_.DefaultConstruct(); + _SourceCodeInfo_default_instance_.DefaultConstruct(); + _GeneratedCodeInfo_Annotation_default_instance_.DefaultConstruct(); + _GeneratedCodeInfo_default_instance_.DefaultConstruct(); + _FileDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::FileOptions*>( + ::google::protobuf::FileOptions::internal_default_instance()); + _FileDescriptorProto_default_instance_.get_mutable()->source_code_info_ = const_cast< ::google::protobuf::SourceCodeInfo*>( + ::google::protobuf::SourceCodeInfo::internal_default_instance()); + _DescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::MessageOptions*>( + ::google::protobuf::MessageOptions::internal_default_instance()); + _FieldDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::FieldOptions*>( + ::google::protobuf::FieldOptions::internal_default_instance()); + _OneofDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::OneofOptions*>( + ::google::protobuf::OneofOptions::internal_default_instance()); + _EnumDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::EnumOptions*>( + ::google::protobuf::EnumOptions::internal_default_instance()); + _EnumValueDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::EnumValueOptions*>( + ::google::protobuf::EnumValueOptions::internal_default_instance()); + _ServiceDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::ServiceOptions*>( + ::google::protobuf::ServiceOptions::internal_default_instance()); + _MethodDescriptorProto_default_instance_.get_mutable()->options_ = const_cast< ::google::protobuf::MethodOptions*>( + ::google::protobuf::MethodOptions::internal_default_instance()); +} + +void protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto() { + static GOOGLE_PROTOBUF_DECLARE_ONCE(once); + ::google::protobuf::GoogleOnceInit(&once, &protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto_impl); +} +void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + static const char descriptor[] = { + "\n google/protobuf/descriptor.proto\022\017goog" + "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file" + "\030\001 \003(\0132$.google.protobuf.FileDescriptorP" + "roto\"\333\003\n\023FileDescriptorProto\022\014\n\004name\030\001 \001" + "(\t\022\017\n\007package\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022" + "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen" + "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog" + "le.protobuf.DescriptorProto\0227\n\tenum_type" + "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP" + "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf." + "ServiceDescriptorProto\0228\n\textension\030\007 \003(" + "\0132%.google.protobuf.FieldDescriptorProto" + "\022-\n\007options\030\010 \001(\0132\034.google.protobuf.File" + "Options\0229\n\020source_code_info\030\t \001(\0132\037.goog" + "le.protobuf.SourceCodeInfo\022\016\n\006syntax\030\014 \001" + "(\t\"\360\004\n\017DescriptorProto\022\014\n\004name\030\001 \001(\t\0224\n\005" + "field\030\002 \003(\0132%.google.protobuf.FieldDescr" + "iptorProto\0228\n\textension\030\006 \003(\0132%.google.p" + "rotobuf.FieldDescriptorProto\0225\n\013nested_t" + "ype\030\003 \003(\0132 .google.protobuf.DescriptorPr" + "oto\0227\n\tenum_type\030\004 \003(\0132$.google.protobuf" + ".EnumDescriptorProto\022H\n\017extension_range\030" + "\005 \003(\0132/.google.protobuf.DescriptorProto." + "ExtensionRange\0229\n\noneof_decl\030\010 \003(\0132%.goo" + "gle.protobuf.OneofDescriptorProto\0220\n\007opt" + "ions\030\007 \001(\0132\037.google.protobuf.MessageOpti" + "ons\022F\n\016reserved_range\030\t \003(\0132..google.pro" + "tobuf.DescriptorProto.ReservedRange\022\025\n\rr" + "eserved_name\030\n \003(\t\032,\n\016ExtensionRange\022\r\n\005" + "start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\032+\n\rReservedRang" + "e\022\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\"\274\005\n\024FieldD" + "escriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003" + " \001(\005\022:\n\005label\030\004 \001(\0162+.google.protobuf.Fi" + "eldDescriptorProto.Label\0228\n\004type\030\005 \001(\0162*" + ".google.protobuf.FieldDescriptorProto.Ty" + "pe\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022" + "\025\n\rdefault_value\030\007 \001(\t\022\023\n\013oneof_index\030\t " + "\001(\005\022\021\n\tjson_name\030\n \001(\t\022.\n\007options\030\010 \001(\0132" + "\035.google.protobuf.FieldOptions\"\266\002\n\004Type\022" + "\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE" + "_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020" + "\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n" + "\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GR" + "OUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022" + "\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_" + "SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SI" + "NT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Label\022\022\n\016LABE" + "L_OPTIONAL\020\001\022\022\n\016LABEL_REQUIRED\020\002\022\022\n\016LABE" + "L_REPEATED\020\003\"T\n\024OneofDescriptorProto\022\014\n\004" + "name\030\001 \001(\t\022.\n\007options\030\002 \001(\0132\035.google.pro" + "tobuf.OneofOptions\"\214\001\n\023EnumDescriptorPro" + "to\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002 \003(\0132).google" + ".protobuf.EnumValueDescriptorProto\022-\n\007op" + "tions\030\003 \001(\0132\034.google.protobuf.EnumOption" + "s\"l\n\030EnumValueDescriptorProto\022\014\n\004name\030\001 " + "\001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.g" + "oogle.protobuf.EnumValueOptions\"\220\001\n\026Serv" + "iceDescriptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006meth" + "od\030\002 \003(\0132&.google.protobuf.MethodDescrip" + "torProto\0220\n\007options\030\003 \001(\0132\037.google.proto" + "buf.ServiceOptions\"\301\001\n\025MethodDescriptorP" + "roto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023" + "\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.g" + "oogle.protobuf.MethodOptions\022\037\n\020client_s" + "treaming\030\005 \001(\010:\005false\022\037\n\020server_streamin" + "g\030\006 \001(\010:\005false\"\232\005\n\013FileOptions\022\024\n\014java_p" + "ackage\030\001 \001(\t\022\034\n\024java_outer_classname\030\010 \001" + "(\t\022\"\n\023java_multiple_files\030\n \001(\010:\005false\022)" + "\n\035java_generate_equals_and_hash\030\024 \001(\010B\002\030" + "\001\022%\n\026java_string_check_utf8\030\033 \001(\010:\005false" + "\022F\n\014optimize_for\030\t \001(\0162).google.protobuf" + ".FileOptions.OptimizeMode:\005SPEED\022\022\n\ngo_p" + "ackage\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001(" + "\010:\005false\022$\n\025java_generic_services\030\021 \001(\010:" + "\005false\022\"\n\023py_generic_services\030\022 \001(\010:\005fal" + "se\022\031\n\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enab" + "le_arenas\030\037 \001(\010:\005false\022\031\n\021objc_class_pre" + "fix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022\024\n\014s" + "wift_prefix\030\' \001(\t\022C\n\024uninterpreted_optio" + "n\030\347\007 \003(\0132$.google.protobuf.Uninterpreted" + "Option\":\n\014OptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCOD" + "E_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010" + "&\020\'\"\354\001\n\016MessageOptions\022&\n\027message_set_wi" + "re_format\030\001 \001(\010:\005false\022.\n\037no_standard_de" + "scriptor_accessor\030\002 \001(\010:\005false\022\031\n\ndeprec" + "ated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\022C\n\024" + "uninterpreted_option\030\347\007 \003(\0132$.google.pro" + "tobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\010" + "\020\t\"\236\003\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.goo" + "gle.protobuf.FieldOptions.CType:\006STRING\022" + "\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$.google" + ".protobuf.FieldOptions.JSType:\tJS_NORMAL" + "\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(" + "\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024uninter" + "preted_option\030\347\007 \003(\0132$.google.protobuf.U" + "ninterpretedOption\"/\n\005CType\022\n\n\006STRING\020\000\022" + "\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JSType\022\r\n" + "\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS_NUMBER" + "\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n\014OneofOptions\022C\n\024u" + "ninterpreted_option\030\347\007 \003(\0132$.google.prot" + "obuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013" + "EnumOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndepr" + "ecated\030\003 \001(\010:\005false\022C\n\024uninterpreted_opt" + "ion\030\347\007 \003(\0132$.google.protobuf.Uninterpret" + "edOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020EnumValueOptions\022" + "\031\n\ndeprecated\030\001 \001(\010:\005false\022C\n\024uninterpre" + "ted_option\030\347\007 \003(\0132$.google.protobuf.Unin" + "terpretedOption*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOpt" + "ions\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n\024unint" + "erpreted_option\030\347\007 \003(\0132$.google.protobuf" + ".UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\255\002\n\rMeth" + "odOptions\022\031\n\ndeprecated\030! \001(\010:\005false\022_\n\021" + "idempotency_level\030\" \001(\0162/.google.protobu" + "f.MethodOptions.IdempotencyLevel:\023IDEMPO" + "TENCY_UNKNOWN\022C\n\024uninterpreted_option\030\347\007" + " \003(\0132$.google.protobuf.UninterpretedOpti" + "on\"P\n\020IdempotencyLevel\022\027\n\023IDEMPOTENCY_UN" + "KNOWN\020\000\022\023\n\017NO_SIDE_EFFECTS\020\001\022\016\n\nIDEMPOTE" + "NT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022" + ";\n\004name\030\002 \003(\0132-.google.protobuf.Uninterp" + "retedOption.NamePart\022\030\n\020identifier_value" + "\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022ne" + "gative_int_value\030\005 \001(\003\022\024\n\014double_value\030\006" + " \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_" + "value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002" + "(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016SourceCodeI" + "nfo\022:\n\010location\030\001 \003(\0132(.google.protobuf." + "SourceCodeInfo.Location\032\206\001\n\010Location\022\020\n\004" + "path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020lead" + "ing_comments\030\003 \001(\t\022\031\n\021trailing_comments\030" + "\004 \001(\t\022!\n\031leading_detached_comments\030\006 \003(\t" + "\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotation\030\001 \003" + "(\0132-.google.protobuf.GeneratedCodeInfo.A" + "nnotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020" + "\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n" + "\003end\030\004 \001(\005B\214\001\n\023com.google.protobufB\020Desc" + "riptorProtosH\001Z>github.com/golang/protob" + "uf/protoc-gen-go/descriptor;descriptor\242\002" + "\003GPB\252\002\032Google.Protobuf.Reflection" + }; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n google/protobuf/descriptor.proto\022\017goog" - "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file" - "\030\001 \003(\0132$.google.protobuf.FileDescriptorP" - "roto\"\333\003\n\023FileDescriptorProto\022\014\n\004name\030\001 \001" - "(\t\022\017\n\007package\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022" - "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen" - "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog" - "le.protobuf.DescriptorProto\0227\n\tenum_type" - "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP" - "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf." - "ServiceDescriptorProto\0228\n\textension\030\007 \003(" - "\0132%.google.protobuf.FieldDescriptorProto" - "\022-\n\007options\030\010 \001(\0132\034.google.protobuf.File" - "Options\0229\n\020source_code_info\030\t \001(\0132\037.goog" - "le.protobuf.SourceCodeInfo\022\016\n\006syntax\030\014 \001" - "(\t\"\360\004\n\017DescriptorProto\022\014\n\004name\030\001 \001(\t\0224\n\005" - "field\030\002 \003(\0132%.google.protobuf.FieldDescr" - "iptorProto\0228\n\textension\030\006 \003(\0132%.google.p" - "rotobuf.FieldDescriptorProto\0225\n\013nested_t" - "ype\030\003 \003(\0132 .google.protobuf.DescriptorPr" - "oto\0227\n\tenum_type\030\004 \003(\0132$.google.protobuf" - ".EnumDescriptorProto\022H\n\017extension_range\030" - "\005 \003(\0132/.google.protobuf.DescriptorProto." - "ExtensionRange\0229\n\noneof_decl\030\010 \003(\0132%.goo" - "gle.protobuf.OneofDescriptorProto\0220\n\007opt" - "ions\030\007 \001(\0132\037.google.protobuf.MessageOpti" - "ons\022F\n\016reserved_range\030\t \003(\0132..google.pro" - "tobuf.DescriptorProto.ReservedRange\022\025\n\rr" - "eserved_name\030\n \003(\t\032,\n\016ExtensionRange\022\r\n\005" - "start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\032+\n\rReservedRang" - "e\022\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\"\274\005\n\024FieldD" - "escriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003" - " \001(\005\022:\n\005label\030\004 \001(\0162+.google.protobuf.Fi" - "eldDescriptorProto.Label\0228\n\004type\030\005 \001(\0162*" - ".google.protobuf.FieldDescriptorProto.Ty" - "pe\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022" - "\025\n\rdefault_value\030\007 \001(\t\022\023\n\013oneof_index\030\t " - "\001(\005\022\021\n\tjson_name\030\n \001(\t\022.\n\007options\030\010 \001(\0132" - "\035.google.protobuf.FieldOptions\"\266\002\n\004Type\022" - "\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE" - "_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020" - "\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n" - "\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GR" - "OUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022" - "\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_" - "SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SI" - "NT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Label\022\022\n\016LABE" - "L_OPTIONAL\020\001\022\022\n\016LABEL_REQUIRED\020\002\022\022\n\016LABE" - "L_REPEATED\020\003\"$\n\024OneofDescriptorProto\022\014\n\004" - "name\030\001 \001(\t\"\214\001\n\023EnumDescriptorProto\022\014\n\004na" - "me\030\001 \001(\t\0228\n\005value\030\002 \003(\0132).google.protobu" - "f.EnumValueDescriptorProto\022-\n\007options\030\003 " - "\001(\0132\034.google.protobuf.EnumOptions\"l\n\030Enu" - "mValueDescriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006n" - "umber\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.google.pr" - "otobuf.EnumValueOptions\"\220\001\n\026ServiceDescr" - "iptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006method\030\002 \003(\013" - "2&.google.protobuf.MethodDescriptorProto" - "\0220\n\007options\030\003 \001(\0132\037.google.protobuf.Serv" - "iceOptions\"\301\001\n\025MethodDescriptorProto\022\014\n\004" - "name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023\n\013output" - "_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.google.pr" - "otobuf.MethodOptions\022\037\n\020client_streaming" - "\030\005 \001(\010:\005false\022\037\n\020server_streaming\030\006 \001(\010:" - "\005false\"\207\005\n\013FileOptions\022\024\n\014java_package\030\001" - " \001(\t\022\034\n\024java_outer_classname\030\010 \001(\t\022\"\n\023ja" - "va_multiple_files\030\n \001(\010:\005false\022,\n\035java_g" - "enerate_equals_and_hash\030\024 \001(\010:\005false\022%\n\026" - "java_string_check_utf8\030\033 \001(\010:\005false\022F\n\014o" - "ptimize_for\030\t \001(\0162).google.protobuf.File" - "Options.OptimizeMode:\005SPEED\022\022\n\ngo_packag" - "e\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001(\010:\005fa" - "lse\022$\n\025java_generic_services\030\021 \001(\010:\005fals" - "e\022\"\n\023py_generic_services\030\022 \001(\010:\005false\022\031\n" - "\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enable_ar" - "enas\030\037 \001(\010:\005false\022\031\n\021objc_class_prefix\030$" - " \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022C\n\024uninte" - "rpreted_option\030\347\007 \003(\0132$.google.protobuf." - "UninterpretedOption\":\n\014OptimizeMode\022\t\n\005S" - "PEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*" - "\t\010\350\007\020\200\200\200\200\002J\004\010&\020\'\"\346\001\n\016MessageOptions\022&\n\027m" - "essage_set_wire_format\030\001 \001(\010:\005false\022.\n\037n" - "o_standard_descriptor_accessor\030\002 \001(\010:\005fa" - "lse\022\031\n\ndeprecated\030\003 \001(\010:\005false\022\021\n\tmap_en" - "try\030\007 \001(\010\022C\n\024uninterpreted_option\030\347\007 \003(\013" - "2$.google.protobuf.UninterpretedOption*\t" - "\010\350\007\020\200\200\200\200\002\"\230\003\n\014FieldOptions\022:\n\005ctype\030\001 \001(" - "\0162#.google.protobuf.FieldOptions.CType:\006" - "STRING\022\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$" - ".google.protobuf.FieldOptions.JSType:\tJS" - "_NORMAL\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecat" - "ed\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024" - "uninterpreted_option\030\347\007 \003(\0132$.google.pro" - "tobuf.UninterpretedOption\"/\n\005CType\022\n\n\006ST" - "RING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JS" - "Type\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS" - "_NUMBER\020\002*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013EnumOptions\022\023\n\013" - "allow_alias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005f" - "alse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go" - "ogle.protobuf.UninterpretedOption*\t\010\350\007\020\200" - "\200\200\200\002\"}\n\020EnumValueOptions\022\031\n\ndeprecated\030\001" - " \001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003" - "(\0132$.google.protobuf.UninterpretedOption" - "*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOptions\022\031\n\ndepreca" - "ted\030! \001(\010:\005false\022C\n\024uninterpreted_option" - "\030\347\007 \003(\0132$.google.protobuf.UninterpretedO" - "ption*\t\010\350\007\020\200\200\200\200\002\"z\n\rMethodOptions\022\031\n\ndep" - "recated\030! \001(\010:\005false\022C\n\024uninterpreted_op" - "tion\030\347\007 \003(\0132$.google.protobuf.Uninterpre" - "tedOption*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOp" - "tion\022;\n\004name\030\002 \003(\0132-.google.protobuf.Uni" - "nterpretedOption.NamePart\022\030\n\020identifier_" - "value\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022" - "\032\n\022negative_int_value\030\005 \001(\003\022\024\n\014double_va" - "lue\030\006 \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggre" - "gate_value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_par" - "t\030\001 \002(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016Source" - "CodeInfo\022:\n\010location\030\001 \003(\0132(.google.prot" - "obuf.SourceCodeInfo.Location\032\206\001\n\010Locatio" - "n\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n" - "\020leading_comments\030\003 \001(\t\022\031\n\021trailing_comm" - "ents\030\004 \001(\t\022!\n\031leading_detached_comments\030" - "\006 \003(\t\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotatio" - "n\030\001 \003(\0132-.google.protobuf.GeneratedCodeI" - "nfo.Annotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003" - "(\005B\002\020\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001" - "(\005\022\013\n\003end\030\004 \001(\005BX\n\023com.google.protobufB\020" - "DescriptorProtosH\001Z\ndescriptor\242\002\003GPB\252\002\032G" - "oogle.Protobuf.Reflection", 5145); + descriptor, 5553); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/descriptor.proto", &protobuf_RegisterTypes); - FileDescriptorSet::default_instance_ = new FileDescriptorSet(); - FileDescriptorProto::default_instance_ = new FileDescriptorProto(); - DescriptorProto::default_instance_ = new DescriptorProto(); - DescriptorProto_ExtensionRange::default_instance_ = new DescriptorProto_ExtensionRange(); - DescriptorProto_ReservedRange::default_instance_ = new DescriptorProto_ReservedRange(); - FieldDescriptorProto::default_instance_ = new FieldDescriptorProto(); - OneofDescriptorProto::default_instance_ = new OneofDescriptorProto(); - EnumDescriptorProto::default_instance_ = new EnumDescriptorProto(); - EnumValueDescriptorProto::default_instance_ = new EnumValueDescriptorProto(); - ServiceDescriptorProto::default_instance_ = new ServiceDescriptorProto(); - MethodDescriptorProto::default_instance_ = new MethodDescriptorProto(); - FileOptions::default_instance_ = new FileOptions(); - MessageOptions::default_instance_ = new MessageOptions(); - FieldOptions::default_instance_ = new FieldOptions(); - EnumOptions::default_instance_ = new EnumOptions(); - EnumValueOptions::default_instance_ = new EnumValueOptions(); - ServiceOptions::default_instance_ = new ServiceOptions(); - MethodOptions::default_instance_ = new MethodOptions(); - UninterpretedOption::default_instance_ = new UninterpretedOption(); - UninterpretedOption_NamePart::default_instance_ = new UninterpretedOption_NamePart(); - SourceCodeInfo::default_instance_ = new SourceCodeInfo(); - SourceCodeInfo_Location::default_instance_ = new SourceCodeInfo_Location(); - GeneratedCodeInfo::default_instance_ = new GeneratedCodeInfo(); - GeneratedCodeInfo_Annotation::default_instance_ = new GeneratedCodeInfo_Annotation(); - FileDescriptorSet::default_instance_->InitAsDefaultInstance(); - FileDescriptorProto::default_instance_->InitAsDefaultInstance(); - DescriptorProto::default_instance_->InitAsDefaultInstance(); - DescriptorProto_ExtensionRange::default_instance_->InitAsDefaultInstance(); - DescriptorProto_ReservedRange::default_instance_->InitAsDefaultInstance(); - FieldDescriptorProto::default_instance_->InitAsDefaultInstance(); - OneofDescriptorProto::default_instance_->InitAsDefaultInstance(); - EnumDescriptorProto::default_instance_->InitAsDefaultInstance(); - EnumValueDescriptorProto::default_instance_->InitAsDefaultInstance(); - ServiceDescriptorProto::default_instance_->InitAsDefaultInstance(); - MethodDescriptorProto::default_instance_->InitAsDefaultInstance(); - FileOptions::default_instance_->InitAsDefaultInstance(); - MessageOptions::default_instance_->InitAsDefaultInstance(); - FieldOptions::default_instance_->InitAsDefaultInstance(); - EnumOptions::default_instance_->InitAsDefaultInstance(); - EnumValueOptions::default_instance_->InitAsDefaultInstance(); - ServiceOptions::default_instance_->InitAsDefaultInstance(); - MethodOptions::default_instance_->InitAsDefaultInstance(); - UninterpretedOption::default_instance_->InitAsDefaultInstance(); - UninterpretedOption_NamePart::default_instance_->InitAsDefaultInstance(); - SourceCodeInfo::default_instance_->InitAsDefaultInstance(); - SourceCodeInfo_Location::default_instance_->InitAsDefaultInstance(); - GeneratedCodeInfo::default_instance_->InitAsDefaultInstance(); - GeneratedCodeInfo_Annotation::default_instance_->InitAsDefaultInstance(); ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_google_2fprotobuf_2fdescriptor_2eproto); } +GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_once_); +void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() { + ::google::protobuf::GoogleOnceInit(&protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_once_, + &protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto_impl); +} // Force AddDescriptors() to be called at static initialization time. struct StaticDescriptorInitializer_google_2fprotobuf_2fdescriptor_2eproto { StaticDescriptorInitializer_google_2fprotobuf_2fdescriptor_2eproto() { protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); } } static_descriptor_initializer_google_2fprotobuf_2fdescriptor_2eproto_; +const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[0]; +} +bool FieldDescriptorProto_Type_IsValid(int value) { + switch (value) { + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + return true; + default: + return false; + } +} -namespace { +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_DOUBLE; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FLOAT; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BOOL; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_STRING; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_GROUP; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_MESSAGE; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BYTES; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_ENUM; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED64; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT32; +const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT64; +const FieldDescriptorProto_Type FieldDescriptorProto::Type_MIN; +const FieldDescriptorProto_Type FieldDescriptorProto::Type_MAX; +const int FieldDescriptorProto::Type_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[1]; +} +bool FieldDescriptorProto_Label_IsValid(int value) { + switch (value) { + case 1: + case 2: + case 3: + return true; + default: + return false; + } +} + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_OPTIONAL; +const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REQUIRED; +const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REPEATED; +const FieldDescriptorProto_Label FieldDescriptorProto::Label_MIN; +const FieldDescriptorProto_Label FieldDescriptorProto::Label_MAX; +const int FieldDescriptorProto::Label_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[2]; +} +bool FileOptions_OptimizeMode_IsValid(int value) { + switch (value) { + case 1: + case 2: + case 3: + return true; + default: + return false; + } +} -static void MergeFromFail(int line) GOOGLE_ATTRIBUTE_COLD; -static void MergeFromFail(int line) { - GOOGLE_CHECK(false) << __FILE__ << ":" << line; +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FileOptions_OptimizeMode FileOptions::SPEED; +const FileOptions_OptimizeMode FileOptions::CODE_SIZE; +const FileOptions_OptimizeMode FileOptions::LITE_RUNTIME; +const FileOptions_OptimizeMode FileOptions::OptimizeMode_MIN; +const FileOptions_OptimizeMode FileOptions::OptimizeMode_MAX; +const int FileOptions::OptimizeMode_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[3]; +} +bool FieldOptions_CType_IsValid(int value) { + switch (value) { + case 0: + case 1: + case 2: + return true; + default: + return false; + } } -} // namespace +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldOptions_CType FieldOptions::STRING; +const FieldOptions_CType FieldOptions::CORD; +const FieldOptions_CType FieldOptions::STRING_PIECE; +const FieldOptions_CType FieldOptions::CType_MIN; +const FieldOptions_CType FieldOptions::CType_MAX; +const int FieldOptions::CType_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[4]; +} +bool FieldOptions_JSType_IsValid(int value) { + switch (value) { + case 0: + case 1: + case 2: + return true; + default: + return false; + } +} + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const FieldOptions_JSType FieldOptions::JS_NORMAL; +const FieldOptions_JSType FieldOptions::JS_STRING; +const FieldOptions_JSType FieldOptions::JS_NUMBER; +const FieldOptions_JSType FieldOptions::JSType_MIN; +const FieldOptions_JSType FieldOptions::JSType_MAX; +const int FieldOptions::JSType_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 +const ::google::protobuf::EnumDescriptor* MethodOptions_IdempotencyLevel_descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_enum_descriptors[5]; +} +bool MethodOptions_IdempotencyLevel_IsValid(int value) { + switch (value) { + case 0: + case 1: + case 2: + return true; + default: + return false; + } +} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENCY_UNKNOWN; +const MethodOptions_IdempotencyLevel MethodOptions::NO_SIDE_EFFECTS; +const MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENT; +const MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MIN; +const MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MAX; +const int MethodOptions::IdempotencyLevel_ARRAYSIZE; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 // =================================================================== @@ -888,24 +934,24 @@ const int FileDescriptorSet::kFileFieldNumber; FileDescriptorSet::FileDescriptorSet() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorSet) } - -void FileDescriptorSet::InitAsDefaultInstance() { -} - FileDescriptorSet::FileDescriptorSet(const FileDescriptorSet& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + file_(from.file_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorSet) } void FileDescriptorSet::SharedCtor() { _cached_size_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } FileDescriptorSet::~FileDescriptorSet() { @@ -914,8 +960,6 @@ FileDescriptorSet::~FileDescriptorSet() { } void FileDescriptorSet::SharedDtor() { - if (this != default_instance_) { - } } void FileDescriptorSet::SetCachedSize(int size) const { @@ -925,16 +969,14 @@ void FileDescriptorSet::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FileDescriptorSet::descriptor() { protobuf_AssignDescriptorsOnce(); - return FileDescriptorSet_descriptor_; + return file_level_metadata[0].descriptor; } const FileDescriptorSet& FileDescriptorSet::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FileDescriptorSet* FileDescriptorSet::default_instance_ = NULL; - FileDescriptorSet* FileDescriptorSet::New(::google::protobuf::Arena* arena) const { FileDescriptorSet* n = new FileDescriptorSet; if (arena != NULL) { @@ -946,10 +988,8 @@ FileDescriptorSet* FileDescriptorSet::New(::google::protobuf::Arena* arena) cons void FileDescriptorSet::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorSet) file_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FileDescriptorSet::MergePartialFromCodedStream( @@ -958,23 +998,20 @@ bool FileDescriptorSet::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorSet) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // repeated .google.protobuf.FileDescriptorProto file = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(input->IncrementRecursionDepth()); - parse_loop_file: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_file())); } else { goto handle_unusual; } - if (input->ExpectTag(10)) goto parse_loop_file; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -1016,14 +1053,15 @@ void FileDescriptorSet::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorSet) } -::google::protobuf::uint8* FileDescriptorSet::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FileDescriptorSet::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorSet) // repeated .google.protobuf.FileDescriptorProto file = 1; for (unsigned int i = 0, n = this->file_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->file(i), target); + InternalWriteMessageNoVirtualToArray( + 1, this->file(i), false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -1034,33 +1072,37 @@ ::google::protobuf::uint8* FileDescriptorSet::SerializeWithCachedSizesToArray( return target; } -int FileDescriptorSet::ByteSize() const { +size_t FileDescriptorSet::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorSet) - int total_size = 0; - - // repeated .google.protobuf.FileDescriptorProto file = 1; - total_size += 1 * this->file_size(); - for (int i = 0; i < this->file_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->file(i)); - } + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.FileDescriptorProto file = 1; + { + unsigned int count = this->file_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->file(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileDescriptorSet) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FileDescriptorSet* source = + GOOGLE_DCHECK_NE(&from, this); + const FileDescriptorSet* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -1074,11 +1116,9 @@ void FileDescriptorSet::MergeFrom(const ::google::protobuf::Message& from) { void FileDescriptorSet::MergeFrom(const FileDescriptorSet& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorSet) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); file_.MergeFrom(from.file_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void FileDescriptorSet::CopyFrom(const ::google::protobuf::Message& from) { @@ -1096,7 +1136,6 @@ void FileDescriptorSet::CopyFrom(const FileDescriptorSet& from) { } bool FileDescriptorSet::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->file())) return false; return true; } @@ -1114,10 +1153,7 @@ void FileDescriptorSet::InternalSwap(FileDescriptorSet* other) { ::google::protobuf::Metadata FileDescriptorSet::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FileDescriptorSet_descriptor_; - metadata.reflection = FileDescriptorSet_reflection_; - return metadata; + return file_level_metadata[0]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -1174,32 +1210,57 @@ const int FileDescriptorProto::kSyntaxFieldNumber; FileDescriptorProto::FileDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FileDescriptorProto) } - -void FileDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::FileOptions*>(&::google::protobuf::FileOptions::default_instance()); - source_code_info_ = const_cast< ::google::protobuf::SourceCodeInfo*>(&::google::protobuf::SourceCodeInfo::default_instance()); -} - FileDescriptorProto::FileDescriptorProto(const FileDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + dependency_(from.dependency_), + public_dependency_(from.public_dependency_), + weak_dependency_(from.weak_dependency_), + message_type_(from.message_type_), + enum_type_(from.enum_type_), + service_(from.service_), + extension_(from.extension_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_package()) { + package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.package_); + } + syntax_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_syntax()) { + syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::FileOptions(*from.options_); + } else { + options_ = NULL; + } + if (from.has_source_code_info()) { + source_code_info_ = new ::google::protobuf::SourceCodeInfo(*from.source_code_info_); + } else { + source_code_info_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorProto) } void FileDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - options_ = NULL; - source_code_info_ = NULL; syntax_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&source_code_info_) - + reinterpret_cast(&options_) + sizeof(source_code_info_)); } FileDescriptorProto::~FileDescriptorProto() { @@ -1211,8 +1272,10 @@ void FileDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); syntax_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; + } + if (this != internal_default_instance()) { delete source_code_info_; } } @@ -1224,16 +1287,14 @@ void FileDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FileDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return FileDescriptorProto_descriptor_; + return file_level_metadata[1].descriptor; } const FileDescriptorProto& FileDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FileDescriptorProto* FileDescriptorProto::default_instance_ = NULL; - FileDescriptorProto* FileDescriptorProto::New(::google::protobuf::Arena* arena) const { FileDescriptorProto* n = new FileDescriptorProto; if (arena != NULL) { @@ -1244,36 +1305,37 @@ FileDescriptorProto* FileDescriptorProto::New(::google::protobuf::Arena* arena) void FileDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorProto) - if (_has_bits_[0 / 32] & 3u) { + dependency_.Clear(); + public_dependency_.Clear(); + weak_dependency_.Clear(); + message_type_.Clear(); + enum_type_.Clear(); + service_.Clear(); + extension_.Clear(); + if (_has_bits_[0 / 32] & 31u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_package()) { - package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*package_.UnsafeRawStringPointer())->clear(); + } + if (has_syntax()) { + GOOGLE_DCHECK(!syntax_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*syntax_.UnsafeRawStringPointer())->clear(); } - } - if (_has_bits_[8 / 32] & 3584u) { if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::FileOptions::Clear(); } if (has_source_code_info()) { - if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear(); - } - if (has_syntax()) { - syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(source_code_info_ != NULL); + source_code_info_->::google::protobuf::SourceCodeInfo::Clear(); } } - dependency_.Clear(); - public_dependency_.Clear(); - weak_dependency_.Clear(); - message_type_.Clear(); - enum_type_.Clear(); - service_.Clear(); - extension_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FileDescriptorProto::MergePartialFromCodedStream( @@ -1282,13 +1344,13 @@ bool FileDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FileDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1298,14 +1360,12 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_package; break; } // optional string package = 2; case 2: { - if (tag == 18) { - parse_package: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_package())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1315,14 +1375,12 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_dependency; break; } // repeated string dependency = 3; case 3: { - if (tag == 26) { - parse_dependency: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->add_dependency())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1333,144 +1391,118 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_dependency; - if (input->ExpectTag(34)) goto parse_message_type; break; } // repeated .google.protobuf.DescriptorProto message_type = 4; case 4: { - if (tag == 34) { - parse_message_type: + if (tag == 34u) { DO_(input->IncrementRecursionDepth()); - parse_loop_message_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_message_type())); } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_loop_message_type; - if (input->ExpectTag(42)) goto parse_loop_enum_type; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.EnumDescriptorProto enum_type = 5; case 5: { - if (tag == 42) { + if (tag == 42u) { DO_(input->IncrementRecursionDepth()); - parse_loop_enum_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_enum_type())); } else { goto handle_unusual; } - if (input->ExpectTag(42)) goto parse_loop_enum_type; - if (input->ExpectTag(50)) goto parse_loop_service; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.ServiceDescriptorProto service = 6; case 6: { - if (tag == 50) { + if (tag == 50u) { DO_(input->IncrementRecursionDepth()); - parse_loop_service: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_service())); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_loop_service; - if (input->ExpectTag(58)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.FieldDescriptorProto extension = 7; case 7: { - if (tag == 58) { + if (tag == 58u) { DO_(input->IncrementRecursionDepth()); - parse_loop_extension: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_extension())); } else { goto handle_unusual; } - if (input->ExpectTag(58)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(66)) goto parse_options; break; } // optional .google.protobuf.FileOptions options = 8; case 8: { - if (tag == 66) { - parse_options: + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(74)) goto parse_source_code_info; break; } // optional .google.protobuf.SourceCodeInfo source_code_info = 9; case 9: { - if (tag == 74) { - parse_source_code_info: + if (tag == 74u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_source_code_info())); } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_public_dependency; break; } // repeated int32 public_dependency = 10; case 10: { - if (tag == 80) { - parse_public_dependency: + if (tag == 80u) { DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 80, input, this->mutable_public_dependency()))); - } else if (tag == 82) { + 1, 80u, input, this->mutable_public_dependency()))); + } else if (tag == 82u) { DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, this->mutable_public_dependency()))); } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_public_dependency; - if (input->ExpectTag(88)) goto parse_weak_dependency; break; } // repeated int32 weak_dependency = 11; case 11: { - if (tag == 88) { - parse_weak_dependency: + if (tag == 88u) { DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 88, input, this->mutable_weak_dependency()))); - } else if (tag == 90) { + 1, 88u, input, this->mutable_weak_dependency()))); + } else if (tag == 90u) { DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, this->mutable_weak_dependency()))); } else { goto handle_unusual; } - if (input->ExpectTag(88)) goto parse_weak_dependency; - if (input->ExpectTag(98)) goto parse_syntax; break; } // optional string syntax = 12; case 12: { - if (tag == 98) { - parse_syntax: + if (tag == 98u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_syntax())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -1480,7 +1512,6 @@ bool FileDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -1604,8 +1635,9 @@ void FileDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FileDescriptorProto) } -::google::protobuf::uint8* FileDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FileDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorProto) // optional string name = 1; if (has_name()) { @@ -1642,43 +1674,43 @@ ::google::protobuf::uint8* FileDescriptorProto::SerializeWithCachedSizesToArray( // repeated .google.protobuf.DescriptorProto message_type = 4; for (unsigned int i = 0, n = this->message_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 4, this->message_type(i), target); + InternalWriteMessageNoVirtualToArray( + 4, this->message_type(i), false, target); } // repeated .google.protobuf.EnumDescriptorProto enum_type = 5; for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 5, this->enum_type(i), target); + InternalWriteMessageNoVirtualToArray( + 5, this->enum_type(i), false, target); } // repeated .google.protobuf.ServiceDescriptorProto service = 6; for (unsigned int i = 0, n = this->service_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 6, this->service(i), target); + InternalWriteMessageNoVirtualToArray( + 6, this->service(i), false, target); } // repeated .google.protobuf.FieldDescriptorProto extension = 7; for (unsigned int i = 0, n = this->extension_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 7, this->extension(i), target); + InternalWriteMessageNoVirtualToArray( + 7, this->extension(i), false, target); } // optional .google.protobuf.FileOptions options = 8; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 8, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 8, *this->options_, false, target); } // optional .google.protobuf.SourceCodeInfo source_code_info = 9; if (has_source_code_info()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 9, *this->source_code_info_, target); + InternalWriteMessageNoVirtualToArray( + 9, *this->source_code_info_, false, target); } // repeated int32 public_dependency = 10; @@ -1712,51 +1744,18 @@ ::google::protobuf::uint8* FileDescriptorProto::SerializeWithCachedSizesToArray( return target; } -int FileDescriptorProto::ByteSize() const { +size_t FileDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorProto) - int total_size = 0; - - if (_has_bits_[0 / 32] & 3u) { - // optional string name = 1; - if (has_name()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); - } - - // optional string package = 2; - if (has_package()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->package()); - } - - } - if (_has_bits_[9 / 32] & 3584u) { - // optional .google.protobuf.FileOptions options = 8; - if (has_options()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->options_); - } - - // optional .google.protobuf.SourceCodeInfo source_code_info = 9; - if (has_source_code_info()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->source_code_info_); - } - - // optional string syntax = 12; - if (has_syntax()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->syntax()); - } + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); } // repeated string dependency = 3; - total_size += 1 * this->dependency_size(); + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->dependency_size()); for (int i = 0; i < this->dependency_size(); i++) { total_size += ::google::protobuf::internal::WireFormatLite::StringSize( this->dependency(i)); @@ -1764,71 +1763,122 @@ int FileDescriptorProto::ByteSize() const { // repeated int32 public_dependency = 10; { - int data_size = 0; - for (int i = 0; i < this->public_dependency_size(); i++) { + size_t data_size = 0; + unsigned int count = this->public_dependency_size(); + for (unsigned int i = 0; i < count; i++) { data_size += ::google::protobuf::internal::WireFormatLite:: Int32Size(this->public_dependency(i)); } - total_size += 1 * this->public_dependency_size() + data_size; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->public_dependency_size()); + total_size += data_size; } // repeated int32 weak_dependency = 11; { - int data_size = 0; - for (int i = 0; i < this->weak_dependency_size(); i++) { + size_t data_size = 0; + unsigned int count = this->weak_dependency_size(); + for (unsigned int i = 0; i < count; i++) { data_size += ::google::protobuf::internal::WireFormatLite:: Int32Size(this->weak_dependency(i)); } - total_size += 1 * this->weak_dependency_size() + data_size; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->weak_dependency_size()); + total_size += data_size; } // repeated .google.protobuf.DescriptorProto message_type = 4; - total_size += 1 * this->message_type_size(); - for (int i = 0; i < this->message_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->message_type(i)); + { + unsigned int count = this->message_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->message_type(i)); + } } // repeated .google.protobuf.EnumDescriptorProto enum_type = 5; - total_size += 1 * this->enum_type_size(); - for (int i = 0; i < this->enum_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->enum_type(i)); + { + unsigned int count = this->enum_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->enum_type(i)); + } } // repeated .google.protobuf.ServiceDescriptorProto service = 6; - total_size += 1 * this->service_size(); - for (int i = 0; i < this->service_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->service(i)); + { + unsigned int count = this->service_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->service(i)); + } } // repeated .google.protobuf.FieldDescriptorProto extension = 7; - total_size += 1 * this->extension_size(); - for (int i = 0; i < this->extension_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->extension(i)); + { + unsigned int count = this->extension_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->extension(i)); + } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); + if (_has_bits_[0 / 32] & 31u) { + // optional string name = 1; + if (has_name()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + // optional string package = 2; + if (has_package()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->package()); + } + + // optional string syntax = 12; + if (has_syntax()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->syntax()); + } + + // optional .google.protobuf.FileOptions options = 8; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->options_); + } + + // optional .google.protobuf.SourceCodeInfo source_code_info = 9; + if (has_source_code_info()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->source_code_info_); + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FileDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const FileDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -1842,7 +1892,8 @@ void FileDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); dependency_.MergeFrom(from.dependency_); public_dependency_.MergeFrom(from.public_dependency_); weak_dependency_.MergeFrom(from.weak_dependency_); @@ -1850,7 +1901,7 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) { enum_type_.MergeFrom(from.enum_type_); service_.MergeFrom(from.service_); extension_.MergeFrom(from.extension_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 31u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -1859,21 +1910,16 @@ void FileDescriptorProto::MergeFrom(const FileDescriptorProto& from) { set_has_package(); package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.package_); } - } - if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) { + if (from.has_syntax()) { + set_has_syntax(); + syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_); + } if (from.has_options()) { mutable_options()->::google::protobuf::FileOptions::MergeFrom(from.options()); } if (from.has_source_code_info()) { mutable_source_code_info()->::google::protobuf::SourceCodeInfo::MergeFrom(from.source_code_info()); } - if (from.has_syntax()) { - set_has_syntax(); - syntax_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.syntax_); - } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } } @@ -1892,7 +1938,6 @@ void FileDescriptorProto::CopyFrom(const FileDescriptorProto& from) { } bool FileDescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->message_type())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->enum_type())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->service())) return false; @@ -1908,8 +1953,6 @@ void FileDescriptorProto::Swap(FileDescriptorProto* other) { InternalSwap(other); } void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) { - name_.Swap(&other->name_); - package_.Swap(&other->package_); dependency_.UnsafeArenaSwap(&other->dependency_); public_dependency_.UnsafeArenaSwap(&other->public_dependency_); weak_dependency_.UnsafeArenaSwap(&other->weak_dependency_); @@ -1917,9 +1960,11 @@ void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) { enum_type_.UnsafeArenaSwap(&other->enum_type_); service_.UnsafeArenaSwap(&other->service_); extension_.UnsafeArenaSwap(&other->extension_); + name_.Swap(&other->name_); + package_.Swap(&other->package_); + syntax_.Swap(&other->syntax_); std::swap(options_, other->options_); std::swap(source_code_info_, other->source_code_info_); - syntax_.Swap(&other->syntax_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -1927,10 +1972,7 @@ void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) { ::google::protobuf::Metadata FileDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FileDescriptorProto_descriptor_; - metadata.reflection = FileDescriptorProto_reflection_; - return metadata; + return file_level_metadata[1]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -1950,37 +1992,45 @@ void FileDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& FileDescriptorProto::name() const { +const ::std::string& FileDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void FileDescriptorProto::set_name(const ::std::string& value) { +void FileDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.name) } - void FileDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void FileDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileDescriptorProto.name) +} +#endif +void FileDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.name) } - void FileDescriptorProto::set_name(const char* value, size_t size) { +void FileDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.name) } - ::std::string* FileDescriptorProto::mutable_name() { +::std::string* FileDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileDescriptorProto::release_name() { +::std::string* FileDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileDescriptorProto::set_allocated_name(::std::string* name) { +void FileDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -2004,37 +2054,45 @@ void FileDescriptorProto::clear_package() { package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_package(); } - const ::std::string& FileDescriptorProto::package() const { +const ::std::string& FileDescriptorProto::package() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.package) - return package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return package_.GetNoArena(); } - void FileDescriptorProto::set_package(const ::std::string& value) { +void FileDescriptorProto::set_package(const ::std::string& value) { set_has_package(); package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.package) } - void FileDescriptorProto::set_package(const char* value) { +#if LANG_CXX11 +void FileDescriptorProto::set_package(::std::string&& value) { + set_has_package(); + package_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileDescriptorProto.package) +} +#endif +void FileDescriptorProto::set_package(const char* value) { set_has_package(); package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.package) } - void FileDescriptorProto::set_package(const char* value, size_t size) { +void FileDescriptorProto::set_package(const char* value, size_t size) { set_has_package(); package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.package) } - ::std::string* FileDescriptorProto::mutable_package() { +::std::string* FileDescriptorProto::mutable_package() { set_has_package(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.package) return package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileDescriptorProto::release_package() { +::std::string* FileDescriptorProto::release_package() { // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.package) clear_has_package(); return package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileDescriptorProto::set_allocated_package(::std::string* package) { +void FileDescriptorProto::set_allocated_package(::std::string* package) { if (package != NULL) { set_has_package(); } else { @@ -2051,49 +2109,49 @@ int FileDescriptorProto::dependency_size() const { void FileDescriptorProto::clear_dependency() { dependency_.Clear(); } - const ::std::string& FileDescriptorProto::dependency(int index) const { +const ::std::string& FileDescriptorProto::dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.dependency) return dependency_.Get(index); } - ::std::string* FileDescriptorProto::mutable_dependency(int index) { +::std::string* FileDescriptorProto::mutable_dependency(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.dependency) return dependency_.Mutable(index); } - void FileDescriptorProto::set_dependency(int index, const ::std::string& value) { +void FileDescriptorProto::set_dependency(int index, const ::std::string& value) { // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.dependency) dependency_.Mutable(index)->assign(value); } - void FileDescriptorProto::set_dependency(int index, const char* value) { +void FileDescriptorProto::set_dependency(int index, const char* value) { dependency_.Mutable(index)->assign(value); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.dependency) } - void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) { +void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) { dependency_.Mutable(index)->assign( reinterpret_cast(value), size); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.dependency) } - ::std::string* FileDescriptorProto::add_dependency() { +::std::string* FileDescriptorProto::add_dependency() { // @@protoc_insertion_point(field_add_mutable:google.protobuf.FileDescriptorProto.dependency) return dependency_.Add(); } - void FileDescriptorProto::add_dependency(const ::std::string& value) { +void FileDescriptorProto::add_dependency(const ::std::string& value) { dependency_.Add()->assign(value); // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency) } - void FileDescriptorProto::add_dependency(const char* value) { +void FileDescriptorProto::add_dependency(const char* value) { dependency_.Add()->assign(value); // @@protoc_insertion_point(field_add_char:google.protobuf.FileDescriptorProto.dependency) } - void FileDescriptorProto::add_dependency(const char* value, size_t size) { +void FileDescriptorProto::add_dependency(const char* value, size_t size) { dependency_.Add()->assign(reinterpret_cast(value), size); // @@protoc_insertion_point(field_add_pointer:google.protobuf.FileDescriptorProto.dependency) } - const ::google::protobuf::RepeatedPtrField< ::std::string>& +const ::google::protobuf::RepeatedPtrField< ::std::string>& FileDescriptorProto::dependency() const { // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.dependency) return dependency_; } - ::google::protobuf::RepeatedPtrField< ::std::string>* +::google::protobuf::RepeatedPtrField< ::std::string>* FileDescriptorProto::mutable_dependency() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.dependency) return &dependency_; @@ -2106,24 +2164,24 @@ int FileDescriptorProto::public_dependency_size() const { void FileDescriptorProto::clear_public_dependency() { public_dependency_.Clear(); } - ::google::protobuf::int32 FileDescriptorProto::public_dependency(int index) const { +::google::protobuf::int32 FileDescriptorProto::public_dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.public_dependency) return public_dependency_.Get(index); } - void FileDescriptorProto::set_public_dependency(int index, ::google::protobuf::int32 value) { +void FileDescriptorProto::set_public_dependency(int index, ::google::protobuf::int32 value) { public_dependency_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.public_dependency) } - void FileDescriptorProto::add_public_dependency(::google::protobuf::int32 value) { +void FileDescriptorProto::add_public_dependency(::google::protobuf::int32 value) { public_dependency_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.public_dependency) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& FileDescriptorProto::public_dependency() const { // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.public_dependency) return public_dependency_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* FileDescriptorProto::mutable_public_dependency() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.public_dependency) return &public_dependency_; @@ -2136,24 +2194,24 @@ int FileDescriptorProto::weak_dependency_size() const { void FileDescriptorProto::clear_weak_dependency() { weak_dependency_.Clear(); } - ::google::protobuf::int32 FileDescriptorProto::weak_dependency(int index) const { +::google::protobuf::int32 FileDescriptorProto::weak_dependency(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.weak_dependency) return weak_dependency_.Get(index); } - void FileDescriptorProto::set_weak_dependency(int index, ::google::protobuf::int32 value) { +void FileDescriptorProto::set_weak_dependency(int index, ::google::protobuf::int32 value) { weak_dependency_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.weak_dependency) } - void FileDescriptorProto::add_weak_dependency(::google::protobuf::int32 value) { +void FileDescriptorProto::add_weak_dependency(::google::protobuf::int32 value) { weak_dependency_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.weak_dependency) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& FileDescriptorProto::weak_dependency() const { // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.weak_dependency) return weak_dependency_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* FileDescriptorProto::mutable_weak_dependency() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.weak_dependency) return &weak_dependency_; @@ -2281,13 +2339,13 @@ FileDescriptorProto::extension() const { // optional .google.protobuf.FileOptions options = 8; bool FileDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } void FileDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000008u; } void FileDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000008u; } void FileDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::FileOptions::Clear(); @@ -2295,7 +2353,8 @@ void FileDescriptorProto::clear_options() { } const ::google::protobuf::FileOptions& FileDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::FileOptions::internal_default_instance(); } ::google::protobuf::FileOptions* FileDescriptorProto::mutable_options() { set_has_options(); @@ -2325,13 +2384,13 @@ void FileDescriptorProto::set_allocated_options(::google::protobuf::FileOptions* // optional .google.protobuf.SourceCodeInfo source_code_info = 9; bool FileDescriptorProto::has_source_code_info() const { - return (_has_bits_[0] & 0x00000400u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } void FileDescriptorProto::set_has_source_code_info() { - _has_bits_[0] |= 0x00000400u; + _has_bits_[0] |= 0x00000010u; } void FileDescriptorProto::clear_has_source_code_info() { - _has_bits_[0] &= ~0x00000400u; + _has_bits_[0] &= ~0x00000010u; } void FileDescriptorProto::clear_source_code_info() { if (source_code_info_ != NULL) source_code_info_->::google::protobuf::SourceCodeInfo::Clear(); @@ -2339,7 +2398,8 @@ void FileDescriptorProto::clear_source_code_info() { } const ::google::protobuf::SourceCodeInfo& FileDescriptorProto::source_code_info() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.source_code_info) - return source_code_info_ != NULL ? *source_code_info_ : *default_instance_->source_code_info_; + return source_code_info_ != NULL ? *source_code_info_ + : *::google::protobuf::SourceCodeInfo::internal_default_instance(); } ::google::protobuf::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() { set_has_source_code_info(); @@ -2369,49 +2429,57 @@ void FileDescriptorProto::set_allocated_source_code_info(::google::protobuf::Sou // optional string syntax = 12; bool FileDescriptorProto::has_syntax() const { - return (_has_bits_[0] & 0x00000800u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FileDescriptorProto::set_has_syntax() { - _has_bits_[0] |= 0x00000800u; + _has_bits_[0] |= 0x00000004u; } void FileDescriptorProto::clear_has_syntax() { - _has_bits_[0] &= ~0x00000800u; + _has_bits_[0] &= ~0x00000004u; } void FileDescriptorProto::clear_syntax() { syntax_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_syntax(); } - const ::std::string& FileDescriptorProto::syntax() const { +const ::std::string& FileDescriptorProto::syntax() const { // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.syntax) - return syntax_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return syntax_.GetNoArena(); } - void FileDescriptorProto::set_syntax(const ::std::string& value) { +void FileDescriptorProto::set_syntax(const ::std::string& value) { set_has_syntax(); syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.syntax) } - void FileDescriptorProto::set_syntax(const char* value) { +#if LANG_CXX11 +void FileDescriptorProto::set_syntax(::std::string&& value) { + set_has_syntax(); + syntax_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileDescriptorProto.syntax) +} +#endif +void FileDescriptorProto::set_syntax(const char* value) { set_has_syntax(); syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.syntax) } - void FileDescriptorProto::set_syntax(const char* value, size_t size) { +void FileDescriptorProto::set_syntax(const char* value, size_t size) { set_has_syntax(); syntax_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.syntax) } - ::std::string* FileDescriptorProto::mutable_syntax() { +::std::string* FileDescriptorProto::mutable_syntax() { set_has_syntax(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.syntax) return syntax_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileDescriptorProto::release_syntax() { +::std::string* FileDescriptorProto::release_syntax() { // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.syntax) clear_has_syntax(); return syntax_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) { +void FileDescriptorProto::set_allocated_syntax(::std::string* syntax) { if (syntax != NULL) { set_has_syntax(); } else { @@ -2432,26 +2500,28 @@ const int DescriptorProto_ExtensionRange::kEndFieldNumber; DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto.ExtensionRange) } - -void DescriptorProto_ExtensionRange::InitAsDefaultInstance() { -} - DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(const DescriptorProto_ExtensionRange& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::memcpy(&start_, &from.start_, + reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ExtensionRange) } void DescriptorProto_ExtensionRange::SharedCtor() { _cached_size_ = 0; - start_ = 0; - end_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() { @@ -2460,8 +2530,6 @@ DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() { } void DescriptorProto_ExtensionRange::SharedDtor() { - if (this != default_instance_) { - } } void DescriptorProto_ExtensionRange::SetCachedSize(int size) const { @@ -2471,16 +2539,14 @@ void DescriptorProto_ExtensionRange::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* DescriptorProto_ExtensionRange::descriptor() { protobuf_AssignDescriptorsOnce(); - return DescriptorProto_ExtensionRange_descriptor_; + return file_level_metadata[2].descriptor; } const DescriptorProto_ExtensionRange& DescriptorProto_ExtensionRange::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::default_instance_ = NULL; - DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::New(::google::protobuf::Arena* arena) const { DescriptorProto_ExtensionRange* n = new DescriptorProto_ExtensionRange; if (arena != NULL) { @@ -2491,31 +2557,12 @@ DescriptorProto_ExtensionRange* DescriptorProto_ExtensionRange::New(::google::pr void DescriptorProto_ExtensionRange::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ExtensionRange) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(DescriptorProto_ExtensionRange, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(start_, end_); - -#undef ZR_HELPER_ -#undef ZR_ - - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream( @@ -2524,36 +2571,33 @@ bool DescriptorProto_ExtensionRange::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ExtensionRange) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional int32 start = 1; case 1: { - if (tag == 8) { + if (tag == 8u) { + set_has_start(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &start_))); - set_has_start(); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_end; break; } // optional int32 end = 2; case 2: { - if (tag == 16) { - parse_end: + if (tag == 16u) { + set_has_end(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &end_))); - set_has_end(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -2599,8 +2643,9 @@ void DescriptorProto_ExtensionRange::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ExtensionRange) } -::google::protobuf::uint8* DescriptorProto_ExtensionRange::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* DescriptorProto_ExtensionRange::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ExtensionRange) // optional int32 start = 1; if (has_start()) { @@ -2620,10 +2665,15 @@ ::google::protobuf::uint8* DescriptorProto_ExtensionRange::SerializeWithCachedSi return target; } -int DescriptorProto_ExtensionRange::ByteSize() const { +size_t DescriptorProto_ExtensionRange::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ExtensionRange) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 3u) { // optional int32 start = 1; if (has_start()) { @@ -2640,21 +2690,17 @@ int DescriptorProto_ExtensionRange::ByteSize() const { } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto.ExtensionRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const DescriptorProto_ExtensionRange* source = + GOOGLE_DCHECK_NE(&from, this); + const DescriptorProto_ExtensionRange* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -2668,8 +2714,9 @@ void DescriptorProto_ExtensionRange::MergeFrom(const ::google::protobuf::Message void DescriptorProto_ExtensionRange::MergeFrom(const DescriptorProto_ExtensionRange& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ExtensionRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { if (from.has_start()) { set_start(from.start()); } @@ -2677,9 +2724,6 @@ void DescriptorProto_ExtensionRange::MergeFrom(const DescriptorProto_ExtensionRa set_end(from.end()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void DescriptorProto_ExtensionRange::CopyFrom(const ::google::protobuf::Message& from) { @@ -2697,7 +2741,6 @@ void DescriptorProto_ExtensionRange::CopyFrom(const DescriptorProto_ExtensionRan } bool DescriptorProto_ExtensionRange::IsInitialized() const { - return true; } @@ -2715,14 +2758,63 @@ void DescriptorProto_ExtensionRange::InternalSwap(DescriptorProto_ExtensionRange ::google::protobuf::Metadata DescriptorProto_ExtensionRange::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = DescriptorProto_ExtensionRange_descriptor_; - metadata.reflection = DescriptorProto_ExtensionRange_reflection_; - return metadata; + return file_level_metadata[2]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// DescriptorProto_ExtensionRange + +// optional int32 start = 1; +bool DescriptorProto_ExtensionRange::has_start() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void DescriptorProto_ExtensionRange::set_has_start() { + _has_bits_[0] |= 0x00000001u; +} +void DescriptorProto_ExtensionRange::clear_has_start() { + _has_bits_[0] &= ~0x00000001u; +} +void DescriptorProto_ExtensionRange::clear_start() { + start_ = 0; + clear_has_start(); +} +::google::protobuf::int32 DescriptorProto_ExtensionRange::start() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start) + return start_; +} +void DescriptorProto_ExtensionRange::set_start(::google::protobuf::int32 value) { + set_has_start(); + start_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start) +} + +// optional int32 end = 2; +bool DescriptorProto_ExtensionRange::has_end() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void DescriptorProto_ExtensionRange::set_has_end() { + _has_bits_[0] |= 0x00000002u; +} +void DescriptorProto_ExtensionRange::clear_has_end() { + _has_bits_[0] &= ~0x00000002u; +} +void DescriptorProto_ExtensionRange::clear_end() { + end_ = 0; + clear_has_end(); +} +::google::protobuf::int32 DescriptorProto_ExtensionRange::end() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.end) + return end_; +} +void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 value) { + set_has_end(); + end_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int DescriptorProto_ReservedRange::kStartFieldNumber; @@ -2731,26 +2823,28 @@ const int DescriptorProto_ReservedRange::kEndFieldNumber; DescriptorProto_ReservedRange::DescriptorProto_ReservedRange() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto.ReservedRange) } - -void DescriptorProto_ReservedRange::InitAsDefaultInstance() { -} - DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(const DescriptorProto_ReservedRange& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + ::memcpy(&start_, &from.start_, + reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ReservedRange) } void DescriptorProto_ReservedRange::SharedCtor() { _cached_size_ = 0; - start_ = 0; - end_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() { @@ -2759,8 +2853,6 @@ DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() { } void DescriptorProto_ReservedRange::SharedDtor() { - if (this != default_instance_) { - } } void DescriptorProto_ReservedRange::SetCachedSize(int size) const { @@ -2770,16 +2862,14 @@ void DescriptorProto_ReservedRange::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* DescriptorProto_ReservedRange::descriptor() { protobuf_AssignDescriptorsOnce(); - return DescriptorProto_ReservedRange_descriptor_; + return file_level_metadata[3].descriptor; } const DescriptorProto_ReservedRange& DescriptorProto_ReservedRange::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::default_instance_ = NULL; - DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::New(::google::protobuf::Arena* arena) const { DescriptorProto_ReservedRange* n = new DescriptorProto_ReservedRange; if (arena != NULL) { @@ -2790,31 +2880,12 @@ DescriptorProto_ReservedRange* DescriptorProto_ReservedRange::New(::google::prot void DescriptorProto_ReservedRange::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ReservedRange) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(DescriptorProto_ReservedRange, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(start_, end_); - -#undef ZR_HELPER_ -#undef ZR_ - - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + ::memset(&start_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&start_) + sizeof(end_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool DescriptorProto_ReservedRange::MergePartialFromCodedStream( @@ -2823,36 +2894,33 @@ bool DescriptorProto_ReservedRange::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto.ReservedRange) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional int32 start = 1; case 1: { - if (tag == 8) { + if (tag == 8u) { + set_has_start(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &start_))); - set_has_start(); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_end; break; } // optional int32 end = 2; case 2: { - if (tag == 16) { - parse_end: + if (tag == 16u) { + set_has_end(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &end_))); - set_has_end(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -2898,8 +2966,9 @@ void DescriptorProto_ReservedRange::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto.ReservedRange) } -::google::protobuf::uint8* DescriptorProto_ReservedRange::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* DescriptorProto_ReservedRange::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ReservedRange) // optional int32 start = 1; if (has_start()) { @@ -2919,10 +2988,15 @@ ::google::protobuf::uint8* DescriptorProto_ReservedRange::SerializeWithCachedSiz return target; } -int DescriptorProto_ReservedRange::ByteSize() const { +size_t DescriptorProto_ReservedRange::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ReservedRange) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 3u) { // optional int32 start = 1; if (has_start()) { @@ -2939,21 +3013,17 @@ int DescriptorProto_ReservedRange::ByteSize() const { } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void DescriptorProto_ReservedRange::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto.ReservedRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const DescriptorProto_ReservedRange* source = + GOOGLE_DCHECK_NE(&from, this); + const DescriptorProto_ReservedRange* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -2967,8 +3037,9 @@ void DescriptorProto_ReservedRange::MergeFrom(const ::google::protobuf::Message& void DescriptorProto_ReservedRange::MergeFrom(const DescriptorProto_ReservedRange& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ReservedRange) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { if (from.has_start()) { set_start(from.start()); } @@ -2976,9 +3047,6 @@ void DescriptorProto_ReservedRange::MergeFrom(const DescriptorProto_ReservedRang set_end(from.end()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void DescriptorProto_ReservedRange::CopyFrom(const ::google::protobuf::Message& from) { @@ -2996,7 +3064,6 @@ void DescriptorProto_ReservedRange::CopyFrom(const DescriptorProto_ReservedRange } bool DescriptorProto_ReservedRange::IsInitialized() const { - return true; } @@ -3014,14 +3081,63 @@ void DescriptorProto_ReservedRange::InternalSwap(DescriptorProto_ReservedRange* ::google::protobuf::Metadata DescriptorProto_ReservedRange::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = DescriptorProto_ReservedRange_descriptor_; - metadata.reflection = DescriptorProto_ReservedRange_reflection_; - return metadata; + return file_level_metadata[3]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// DescriptorProto_ReservedRange + +// optional int32 start = 1; +bool DescriptorProto_ReservedRange::has_start() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void DescriptorProto_ReservedRange::set_has_start() { + _has_bits_[0] |= 0x00000001u; +} +void DescriptorProto_ReservedRange::clear_has_start() { + _has_bits_[0] &= ~0x00000001u; +} +void DescriptorProto_ReservedRange::clear_start() { + start_ = 0; + clear_has_start(); +} +::google::protobuf::int32 DescriptorProto_ReservedRange::start() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start) + return start_; +} +void DescriptorProto_ReservedRange::set_start(::google::protobuf::int32 value) { + set_has_start(); + start_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start) +} + +// optional int32 end = 2; +bool DescriptorProto_ReservedRange::has_end() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void DescriptorProto_ReservedRange::set_has_end() { + _has_bits_[0] |= 0x00000002u; +} +void DescriptorProto_ReservedRange::clear_has_end() { + _has_bits_[0] &= ~0x00000002u; +} +void DescriptorProto_ReservedRange::clear_end() { + end_ = 0; + clear_has_end(); +} +::google::protobuf::int32 DescriptorProto_ReservedRange::end() const { + // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.end) + return end_; +} +void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 value) { + set_has_end(); + end_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int DescriptorProto::kNameFieldNumber; @@ -3038,28 +3154,42 @@ const int DescriptorProto::kReservedNameFieldNumber; DescriptorProto::DescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.DescriptorProto) } - -void DescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::MessageOptions*>(&::google::protobuf::MessageOptions::default_instance()); -} - DescriptorProto::DescriptorProto(const DescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + field_(from.field_), + extension_(from.extension_), + nested_type_(from.nested_type_), + enum_type_(from.enum_type_), + extension_range_(from.extension_range_), + oneof_decl_(from.oneof_decl_), + reserved_range_(from.reserved_range_), + reserved_name_(from.reserved_name_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::MessageOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto) } void DescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } DescriptorProto::~DescriptorProto() { @@ -3069,7 +3199,7 @@ DescriptorProto::~DescriptorProto() { void DescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -3081,16 +3211,14 @@ void DescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* DescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return DescriptorProto_descriptor_; + return file_level_metadata[4].descriptor; } const DescriptorProto& DescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -DescriptorProto* DescriptorProto::default_instance_ = NULL; - DescriptorProto* DescriptorProto::New(::google::protobuf::Arena* arena) const { DescriptorProto* n = new DescriptorProto; if (arena != NULL) { @@ -3101,14 +3229,6 @@ DescriptorProto* DescriptorProto::New(::google::protobuf::Arena* arena) const { void DescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto) - if (_has_bits_[0 / 32] & 129u) { - if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear(); - } - } field_.Clear(); extension_.Clear(); nested_type_.Clear(); @@ -3117,10 +3237,18 @@ void DescriptorProto::Clear() { oneof_decl_.Clear(); reserved_range_.Clear(); reserved_name_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + if (has_name()) { + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); + } + if (has_options()) { + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::MessageOptions::Clear(); + } } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool DescriptorProto::MergePartialFromCodedStream( @@ -3129,13 +3257,13 @@ bool DescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.DescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3145,141 +3273,114 @@ bool DescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_field; break; } // repeated .google.protobuf.FieldDescriptorProto field = 2; case 2: { - if (tag == 18) { - parse_field: + if (tag == 18u) { DO_(input->IncrementRecursionDepth()); - parse_loop_field: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_field())); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_loop_field; - if (input->ExpectTag(26)) goto parse_loop_nested_type; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.DescriptorProto nested_type = 3; case 3: { - if (tag == 26) { + if (tag == 26u) { DO_(input->IncrementRecursionDepth()); - parse_loop_nested_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_nested_type())); } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_loop_nested_type; - if (input->ExpectTag(34)) goto parse_loop_enum_type; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.EnumDescriptorProto enum_type = 4; case 4: { - if (tag == 34) { + if (tag == 34u) { DO_(input->IncrementRecursionDepth()); - parse_loop_enum_type: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_enum_type())); } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_loop_enum_type; - if (input->ExpectTag(42)) goto parse_loop_extension_range; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; case 5: { - if (tag == 42) { + if (tag == 42u) { DO_(input->IncrementRecursionDepth()); - parse_loop_extension_range: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_extension_range())); } else { goto handle_unusual; } - if (input->ExpectTag(42)) goto parse_loop_extension_range; - if (input->ExpectTag(50)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.FieldDescriptorProto extension = 6; case 6: { - if (tag == 50) { + if (tag == 50u) { DO_(input->IncrementRecursionDepth()); - parse_loop_extension: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_extension())); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_loop_extension; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(58)) goto parse_options; break; } // optional .google.protobuf.MessageOptions options = 7; case 7: { - if (tag == 58) { - parse_options: + if (tag == 58u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_oneof_decl; break; } // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; case 8: { - if (tag == 66) { - parse_oneof_decl: + if (tag == 66u) { DO_(input->IncrementRecursionDepth()); - parse_loop_oneof_decl: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_oneof_decl())); } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_loop_oneof_decl; - if (input->ExpectTag(74)) goto parse_loop_reserved_range; input->UnsafeDecrementRecursionDepth(); break; } // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9; case 9: { - if (tag == 74) { + if (tag == 74u) { DO_(input->IncrementRecursionDepth()); - parse_loop_reserved_range: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_reserved_range())); } else { goto handle_unusual; } - if (input->ExpectTag(74)) goto parse_loop_reserved_range; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(82)) goto parse_reserved_name; break; } // repeated string reserved_name = 10; case 10: { - if (tag == 82) { - parse_reserved_name: + if (tag == 82u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->add_reserved_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -3290,8 +3391,6 @@ bool DescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(82)) goto parse_reserved_name; - if (input->ExpectAtEnd()) goto success; break; } @@ -3395,8 +3494,9 @@ void DescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.DescriptorProto) } -::google::protobuf::uint8* DescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* DescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto) // optional string name = 1; if (has_name()) { @@ -3412,57 +3512,57 @@ ::google::protobuf::uint8* DescriptorProto::SerializeWithCachedSizesToArray( // repeated .google.protobuf.FieldDescriptorProto field = 2; for (unsigned int i = 0, n = this->field_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->field(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->field(i), false, target); } // repeated .google.protobuf.DescriptorProto nested_type = 3; for (unsigned int i = 0, n = this->nested_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, this->nested_type(i), target); + InternalWriteMessageNoVirtualToArray( + 3, this->nested_type(i), false, target); } // repeated .google.protobuf.EnumDescriptorProto enum_type = 4; for (unsigned int i = 0, n = this->enum_type_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 4, this->enum_type(i), target); + InternalWriteMessageNoVirtualToArray( + 4, this->enum_type(i), false, target); } // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; for (unsigned int i = 0, n = this->extension_range_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 5, this->extension_range(i), target); + InternalWriteMessageNoVirtualToArray( + 5, this->extension_range(i), false, target); } // repeated .google.protobuf.FieldDescriptorProto extension = 6; for (unsigned int i = 0, n = this->extension_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 6, this->extension(i), target); + InternalWriteMessageNoVirtualToArray( + 6, this->extension(i), false, target); } // optional .google.protobuf.MessageOptions options = 7; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 7, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 7, *this->options_, false, target); } // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; for (unsigned int i = 0, n = this->oneof_decl_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 8, this->oneof_decl(i), target); + InternalWriteMessageNoVirtualToArray( + 8, this->oneof_decl(i), false, target); } // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9; for (unsigned int i = 0, n = this->reserved_range_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 9, this->reserved_range(i), target); + InternalWriteMessageNoVirtualToArray( + 9, this->reserved_range(i), false, target); } // repeated string reserved_name = 10; @@ -3483,104 +3583,127 @@ ::google::protobuf::uint8* DescriptorProto::SerializeWithCachedSizesToArray( return target; } -int DescriptorProto::ByteSize() const { +size_t DescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto) - int total_size = 0; - - if (_has_bits_[0 / 32] & 129u) { - // optional string name = 1; - if (has_name()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); - } - - // optional .google.protobuf.MessageOptions options = 7; - if (has_options()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - *this->options_); - } + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); } // repeated .google.protobuf.FieldDescriptorProto field = 2; - total_size += 1 * this->field_size(); - for (int i = 0; i < this->field_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->field(i)); + { + unsigned int count = this->field_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->field(i)); + } } // repeated .google.protobuf.FieldDescriptorProto extension = 6; - total_size += 1 * this->extension_size(); - for (int i = 0; i < this->extension_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->extension(i)); + { + unsigned int count = this->extension_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->extension(i)); + } } // repeated .google.protobuf.DescriptorProto nested_type = 3; - total_size += 1 * this->nested_type_size(); - for (int i = 0; i < this->nested_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->nested_type(i)); + { + unsigned int count = this->nested_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->nested_type(i)); + } } // repeated .google.protobuf.EnumDescriptorProto enum_type = 4; - total_size += 1 * this->enum_type_size(); - for (int i = 0; i < this->enum_type_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->enum_type(i)); + { + unsigned int count = this->enum_type_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->enum_type(i)); + } } // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5; - total_size += 1 * this->extension_range_size(); - for (int i = 0; i < this->extension_range_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->extension_range(i)); + { + unsigned int count = this->extension_range_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->extension_range(i)); + } } // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8; - total_size += 1 * this->oneof_decl_size(); - for (int i = 0; i < this->oneof_decl_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->oneof_decl(i)); + { + unsigned int count = this->oneof_decl_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->oneof_decl(i)); + } } // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9; - total_size += 1 * this->reserved_range_size(); - for (int i = 0; i < this->reserved_range_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->reserved_range(i)); + { + unsigned int count = this->reserved_range_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->reserved_range(i)); + } } // repeated string reserved_name = 10; - total_size += 1 * this->reserved_name_size(); + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->reserved_name_size()); for (int i = 0; i < this->reserved_name_size(); i++) { total_size += ::google::protobuf::internal::WireFormatLite::StringSize( this->reserved_name(i)); } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); + if (_has_bits_[0 / 32] & 3u) { + // optional string name = 1; + if (has_name()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + // optional .google.protobuf.MessageOptions options = 7; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->options_); + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.DescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const DescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const DescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -3594,7 +3717,8 @@ void DescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void DescriptorProto::MergeFrom(const DescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); field_.MergeFrom(from.field_); extension_.MergeFrom(from.extension_); nested_type_.MergeFrom(from.nested_type_); @@ -3603,7 +3727,7 @@ void DescriptorProto::MergeFrom(const DescriptorProto& from) { oneof_decl_.MergeFrom(from.oneof_decl_); reserved_range_.MergeFrom(from.reserved_range_); reserved_name_.MergeFrom(from.reserved_name_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -3612,9 +3736,6 @@ void DescriptorProto::MergeFrom(const DescriptorProto& from) { mutable_options()->::google::protobuf::MessageOptions::MergeFrom(from.options()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void DescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -3632,11 +3753,11 @@ void DescriptorProto::CopyFrom(const DescriptorProto& from) { } bool DescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->field())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->extension())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->nested_type())) return false; if (!::google::protobuf::internal::AllAreInitialized(this->enum_type())) return false; + if (!::google::protobuf::internal::AllAreInitialized(this->oneof_decl())) return false; if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -3648,16 +3769,16 @@ void DescriptorProto::Swap(DescriptorProto* other) { InternalSwap(other); } void DescriptorProto::InternalSwap(DescriptorProto* other) { - name_.Swap(&other->name_); field_.UnsafeArenaSwap(&other->field_); extension_.UnsafeArenaSwap(&other->extension_); nested_type_.UnsafeArenaSwap(&other->nested_type_); enum_type_.UnsafeArenaSwap(&other->enum_type_); extension_range_.UnsafeArenaSwap(&other->extension_range_); oneof_decl_.UnsafeArenaSwap(&other->oneof_decl_); - std::swap(options_, other->options_); reserved_range_.UnsafeArenaSwap(&other->reserved_range_); reserved_name_.UnsafeArenaSwap(&other->reserved_name_); + name_.Swap(&other->name_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -3665,117 +3786,10 @@ void DescriptorProto::InternalSwap(DescriptorProto* other) { ::google::protobuf::Metadata DescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = DescriptorProto_descriptor_; - metadata.reflection = DescriptorProto_reflection_; - return metadata; + return file_level_metadata[4]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// DescriptorProto_ExtensionRange - -// optional int32 start = 1; -bool DescriptorProto_ExtensionRange::has_start() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -void DescriptorProto_ExtensionRange::set_has_start() { - _has_bits_[0] |= 0x00000001u; -} -void DescriptorProto_ExtensionRange::clear_has_start() { - _has_bits_[0] &= ~0x00000001u; -} -void DescriptorProto_ExtensionRange::clear_start() { - start_ = 0; - clear_has_start(); -} - ::google::protobuf::int32 DescriptorProto_ExtensionRange::start() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start) - return start_; -} - void DescriptorProto_ExtensionRange::set_start(::google::protobuf::int32 value) { - set_has_start(); - start_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start) -} - -// optional int32 end = 2; -bool DescriptorProto_ExtensionRange::has_end() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void DescriptorProto_ExtensionRange::set_has_end() { - _has_bits_[0] |= 0x00000002u; -} -void DescriptorProto_ExtensionRange::clear_has_end() { - _has_bits_[0] &= ~0x00000002u; -} -void DescriptorProto_ExtensionRange::clear_end() { - end_ = 0; - clear_has_end(); -} - ::google::protobuf::int32 DescriptorProto_ExtensionRange::end() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.end) - return end_; -} - void DescriptorProto_ExtensionRange::set_end(::google::protobuf::int32 value) { - set_has_end(); - end_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end) -} - -// ------------------------------------------------------------------- - -// DescriptorProto_ReservedRange - -// optional int32 start = 1; -bool DescriptorProto_ReservedRange::has_start() const { - return (_has_bits_[0] & 0x00000001u) != 0; -} -void DescriptorProto_ReservedRange::set_has_start() { - _has_bits_[0] |= 0x00000001u; -} -void DescriptorProto_ReservedRange::clear_has_start() { - _has_bits_[0] &= ~0x00000001u; -} -void DescriptorProto_ReservedRange::clear_start() { - start_ = 0; - clear_has_start(); -} - ::google::protobuf::int32 DescriptorProto_ReservedRange::start() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start) - return start_; -} - void DescriptorProto_ReservedRange::set_start(::google::protobuf::int32 value) { - set_has_start(); - start_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start) -} - -// optional int32 end = 2; -bool DescriptorProto_ReservedRange::has_end() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void DescriptorProto_ReservedRange::set_has_end() { - _has_bits_[0] |= 0x00000002u; -} -void DescriptorProto_ReservedRange::clear_has_end() { - _has_bits_[0] &= ~0x00000002u; -} -void DescriptorProto_ReservedRange::clear_end() { - end_ = 0; - clear_has_end(); -} - ::google::protobuf::int32 DescriptorProto_ReservedRange::end() const { - // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.end) - return end_; -} - void DescriptorProto_ReservedRange::set_end(::google::protobuf::int32 value) { - set_has_end(); - end_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end) -} - -// ------------------------------------------------------------------- - // DescriptorProto // optional string name = 1; @@ -3792,37 +3806,45 @@ void DescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& DescriptorProto::name() const { +const ::std::string& DescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void DescriptorProto::set_name(const ::std::string& value) { +void DescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.name) } - void DescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void DescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.DescriptorProto.name) +} +#endif +void DescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.name) } - void DescriptorProto::set_name(const char* value, size_t size) { +void DescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.name) } - ::std::string* DescriptorProto::mutable_name() { +::std::string* DescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* DescriptorProto::release_name() { +::std::string* DescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void DescriptorProto::set_allocated_name(::std::string* name) { +void DescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -4014,13 +4036,13 @@ DescriptorProto::oneof_decl() const { // optional .google.protobuf.MessageOptions options = 7; bool DescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000080u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void DescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000080u; + _has_bits_[0] |= 0x00000002u; } void DescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000080u; + _has_bits_[0] &= ~0x00000002u; } void DescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::MessageOptions::Clear(); @@ -4028,7 +4050,8 @@ void DescriptorProto::clear_options() { } const ::google::protobuf::MessageOptions& DescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::MessageOptions::internal_default_instance(); } ::google::protobuf::MessageOptions* DescriptorProto::mutable_options() { set_has_options(); @@ -4093,49 +4116,49 @@ int DescriptorProto::reserved_name_size() const { void DescriptorProto::clear_reserved_name() { reserved_name_.Clear(); } - const ::std::string& DescriptorProto::reserved_name(int index) const { +const ::std::string& DescriptorProto::reserved_name(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_name) return reserved_name_.Get(index); } - ::std::string* DescriptorProto::mutable_reserved_name(int index) { +::std::string* DescriptorProto::mutable_reserved_name(int index) { // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_name) return reserved_name_.Mutable(index); } - void DescriptorProto::set_reserved_name(int index, const ::std::string& value) { +void DescriptorProto::set_reserved_name(int index, const ::std::string& value) { // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.reserved_name) reserved_name_.Mutable(index)->assign(value); } - void DescriptorProto::set_reserved_name(int index, const char* value) { +void DescriptorProto::set_reserved_name(int index, const char* value) { reserved_name_.Mutable(index)->assign(value); // @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.reserved_name) } - void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) { +void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) { reserved_name_.Mutable(index)->assign( reinterpret_cast(value), size); // @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.reserved_name) } - ::std::string* DescriptorProto::add_reserved_name() { +::std::string* DescriptorProto::add_reserved_name() { // @@protoc_insertion_point(field_add_mutable:google.protobuf.DescriptorProto.reserved_name) return reserved_name_.Add(); } - void DescriptorProto::add_reserved_name(const ::std::string& value) { +void DescriptorProto::add_reserved_name(const ::std::string& value) { reserved_name_.Add()->assign(value); // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name) } - void DescriptorProto::add_reserved_name(const char* value) { +void DescriptorProto::add_reserved_name(const char* value) { reserved_name_.Add()->assign(value); // @@protoc_insertion_point(field_add_char:google.protobuf.DescriptorProto.reserved_name) } - void DescriptorProto::add_reserved_name(const char* value, size_t size) { +void DescriptorProto::add_reserved_name(const char* value, size_t size) { reserved_name_.Add()->assign(reinterpret_cast(value), size); // @@protoc_insertion_point(field_add_pointer:google.protobuf.DescriptorProto.reserved_name) } - const ::google::protobuf::RepeatedPtrField< ::std::string>& +const ::google::protobuf::RepeatedPtrField< ::std::string>& DescriptorProto::reserved_name() const { // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_name) return reserved_name_; } - ::google::protobuf::RepeatedPtrField< ::std::string>* +::google::protobuf::RepeatedPtrField< ::std::string>* DescriptorProto::mutable_reserved_name() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_name) return &reserved_name_; @@ -4145,82 +4168,6 @@ DescriptorProto::mutable_reserved_name() { // =================================================================== -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Type_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldDescriptorProto_Type_descriptor_; -} -bool FieldDescriptorProto_Type_IsValid(int value) { - switch(value) { - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - case 18: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_DOUBLE; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FLOAT; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BOOL; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_STRING; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_GROUP; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_MESSAGE; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BYTES; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_ENUM; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED64; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT32; -const FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT64; -const FieldDescriptorProto_Type FieldDescriptorProto::Type_MIN; -const FieldDescriptorProto_Type FieldDescriptorProto::Type_MAX; -const int FieldDescriptorProto::Type_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -const ::google::protobuf::EnumDescriptor* FieldDescriptorProto_Label_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldDescriptorProto_Label_descriptor_; -} -bool FieldDescriptorProto_Label_IsValid(int value) { - switch(value) { - case 1: - case 2: - case 3: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_OPTIONAL; -const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REQUIRED; -const FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REPEATED; -const FieldDescriptorProto_Label FieldDescriptorProto::Label_MIN; -const FieldDescriptorProto_Label FieldDescriptorProto::Label_MAX; -const int FieldDescriptorProto::Label_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int FieldDescriptorProto::kNameFieldNumber; const int FieldDescriptorProto::kNumberFieldNumber; @@ -4236,36 +4183,60 @@ const int FieldDescriptorProto::kOptionsFieldNumber; FieldDescriptorProto::FieldDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FieldDescriptorProto) } - -void FieldDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::FieldOptions*>(&::google::protobuf::FieldOptions::default_instance()); -} - FieldDescriptorProto::FieldDescriptorProto(const FieldDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + type_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_type_name()) { + type_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_name_); + } + extendee_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_extendee()) { + extendee_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.extendee_); + } + default_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_default_value()) { + default_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.default_value_); + } + json_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_json_name()) { + json_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.json_name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::FieldOptions(*from.options_); + } else { + options_ = NULL; + } + ::memcpy(&number_, &from.number_, + reinterpret_cast(&type_) - + reinterpret_cast(&number_) + sizeof(type_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldDescriptorProto) } void FieldDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - number_ = 0; - label_ = 1; - type_ = 1; type_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); extendee_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); default_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - oneof_index_ = 0; json_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&oneof_index_) - + reinterpret_cast(&options_) + sizeof(oneof_index_)); + label_ = 1; + type_ = 1; } FieldDescriptorProto::~FieldDescriptorProto() { @@ -4279,7 +4250,7 @@ void FieldDescriptorProto::SharedDtor() { extendee_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); default_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); json_name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -4291,16 +4262,14 @@ void FieldDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FieldDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return FieldDescriptorProto_descriptor_; + return file_level_metadata[5].descriptor; } const FieldDescriptorProto& FieldDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FieldDescriptorProto* FieldDescriptorProto::default_instance_ = NULL; - FieldDescriptorProto* FieldDescriptorProto::New(::google::protobuf::Arena* arena) const { FieldDescriptorProto* n = new FieldDescriptorProto; if (arena != NULL) { @@ -4311,36 +4280,42 @@ FieldDescriptorProto* FieldDescriptorProto::New(::google::protobuf::Arena* arena void FieldDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldDescriptorProto) - if (_has_bits_[0 / 32] & 255u) { + if (_has_bits_[0 / 32] & 63u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } - number_ = 0; - label_ = 1; - type_ = 1; if (has_type_name()) { - type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!type_name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*type_name_.UnsafeRawStringPointer())->clear(); } if (has_extendee()) { - extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!extendee_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*extendee_.UnsafeRawStringPointer())->clear(); } if (has_default_value()) { - default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!default_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*default_value_.UnsafeRawStringPointer())->clear(); } - oneof_index_ = 0; - } - if (_has_bits_[8 / 32] & 768u) { if (has_json_name()) { - json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!json_name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*json_name_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::FieldOptions::Clear(); } } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 192u) { + ::memset(&number_, 0, reinterpret_cast(&oneof_index_) - + reinterpret_cast(&number_) + sizeof(oneof_index_)); + } + if (_has_bits_[8 / 32] & 768u) { + label_ = 1; + type_ = 1; } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FieldDescriptorProto::MergePartialFromCodedStream( @@ -4349,13 +4324,13 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FieldDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4365,14 +4340,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_extendee; break; } // optional string extendee = 2; case 2: { - if (tag == 18) { - parse_extendee: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_extendee())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4382,29 +4355,25 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_number; break; } // optional int32 number = 3; case 3: { - if (tag == 24) { - parse_number: + if (tag == 24u) { + set_has_number(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &number_))); - set_has_number(); } else { goto handle_unusual; } - if (input->ExpectTag(32)) goto parse_label; break; } // optional .google.protobuf.FieldDescriptorProto.Label label = 4; case 4: { - if (tag == 32) { - parse_label: + if (tag == 32u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -4417,14 +4386,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_type; break; } // optional .google.protobuf.FieldDescriptorProto.Type type = 5; case 5: { - if (tag == 40) { - parse_type: + if (tag == 40u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -4437,14 +4404,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_type_name; break; } // optional string type_name = 6; case 6: { - if (tag == 50) { - parse_type_name: + if (tag == 50u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_type_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4454,14 +4419,12 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(58)) goto parse_default_value; break; } // optional string default_value = 7; case 7: { - if (tag == 58) { - parse_default_value: + if (tag == 58u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_default_value())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4471,42 +4434,36 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_options; break; } // optional .google.protobuf.FieldOptions options = 8; case 8: { - if (tag == 66) { - parse_options: + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(72)) goto parse_oneof_index; break; } // optional int32 oneof_index = 9; case 9: { - if (tag == 72) { - parse_oneof_index: + if (tag == 72u) { + set_has_oneof_index(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &oneof_index_))); - set_has_oneof_index(); } else { goto handle_unusual; } - if (input->ExpectTag(82)) goto parse_json_name; break; } // optional string json_name = 10; case 10: { - if (tag == 82) { - parse_json_name: + if (tag == 82u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_json_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -4516,7 +4473,6 @@ bool FieldDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -4630,8 +4586,9 @@ void FieldDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FieldDescriptorProto) } -::google::protobuf::uint8* FieldDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FieldDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldDescriptorProto) // optional string name = 1; if (has_name()) { @@ -4697,8 +4654,8 @@ ::google::protobuf::uint8* FieldDescriptorProto::SerializeWithCachedSizesToArray // optional .google.protobuf.FieldOptions options = 8; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 8, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 8, *this->options_, false, target); } // optional int32 oneof_index = 9; @@ -4725,10 +4682,15 @@ ::google::protobuf::uint8* FieldDescriptorProto::SerializeWithCachedSizesToArray return target; } -int FieldDescriptorProto::ByteSize() const { +size_t FieldDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldDescriptorProto) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 255u) { // optional string name = 1; if (has_name()) { @@ -4737,25 +4699,6 @@ int FieldDescriptorProto::ByteSize() const { this->name()); } - // optional int32 number = 3; - if (has_number()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->number()); - } - - // optional .google.protobuf.FieldDescriptorProto.Label label = 4; - if (has_label()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->label()); - } - - // optional .google.protobuf.FieldDescriptorProto.Type type = 5; - if (has_type()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->type()); - } - // optional string type_name = 6; if (has_type_name()) { total_size += 1 + @@ -4777,15 +4720,6 @@ int FieldDescriptorProto::ByteSize() const { this->default_value()); } - // optional int32 oneof_index = 9; - if (has_oneof_index()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->oneof_index()); - } - - } - if (_has_bits_[8 / 32] & 768u) { // optional string json_name = 10; if (has_json_name()) { total_size += 1 + @@ -4800,22 +4734,46 @@ int FieldDescriptorProto::ByteSize() const { *this->options_); } + // optional int32 number = 3; + if (has_number()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->number()); + } + + // optional int32 oneof_index = 9; + if (has_oneof_index()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->oneof_index()); + } + } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); + if (_has_bits_[8 / 32] & 768u) { + // optional .google.protobuf.FieldDescriptorProto.Label label = 4; + if (has_label()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->label()); + } + + // optional .google.protobuf.FieldDescriptorProto.Type type = 5; + if (has_type()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->type()); + } + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FieldDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FieldDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const FieldDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -4829,21 +4787,13 @@ void FieldDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 255u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.has_number()) { - set_number(from.number()); - } - if (from.has_label()) { - set_label(from.label()); - } - if (from.has_type()) { - set_type(from.type()); - } if (from.has_type_name()) { set_has_type_name(); type_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.type_name_); @@ -4856,11 +4806,6 @@ void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) { set_has_default_value(); default_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.default_value_); } - if (from.has_oneof_index()) { - set_oneof_index(from.oneof_index()); - } - } - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_json_name()) { set_has_json_name(); json_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.json_name_); @@ -4868,9 +4813,20 @@ void FieldDescriptorProto::MergeFrom(const FieldDescriptorProto& from) { if (from.has_options()) { mutable_options()->::google::protobuf::FieldOptions::MergeFrom(from.options()); } + if (from.has_number()) { + set_number(from.number()); + } + if (from.has_oneof_index()) { + set_oneof_index(from.oneof_index()); + } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + if (from._has_bits_[8 / 32] & 768u) { + if (from.has_label()) { + set_label(from.label()); + } + if (from.has_type()) { + set_type(from.type()); + } } } @@ -4889,7 +4845,6 @@ void FieldDescriptorProto::CopyFrom(const FieldDescriptorProto& from) { } bool FieldDescriptorProto::IsInitialized() const { - if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -4902,15 +4857,15 @@ void FieldDescriptorProto::Swap(FieldDescriptorProto* other) { } void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* other) { name_.Swap(&other->name_); - std::swap(number_, other->number_); - std::swap(label_, other->label_); - std::swap(type_, other->type_); type_name_.Swap(&other->type_name_); extendee_.Swap(&other->extendee_); default_value_.Swap(&other->default_value_); - std::swap(oneof_index_, other->oneof_index_); json_name_.Swap(&other->json_name_); std::swap(options_, other->options_); + std::swap(number_, other->number_); + std::swap(oneof_index_, other->oneof_index_); + std::swap(label_, other->label_); + std::swap(type_, other->type_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -4918,10 +4873,7 @@ void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* other) { ::google::protobuf::Metadata FieldDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FieldDescriptorProto_descriptor_; - metadata.reflection = FieldDescriptorProto_reflection_; - return metadata; + return file_level_metadata[5]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -4941,37 +4893,45 @@ void FieldDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& FieldDescriptorProto::name() const { +const ::std::string& FieldDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void FieldDescriptorProto::set_name(const ::std::string& value) { +void FieldDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.name) } - void FieldDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.name) +} +#endif +void FieldDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.name) } - void FieldDescriptorProto::set_name(const char* value, size_t size) { +void FieldDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.name) } - ::std::string* FieldDescriptorProto::mutable_name() { +::std::string* FieldDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_name() { +::std::string* FieldDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_name(::std::string* name) { +void FieldDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -4983,23 +4943,23 @@ void FieldDescriptorProto::clear_name() { // optional int32 number = 3; bool FieldDescriptorProto::has_number() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000040u) != 0; } void FieldDescriptorProto::set_has_number() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000040u; } void FieldDescriptorProto::clear_has_number() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000040u; } void FieldDescriptorProto::clear_number() { number_ = 0; clear_has_number(); } - ::google::protobuf::int32 FieldDescriptorProto::number() const { +::google::protobuf::int32 FieldDescriptorProto::number() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.number) return number_; } - void FieldDescriptorProto::set_number(::google::protobuf::int32 value) { +void FieldDescriptorProto::set_number(::google::protobuf::int32 value) { set_has_number(); number_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number) @@ -5007,23 +4967,23 @@ void FieldDescriptorProto::clear_number() { // optional .google.protobuf.FieldDescriptorProto.Label label = 4; bool FieldDescriptorProto::has_label() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000100u) != 0; } void FieldDescriptorProto::set_has_label() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000100u; } void FieldDescriptorProto::clear_has_label() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000100u; } void FieldDescriptorProto::clear_label() { label_ = 1; clear_has_label(); } - ::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const { +::google::protobuf::FieldDescriptorProto_Label FieldDescriptorProto::label() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.label) return static_cast< ::google::protobuf::FieldDescriptorProto_Label >(label_); } - void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) { +void FieldDescriptorProto::set_label(::google::protobuf::FieldDescriptorProto_Label value) { assert(::google::protobuf::FieldDescriptorProto_Label_IsValid(value)); set_has_label(); label_ = value; @@ -5032,23 +4992,23 @@ void FieldDescriptorProto::clear_label() { // optional .google.protobuf.FieldDescriptorProto.Type type = 5; bool FieldDescriptorProto::has_type() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000200u) != 0; } void FieldDescriptorProto::set_has_type() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000200u; } void FieldDescriptorProto::clear_has_type() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000200u; } void FieldDescriptorProto::clear_type() { type_ = 1; clear_has_type(); } - ::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const { +::google::protobuf::FieldDescriptorProto_Type FieldDescriptorProto::type() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type) return static_cast< ::google::protobuf::FieldDescriptorProto_Type >(type_); } - void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) { +void FieldDescriptorProto::set_type(::google::protobuf::FieldDescriptorProto_Type value) { assert(::google::protobuf::FieldDescriptorProto_Type_IsValid(value)); set_has_type(); type_ = value; @@ -5057,49 +5017,57 @@ void FieldDescriptorProto::clear_type() { // optional string type_name = 6; bool FieldDescriptorProto::has_type_name() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void FieldDescriptorProto::set_has_type_name() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000002u; } void FieldDescriptorProto::clear_has_type_name() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000002u; } void FieldDescriptorProto::clear_type_name() { type_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_type_name(); } - const ::std::string& FieldDescriptorProto::type_name() const { +const ::std::string& FieldDescriptorProto::type_name() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type_name) - return type_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return type_name_.GetNoArena(); } - void FieldDescriptorProto::set_type_name(const ::std::string& value) { +void FieldDescriptorProto::set_type_name(const ::std::string& value) { set_has_type_name(); type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type_name) } - void FieldDescriptorProto::set_type_name(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_type_name(::std::string&& value) { + set_has_type_name(); + type_name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.type_name) +} +#endif +void FieldDescriptorProto::set_type_name(const char* value) { set_has_type_name(); type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.type_name) } - void FieldDescriptorProto::set_type_name(const char* value, size_t size) { +void FieldDescriptorProto::set_type_name(const char* value, size_t size) { set_has_type_name(); type_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.type_name) } - ::std::string* FieldDescriptorProto::mutable_type_name() { +::std::string* FieldDescriptorProto::mutable_type_name() { set_has_type_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.type_name) return type_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_type_name() { +::std::string* FieldDescriptorProto::release_type_name() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.type_name) clear_has_type_name(); return type_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) { +void FieldDescriptorProto::set_allocated_type_name(::std::string* type_name) { if (type_name != NULL) { set_has_type_name(); } else { @@ -5111,49 +5079,57 @@ void FieldDescriptorProto::clear_type_name() { // optional string extendee = 2; bool FieldDescriptorProto::has_extendee() const { - return (_has_bits_[0] & 0x00000020u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FieldDescriptorProto::set_has_extendee() { - _has_bits_[0] |= 0x00000020u; + _has_bits_[0] |= 0x00000004u; } void FieldDescriptorProto::clear_has_extendee() { - _has_bits_[0] &= ~0x00000020u; + _has_bits_[0] &= ~0x00000004u; } void FieldDescriptorProto::clear_extendee() { extendee_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_extendee(); } - const ::std::string& FieldDescriptorProto::extendee() const { +const ::std::string& FieldDescriptorProto::extendee() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.extendee) - return extendee_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return extendee_.GetNoArena(); } - void FieldDescriptorProto::set_extendee(const ::std::string& value) { +void FieldDescriptorProto::set_extendee(const ::std::string& value) { set_has_extendee(); extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.extendee) } - void FieldDescriptorProto::set_extendee(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_extendee(::std::string&& value) { + set_has_extendee(); + extendee_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.extendee) +} +#endif +void FieldDescriptorProto::set_extendee(const char* value) { set_has_extendee(); extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.extendee) } - void FieldDescriptorProto::set_extendee(const char* value, size_t size) { +void FieldDescriptorProto::set_extendee(const char* value, size_t size) { set_has_extendee(); extendee_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.extendee) } - ::std::string* FieldDescriptorProto::mutable_extendee() { +::std::string* FieldDescriptorProto::mutable_extendee() { set_has_extendee(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.extendee) return extendee_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_extendee() { +::std::string* FieldDescriptorProto::release_extendee() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.extendee) clear_has_extendee(); return extendee_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) { +void FieldDescriptorProto::set_allocated_extendee(::std::string* extendee) { if (extendee != NULL) { set_has_extendee(); } else { @@ -5165,49 +5141,57 @@ void FieldDescriptorProto::clear_extendee() { // optional string default_value = 7; bool FieldDescriptorProto::has_default_value() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } void FieldDescriptorProto::set_has_default_value() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000008u; } void FieldDescriptorProto::clear_has_default_value() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000008u; } void FieldDescriptorProto::clear_default_value() { default_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_default_value(); } - const ::std::string& FieldDescriptorProto::default_value() const { +const ::std::string& FieldDescriptorProto::default_value() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.default_value) - return default_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return default_value_.GetNoArena(); } - void FieldDescriptorProto::set_default_value(const ::std::string& value) { +void FieldDescriptorProto::set_default_value(const ::std::string& value) { set_has_default_value(); default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.default_value) } - void FieldDescriptorProto::set_default_value(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_default_value(::std::string&& value) { + set_has_default_value(); + default_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.default_value) +} +#endif +void FieldDescriptorProto::set_default_value(const char* value) { set_has_default_value(); default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.default_value) } - void FieldDescriptorProto::set_default_value(const char* value, size_t size) { +void FieldDescriptorProto::set_default_value(const char* value, size_t size) { set_has_default_value(); default_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.default_value) } - ::std::string* FieldDescriptorProto::mutable_default_value() { +::std::string* FieldDescriptorProto::mutable_default_value() { set_has_default_value(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.default_value) return default_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_default_value() { +::std::string* FieldDescriptorProto::release_default_value() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.default_value) clear_has_default_value(); return default_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) { +void FieldDescriptorProto::set_allocated_default_value(::std::string* default_value) { if (default_value != NULL) { set_has_default_value(); } else { @@ -5231,11 +5215,11 @@ void FieldDescriptorProto::clear_oneof_index() { oneof_index_ = 0; clear_has_oneof_index(); } - ::google::protobuf::int32 FieldDescriptorProto::oneof_index() const { +::google::protobuf::int32 FieldDescriptorProto::oneof_index() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.oneof_index) return oneof_index_; } - void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) { +void FieldDescriptorProto::set_oneof_index(::google::protobuf::int32 value) { set_has_oneof_index(); oneof_index_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index) @@ -5243,49 +5227,57 @@ void FieldDescriptorProto::clear_oneof_index() { // optional string json_name = 10; bool FieldDescriptorProto::has_json_name() const { - return (_has_bits_[0] & 0x00000100u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } void FieldDescriptorProto::set_has_json_name() { - _has_bits_[0] |= 0x00000100u; + _has_bits_[0] |= 0x00000010u; } void FieldDescriptorProto::clear_has_json_name() { - _has_bits_[0] &= ~0x00000100u; + _has_bits_[0] &= ~0x00000010u; } void FieldDescriptorProto::clear_json_name() { json_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_json_name(); } - const ::std::string& FieldDescriptorProto::json_name() const { +const ::std::string& FieldDescriptorProto::json_name() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.json_name) - return json_name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return json_name_.GetNoArena(); } - void FieldDescriptorProto::set_json_name(const ::std::string& value) { +void FieldDescriptorProto::set_json_name(const ::std::string& value) { set_has_json_name(); json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.json_name) } - void FieldDescriptorProto::set_json_name(const char* value) { +#if LANG_CXX11 +void FieldDescriptorProto::set_json_name(::std::string&& value) { + set_has_json_name(); + json_name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FieldDescriptorProto.json_name) +} +#endif +void FieldDescriptorProto::set_json_name(const char* value) { set_has_json_name(); json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FieldDescriptorProto.json_name) } - void FieldDescriptorProto::set_json_name(const char* value, size_t size) { +void FieldDescriptorProto::set_json_name(const char* value, size_t size) { set_has_json_name(); json_name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldDescriptorProto.json_name) } - ::std::string* FieldDescriptorProto::mutable_json_name() { +::std::string* FieldDescriptorProto::mutable_json_name() { set_has_json_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.json_name) return json_name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FieldDescriptorProto::release_json_name() { +::std::string* FieldDescriptorProto::release_json_name() { // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.json_name) clear_has_json_name(); return json_name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) { +void FieldDescriptorProto::set_allocated_json_name(::std::string* json_name) { if (json_name != NULL) { set_has_json_name(); } else { @@ -5297,13 +5289,13 @@ void FieldDescriptorProto::clear_json_name() { // optional .google.protobuf.FieldOptions options = 8; bool FieldDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000020u) != 0; } void FieldDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000020u; } void FieldDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000020u; } void FieldDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::FieldOptions::Clear(); @@ -5311,7 +5303,8 @@ void FieldDescriptorProto::clear_options() { } const ::google::protobuf::FieldOptions& FieldDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::FieldOptions::internal_default_instance(); } ::google::protobuf::FieldOptions* FieldDescriptorProto::mutable_options() { set_has_options(); @@ -5345,30 +5338,39 @@ void FieldDescriptorProto::set_allocated_options(::google::protobuf::FieldOption #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int OneofDescriptorProto::kNameFieldNumber; +const int OneofDescriptorProto::kOptionsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 OneofDescriptorProto::OneofDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.OneofDescriptorProto) } - -void OneofDescriptorProto::InitAsDefaultInstance() { -} - OneofDescriptorProto::OneofDescriptorProto(const OneofDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::OneofOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.OneofDescriptorProto) } void OneofDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + options_ = NULL; } OneofDescriptorProto::~OneofDescriptorProto() { @@ -5378,7 +5380,8 @@ OneofDescriptorProto::~OneofDescriptorProto() { void OneofDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { + delete options_; } } @@ -5389,16 +5392,14 @@ void OneofDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* OneofDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return OneofDescriptorProto_descriptor_; + return file_level_metadata[6].descriptor; } const OneofDescriptorProto& OneofDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -OneofDescriptorProto* OneofDescriptorProto::default_instance_ = NULL; - OneofDescriptorProto* OneofDescriptorProto::New(::google::protobuf::Arena* arena) const { OneofDescriptorProto* n = new OneofDescriptorProto; if (arena != NULL) { @@ -5409,13 +5410,18 @@ OneofDescriptorProto* OneofDescriptorProto::New(::google::protobuf::Arena* arena void OneofDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.OneofDescriptorProto) - if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + if (has_name()) { + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); + } + if (has_options()) { + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::OneofOptions::Clear(); + } } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool OneofDescriptorProto::MergePartialFromCodedStream( @@ -5424,13 +5430,13 @@ bool OneofDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.OneofDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5440,7 +5446,17 @@ bool OneofDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; + break; + } + + // optional .google.protobuf.OneofOptions options = 2; + case 2: { + if (tag == 18u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_options())); + } else { + goto handle_unusual; + } break; } @@ -5479,6 +5495,12 @@ void OneofDescriptorProto::SerializeWithCachedSizes( 1, this->name(), output); } + // optional .google.protobuf.OneofOptions options = 2; + if (has_options()) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, *this->options_, output); + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -5486,8 +5508,9 @@ void OneofDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.OneofDescriptorProto) } -::google::protobuf::uint8* OneofDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* OneofDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofDescriptorProto) // optional string name = 1; if (has_name()) { @@ -5500,6 +5523,13 @@ ::google::protobuf::uint8* OneofDescriptorProto::SerializeWithCachedSizesToArray 1, this->name(), target); } + // optional .google.protobuf.OneofOptions options = 2; + if (has_options()) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageNoVirtualToArray( + 2, *this->options_, false, target); + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -5508,32 +5538,42 @@ ::google::protobuf::uint8* OneofDescriptorProto::SerializeWithCachedSizesToArray return target; } -int OneofDescriptorProto::ByteSize() const { +size_t OneofDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofDescriptorProto) - int total_size = 0; - - // optional string name = 1; - if (has_name()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name()); - } + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + if (_has_bits_[0 / 32] & 3u) { + // optional string name = 1; + if (has_name()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name()); + } + + // optional .google.protobuf.OneofOptions options = 2; + if (has_options()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + *this->options_); + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.OneofDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const OneofDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const OneofDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -5547,15 +5587,16 @@ void OneofDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void OneofDescriptorProto::MergeFrom(const OneofDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + if (from.has_options()) { + mutable_options()->::google::protobuf::OneofOptions::MergeFrom(from.options()); + } } } @@ -5574,7 +5615,9 @@ void OneofDescriptorProto::CopyFrom(const OneofDescriptorProto& from) { } bool OneofDescriptorProto::IsInitialized() const { - + if (has_options()) { + if (!this->options_->IsInitialized()) return false; + } return true; } @@ -5584,6 +5627,7 @@ void OneofDescriptorProto::Swap(OneofDescriptorProto* other) { } void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) { name_.Swap(&other->name_); + std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -5591,10 +5635,7 @@ void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) { ::google::protobuf::Metadata OneofDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = OneofDescriptorProto_descriptor_; - metadata.reflection = OneofDescriptorProto_reflection_; - return metadata; + return file_level_metadata[6]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -5614,37 +5655,45 @@ void OneofDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& OneofDescriptorProto::name() const { +const ::std::string& OneofDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void OneofDescriptorProto::set_name(const ::std::string& value) { +void OneofDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.OneofDescriptorProto.name) } - void OneofDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void OneofDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.OneofDescriptorProto.name) +} +#endif +void OneofDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.OneofDescriptorProto.name) } - void OneofDescriptorProto::set_name(const char* value, size_t size) { +void OneofDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.OneofDescriptorProto.name) } - ::std::string* OneofDescriptorProto::mutable_name() { +::std::string* OneofDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* OneofDescriptorProto::release_name() { +::std::string* OneofDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void OneofDescriptorProto::set_allocated_name(::std::string* name) { +void OneofDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -5654,6 +5703,51 @@ void OneofDescriptorProto::clear_name() { // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name) } +// optional .google.protobuf.OneofOptions options = 2; +bool OneofDescriptorProto::has_options() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void OneofDescriptorProto::set_has_options() { + _has_bits_[0] |= 0x00000002u; +} +void OneofDescriptorProto::clear_has_options() { + _has_bits_[0] &= ~0x00000002u; +} +void OneofDescriptorProto::clear_options() { + if (options_ != NULL) options_->::google::protobuf::OneofOptions::Clear(); + clear_has_options(); +} +const ::google::protobuf::OneofOptions& OneofDescriptorProto::options() const { + // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.options) + return options_ != NULL ? *options_ + : *::google::protobuf::OneofOptions::internal_default_instance(); +} +::google::protobuf::OneofOptions* OneofDescriptorProto::mutable_options() { + set_has_options(); + if (options_ == NULL) { + options_ = new ::google::protobuf::OneofOptions; + } + // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.options) + return options_; +} +::google::protobuf::OneofOptions* OneofDescriptorProto::release_options() { + // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.options) + clear_has_options(); + ::google::protobuf::OneofOptions* temp = options_; + options_ = NULL; + return temp; +} +void OneofDescriptorProto::set_allocated_options(::google::protobuf::OneofOptions* options) { + delete options_; + options_ = options; + if (options) { + set_has_options(); + } else { + clear_has_options(); + } + // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.options) +} + #endif // PROTOBUF_INLINE_NOT_IN_HEADERS // =================================================================== @@ -5666,28 +5760,35 @@ const int EnumDescriptorProto::kOptionsFieldNumber; EnumDescriptorProto::EnumDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.EnumDescriptorProto) } - -void EnumDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::EnumOptions*>(&::google::protobuf::EnumOptions::default_instance()); -} - EnumDescriptorProto::EnumDescriptorProto(const EnumDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + value_(from.value_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::EnumOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumDescriptorProto) } void EnumDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } EnumDescriptorProto::~EnumDescriptorProto() { @@ -5697,7 +5798,7 @@ EnumDescriptorProto::~EnumDescriptorProto() { void EnumDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -5709,16 +5810,14 @@ void EnumDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* EnumDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumDescriptorProto_descriptor_; + return file_level_metadata[7].descriptor; } const EnumDescriptorProto& EnumDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumDescriptorProto* EnumDescriptorProto::default_instance_ = NULL; - EnumDescriptorProto* EnumDescriptorProto::New(::google::protobuf::Arena* arena) const { EnumDescriptorProto* n = new EnumDescriptorProto; if (arena != NULL) { @@ -5729,19 +5828,19 @@ EnumDescriptorProto* EnumDescriptorProto::New(::google::protobuf::Arena* arena) void EnumDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto) - if (_has_bits_[0 / 32] & 5u) { + value_.Clear(); + if (_has_bits_[0 / 32] & 3u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::EnumOptions::Clear(); } } - value_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool EnumDescriptorProto::MergePartialFromCodedStream( @@ -5750,13 +5849,13 @@ bool EnumDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.EnumDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -5766,37 +5865,30 @@ bool EnumDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_value; break; } // repeated .google.protobuf.EnumValueDescriptorProto value = 2; case 2: { - if (tag == 18) { - parse_value: + if (tag == 18u) { DO_(input->IncrementRecursionDepth()); - parse_loop_value: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_value())); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_loop_value; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(26)) goto parse_options; break; } // optional .google.protobuf.EnumOptions options = 3; case 3: { - if (tag == 26) { - parse_options: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -5854,8 +5946,9 @@ void EnumDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.EnumDescriptorProto) } -::google::protobuf::uint8* EnumDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* EnumDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumDescriptorProto) // optional string name = 1; if (has_name()) { @@ -5871,15 +5964,15 @@ ::google::protobuf::uint8* EnumDescriptorProto::SerializeWithCachedSizesToArray( // repeated .google.protobuf.EnumValueDescriptorProto value = 2; for (unsigned int i = 0, n = this->value_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->value(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->value(i), false, target); } // optional .google.protobuf.EnumOptions options = 3; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 3, *this->options_, false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -5890,11 +5983,27 @@ ::google::protobuf::uint8* EnumDescriptorProto::SerializeWithCachedSizesToArray( return target; } -int EnumDescriptorProto::ByteSize() const { +size_t EnumDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumDescriptorProto) - int total_size = 0; + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.EnumValueDescriptorProto value = 2; + { + unsigned int count = this->value_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->value(i)); + } + } - if (_has_bits_[0 / 32] & 5u) { + if (_has_bits_[0 / 32] & 3u) { // optional string name = 1; if (has_name()) { total_size += 1 + @@ -5910,29 +6019,17 @@ int EnumDescriptorProto::ByteSize() const { } } - // repeated .google.protobuf.EnumValueDescriptorProto value = 2; - total_size += 1 * this->value_size(); - for (int i = 0; i < this->value_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->value(i)); - } - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const EnumDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -5946,9 +6043,10 @@ void EnumDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void EnumDescriptorProto::MergeFrom(const EnumDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); value_.MergeFrom(from.value_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -5957,9 +6055,6 @@ void EnumDescriptorProto::MergeFrom(const EnumDescriptorProto& from) { mutable_options()->::google::protobuf::EnumOptions::MergeFrom(from.options()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void EnumDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -5977,7 +6072,6 @@ void EnumDescriptorProto::CopyFrom(const EnumDescriptorProto& from) { } bool EnumDescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->value())) return false; if (has_options()) { if (!this->options_->IsInitialized()) return false; @@ -5990,8 +6084,8 @@ void EnumDescriptorProto::Swap(EnumDescriptorProto* other) { InternalSwap(other); } void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) { - name_.Swap(&other->name_); value_.UnsafeArenaSwap(&other->value_); + name_.Swap(&other->name_); std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); @@ -6000,10 +6094,7 @@ void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) { ::google::protobuf::Metadata EnumDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumDescriptorProto_descriptor_; - metadata.reflection = EnumDescriptorProto_reflection_; - return metadata; + return file_level_metadata[7]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -6023,37 +6114,45 @@ void EnumDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& EnumDescriptorProto::name() const { +const ::std::string& EnumDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void EnumDescriptorProto::set_name(const ::std::string& value) { +void EnumDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.name) } - void EnumDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void EnumDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.EnumDescriptorProto.name) +} +#endif +void EnumDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.EnumDescriptorProto.name) } - void EnumDescriptorProto::set_name(const char* value, size_t size) { +void EnumDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumDescriptorProto.name) } - ::std::string* EnumDescriptorProto::mutable_name() { +::std::string* EnumDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* EnumDescriptorProto::release_name() { +::std::string* EnumDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void EnumDescriptorProto::set_allocated_name(::std::string* name) { +void EnumDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -6095,13 +6194,13 @@ EnumDescriptorProto::value() const { // optional .google.protobuf.EnumOptions options = 3; bool EnumDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void EnumDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void EnumDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void EnumDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::EnumOptions::Clear(); @@ -6109,7 +6208,8 @@ void EnumDescriptorProto::clear_options() { } const ::google::protobuf::EnumOptions& EnumDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::EnumOptions::internal_default_instance(); } ::google::protobuf::EnumOptions* EnumDescriptorProto::mutable_options() { set_has_options(); @@ -6149,29 +6249,36 @@ const int EnumValueDescriptorProto::kOptionsFieldNumber; EnumValueDescriptorProto::EnumValueDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.EnumValueDescriptorProto) } - -void EnumValueDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::EnumValueOptions*>(&::google::protobuf::EnumValueOptions::default_instance()); -} - EnumValueDescriptorProto::EnumValueDescriptorProto(const EnumValueDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::EnumValueOptions(*from.options_); + } else { + options_ = NULL; + } + number_ = from.number_; // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueDescriptorProto) } void EnumValueDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - number_ = 0; - options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&number_) - + reinterpret_cast(&options_) + sizeof(number_)); } EnumValueDescriptorProto::~EnumValueDescriptorProto() { @@ -6181,7 +6288,7 @@ EnumValueDescriptorProto::~EnumValueDescriptorProto() { void EnumValueDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -6193,16 +6300,14 @@ void EnumValueDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* EnumValueDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumValueDescriptorProto_descriptor_; + return file_level_metadata[8].descriptor; } const EnumValueDescriptorProto& EnumValueDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumValueDescriptorProto* EnumValueDescriptorProto::default_instance_ = NULL; - EnumValueDescriptorProto* EnumValueDescriptorProto::New(::google::protobuf::Arena* arena) const { EnumValueDescriptorProto* n = new EnumValueDescriptorProto; if (arena != NULL) { @@ -6213,19 +6318,19 @@ EnumValueDescriptorProto* EnumValueDescriptorProto::New(::google::protobuf::Aren void EnumValueDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueDescriptorProto) - if (_has_bits_[0 / 32] & 7u) { + if (_has_bits_[0 / 32] & 3u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } - number_ = 0; if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::EnumValueOptions::Clear(); } } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + number_ = 0; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool EnumValueDescriptorProto::MergePartialFromCodedStream( @@ -6234,13 +6339,13 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -6250,35 +6355,30 @@ bool EnumValueDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_number; break; } // optional int32 number = 2; case 2: { - if (tag == 16) { - parse_number: + if (tag == 16u) { + set_has_number(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &number_))); - set_has_number(); } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_options; break; } // optional .google.protobuf.EnumValueOptions options = 3; case 3: { - if (tag == 26) { - parse_options: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -6335,8 +6435,9 @@ void EnumValueDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueDescriptorProto) } -::google::protobuf::uint8* EnumValueDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* EnumValueDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueDescriptorProto) // optional string name = 1; if (has_name()) { @@ -6357,8 +6458,8 @@ ::google::protobuf::uint8* EnumValueDescriptorProto::SerializeWithCachedSizesToA // optional .google.protobuf.EnumValueOptions options = 3; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 3, *this->options_, false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -6369,10 +6470,15 @@ ::google::protobuf::uint8* EnumValueDescriptorProto::SerializeWithCachedSizesToA return target; } -int EnumValueDescriptorProto::ByteSize() const { +size_t EnumValueDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueDescriptorProto) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 7u) { // optional string name = 1; if (has_name()) { @@ -6381,13 +6487,6 @@ int EnumValueDescriptorProto::ByteSize() const { this->name()); } - // optional int32 number = 2; - if (has_number()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size( - this->number()); - } - // optional .google.protobuf.EnumValueOptions options = 3; if (has_options()) { total_size += 1 + @@ -6395,22 +6494,25 @@ int EnumValueDescriptorProto::ByteSize() const { *this->options_); } + // optional int32 number = 2; + if (has_number()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size( + this->number()); + } + } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumValueDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const EnumValueDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -6424,21 +6526,19 @@ void EnumValueDescriptorProto::MergeFrom(const ::google::protobuf::Message& from void EnumValueDescriptorProto::MergeFrom(const EnumValueDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 7u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); } - if (from.has_number()) { - set_number(from.number()); - } if (from.has_options()) { mutable_options()->::google::protobuf::EnumValueOptions::MergeFrom(from.options()); } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + if (from.has_number()) { + set_number(from.number()); + } } } @@ -6457,7 +6557,6 @@ void EnumValueDescriptorProto::CopyFrom(const EnumValueDescriptorProto& from) { } bool EnumValueDescriptorProto::IsInitialized() const { - if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -6470,8 +6569,8 @@ void EnumValueDescriptorProto::Swap(EnumValueDescriptorProto* other) { } void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) { name_.Swap(&other->name_); - std::swap(number_, other->number_); std::swap(options_, other->options_); + std::swap(number_, other->number_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -6479,10 +6578,7 @@ void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) { ::google::protobuf::Metadata EnumValueDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumValueDescriptorProto_descriptor_; - metadata.reflection = EnumValueDescriptorProto_reflection_; - return metadata; + return file_level_metadata[8]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -6502,37 +6598,45 @@ void EnumValueDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& EnumValueDescriptorProto::name() const { +const ::std::string& EnumValueDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void EnumValueDescriptorProto::set_name(const ::std::string& value) { +void EnumValueDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.name) } - void EnumValueDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void EnumValueDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.EnumValueDescriptorProto.name) +} +#endif +void EnumValueDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.EnumValueDescriptorProto.name) } - void EnumValueDescriptorProto::set_name(const char* value, size_t size) { +void EnumValueDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumValueDescriptorProto.name) } - ::std::string* EnumValueDescriptorProto::mutable_name() { +::std::string* EnumValueDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* EnumValueDescriptorProto::release_name() { +::std::string* EnumValueDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void EnumValueDescriptorProto::set_allocated_name(::std::string* name) { +void EnumValueDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -6544,23 +6648,23 @@ void EnumValueDescriptorProto::clear_name() { // optional int32 number = 2; bool EnumValueDescriptorProto::has_number() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void EnumValueDescriptorProto::set_has_number() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000004u; } void EnumValueDescriptorProto::clear_has_number() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000004u; } void EnumValueDescriptorProto::clear_number() { number_ = 0; clear_has_number(); } - ::google::protobuf::int32 EnumValueDescriptorProto::number() const { +::google::protobuf::int32 EnumValueDescriptorProto::number() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.number) return number_; } - void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) { +void EnumValueDescriptorProto::set_number(::google::protobuf::int32 value) { set_has_number(); number_ = value; // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number) @@ -6568,13 +6672,13 @@ void EnumValueDescriptorProto::clear_number() { // optional .google.protobuf.EnumValueOptions options = 3; bool EnumValueDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void EnumValueDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void EnumValueDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void EnumValueDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::EnumValueOptions::Clear(); @@ -6582,7 +6686,8 @@ void EnumValueDescriptorProto::clear_options() { } const ::google::protobuf::EnumValueOptions& EnumValueDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::EnumValueOptions::internal_default_instance(); } ::google::protobuf::EnumValueOptions* EnumValueDescriptorProto::mutable_options() { set_has_options(); @@ -6622,28 +6727,35 @@ const int ServiceDescriptorProto::kOptionsFieldNumber; ServiceDescriptorProto::ServiceDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.ServiceDescriptorProto) } - -void ServiceDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::ServiceOptions*>(&::google::protobuf::ServiceOptions::default_instance()); -} - ServiceDescriptorProto::ServiceDescriptorProto(const ServiceDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + method_(from.method_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::ServiceOptions(*from.options_); + } else { + options_ = NULL; + } // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceDescriptorProto) } void ServiceDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); options_ = NULL; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } ServiceDescriptorProto::~ServiceDescriptorProto() { @@ -6653,7 +6765,7 @@ ServiceDescriptorProto::~ServiceDescriptorProto() { void ServiceDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -6665,16 +6777,14 @@ void ServiceDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* ServiceDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return ServiceDescriptorProto_descriptor_; + return file_level_metadata[9].descriptor; } const ServiceDescriptorProto& ServiceDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -ServiceDescriptorProto* ServiceDescriptorProto::default_instance_ = NULL; - ServiceDescriptorProto* ServiceDescriptorProto::New(::google::protobuf::Arena* arena) const { ServiceDescriptorProto* n = new ServiceDescriptorProto; if (arena != NULL) { @@ -6685,19 +6795,19 @@ ServiceDescriptorProto* ServiceDescriptorProto::New(::google::protobuf::Arena* a void ServiceDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceDescriptorProto) - if (_has_bits_[0 / 32] & 5u) { + method_.Clear(); + if (_has_bits_[0 / 32] & 3u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::ServiceOptions::Clear(); } } - method_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool ServiceDescriptorProto::MergePartialFromCodedStream( @@ -6706,13 +6816,13 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.ServiceDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -6722,37 +6832,30 @@ bool ServiceDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_method; break; } // repeated .google.protobuf.MethodDescriptorProto method = 2; case 2: { - if (tag == 18) { - parse_method: + if (tag == 18u) { DO_(input->IncrementRecursionDepth()); - parse_loop_method: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_method())); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_loop_method; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(26)) goto parse_options; break; } // optional .google.protobuf.ServiceOptions options = 3; case 3: { - if (tag == 26) { - parse_options: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -6810,8 +6913,9 @@ void ServiceDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceDescriptorProto) } -::google::protobuf::uint8* ServiceDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* ServiceDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceDescriptorProto) // optional string name = 1; if (has_name()) { @@ -6827,15 +6931,15 @@ ::google::protobuf::uint8* ServiceDescriptorProto::SerializeWithCachedSizesToArr // repeated .google.protobuf.MethodDescriptorProto method = 2; for (unsigned int i = 0, n = this->method_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->method(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->method(i), false, target); } // optional .google.protobuf.ServiceOptions options = 3; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 3, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 3, *this->options_, false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -6846,11 +6950,27 @@ ::google::protobuf::uint8* ServiceDescriptorProto::SerializeWithCachedSizesToArr return target; } -int ServiceDescriptorProto::ByteSize() const { +size_t ServiceDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceDescriptorProto) - int total_size = 0; + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.MethodDescriptorProto method = 2; + { + unsigned int count = this->method_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->method(i)); + } + } - if (_has_bits_[0 / 32] & 5u) { + if (_has_bits_[0 / 32] & 3u) { // optional string name = 1; if (has_name()) { total_size += 1 + @@ -6866,29 +6986,17 @@ int ServiceDescriptorProto::ByteSize() const { } } - // repeated .google.protobuf.MethodDescriptorProto method = 2; - total_size += 1 * this->method_size(); - for (int i = 0; i < this->method_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->method(i)); - } - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const ServiceDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const ServiceDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -6902,9 +7010,10 @@ void ServiceDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) void ServiceDescriptorProto::MergeFrom(const ServiceDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); method_.MergeFrom(from.method_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -6913,9 +7022,6 @@ void ServiceDescriptorProto::MergeFrom(const ServiceDescriptorProto& from) { mutable_options()->::google::protobuf::ServiceOptions::MergeFrom(from.options()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void ServiceDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -6933,7 +7039,6 @@ void ServiceDescriptorProto::CopyFrom(const ServiceDescriptorProto& from) { } bool ServiceDescriptorProto::IsInitialized() const { - if (!::google::protobuf::internal::AllAreInitialized(this->method())) return false; if (has_options()) { if (!this->options_->IsInitialized()) return false; @@ -6946,8 +7051,8 @@ void ServiceDescriptorProto::Swap(ServiceDescriptorProto* other) { InternalSwap(other); } void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) { - name_.Swap(&other->name_); method_.UnsafeArenaSwap(&other->method_); + name_.Swap(&other->name_); std::swap(options_, other->options_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); @@ -6956,10 +7061,7 @@ void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) { ::google::protobuf::Metadata ServiceDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = ServiceDescriptorProto_descriptor_; - metadata.reflection = ServiceDescriptorProto_reflection_; - return metadata; + return file_level_metadata[9]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -6979,37 +7081,45 @@ void ServiceDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& ServiceDescriptorProto::name() const { +const ::std::string& ServiceDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void ServiceDescriptorProto::set_name(const ::std::string& value) { +void ServiceDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.ServiceDescriptorProto.name) } - void ServiceDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void ServiceDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.ServiceDescriptorProto.name) +} +#endif +void ServiceDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.ServiceDescriptorProto.name) } - void ServiceDescriptorProto::set_name(const char* value, size_t size) { +void ServiceDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.ServiceDescriptorProto.name) } - ::std::string* ServiceDescriptorProto::mutable_name() { +::std::string* ServiceDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* ServiceDescriptorProto::release_name() { +::std::string* ServiceDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void ServiceDescriptorProto::set_allocated_name(::std::string* name) { +void ServiceDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -7051,13 +7161,13 @@ ServiceDescriptorProto::method() const { // optional .google.protobuf.ServiceOptions options = 3; bool ServiceDescriptorProto::has_options() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void ServiceDescriptorProto::set_has_options() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void ServiceDescriptorProto::clear_has_options() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void ServiceDescriptorProto::clear_options() { if (options_ != NULL) options_->::google::protobuf::ServiceOptions::Clear(); @@ -7065,7 +7175,8 @@ void ServiceDescriptorProto::clear_options() { } const ::google::protobuf::ServiceOptions& ServiceDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::ServiceOptions::internal_default_instance(); } ::google::protobuf::ServiceOptions* ServiceDescriptorProto::mutable_options() { set_has_options(); @@ -7108,32 +7219,48 @@ const int MethodDescriptorProto::kServerStreamingFieldNumber; MethodDescriptorProto::MethodDescriptorProto() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.MethodDescriptorProto) } - -void MethodDescriptorProto::InitAsDefaultInstance() { - options_ = const_cast< ::google::protobuf::MethodOptions*>(&::google::protobuf::MethodOptions::default_instance()); -} - MethodDescriptorProto::MethodDescriptorProto(const MethodDescriptorProto& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name()) { + name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); + } + input_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_input_type()) { + input_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.input_type_); + } + output_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_output_type()) { + output_type_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.output_type_); + } + if (from.has_options()) { + options_ = new ::google::protobuf::MethodOptions(*from.options_); + } else { + options_ = NULL; + } + ::memcpy(&client_streaming_, &from.client_streaming_, + reinterpret_cast(&server_streaming_) - + reinterpret_cast(&client_streaming_) + sizeof(server_streaming_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodDescriptorProto) } void MethodDescriptorProto::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); input_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); output_type_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - options_ = NULL; - client_streaming_ = false; - server_streaming_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&options_, 0, reinterpret_cast(&server_streaming_) - + reinterpret_cast(&options_) + sizeof(server_streaming_)); } MethodDescriptorProto::~MethodDescriptorProto() { @@ -7145,7 +7272,7 @@ void MethodDescriptorProto::SharedDtor() { name_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); input_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); output_type_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { + if (this != internal_default_instance()) { delete options_; } } @@ -7157,16 +7284,14 @@ void MethodDescriptorProto::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* MethodDescriptorProto::descriptor() { protobuf_AssignDescriptorsOnce(); - return MethodDescriptorProto_descriptor_; + return file_level_metadata[10].descriptor; } const MethodDescriptorProto& MethodDescriptorProto::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -MethodDescriptorProto* MethodDescriptorProto::default_instance_ = NULL; - MethodDescriptorProto* MethodDescriptorProto::New(::google::protobuf::Arena* arena) const { MethodDescriptorProto* n = new MethodDescriptorProto; if (arena != NULL) { @@ -7177,45 +7302,30 @@ MethodDescriptorProto* MethodDescriptorProto::New(::google::protobuf::Arena* are void MethodDescriptorProto::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.MethodDescriptorProto) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(MethodDescriptorProto, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 63u) { - ZR_(client_streaming_, server_streaming_); + if (_has_bits_[0 / 32] & 15u) { if (has_name()) { - name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!name_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_.UnsafeRawStringPointer())->clear(); } if (has_input_type()) { - input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!input_type_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*input_type_.UnsafeRawStringPointer())->clear(); } if (has_output_type()) { - output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!output_type_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*output_type_.UnsafeRawStringPointer())->clear(); } if (has_options()) { - if (options_ != NULL) options_->::google::protobuf::MethodOptions::Clear(); + GOOGLE_DCHECK(options_ != NULL); + options_->::google::protobuf::MethodOptions::Clear(); } } - -#undef ZR_HELPER_ -#undef ZR_ - - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 48u) { + ::memset(&client_streaming_, 0, reinterpret_cast(&server_streaming_) - + reinterpret_cast(&client_streaming_) + sizeof(server_streaming_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool MethodDescriptorProto::MergePartialFromCodedStream( @@ -7224,13 +7334,13 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.MethodDescriptorProto) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string name = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_name())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7240,14 +7350,12 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_input_type; break; } // optional string input_type = 2; case 2: { - if (tag == 18) { - parse_input_type: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_input_type())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7257,14 +7365,12 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_output_type; break; } // optional string output_type = 3; case 3: { - if (tag == 26) { - parse_output_type: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_output_type())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -7274,50 +7380,43 @@ bool MethodDescriptorProto::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_options; break; } // optional .google.protobuf.MethodOptions options = 4; case 4: { - if (tag == 34) { - parse_options: + if (tag == 34u) { DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( input, mutable_options())); } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_client_streaming; break; } // optional bool client_streaming = 5 [default = false]; case 5: { - if (tag == 40) { - parse_client_streaming: + if (tag == 40u) { + set_has_client_streaming(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &client_streaming_))); - set_has_client_streaming(); } else { goto handle_unusual; } - if (input->ExpectTag(48)) goto parse_server_streaming; break; } // optional bool server_streaming = 6 [default = false]; case 6: { - if (tag == 48) { - parse_server_streaming: + if (tag == 48u) { + set_has_server_streaming(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &server_streaming_))); - set_has_server_streaming(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -7399,8 +7498,9 @@ void MethodDescriptorProto::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.MethodDescriptorProto) } -::google::protobuf::uint8* MethodDescriptorProto::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* MethodDescriptorProto::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodDescriptorProto) // optional string name = 1; if (has_name()) { @@ -7438,8 +7538,8 @@ ::google::protobuf::uint8* MethodDescriptorProto::SerializeWithCachedSizesToArra // optional .google.protobuf.MethodOptions options = 4; if (has_options()) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 4, *this->options_, target); + InternalWriteMessageNoVirtualToArray( + 4, *this->options_, false, target); } // optional bool client_streaming = 5 [default = false]; @@ -7460,10 +7560,15 @@ ::google::protobuf::uint8* MethodDescriptorProto::SerializeWithCachedSizesToArra return target; } -int MethodDescriptorProto::ByteSize() const { +size_t MethodDescriptorProto::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodDescriptorProto) - int total_size = 0; + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } if (_has_bits_[0 / 32] & 63u) { // optional string name = 1; if (has_name()) { @@ -7504,21 +7609,17 @@ int MethodDescriptorProto::ByteSize() const { } } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const MethodDescriptorProto* source = + GOOGLE_DCHECK_NE(&from, this); + const MethodDescriptorProto* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -7532,8 +7633,9 @@ void MethodDescriptorProto::MergeFrom(const ::google::protobuf::Message& from) { void MethodDescriptorProto::MergeFrom(const MethodDescriptorProto& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodDescriptorProto) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 63u) { if (from.has_name()) { set_has_name(); name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_); @@ -7556,9 +7658,6 @@ void MethodDescriptorProto::MergeFrom(const MethodDescriptorProto& from) { set_server_streaming(from.server_streaming()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void MethodDescriptorProto::CopyFrom(const ::google::protobuf::Message& from) { @@ -7576,7 +7675,6 @@ void MethodDescriptorProto::CopyFrom(const MethodDescriptorProto& from) { } bool MethodDescriptorProto::IsInitialized() const { - if (has_options()) { if (!this->options_->IsInitialized()) return false; } @@ -7601,10 +7699,7 @@ void MethodDescriptorProto::InternalSwap(MethodDescriptorProto* other) { ::google::protobuf::Metadata MethodDescriptorProto::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = MethodDescriptorProto_descriptor_; - metadata.reflection = MethodDescriptorProto_reflection_; - return metadata; + return file_level_metadata[10]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -7624,37 +7719,45 @@ void MethodDescriptorProto::clear_name() { name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name(); } - const ::std::string& MethodDescriptorProto::name() const { +const ::std::string& MethodDescriptorProto::name() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.name) - return name_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_.GetNoArena(); } - void MethodDescriptorProto::set_name(const ::std::string& value) { +void MethodDescriptorProto::set_name(const ::std::string& value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.name) } - void MethodDescriptorProto::set_name(const char* value) { +#if LANG_CXX11 +void MethodDescriptorProto::set_name(::std::string&& value) { + set_has_name(); + name_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.MethodDescriptorProto.name) +} +#endif +void MethodDescriptorProto::set_name(const char* value) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.name) } - void MethodDescriptorProto::set_name(const char* value, size_t size) { +void MethodDescriptorProto::set_name(const char* value, size_t size) { set_has_name(); name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.name) } - ::std::string* MethodDescriptorProto::mutable_name() { +::std::string* MethodDescriptorProto::mutable_name() { set_has_name(); // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.name) return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* MethodDescriptorProto::release_name() { +::std::string* MethodDescriptorProto::release_name() { // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.name) clear_has_name(); return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void MethodDescriptorProto::set_allocated_name(::std::string* name) { +void MethodDescriptorProto::set_allocated_name(::std::string* name) { if (name != NULL) { set_has_name(); } else { @@ -7678,37 +7781,45 @@ void MethodDescriptorProto::clear_input_type() { input_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_input_type(); } - const ::std::string& MethodDescriptorProto::input_type() const { +const ::std::string& MethodDescriptorProto::input_type() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.input_type) - return input_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return input_type_.GetNoArena(); } - void MethodDescriptorProto::set_input_type(const ::std::string& value) { +void MethodDescriptorProto::set_input_type(const ::std::string& value) { set_has_input_type(); input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.input_type) } - void MethodDescriptorProto::set_input_type(const char* value) { +#if LANG_CXX11 +void MethodDescriptorProto::set_input_type(::std::string&& value) { + set_has_input_type(); + input_type_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.MethodDescriptorProto.input_type) +} +#endif +void MethodDescriptorProto::set_input_type(const char* value) { set_has_input_type(); input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.input_type) } - void MethodDescriptorProto::set_input_type(const char* value, size_t size) { +void MethodDescriptorProto::set_input_type(const char* value, size_t size) { set_has_input_type(); input_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.input_type) } - ::std::string* MethodDescriptorProto::mutable_input_type() { +::std::string* MethodDescriptorProto::mutable_input_type() { set_has_input_type(); // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.input_type) return input_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* MethodDescriptorProto::release_input_type() { +::std::string* MethodDescriptorProto::release_input_type() { // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.input_type) clear_has_input_type(); return input_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) { +void MethodDescriptorProto::set_allocated_input_type(::std::string* input_type) { if (input_type != NULL) { set_has_input_type(); } else { @@ -7732,37 +7843,45 @@ void MethodDescriptorProto::clear_output_type() { output_type_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_output_type(); } - const ::std::string& MethodDescriptorProto::output_type() const { +const ::std::string& MethodDescriptorProto::output_type() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.output_type) - return output_type_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return output_type_.GetNoArena(); } - void MethodDescriptorProto::set_output_type(const ::std::string& value) { +void MethodDescriptorProto::set_output_type(const ::std::string& value) { set_has_output_type(); output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.output_type) } - void MethodDescriptorProto::set_output_type(const char* value) { +#if LANG_CXX11 +void MethodDescriptorProto::set_output_type(::std::string&& value) { + set_has_output_type(); + output_type_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.MethodDescriptorProto.output_type) +} +#endif +void MethodDescriptorProto::set_output_type(const char* value) { set_has_output_type(); output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.MethodDescriptorProto.output_type) } - void MethodDescriptorProto::set_output_type(const char* value, size_t size) { +void MethodDescriptorProto::set_output_type(const char* value, size_t size) { set_has_output_type(); output_type_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.MethodDescriptorProto.output_type) } - ::std::string* MethodDescriptorProto::mutable_output_type() { +::std::string* MethodDescriptorProto::mutable_output_type() { set_has_output_type(); // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.output_type) return output_type_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* MethodDescriptorProto::release_output_type() { +::std::string* MethodDescriptorProto::release_output_type() { // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.output_type) clear_has_output_type(); return output_type_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) { +void MethodDescriptorProto::set_allocated_output_type(::std::string* output_type) { if (output_type != NULL) { set_has_output_type(); } else { @@ -7788,7 +7907,8 @@ void MethodDescriptorProto::clear_options() { } const ::google::protobuf::MethodOptions& MethodDescriptorProto::options() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options) - return options_ != NULL ? *options_ : *default_instance_->options_; + return options_ != NULL ? *options_ + : *::google::protobuf::MethodOptions::internal_default_instance(); } ::google::protobuf::MethodOptions* MethodDescriptorProto::mutable_options() { set_has_options(); @@ -7830,11 +7950,11 @@ void MethodDescriptorProto::clear_client_streaming() { client_streaming_ = false; clear_has_client_streaming(); } - bool MethodDescriptorProto::client_streaming() const { +bool MethodDescriptorProto::client_streaming() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.client_streaming) return client_streaming_; } - void MethodDescriptorProto::set_client_streaming(bool value) { +void MethodDescriptorProto::set_client_streaming(bool value) { set_has_client_streaming(); client_streaming_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.client_streaming) @@ -7854,11 +7974,11 @@ void MethodDescriptorProto::clear_server_streaming() { server_streaming_ = false; clear_has_server_streaming(); } - bool MethodDescriptorProto::server_streaming() const { +bool MethodDescriptorProto::server_streaming() const { // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.server_streaming) return server_streaming_; } - void MethodDescriptorProto::set_server_streaming(bool value) { +void MethodDescriptorProto::set_server_streaming(bool value) { set_has_server_streaming(); server_streaming_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming) @@ -7868,29 +7988,6 @@ void MethodDescriptorProto::clear_server_streaming() { // =================================================================== -const ::google::protobuf::EnumDescriptor* FileOptions_OptimizeMode_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FileOptions_OptimizeMode_descriptor_; -} -bool FileOptions_OptimizeMode_IsValid(int value) { - switch(value) { - case 1: - case 2: - case 3: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FileOptions_OptimizeMode FileOptions::SPEED; -const FileOptions_OptimizeMode FileOptions::CODE_SIZE; -const FileOptions_OptimizeMode FileOptions::LITE_RUNTIME; -const FileOptions_OptimizeMode FileOptions::OptimizeMode_MIN; -const FileOptions_OptimizeMode FileOptions::OptimizeMode_MAX; -const int FileOptions::OptimizeMode_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int FileOptions::kJavaPackageFieldNumber; const int FileOptions::kJavaOuterClassnameFieldNumber; @@ -7906,44 +8003,67 @@ const int FileOptions::kDeprecatedFieldNumber; const int FileOptions::kCcEnableArenasFieldNumber; const int FileOptions::kObjcClassPrefixFieldNumber; const int FileOptions::kCsharpNamespaceFieldNumber; +const int FileOptions::kSwiftPrefixFieldNumber; const int FileOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 FileOptions::FileOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FileOptions) } - -void FileOptions::InitAsDefaultInstance() { -} - FileOptions::FileOptions(const FileOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + java_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_java_package()) { + java_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_package_); + } + java_outer_classname_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_java_outer_classname()) { + java_outer_classname_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_outer_classname_); + } + go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_go_package()) { + go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_); + } + objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_objc_class_prefix()) { + objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_); + } + csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_csharp_namespace()) { + csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_); + } + swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_swift_prefix()) { + swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_); + } + ::memcpy(&java_multiple_files_, &from.java_multiple_files_, + reinterpret_cast(&optimize_for_) - + reinterpret_cast(&java_multiple_files_) + sizeof(optimize_for_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.FileOptions) } void FileOptions::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; java_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); java_outer_classname_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - java_multiple_files_ = false; - java_generate_equals_and_hash_ = false; - java_string_check_utf8_ = false; - optimize_for_ = 1; go_package_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - cc_generic_services_ = false; - java_generic_services_ = false; - py_generic_services_ = false; - deprecated_ = false; - cc_enable_arenas_ = false; objc_class_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); csharp_namespace_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + swift_prefix_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(&java_multiple_files_, 0, reinterpret_cast(&cc_enable_arenas_) - + reinterpret_cast(&java_multiple_files_) + sizeof(cc_enable_arenas_)); + optimize_for_ = 1; } FileOptions::~FileOptions() { @@ -7957,8 +8077,7 @@ void FileOptions::SharedDtor() { go_package_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); objc_class_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); csharp_namespace_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } + swift_prefix_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } void FileOptions::SetCachedSize(int size) const { @@ -7968,16 +8087,14 @@ void FileOptions::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FileOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return FileOptions_descriptor_; + return file_level_metadata[11].descriptor; } const FileOptions& FileOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FileOptions* FileOptions::default_instance_ = NULL; - FileOptions* FileOptions::New(::google::protobuf::Arena* arena) const { FileOptions* n = new FileOptions; if (arena != NULL) { @@ -7989,53 +8106,44 @@ FileOptions* FileOptions::New(::google::protobuf::Arena* arena) const { void FileOptions::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FileOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(FileOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 255u) { - ZR_(java_multiple_files_, cc_generic_services_); + uninterpreted_option_.Clear(); + if (_has_bits_[0 / 32] & 63u) { if (has_java_package()) { - java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!java_package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*java_package_.UnsafeRawStringPointer())->clear(); } if (has_java_outer_classname()) { - java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!java_outer_classname_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*java_outer_classname_.UnsafeRawStringPointer())->clear(); } - optimize_for_ = 1; if (has_go_package()) { - go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!go_package_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*go_package_.UnsafeRawStringPointer())->clear(); } - } - if (_has_bits_[8 / 32] & 16128u) { - ZR_(java_generic_services_, cc_enable_arenas_); if (has_objc_class_prefix()) { - objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!objc_class_prefix_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*objc_class_prefix_.UnsafeRawStringPointer())->clear(); } if (has_csharp_namespace()) { - csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + GOOGLE_DCHECK(!csharp_namespace_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*csharp_namespace_.UnsafeRawStringPointer())->clear(); + } + if (has_swift_prefix()) { + GOOGLE_DCHECK(!swift_prefix_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*swift_prefix_.UnsafeRawStringPointer())->clear(); } } - -#undef ZR_HELPER_ -#undef ZR_ - - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 192u) { + ::memset(&java_multiple_files_, 0, reinterpret_cast(&java_generate_equals_and_hash_) - + reinterpret_cast(&java_multiple_files_) + sizeof(java_generate_equals_and_hash_)); } + if (_has_bits_[8 / 32] & 32512u) { + ::memset(&java_string_check_utf8_, 0, reinterpret_cast(&cc_enable_arenas_) - + reinterpret_cast(&java_string_check_utf8_) + sizeof(cc_enable_arenas_)); + optimize_for_ = 1; + } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FileOptions::MergePartialFromCodedStream( @@ -8044,13 +8152,13 @@ bool FileOptions::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FileOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional string java_package = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_java_package())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8060,14 +8168,12 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(66)) goto parse_java_outer_classname; break; } // optional string java_outer_classname = 8; case 8: { - if (tag == 66) { - parse_java_outer_classname: + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_java_outer_classname())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8077,14 +8183,12 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(72)) goto parse_optimize_for; break; } // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; case 9: { - if (tag == 72) { - parse_optimize_for: + if (tag == 72u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -8097,29 +8201,25 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_java_multiple_files; break; } // optional bool java_multiple_files = 10 [default = false]; case 10: { - if (tag == 80) { - parse_java_multiple_files: + if (tag == 80u) { + set_has_java_multiple_files(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_multiple_files_))); - set_has_java_multiple_files(); } else { goto handle_unusual; } - if (input->ExpectTag(90)) goto parse_go_package; break; } // optional string go_package = 11; case 11: { - if (tag == 90) { - parse_go_package: + if (tag == 90u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_go_package())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8129,119 +8229,103 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(128)) goto parse_cc_generic_services; break; } // optional bool cc_generic_services = 16 [default = false]; case 16: { - if (tag == 128) { - parse_cc_generic_services: + if (tag == 128u) { + set_has_cc_generic_services(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &cc_generic_services_))); - set_has_cc_generic_services(); } else { goto handle_unusual; } - if (input->ExpectTag(136)) goto parse_java_generic_services; break; } // optional bool java_generic_services = 17 [default = false]; case 17: { - if (tag == 136) { - parse_java_generic_services: + if (tag == 136u) { + set_has_java_generic_services(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_generic_services_))); - set_has_java_generic_services(); } else { goto handle_unusual; } - if (input->ExpectTag(144)) goto parse_py_generic_services; break; } // optional bool py_generic_services = 18 [default = false]; case 18: { - if (tag == 144) { - parse_py_generic_services: + if (tag == 144u) { + set_has_py_generic_services(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &py_generic_services_))); - set_has_py_generic_services(); } else { goto handle_unusual; } - if (input->ExpectTag(160)) goto parse_java_generate_equals_and_hash; break; } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; case 20: { - if (tag == 160) { - parse_java_generate_equals_and_hash: + if (tag == 160u) { + set_has_java_generate_equals_and_hash(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_generate_equals_and_hash_))); - set_has_java_generate_equals_and_hash(); } else { goto handle_unusual; } - if (input->ExpectTag(184)) goto parse_deprecated; break; } // optional bool deprecated = 23 [default = false]; case 23: { - if (tag == 184) { - parse_deprecated: + if (tag == 184u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(216)) goto parse_java_string_check_utf8; break; } // optional bool java_string_check_utf8 = 27 [default = false]; case 27: { - if (tag == 216) { - parse_java_string_check_utf8: + if (tag == 216u) { + set_has_java_string_check_utf8(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &java_string_check_utf8_))); - set_has_java_string_check_utf8(); } else { goto handle_unusual; } - if (input->ExpectTag(248)) goto parse_cc_enable_arenas; break; } // optional bool cc_enable_arenas = 31 [default = false]; case 31: { - if (tag == 248) { - parse_cc_enable_arenas: + if (tag == 248u) { + set_has_cc_enable_arenas(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &cc_enable_arenas_))); - set_has_cc_enable_arenas(); } else { goto handle_unusual; } - if (input->ExpectTag(290)) goto parse_objc_class_prefix; break; } // optional string objc_class_prefix = 36; case 36: { - if (tag == 290) { - parse_objc_class_prefix: + if (tag == 290u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_objc_class_prefix())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8251,14 +8335,12 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(298)) goto parse_csharp_namespace; break; } // optional string csharp_namespace = 37; case 37: { - if (tag == 298) { - parse_csharp_namespace: + if (tag == 298u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_csharp_namespace())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -8268,24 +8350,34 @@ bool FileOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; + break; + } + + // optional string swift_prefix = 39; + case 39: { + if (tag == 314u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_swift_prefix())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->swift_prefix().data(), this->swift_prefix().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.FileOptions.swift_prefix"); + } else { + goto handle_unusual; + } break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -8297,7 +8389,7 @@ bool FileOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -8375,7 +8467,7 @@ void FileOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteBool(18, this->py_generic_services(), output); } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; if (has_java_generate_equals_and_hash()) { ::google::protobuf::internal::WireFormatLite::WriteBool(20, this->java_generate_equals_and_hash(), output); } @@ -8415,6 +8507,16 @@ void FileOptions::SerializeWithCachedSizes( 37, this->csharp_namespace(), output); } + // optional string swift_prefix = 39; + if (has_swift_prefix()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->swift_prefix().data(), this->swift_prefix().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.FileOptions.swift_prefix"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 39, this->swift_prefix(), output); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -8432,8 +8534,9 @@ void FileOptions::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FileOptions) } -::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FileOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileOptions) // optional string java_package = 1; if (has_java_package()) { @@ -8494,7 +8597,7 @@ ::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(18, this->py_generic_services(), target); } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; if (has_java_generate_equals_and_hash()) { target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(20, this->java_generate_equals_and_hash(), target); } @@ -8536,16 +8639,27 @@ ::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( 37, this->csharp_namespace(), target); } + // optional string swift_prefix = 39; + if (has_swift_prefix()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->swift_prefix().data(), this->swift_prefix().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.FileOptions.swift_prefix"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 39, this->swift_prefix(), target); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( @@ -8555,9 +8669,27 @@ ::google::protobuf::uint8* FileOptions::SerializeWithCachedSizesToArray( return target; } -int FileOptions::ByteSize() const { +size_t FileOptions::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileOptions) - int total_size = 0; + size_t total_size = 0; + + total_size += _extensions_.ByteSize(); + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } if (_has_bits_[0 / 32] & 255u) { // optional string java_package = 1; @@ -8574,41 +8706,56 @@ int FileOptions::ByteSize() const { this->java_outer_classname()); } + // optional string go_package = 11; + if (has_go_package()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->go_package()); + } + + // optional string objc_class_prefix = 36; + if (has_objc_class_prefix()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->objc_class_prefix()); + } + + // optional string csharp_namespace = 37; + if (has_csharp_namespace()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->csharp_namespace()); + } + + // optional string swift_prefix = 39; + if (has_swift_prefix()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->swift_prefix()); + } + // optional bool java_multiple_files = 10 [default = false]; if (has_java_multiple_files()) { total_size += 1 + 1; } - // optional bool java_generate_equals_and_hash = 20 [default = false]; + // optional bool java_generate_equals_and_hash = 20 [deprecated = true]; if (has_java_generate_equals_and_hash()) { total_size += 2 + 1; } + } + if (_has_bits_[8 / 32] & 32512u) { // optional bool java_string_check_utf8 = 27 [default = false]; if (has_java_string_check_utf8()) { total_size += 2 + 1; } - // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; - if (has_optimize_for()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::EnumSize(this->optimize_for()); - } - - // optional string go_package = 11; - if (has_go_package()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->go_package()); - } - // optional bool cc_generic_services = 16 [default = false]; if (has_cc_generic_services()) { total_size += 2 + 1; } - } - if (_has_bits_[8 / 32] & 16128u) { // optional bool java_generic_services = 17 [default = false]; if (has_java_generic_services()) { total_size += 2 + 1; @@ -8629,46 +8776,24 @@ int FileOptions::ByteSize() const { total_size += 2 + 1; } - // optional string objc_class_prefix = 36; - if (has_objc_class_prefix()) { - total_size += 2 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->objc_class_prefix()); - } - - // optional string csharp_namespace = 37; - if (has_csharp_namespace()) { - total_size += 2 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->csharp_namespace()); + // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; + if (has_optimize_for()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->optimize_for()); } } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } - - total_size += _extensions_.ByteSize(); - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FileOptions::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FileOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FileOptions* source = + GOOGLE_DCHECK_NE(&from, this); + const FileOptions* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -8682,9 +8807,11 @@ void FileOptions::MergeFrom(const ::google::protobuf::Message& from) { void FileOptions::MergeFrom(const FileOptions& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 255u) { if (from.has_java_package()) { set_has_java_package(); java_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_package_); @@ -8693,27 +8820,36 @@ void FileOptions::MergeFrom(const FileOptions& from) { set_has_java_outer_classname(); java_outer_classname_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.java_outer_classname_); } - if (from.has_java_multiple_files()) { + if (from.has_go_package()) { + set_has_go_package(); + go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_); + } + if (from.has_objc_class_prefix()) { + set_has_objc_class_prefix(); + objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_); + } + if (from.has_csharp_namespace()) { + set_has_csharp_namespace(); + csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_); + } + if (from.has_swift_prefix()) { + set_has_swift_prefix(); + swift_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.swift_prefix_); + } + if (from.has_java_multiple_files()) { set_java_multiple_files(from.java_multiple_files()); } if (from.has_java_generate_equals_and_hash()) { set_java_generate_equals_and_hash(from.java_generate_equals_and_hash()); } + } + if (from._has_bits_[8 / 32] & 32512u) { if (from.has_java_string_check_utf8()) { set_java_string_check_utf8(from.java_string_check_utf8()); } - if (from.has_optimize_for()) { - set_optimize_for(from.optimize_for()); - } - if (from.has_go_package()) { - set_has_go_package(); - go_package_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.go_package_); - } if (from.has_cc_generic_services()) { set_cc_generic_services(from.cc_generic_services()); } - } - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_java_generic_services()) { set_java_generic_services(from.java_generic_services()); } @@ -8726,19 +8862,10 @@ void FileOptions::MergeFrom(const FileOptions& from) { if (from.has_cc_enable_arenas()) { set_cc_enable_arenas(from.cc_enable_arenas()); } - if (from.has_objc_class_prefix()) { - set_has_objc_class_prefix(); - objc_class_prefix_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.objc_class_prefix_); - } - if (from.has_csharp_namespace()) { - set_has_csharp_namespace(); - csharp_namespace_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.csharp_namespace_); + if (from.has_optimize_for()) { + set_optimize_for(from.optimize_for()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void FileOptions::CopyFrom(const ::google::protobuf::Message& from) { @@ -8756,10 +8883,12 @@ void FileOptions::CopyFrom(const FileOptions& from) { } bool FileOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } void FileOptions::Swap(FileOptions* other) { @@ -8767,21 +8896,22 @@ void FileOptions::Swap(FileOptions* other) { InternalSwap(other); } void FileOptions::InternalSwap(FileOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); java_package_.Swap(&other->java_package_); java_outer_classname_.Swap(&other->java_outer_classname_); + go_package_.Swap(&other->go_package_); + objc_class_prefix_.Swap(&other->objc_class_prefix_); + csharp_namespace_.Swap(&other->csharp_namespace_); + swift_prefix_.Swap(&other->swift_prefix_); std::swap(java_multiple_files_, other->java_multiple_files_); std::swap(java_generate_equals_and_hash_, other->java_generate_equals_and_hash_); std::swap(java_string_check_utf8_, other->java_string_check_utf8_); - std::swap(optimize_for_, other->optimize_for_); - go_package_.Swap(&other->go_package_); std::swap(cc_generic_services_, other->cc_generic_services_); std::swap(java_generic_services_, other->java_generic_services_); std::swap(py_generic_services_, other->py_generic_services_); std::swap(deprecated_, other->deprecated_); std::swap(cc_enable_arenas_, other->cc_enable_arenas_); - objc_class_prefix_.Swap(&other->objc_class_prefix_); - csharp_namespace_.Swap(&other->csharp_namespace_); - uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(optimize_for_, other->optimize_for_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -8790,10 +8920,7 @@ void FileOptions::InternalSwap(FileOptions* other) { ::google::protobuf::Metadata FileOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FileOptions_descriptor_; - metadata.reflection = FileOptions_reflection_; - return metadata; + return file_level_metadata[11]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -8813,37 +8940,45 @@ void FileOptions::clear_java_package() { java_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_java_package(); } - const ::std::string& FileOptions::java_package() const { +const ::std::string& FileOptions::java_package() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_package) - return java_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return java_package_.GetNoArena(); } - void FileOptions::set_java_package(const ::std::string& value) { +void FileOptions::set_java_package(const ::std::string& value) { set_has_java_package(); java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_package) } - void FileOptions::set_java_package(const char* value) { +#if LANG_CXX11 +void FileOptions::set_java_package(::std::string&& value) { + set_has_java_package(); + java_package_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.java_package) +} +#endif +void FileOptions::set_java_package(const char* value) { set_has_java_package(); java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_package) } - void FileOptions::set_java_package(const char* value, size_t size) { +void FileOptions::set_java_package(const char* value, size_t size) { set_has_java_package(); java_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_package) } - ::std::string* FileOptions::mutable_java_package() { +::std::string* FileOptions::mutable_java_package() { set_has_java_package(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_package) return java_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_java_package() { +::std::string* FileOptions::release_java_package() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_package) clear_has_java_package(); return java_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_java_package(::std::string* java_package) { +void FileOptions::set_allocated_java_package(::std::string* java_package) { if (java_package != NULL) { set_has_java_package(); } else { @@ -8867,37 +9002,45 @@ void FileOptions::clear_java_outer_classname() { java_outer_classname_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_java_outer_classname(); } - const ::std::string& FileOptions::java_outer_classname() const { +const ::std::string& FileOptions::java_outer_classname() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_outer_classname) - return java_outer_classname_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return java_outer_classname_.GetNoArena(); } - void FileOptions::set_java_outer_classname(const ::std::string& value) { +void FileOptions::set_java_outer_classname(const ::std::string& value) { set_has_java_outer_classname(); java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_outer_classname) } - void FileOptions::set_java_outer_classname(const char* value) { +#if LANG_CXX11 +void FileOptions::set_java_outer_classname(::std::string&& value) { + set_has_java_outer_classname(); + java_outer_classname_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.java_outer_classname) +} +#endif +void FileOptions::set_java_outer_classname(const char* value) { set_has_java_outer_classname(); java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.java_outer_classname) } - void FileOptions::set_java_outer_classname(const char* value, size_t size) { +void FileOptions::set_java_outer_classname(const char* value, size_t size) { set_has_java_outer_classname(); java_outer_classname_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.java_outer_classname) } - ::std::string* FileOptions::mutable_java_outer_classname() { +::std::string* FileOptions::mutable_java_outer_classname() { set_has_java_outer_classname(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_outer_classname) return java_outer_classname_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_java_outer_classname() { +::std::string* FileOptions::release_java_outer_classname() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_outer_classname) clear_has_java_outer_classname(); return java_outer_classname_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_classname) { +void FileOptions::set_allocated_java_outer_classname(::std::string* java_outer_classname) { if (java_outer_classname != NULL) { set_has_java_outer_classname(); } else { @@ -8909,47 +9052,47 @@ void FileOptions::clear_java_outer_classname() { // optional bool java_multiple_files = 10 [default = false]; bool FileOptions::has_java_multiple_files() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000040u) != 0; } void FileOptions::set_has_java_multiple_files() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000040u; } void FileOptions::clear_has_java_multiple_files() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000040u; } void FileOptions::clear_java_multiple_files() { java_multiple_files_ = false; clear_has_java_multiple_files(); } - bool FileOptions::java_multiple_files() const { +bool FileOptions::java_multiple_files() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_multiple_files) return java_multiple_files_; } - void FileOptions::set_java_multiple_files(bool value) { +void FileOptions::set_java_multiple_files(bool value) { set_has_java_multiple_files(); java_multiple_files_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files) } -// optional bool java_generate_equals_and_hash = 20 [default = false]; +// optional bool java_generate_equals_and_hash = 20 [deprecated = true]; bool FileOptions::has_java_generate_equals_and_hash() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000080u) != 0; } void FileOptions::set_has_java_generate_equals_and_hash() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000080u; } void FileOptions::clear_has_java_generate_equals_and_hash() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000080u; } void FileOptions::clear_java_generate_equals_and_hash() { java_generate_equals_and_hash_ = false; clear_has_java_generate_equals_and_hash(); } - bool FileOptions::java_generate_equals_and_hash() const { +bool FileOptions::java_generate_equals_and_hash() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generate_equals_and_hash) return java_generate_equals_and_hash_; } - void FileOptions::set_java_generate_equals_and_hash(bool value) { +void FileOptions::set_java_generate_equals_and_hash(bool value) { set_has_java_generate_equals_and_hash(); java_generate_equals_and_hash_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generate_equals_and_hash) @@ -8957,23 +9100,23 @@ void FileOptions::clear_java_generate_equals_and_hash() { // optional bool java_string_check_utf8 = 27 [default = false]; bool FileOptions::has_java_string_check_utf8() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000100u) != 0; } void FileOptions::set_has_java_string_check_utf8() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000100u; } void FileOptions::clear_has_java_string_check_utf8() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000100u; } void FileOptions::clear_java_string_check_utf8() { java_string_check_utf8_ = false; clear_has_java_string_check_utf8(); } - bool FileOptions::java_string_check_utf8() const { +bool FileOptions::java_string_check_utf8() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_string_check_utf8) return java_string_check_utf8_; } - void FileOptions::set_java_string_check_utf8(bool value) { +void FileOptions::set_java_string_check_utf8(bool value) { set_has_java_string_check_utf8(); java_string_check_utf8_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8) @@ -8981,23 +9124,23 @@ void FileOptions::clear_java_string_check_utf8() { // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; bool FileOptions::has_optimize_for() const { - return (_has_bits_[0] & 0x00000020u) != 0; + return (_has_bits_[0] & 0x00004000u) != 0; } void FileOptions::set_has_optimize_for() { - _has_bits_[0] |= 0x00000020u; + _has_bits_[0] |= 0x00004000u; } void FileOptions::clear_has_optimize_for() { - _has_bits_[0] &= ~0x00000020u; + _has_bits_[0] &= ~0x00004000u; } void FileOptions::clear_optimize_for() { optimize_for_ = 1; clear_has_optimize_for(); } - ::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const { +::google::protobuf::FileOptions_OptimizeMode FileOptions::optimize_for() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.optimize_for) return static_cast< ::google::protobuf::FileOptions_OptimizeMode >(optimize_for_); } - void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) { +void FileOptions::set_optimize_for(::google::protobuf::FileOptions_OptimizeMode value) { assert(::google::protobuf::FileOptions_OptimizeMode_IsValid(value)); set_has_optimize_for(); optimize_for_ = value; @@ -9006,49 +9149,57 @@ void FileOptions::clear_optimize_for() { // optional string go_package = 11; bool FileOptions::has_go_package() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FileOptions::set_has_go_package() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000004u; } void FileOptions::clear_has_go_package() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000004u; } void FileOptions::clear_go_package() { go_package_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_go_package(); } - const ::std::string& FileOptions::go_package() const { +const ::std::string& FileOptions::go_package() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.go_package) - return go_package_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return go_package_.GetNoArena(); } - void FileOptions::set_go_package(const ::std::string& value) { +void FileOptions::set_go_package(const ::std::string& value) { set_has_go_package(); go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.go_package) } - void FileOptions::set_go_package(const char* value) { +#if LANG_CXX11 +void FileOptions::set_go_package(::std::string&& value) { + set_has_go_package(); + go_package_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.go_package) +} +#endif +void FileOptions::set_go_package(const char* value) { set_has_go_package(); go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.go_package) } - void FileOptions::set_go_package(const char* value, size_t size) { +void FileOptions::set_go_package(const char* value, size_t size) { set_has_go_package(); go_package_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.go_package) } - ::std::string* FileOptions::mutable_go_package() { +::std::string* FileOptions::mutable_go_package() { set_has_go_package(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.go_package) return go_package_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_go_package() { +::std::string* FileOptions::release_go_package() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.go_package) clear_has_go_package(); return go_package_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_go_package(::std::string* go_package) { +void FileOptions::set_allocated_go_package(::std::string* go_package) { if (go_package != NULL) { set_has_go_package(); } else { @@ -9060,23 +9211,23 @@ void FileOptions::clear_go_package() { // optional bool cc_generic_services = 16 [default = false]; bool FileOptions::has_cc_generic_services() const { - return (_has_bits_[0] & 0x00000080u) != 0; + return (_has_bits_[0] & 0x00000200u) != 0; } void FileOptions::set_has_cc_generic_services() { - _has_bits_[0] |= 0x00000080u; + _has_bits_[0] |= 0x00000200u; } void FileOptions::clear_has_cc_generic_services() { - _has_bits_[0] &= ~0x00000080u; + _has_bits_[0] &= ~0x00000200u; } void FileOptions::clear_cc_generic_services() { cc_generic_services_ = false; clear_has_cc_generic_services(); } - bool FileOptions::cc_generic_services() const { +bool FileOptions::cc_generic_services() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_generic_services) return cc_generic_services_; } - void FileOptions::set_cc_generic_services(bool value) { +void FileOptions::set_cc_generic_services(bool value) { set_has_cc_generic_services(); cc_generic_services_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services) @@ -9084,23 +9235,23 @@ void FileOptions::clear_cc_generic_services() { // optional bool java_generic_services = 17 [default = false]; bool FileOptions::has_java_generic_services() const { - return (_has_bits_[0] & 0x00000100u) != 0; + return (_has_bits_[0] & 0x00000400u) != 0; } void FileOptions::set_has_java_generic_services() { - _has_bits_[0] |= 0x00000100u; + _has_bits_[0] |= 0x00000400u; } void FileOptions::clear_has_java_generic_services() { - _has_bits_[0] &= ~0x00000100u; + _has_bits_[0] &= ~0x00000400u; } void FileOptions::clear_java_generic_services() { java_generic_services_ = false; clear_has_java_generic_services(); } - bool FileOptions::java_generic_services() const { +bool FileOptions::java_generic_services() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generic_services) return java_generic_services_; } - void FileOptions::set_java_generic_services(bool value) { +void FileOptions::set_java_generic_services(bool value) { set_has_java_generic_services(); java_generic_services_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services) @@ -9108,23 +9259,23 @@ void FileOptions::clear_java_generic_services() { // optional bool py_generic_services = 18 [default = false]; bool FileOptions::has_py_generic_services() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000800u) != 0; } void FileOptions::set_has_py_generic_services() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000800u; } void FileOptions::clear_has_py_generic_services() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000800u; } void FileOptions::clear_py_generic_services() { py_generic_services_ = false; clear_has_py_generic_services(); } - bool FileOptions::py_generic_services() const { +bool FileOptions::py_generic_services() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.py_generic_services) return py_generic_services_; } - void FileOptions::set_py_generic_services(bool value) { +void FileOptions::set_py_generic_services(bool value) { set_has_py_generic_services(); py_generic_services_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services) @@ -9132,23 +9283,23 @@ void FileOptions::clear_py_generic_services() { // optional bool deprecated = 23 [default = false]; bool FileOptions::has_deprecated() const { - return (_has_bits_[0] & 0x00000400u) != 0; + return (_has_bits_[0] & 0x00001000u) != 0; } void FileOptions::set_has_deprecated() { - _has_bits_[0] |= 0x00000400u; + _has_bits_[0] |= 0x00001000u; } void FileOptions::clear_has_deprecated() { - _has_bits_[0] &= ~0x00000400u; + _has_bits_[0] &= ~0x00001000u; } void FileOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool FileOptions::deprecated() const { +bool FileOptions::deprecated() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.deprecated) return deprecated_; } - void FileOptions::set_deprecated(bool value) { +void FileOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated) @@ -9156,23 +9307,23 @@ void FileOptions::clear_deprecated() { // optional bool cc_enable_arenas = 31 [default = false]; bool FileOptions::has_cc_enable_arenas() const { - return (_has_bits_[0] & 0x00000800u) != 0; + return (_has_bits_[0] & 0x00002000u) != 0; } void FileOptions::set_has_cc_enable_arenas() { - _has_bits_[0] |= 0x00000800u; + _has_bits_[0] |= 0x00002000u; } void FileOptions::clear_has_cc_enable_arenas() { - _has_bits_[0] &= ~0x00000800u; + _has_bits_[0] &= ~0x00002000u; } void FileOptions::clear_cc_enable_arenas() { cc_enable_arenas_ = false; clear_has_cc_enable_arenas(); } - bool FileOptions::cc_enable_arenas() const { +bool FileOptions::cc_enable_arenas() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_enable_arenas) return cc_enable_arenas_; } - void FileOptions::set_cc_enable_arenas(bool value) { +void FileOptions::set_cc_enable_arenas(bool value) { set_has_cc_enable_arenas(); cc_enable_arenas_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas) @@ -9180,49 +9331,57 @@ void FileOptions::clear_cc_enable_arenas() { // optional string objc_class_prefix = 36; bool FileOptions::has_objc_class_prefix() const { - return (_has_bits_[0] & 0x00001000u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } void FileOptions::set_has_objc_class_prefix() { - _has_bits_[0] |= 0x00001000u; + _has_bits_[0] |= 0x00000008u; } void FileOptions::clear_has_objc_class_prefix() { - _has_bits_[0] &= ~0x00001000u; + _has_bits_[0] &= ~0x00000008u; } void FileOptions::clear_objc_class_prefix() { objc_class_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_objc_class_prefix(); } - const ::std::string& FileOptions::objc_class_prefix() const { +const ::std::string& FileOptions::objc_class_prefix() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.objc_class_prefix) - return objc_class_prefix_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return objc_class_prefix_.GetNoArena(); } - void FileOptions::set_objc_class_prefix(const ::std::string& value) { +void FileOptions::set_objc_class_prefix(const ::std::string& value) { set_has_objc_class_prefix(); objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.objc_class_prefix) } - void FileOptions::set_objc_class_prefix(const char* value) { +#if LANG_CXX11 +void FileOptions::set_objc_class_prefix(::std::string&& value) { + set_has_objc_class_prefix(); + objc_class_prefix_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.objc_class_prefix) +} +#endif +void FileOptions::set_objc_class_prefix(const char* value) { set_has_objc_class_prefix(); objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.objc_class_prefix) } - void FileOptions::set_objc_class_prefix(const char* value, size_t size) { +void FileOptions::set_objc_class_prefix(const char* value, size_t size) { set_has_objc_class_prefix(); objc_class_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.objc_class_prefix) } - ::std::string* FileOptions::mutable_objc_class_prefix() { +::std::string* FileOptions::mutable_objc_class_prefix() { set_has_objc_class_prefix(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.objc_class_prefix) return objc_class_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_objc_class_prefix() { +::std::string* FileOptions::release_objc_class_prefix() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.objc_class_prefix) clear_has_objc_class_prefix(); return objc_class_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_prefix) { +void FileOptions::set_allocated_objc_class_prefix(::std::string* objc_class_prefix) { if (objc_class_prefix != NULL) { set_has_objc_class_prefix(); } else { @@ -9234,49 +9393,57 @@ void FileOptions::clear_objc_class_prefix() { // optional string csharp_namespace = 37; bool FileOptions::has_csharp_namespace() const { - return (_has_bits_[0] & 0x00002000u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } void FileOptions::set_has_csharp_namespace() { - _has_bits_[0] |= 0x00002000u; + _has_bits_[0] |= 0x00000010u; } void FileOptions::clear_has_csharp_namespace() { - _has_bits_[0] &= ~0x00002000u; + _has_bits_[0] &= ~0x00000010u; } void FileOptions::clear_csharp_namespace() { csharp_namespace_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_csharp_namespace(); } - const ::std::string& FileOptions::csharp_namespace() const { +const ::std::string& FileOptions::csharp_namespace() const { // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_namespace) - return csharp_namespace_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return csharp_namespace_.GetNoArena(); } - void FileOptions::set_csharp_namespace(const ::std::string& value) { +void FileOptions::set_csharp_namespace(const ::std::string& value) { set_has_csharp_namespace(); csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_namespace) } - void FileOptions::set_csharp_namespace(const char* value) { +#if LANG_CXX11 +void FileOptions::set_csharp_namespace(::std::string&& value) { + set_has_csharp_namespace(); + csharp_namespace_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.csharp_namespace) +} +#endif +void FileOptions::set_csharp_namespace(const char* value) { set_has_csharp_namespace(); csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.csharp_namespace) } - void FileOptions::set_csharp_namespace(const char* value, size_t size) { +void FileOptions::set_csharp_namespace(const char* value, size_t size) { set_has_csharp_namespace(); csharp_namespace_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.csharp_namespace) } - ::std::string* FileOptions::mutable_csharp_namespace() { +::std::string* FileOptions::mutable_csharp_namespace() { set_has_csharp_namespace(); // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.csharp_namespace) return csharp_namespace_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* FileOptions::release_csharp_namespace() { +::std::string* FileOptions::release_csharp_namespace() { // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.csharp_namespace) clear_has_csharp_namespace(); return csharp_namespace_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) { +void FileOptions::set_allocated_csharp_namespace(::std::string* csharp_namespace) { if (csharp_namespace != NULL) { set_has_csharp_namespace(); } else { @@ -9286,6 +9453,68 @@ void FileOptions::clear_csharp_namespace() { // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace) } +// optional string swift_prefix = 39; +bool FileOptions::has_swift_prefix() const { + return (_has_bits_[0] & 0x00000020u) != 0; +} +void FileOptions::set_has_swift_prefix() { + _has_bits_[0] |= 0x00000020u; +} +void FileOptions::clear_has_swift_prefix() { + _has_bits_[0] &= ~0x00000020u; +} +void FileOptions::clear_swift_prefix() { + swift_prefix_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_swift_prefix(); +} +const ::std::string& FileOptions::swift_prefix() const { + // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.swift_prefix) + return swift_prefix_.GetNoArena(); +} +void FileOptions::set_swift_prefix(const ::std::string& value) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix) +} +#if LANG_CXX11 +void FileOptions::set_swift_prefix(::std::string&& value) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.FileOptions.swift_prefix) +} +#endif +void FileOptions::set_swift_prefix(const char* value) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.FileOptions.swift_prefix) +} +void FileOptions::set_swift_prefix(const char* value, size_t size) { + set_has_swift_prefix(); + swift_prefix_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileOptions.swift_prefix) +} +::std::string* FileOptions::mutable_swift_prefix() { + set_has_swift_prefix(); + // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.swift_prefix) + return swift_prefix_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* FileOptions::release_swift_prefix() { + // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix) + clear_has_swift_prefix(); + return swift_prefix_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void FileOptions::set_allocated_swift_prefix(::std::string* swift_prefix) { + if (swift_prefix != NULL) { + set_has_swift_prefix(); + } else { + clear_has_swift_prefix(); + } + swift_prefix_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), swift_prefix); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix) +} + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; int FileOptions::uninterpreted_option_size() const { return uninterpreted_option_.size(); @@ -9330,28 +9559,30 @@ const int MessageOptions::kUninterpretedOptionFieldNumber; MessageOptions::MessageOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.MessageOptions) } - -void MessageOptions::InitAsDefaultInstance() { -} - MessageOptions::MessageOptions(const MessageOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&message_set_wire_format_, &from.message_set_wire_format_, + reinterpret_cast(&map_entry_) - + reinterpret_cast(&message_set_wire_format_) + sizeof(map_entry_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.MessageOptions) } void MessageOptions::SharedCtor() { _cached_size_ = 0; - message_set_wire_format_ = false; - no_standard_descriptor_accessor_ = false; - deprecated_ = false; - map_entry_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&message_set_wire_format_, 0, reinterpret_cast(&map_entry_) - + reinterpret_cast(&message_set_wire_format_) + sizeof(map_entry_)); } MessageOptions::~MessageOptions() { @@ -9360,8 +9591,6 @@ MessageOptions::~MessageOptions() { } void MessageOptions::SharedDtor() { - if (this != default_instance_) { - } } void MessageOptions::SetCachedSize(int size) const { @@ -9371,16 +9600,14 @@ void MessageOptions::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* MessageOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return MessageOptions_descriptor_; + return file_level_metadata[12].descriptor; } const MessageOptions& MessageOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -MessageOptions* MessageOptions::default_instance_ = NULL; - MessageOptions* MessageOptions::New(::google::protobuf::Arena* arena) const { MessageOptions* n = new MessageOptions; if (arena != NULL) { @@ -9392,32 +9619,13 @@ MessageOptions* MessageOptions::New(::google::protobuf::Arena* arena) const { void MessageOptions::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.MessageOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(MessageOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(message_set_wire_format_, map_entry_); - -#undef ZR_HELPER_ -#undef ZR_ - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 15u) { + ::memset(&message_set_wire_format_, 0, reinterpret_cast(&map_entry_) - + reinterpret_cast(&message_set_wire_format_) + sizeof(map_entry_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool MessageOptions::MergePartialFromCodedStream( @@ -9426,83 +9634,72 @@ bool MessageOptions::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.MessageOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional bool message_set_wire_format = 1 [default = false]; case 1: { - if (tag == 8) { + if (tag == 8u) { + set_has_message_set_wire_format(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &message_set_wire_format_))); - set_has_message_set_wire_format(); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_no_standard_descriptor_accessor; break; } // optional bool no_standard_descriptor_accessor = 2 [default = false]; case 2: { - if (tag == 16) { - parse_no_standard_descriptor_accessor: + if (tag == 16u) { + set_has_no_standard_descriptor_accessor(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &no_standard_descriptor_accessor_))); - set_has_no_standard_descriptor_accessor(); } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_deprecated; break; } // optional bool deprecated = 3 [default = false]; case 3: { - if (tag == 24) { - parse_deprecated: + if (tag == 24u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(56)) goto parse_map_entry; break; } // optional bool map_entry = 7; case 7: { - if (tag == 56) { - parse_map_entry: + if (tag == 56u) { + set_has_map_entry(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &map_entry_))); - set_has_map_entry(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -9514,7 +9711,7 @@ bool MessageOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -9573,8 +9770,9 @@ void MessageOptions::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.MessageOptions) } -::google::protobuf::uint8* MessageOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* MessageOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MessageOptions) // optional bool message_set_wire_format = 1 [default = false]; if (has_message_set_wire_format()) { @@ -9599,13 +9797,13 @@ ::google::protobuf::uint8* MessageOptions::SerializeWithCachedSizesToArray( // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( @@ -9615,9 +9813,27 @@ ::google::protobuf::uint8* MessageOptions::SerializeWithCachedSizesToArray( return target; } -int MessageOptions::ByteSize() const { +size_t MessageOptions::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.MessageOptions) - int total_size = 0; + size_t total_size = 0; + + total_size += _extensions_.ByteSize(); + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } if (_has_bits_[0 / 32] & 15u) { // optional bool message_set_wire_format = 1 [default = false]; @@ -9641,31 +9857,17 @@ int MessageOptions::ByteSize() const { } } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } - - total_size += _extensions_.ByteSize(); - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MessageOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const MessageOptions* source = + GOOGLE_DCHECK_NE(&from, this); + const MessageOptions* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -9679,9 +9881,11 @@ void MessageOptions::MergeFrom(const ::google::protobuf::Message& from) { void MessageOptions::MergeFrom(const MessageOptions& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MessageOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 15u) { if (from.has_message_set_wire_format()) { set_message_set_wire_format(from.message_set_wire_format()); } @@ -9695,10 +9899,6 @@ void MessageOptions::MergeFrom(const MessageOptions& from) { set_map_entry(from.map_entry()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void MessageOptions::CopyFrom(const ::google::protobuf::Message& from) { @@ -9716,10 +9916,12 @@ void MessageOptions::CopyFrom(const MessageOptions& from) { } bool MessageOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } void MessageOptions::Swap(MessageOptions* other) { @@ -9727,11 +9929,11 @@ void MessageOptions::Swap(MessageOptions* other) { InternalSwap(other); } void MessageOptions::InternalSwap(MessageOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(message_set_wire_format_, other->message_set_wire_format_); std::swap(no_standard_descriptor_accessor_, other->no_standard_descriptor_accessor_); std::swap(deprecated_, other->deprecated_); std::swap(map_entry_, other->map_entry_); - uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -9740,10 +9942,7 @@ void MessageOptions::InternalSwap(MessageOptions* other) { ::google::protobuf::Metadata MessageOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = MessageOptions_descriptor_; - metadata.reflection = MessageOptions_reflection_; - return metadata; + return file_level_metadata[12]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -9763,11 +9962,11 @@ void MessageOptions::clear_message_set_wire_format() { message_set_wire_format_ = false; clear_has_message_set_wire_format(); } - bool MessageOptions::message_set_wire_format() const { +bool MessageOptions::message_set_wire_format() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.message_set_wire_format) return message_set_wire_format_; } - void MessageOptions::set_message_set_wire_format(bool value) { +void MessageOptions::set_message_set_wire_format(bool value) { set_has_message_set_wire_format(); message_set_wire_format_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format) @@ -9787,11 +9986,11 @@ void MessageOptions::clear_no_standard_descriptor_accessor() { no_standard_descriptor_accessor_ = false; clear_has_no_standard_descriptor_accessor(); } - bool MessageOptions::no_standard_descriptor_accessor() const { +bool MessageOptions::no_standard_descriptor_accessor() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.no_standard_descriptor_accessor) return no_standard_descriptor_accessor_; } - void MessageOptions::set_no_standard_descriptor_accessor(bool value) { +void MessageOptions::set_no_standard_descriptor_accessor(bool value) { set_has_no_standard_descriptor_accessor(); no_standard_descriptor_accessor_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor) @@ -9811,11 +10010,11 @@ void MessageOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool MessageOptions::deprecated() const { +bool MessageOptions::deprecated() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.deprecated) return deprecated_; } - void MessageOptions::set_deprecated(bool value) { +void MessageOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated) @@ -9835,11 +10034,11 @@ void MessageOptions::clear_map_entry() { map_entry_ = false; clear_has_map_entry(); } - bool MessageOptions::map_entry() const { +bool MessageOptions::map_entry() const { // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.map_entry) return map_entry_; } - void MessageOptions::set_map_entry(bool value) { +void MessageOptions::set_map_entry(bool value) { set_has_map_entry(); map_entry_ = value; // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry) @@ -9879,52 +10078,6 @@ MessageOptions::uninterpreted_option() const { // =================================================================== -const ::google::protobuf::EnumDescriptor* FieldOptions_CType_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldOptions_CType_descriptor_; -} -bool FieldOptions_CType_IsValid(int value) { - switch(value) { - case 0: - case 1: - case 2: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldOptions_CType FieldOptions::STRING; -const FieldOptions_CType FieldOptions::CORD; -const FieldOptions_CType FieldOptions::STRING_PIECE; -const FieldOptions_CType FieldOptions::CType_MIN; -const FieldOptions_CType FieldOptions::CType_MAX; -const int FieldOptions::CType_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -const ::google::protobuf::EnumDescriptor* FieldOptions_JSType_descriptor() { - protobuf_AssignDescriptorsOnce(); - return FieldOptions_JSType_descriptor_; -} -bool FieldOptions_JSType_IsValid(int value) { - switch(value) { - case 0: - case 1: - case 2: - return true; - default: - return false; - } -} - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const FieldOptions_JSType FieldOptions::JS_NORMAL; -const FieldOptions_JSType FieldOptions::JS_STRING; -const FieldOptions_JSType FieldOptions::JS_NUMBER; -const FieldOptions_JSType FieldOptions::JSType_MIN; -const FieldOptions_JSType FieldOptions::JSType_MAX; -const int FieldOptions::JSType_ARRAYSIZE; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int FieldOptions::kCtypeFieldNumber; const int FieldOptions::kPackedFieldNumber; @@ -9937,30 +10090,30 @@ const int FieldOptions::kUninterpretedOptionFieldNumber; FieldOptions::FieldOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.FieldOptions) } - -void FieldOptions::InitAsDefaultInstance() { -} - FieldOptions::FieldOptions(const FieldOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&ctype_, &from.ctype_, + reinterpret_cast(&weak_) - + reinterpret_cast(&ctype_) + sizeof(weak_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions) } void FieldOptions::SharedCtor() { _cached_size_ = 0; - ctype_ = 0; - packed_ = false; - jstype_ = 0; - lazy_ = false; - deprecated_ = false; - weak_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&ctype_, 0, reinterpret_cast(&weak_) - + reinterpret_cast(&ctype_) + sizeof(weak_)); } FieldOptions::~FieldOptions() { @@ -9969,8 +10122,6 @@ FieldOptions::~FieldOptions() { } void FieldOptions::SharedDtor() { - if (this != default_instance_) { - } } void FieldOptions::SetCachedSize(int size) const { @@ -9980,16 +10131,14 @@ void FieldOptions::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* FieldOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return FieldOptions_descriptor_; + return file_level_metadata[13].descriptor; } const FieldOptions& FieldOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -FieldOptions* FieldOptions::default_instance_ = NULL; - FieldOptions* FieldOptions::New(::google::protobuf::Arena* arena) const { FieldOptions* n = new FieldOptions; if (arena != NULL) { @@ -10001,35 +10150,13 @@ FieldOptions* FieldOptions::New(::google::protobuf::Arena* arena) const { void FieldOptions::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(FieldOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 63u) { - ZR_(ctype_, jstype_); - ZR_(packed_, weak_); - } - -#undef ZR_HELPER_ -#undef ZR_ - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 63u) { + ::memset(&ctype_, 0, reinterpret_cast(&weak_) - + reinterpret_cast(&ctype_) + sizeof(weak_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool FieldOptions::MergePartialFromCodedStream( @@ -10038,13 +10165,13 @@ bool FieldOptions::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.FieldOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; case 1: { - if (tag == 8) { + if (tag == 8u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -10057,59 +10184,51 @@ bool FieldOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_packed; break; } // optional bool packed = 2; case 2: { - if (tag == 16) { - parse_packed: + if (tag == 16u) { + set_has_packed(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &packed_))); - set_has_packed(); } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_deprecated; break; } // optional bool deprecated = 3 [default = false]; case 3: { - if (tag == 24) { - parse_deprecated: + if (tag == 24u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(40)) goto parse_lazy; break; } // optional bool lazy = 5 [default = false]; case 5: { - if (tag == 40) { - parse_lazy: + if (tag == 40u) { + set_has_lazy(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &lazy_))); - set_has_lazy(); } else { goto handle_unusual; } - if (input->ExpectTag(48)) goto parse_jstype; break; } // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; case 6: { - if (tag == 48) { - parse_jstype: + if (tag == 48u) { int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -10122,39 +10241,32 @@ bool FieldOptions::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(80)) goto parse_weak; break; } // optional bool weak = 10 [default = false]; case 10: { - if (tag == 80) { - parse_weak: + if (tag == 80u) { + set_has_weak(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &weak_))); - set_has_weak(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -10166,7 +10278,7 @@ bool FieldOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -10237,8 +10349,9 @@ void FieldOptions::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.FieldOptions) } -::google::protobuf::uint8* FieldOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* FieldOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldOptions) // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; if (has_ctype()) { @@ -10275,13 +10388,13 @@ ::google::protobuf::uint8* FieldOptions::SerializeWithCachedSizesToArray( // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( @@ -10291,9 +10404,27 @@ ::google::protobuf::uint8* FieldOptions::SerializeWithCachedSizesToArray( return target; } -int FieldOptions::ByteSize() const { +size_t FieldOptions::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldOptions) - int total_size = 0; + size_t total_size = 0; + + total_size += _extensions_.ByteSize(); + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } if (_has_bits_[0 / 32] & 63u) { // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; @@ -10302,17 +10433,17 @@ int FieldOptions::ByteSize() const { ::google::protobuf::internal::WireFormatLite::EnumSize(this->ctype()); } - // optional bool packed = 2; - if (has_packed()) { - total_size += 1 + 1; - } - // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; if (has_jstype()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->jstype()); } + // optional bool packed = 2; + if (has_packed()) { + total_size += 1 + 1; + } + // optional bool lazy = 5 [default = false]; if (has_lazy()) { total_size += 1 + 1; @@ -10329,31 +10460,17 @@ int FieldOptions::ByteSize() const { } } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } - - total_size += _extensions_.ByteSize(); - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.FieldOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const FieldOptions* source = + GOOGLE_DCHECK_NE(&from, this); + const FieldOptions* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -10367,18 +10484,20 @@ void FieldOptions::MergeFrom(const ::google::protobuf::Message& from) { void FieldOptions::MergeFrom(const FieldOptions& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 63u) { if (from.has_ctype()) { set_ctype(from.ctype()); } - if (from.has_packed()) { - set_packed(from.packed()); - } if (from.has_jstype()) { set_jstype(from.jstype()); } + if (from.has_packed()) { + set_packed(from.packed()); + } if (from.has_lazy()) { set_lazy(from.lazy()); } @@ -10389,10 +10508,6 @@ void FieldOptions::MergeFrom(const FieldOptions& from) { set_weak(from.weak()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void FieldOptions::CopyFrom(const ::google::protobuf::Message& from) { @@ -10410,10 +10525,12 @@ void FieldOptions::CopyFrom(const FieldOptions& from) { } bool FieldOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } void FieldOptions::Swap(FieldOptions* other) { @@ -10421,13 +10538,13 @@ void FieldOptions::Swap(FieldOptions* other) { InternalSwap(other); } void FieldOptions::InternalSwap(FieldOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(ctype_, other->ctype_); - std::swap(packed_, other->packed_); std::swap(jstype_, other->jstype_); + std::swap(packed_, other->packed_); std::swap(lazy_, other->lazy_); std::swap(deprecated_, other->deprecated_); std::swap(weak_, other->weak_); - uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); @@ -10436,10 +10553,7 @@ void FieldOptions::InternalSwap(FieldOptions* other) { ::google::protobuf::Metadata FieldOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = FieldOptions_descriptor_; - metadata.reflection = FieldOptions_reflection_; - return metadata; + return file_level_metadata[13]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -10459,11 +10573,11 @@ void FieldOptions::clear_ctype() { ctype_ = 0; clear_has_ctype(); } - ::google::protobuf::FieldOptions_CType FieldOptions::ctype() const { +::google::protobuf::FieldOptions_CType FieldOptions::ctype() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.ctype) return static_cast< ::google::protobuf::FieldOptions_CType >(ctype_); } - void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) { +void FieldOptions::set_ctype(::google::protobuf::FieldOptions_CType value) { assert(::google::protobuf::FieldOptions_CType_IsValid(value)); set_has_ctype(); ctype_ = value; @@ -10472,23 +10586,23 @@ void FieldOptions::clear_ctype() { // optional bool packed = 2; bool FieldOptions::has_packed() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } void FieldOptions::set_has_packed() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000004u; } void FieldOptions::clear_has_packed() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000004u; } void FieldOptions::clear_packed() { packed_ = false; clear_has_packed(); } - bool FieldOptions::packed() const { +bool FieldOptions::packed() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.packed) return packed_; } - void FieldOptions::set_packed(bool value) { +void FieldOptions::set_packed(bool value) { set_has_packed(); packed_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed) @@ -10496,23 +10610,23 @@ void FieldOptions::clear_packed() { // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; bool FieldOptions::has_jstype() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void FieldOptions::set_has_jstype() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000002u; } void FieldOptions::clear_has_jstype() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000002u; } void FieldOptions::clear_jstype() { jstype_ = 0; clear_has_jstype(); } - ::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const { +::google::protobuf::FieldOptions_JSType FieldOptions::jstype() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.jstype) return static_cast< ::google::protobuf::FieldOptions_JSType >(jstype_); } - void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) { +void FieldOptions::set_jstype(::google::protobuf::FieldOptions_JSType value) { assert(::google::protobuf::FieldOptions_JSType_IsValid(value)); set_has_jstype(); jstype_ = value; @@ -10533,11 +10647,11 @@ void FieldOptions::clear_lazy() { lazy_ = false; clear_has_lazy(); } - bool FieldOptions::lazy() const { +bool FieldOptions::lazy() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.lazy) return lazy_; } - void FieldOptions::set_lazy(bool value) { +void FieldOptions::set_lazy(bool value) { set_has_lazy(); lazy_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy) @@ -10557,11 +10671,11 @@ void FieldOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool FieldOptions::deprecated() const { +bool FieldOptions::deprecated() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.deprecated) return deprecated_; } - void FieldOptions::set_deprecated(bool value) { +void FieldOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated) @@ -10581,11 +10695,11 @@ void FieldOptions::clear_weak() { weak_ = false; clear_has_weak(); } - bool FieldOptions::weak() const { +bool FieldOptions::weak() const { // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.weak) return weak_; } - void FieldOptions::set_weak(bool value) { +void FieldOptions::set_weak(bool value) { set_has_weak(); weak_ = value; // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak) @@ -10626,154 +10740,91 @@ FieldOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int EnumOptions::kAllowAliasFieldNumber; -const int EnumOptions::kDeprecatedFieldNumber; -const int EnumOptions::kUninterpretedOptionFieldNumber; +const int OneofOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -EnumOptions::EnumOptions() +OneofOptions::OneofOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.EnumOptions) + // @@protoc_insertion_point(constructor:google.protobuf.OneofOptions) } - -void EnumOptions::InitAsDefaultInstance() { -} - -EnumOptions::EnumOptions(const EnumOptions& from) +OneofOptions::OneofOptions(const OneofOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + // @@protoc_insertion_point(copy_constructor:google.protobuf.OneofOptions) } -void EnumOptions::SharedCtor() { +void OneofOptions::SharedCtor() { _cached_size_ = 0; - allow_alias_ = false; - deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } -EnumOptions::~EnumOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions) +OneofOptions::~OneofOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.OneofOptions) SharedDtor(); } -void EnumOptions::SharedDtor() { - if (this != default_instance_) { - } +void OneofOptions::SharedDtor() { } -void EnumOptions::SetCachedSize(int size) const { +void OneofOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* EnumOptions::descriptor() { +const ::google::protobuf::Descriptor* OneofOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumOptions_descriptor_; + return file_level_metadata[14].descriptor; } -const EnumOptions& EnumOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const OneofOptions& OneofOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumOptions* EnumOptions::default_instance_ = NULL; - -EnumOptions* EnumOptions::New(::google::protobuf::Arena* arena) const { - EnumOptions* n = new EnumOptions; +OneofOptions* OneofOptions::New(::google::protobuf::Arena* arena) const { + OneofOptions* n = new OneofOptions; if (arena != NULL) { arena->Own(n); } return n; } -void EnumOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions) +void OneofOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofOptions) _extensions_.Clear(); -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(EnumOptions, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - ZR_(allow_alias_, deprecated_); - -#undef ZR_HELPER_ -#undef ZR_ - uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool EnumOptions::MergePartialFromCodedStream( +bool OneofOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.EnumOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.OneofOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool allow_alias = 2; - case 2: { - if (tag == 16) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &allow_alias_))); - set_has_allow_alias(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(24)) goto parse_deprecated; - break; - } - - // optional bool deprecated = 3 [default = false]; - case 3: { - if (tag == 24) { - parse_deprecated: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &deprecated_))); - set_has_deprecated(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; - break; - } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -10785,7 +10836,7 @@ bool EnumOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -10796,27 +10847,17 @@ bool EnumOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.EnumOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.OneofOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.OneofOptions) return false; #undef DO_ } -void EnumOptions::SerializeWithCachedSizes( +void OneofOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumOptions) - // optional bool allow_alias = 2; - if (has_allow_alias()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->allow_alias(), output); - } - - // optional bool deprecated = 3 [default = false]; - if (has_deprecated()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output); - } - + // @@protoc_insertion_point(serialize_start:google.protobuf.OneofOptions) // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( @@ -10831,64 +10872,35 @@ void EnumOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.OneofOptions) } -::google::protobuf::uint8* EnumOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumOptions) - // optional bool allow_alias = 2; - if (has_allow_alias()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->allow_alias(), target); - } - - // optional bool deprecated = 3 [default = false]; - if (has_deprecated()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target); - } - +::google::protobuf::uint8* OneofOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofOptions) // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.OneofOptions) return target; } -int EnumOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumOptions) - int total_size = 0; - - if (_has_bits_[0 / 32] & 3u) { - // optional bool allow_alias = 2; - if (has_allow_alias()) { - total_size += 1 + 1; - } - - // optional bool deprecated = 3 [default = false]; - if (has_deprecated()) { - total_size += 1 + 1; - } - - } - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t OneofOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -10897,73 +10909,75 @@ int EnumOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void EnumOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void OneofOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.OneofOptions) + GOOGLE_DCHECK_NE(&from, this); + const OneofOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.OneofOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.OneofOptions) MergeFrom(*source); } } -void EnumOptions::MergeFrom(const EnumOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_allow_alias()) { - set_allow_alias(from.allow_alias()); - } - if (from.has_deprecated()) { - set_deprecated(from.deprecated()); - } - } +void OneofOptions::MergeFrom(const OneofOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofOptions) + GOOGLE_DCHECK_NE(&from, this); _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); } -void EnumOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumOptions) +void OneofOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.OneofOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void EnumOptions::CopyFrom(const EnumOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumOptions) +void OneofOptions::CopyFrom(const OneofOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.OneofOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool EnumOptions::IsInitialized() const { +bool OneofOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void EnumOptions::Swap(EnumOptions* other) { +void OneofOptions::Swap(OneofOptions* other) { if (other == this) return; InternalSwap(other); } -void EnumOptions::InternalSwap(EnumOptions* other) { - std::swap(allow_alias_, other->allow_alias_); - std::swap(deprecated_, other->deprecated_); +void OneofOptions::InternalSwap(OneofOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); @@ -10971,92 +10985,41 @@ void EnumOptions::InternalSwap(EnumOptions* other) { _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata EnumOptions::GetMetadata() const { +::google::protobuf::Metadata OneofOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumOptions_descriptor_; - metadata.reflection = EnumOptions_reflection_; - return metadata; + return file_level_metadata[14]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// EnumOptions +// OneofOptions -// optional bool allow_alias = 2; -bool EnumOptions::has_allow_alias() const { - return (_has_bits_[0] & 0x00000001u) != 0; +// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; +int OneofOptions::uninterpreted_option_size() const { + return uninterpreted_option_.size(); } -void EnumOptions::set_has_allow_alias() { - _has_bits_[0] |= 0x00000001u; +void OneofOptions::clear_uninterpreted_option() { + uninterpreted_option_.Clear(); } -void EnumOptions::clear_has_allow_alias() { - _has_bits_[0] &= ~0x00000001u; +const ::google::protobuf::UninterpretedOption& OneofOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.OneofOptions.uninterpreted_option) + return uninterpreted_option_.Get(index); } -void EnumOptions::clear_allow_alias() { - allow_alias_ = false; - clear_has_allow_alias(); +::google::protobuf::UninterpretedOption* OneofOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.OneofOptions.uninterpreted_option) + return uninterpreted_option_.Mutable(index); } - bool EnumOptions::allow_alias() const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias) - return allow_alias_; +::google::protobuf::UninterpretedOption* OneofOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.OneofOptions.uninterpreted_option) + return uninterpreted_option_.Add(); } - void EnumOptions::set_allow_alias(bool value) { - set_has_allow_alias(); - allow_alias_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias) -} - -// optional bool deprecated = 3 [default = false]; -bool EnumOptions::has_deprecated() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void EnumOptions::set_has_deprecated() { - _has_bits_[0] |= 0x00000002u; -} -void EnumOptions::clear_has_deprecated() { - _has_bits_[0] &= ~0x00000002u; -} -void EnumOptions::clear_deprecated() { - deprecated_ = false; - clear_has_deprecated(); -} - bool EnumOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated) - return deprecated_; -} - void EnumOptions::set_deprecated(bool value) { - set_has_deprecated(); - deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated) -} - -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int EnumOptions::uninterpreted_option_size() const { - return uninterpreted_option_.size(); -} -void EnumOptions::clear_uninterpreted_option() { - uninterpreted_option_.Clear(); -} -const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option) - return uninterpreted_option_.Get(index); -} -::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option) - return uninterpreted_option_.Mutable(index); -} -::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option) - return uninterpreted_option_.Add(); -} -::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -EnumOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option) - return &uninterpreted_option_; +::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* +OneofOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.OneofOptions.uninterpreted_option) + return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -EnumOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option) +OneofOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.OneofOptions.uninterpreted_option) return uninterpreted_option_; } @@ -11065,117 +11028,128 @@ EnumOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int EnumValueOptions::kDeprecatedFieldNumber; -const int EnumValueOptions::kUninterpretedOptionFieldNumber; +const int EnumOptions::kAllowAliasFieldNumber; +const int EnumOptions::kDeprecatedFieldNumber; +const int EnumOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -EnumValueOptions::EnumValueOptions() +EnumOptions::EnumOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.EnumValueOptions) -} - -void EnumValueOptions::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.EnumOptions) } - -EnumValueOptions::EnumValueOptions(const EnumValueOptions& from) +EnumOptions::EnumOptions(const EnumOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&allow_alias_, &from.allow_alias_, + reinterpret_cast(&deprecated_) - + reinterpret_cast(&allow_alias_) + sizeof(deprecated_)); + // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions) } -void EnumValueOptions::SharedCtor() { +void EnumOptions::SharedCtor() { _cached_size_ = 0; - deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&allow_alias_, 0, reinterpret_cast(&deprecated_) - + reinterpret_cast(&allow_alias_) + sizeof(deprecated_)); } -EnumValueOptions::~EnumValueOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions) +EnumOptions::~EnumOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions) SharedDtor(); } -void EnumValueOptions::SharedDtor() { - if (this != default_instance_) { - } +void EnumOptions::SharedDtor() { } -void EnumValueOptions::SetCachedSize(int size) const { +void EnumOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* EnumValueOptions::descriptor() { +const ::google::protobuf::Descriptor* EnumOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return EnumValueOptions_descriptor_; + return file_level_metadata[15].descriptor; } -const EnumValueOptions& EnumValueOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const EnumOptions& EnumOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -EnumValueOptions* EnumValueOptions::default_instance_ = NULL; - -EnumValueOptions* EnumValueOptions::New(::google::protobuf::Arena* arena) const { - EnumValueOptions* n = new EnumValueOptions; +EnumOptions* EnumOptions::New(::google::protobuf::Arena* arena) const { + EnumOptions* n = new EnumOptions; if (arena != NULL) { arena->Own(n); } return n; } -void EnumValueOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions) +void EnumOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions) _extensions_.Clear(); - deprecated_ = false; uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (_has_bits_[0 / 32] & 3u) { + ::memset(&allow_alias_, 0, reinterpret_cast(&deprecated_) - + reinterpret_cast(&allow_alias_) + sizeof(deprecated_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool EnumValueOptions::MergePartialFromCodedStream( +bool EnumOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.EnumOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool deprecated = 1 [default = false]; - case 1: { - if (tag == 8) { + // optional bool allow_alias = 2; + case 2: { + if (tag == 16u) { + set_has_allow_alias(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &deprecated_))); + input, &allow_alias_))); + } else { + goto handle_unusual; + } + break; + } + + // optional bool deprecated = 3 [default = false]; + case 3: { + if (tag == 24u) { set_has_deprecated(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &deprecated_))); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -11187,7 +11161,7 @@ bool EnumValueOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -11198,20 +11172,25 @@ bool EnumValueOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.EnumOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.EnumOptions) return false; #undef DO_ } -void EnumValueOptions::SerializeWithCachedSizes( +void EnumOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueOptions) - // optional bool deprecated = 1 [default = false]; + // @@protoc_insertion_point(serialize_start:google.protobuf.EnumOptions) + // optional bool allow_alias = 2; + if (has_allow_alias()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->allow_alias(), output); + } + + // optional bool deprecated = 3 [default = false]; if (has_deprecated()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->deprecated(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->deprecated(), output); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; @@ -11228,52 +11207,45 @@ void EnumValueOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.EnumOptions) } -::google::protobuf::uint8* EnumValueOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueOptions) - // optional bool deprecated = 1 [default = false]; +::google::protobuf::uint8* EnumOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumOptions) + // optional bool allow_alias = 2; + if (has_allow_alias()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->allow_alias(), target); + } + + // optional bool deprecated = 3 [default = false]; if (has_deprecated()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->deprecated(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->deprecated(), target); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions) return target; } -int EnumValueOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueOptions) - int total_size = 0; - - // optional bool deprecated = 1 [default = false]; - if (has_deprecated()) { - total_size += 1 + 1; - } - - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t EnumOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -11282,138 +11254,187 @@ int EnumValueOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + if (_has_bits_[0 / 32] & 3u) { + // optional bool allow_alias = 2; + if (has_allow_alias()) { + total_size += 1 + 1; + } + + // optional bool deprecated = 3 [default = false]; + if (has_deprecated()) { + total_size += 1 + 1; + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void EnumValueOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const EnumValueOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void EnumOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumOptions) + GOOGLE_DCHECK_NE(&from, this); + const EnumOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumValueOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumOptions) MergeFrom(*source); } } -void EnumValueOptions::MergeFrom(const EnumValueOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); +void EnumOptions::MergeFrom(const EnumOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumOptions) + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_allow_alias()) { + set_allow_alias(from.allow_alias()); + } if (from.has_deprecated()) { set_deprecated(from.deprecated()); } } - _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } -void EnumValueOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumValueOptions) +void EnumOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void EnumValueOptions::CopyFrom(const EnumValueOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueOptions) +void EnumOptions::CopyFrom(const EnumOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool EnumValueOptions::IsInitialized() const { +bool EnumOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void EnumValueOptions::Swap(EnumValueOptions* other) { +void EnumOptions::Swap(EnumOptions* other) { if (other == this) return; InternalSwap(other); } -void EnumValueOptions::InternalSwap(EnumValueOptions* other) { - std::swap(deprecated_, other->deprecated_); +void EnumOptions::InternalSwap(EnumOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(allow_alias_, other->allow_alias_); + std::swap(deprecated_, other->deprecated_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata EnumValueOptions::GetMetadata() const { +::google::protobuf::Metadata EnumOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = EnumValueOptions_descriptor_; - metadata.reflection = EnumValueOptions_reflection_; - return metadata; + return file_level_metadata[15]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// EnumValueOptions +// EnumOptions -// optional bool deprecated = 1 [default = false]; -bool EnumValueOptions::has_deprecated() const { +// optional bool allow_alias = 2; +bool EnumOptions::has_allow_alias() const { return (_has_bits_[0] & 0x00000001u) != 0; } -void EnumValueOptions::set_has_deprecated() { +void EnumOptions::set_has_allow_alias() { _has_bits_[0] |= 0x00000001u; } -void EnumValueOptions::clear_has_deprecated() { +void EnumOptions::clear_has_allow_alias() { _has_bits_[0] &= ~0x00000001u; } -void EnumValueOptions::clear_deprecated() { - deprecated_ = false; - clear_has_deprecated(); +void EnumOptions::clear_allow_alias() { + allow_alias_ = false; + clear_has_allow_alias(); } - bool EnumValueOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated) - return deprecated_; +bool EnumOptions::allow_alias() const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias) + return allow_alias_; } - void EnumValueOptions::set_deprecated(bool value) { - set_has_deprecated(); - deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated) +void EnumOptions::set_allow_alias(bool value) { + set_has_allow_alias(); + allow_alias_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias) } -// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int EnumValueOptions::uninterpreted_option_size() const { - return uninterpreted_option_.size(); +// optional bool deprecated = 3 [default = false]; +bool EnumOptions::has_deprecated() const { + return (_has_bits_[0] & 0x00000002u) != 0; } -void EnumValueOptions::clear_uninterpreted_option() { - uninterpreted_option_.Clear(); +void EnumOptions::set_has_deprecated() { + _has_bits_[0] |= 0x00000002u; } -const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option) +void EnumOptions::clear_has_deprecated() { + _has_bits_[0] &= ~0x00000002u; +} +void EnumOptions::clear_deprecated() { + deprecated_ = false; + clear_has_deprecated(); +} +bool EnumOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated) + return deprecated_; +} +void EnumOptions::set_deprecated(bool value) { + set_has_deprecated(); + deprecated_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated) +} + +// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; +int EnumOptions::uninterpreted_option_size() const { + return uninterpreted_option_.size(); +} +void EnumOptions::clear_uninterpreted_option() { + uninterpreted_option_.Clear(); +} +const ::google::protobuf::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_.Get(index); } -::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_.Mutable(index); } -::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_.Add(); } ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -EnumValueOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option) +EnumOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option) return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -EnumValueOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option) +EnumOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option) return uninterpreted_option_; } @@ -11422,117 +11443,108 @@ EnumValueOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int ServiceOptions::kDeprecatedFieldNumber; -const int ServiceOptions::kUninterpretedOptionFieldNumber; +const int EnumValueOptions::kDeprecatedFieldNumber; +const int EnumValueOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -ServiceOptions::ServiceOptions() +EnumValueOptions::EnumValueOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.ServiceOptions) -} - -void ServiceOptions::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.EnumValueOptions) } - -ServiceOptions::ServiceOptions(const ServiceOptions& from) +EnumValueOptions::EnumValueOptions(const EnumValueOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + deprecated_ = from.deprecated_; + // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions) } -void ServiceOptions::SharedCtor() { +void EnumValueOptions::SharedCtor() { _cached_size_ = 0; deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } -ServiceOptions::~ServiceOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.ServiceOptions) +EnumValueOptions::~EnumValueOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions) SharedDtor(); } -void ServiceOptions::SharedDtor() { - if (this != default_instance_) { - } +void EnumValueOptions::SharedDtor() { } -void ServiceOptions::SetCachedSize(int size) const { +void EnumValueOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* ServiceOptions::descriptor() { +const ::google::protobuf::Descriptor* EnumValueOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return ServiceOptions_descriptor_; + return file_level_metadata[16].descriptor; } -const ServiceOptions& ServiceOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const EnumValueOptions& EnumValueOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -ServiceOptions* ServiceOptions::default_instance_ = NULL; - -ServiceOptions* ServiceOptions::New(::google::protobuf::Arena* arena) const { - ServiceOptions* n = new ServiceOptions; +EnumValueOptions* EnumValueOptions::New(::google::protobuf::Arena* arena) const { + EnumValueOptions* n = new EnumValueOptions; if (arena != NULL) { arena->Own(n); } return n; } -void ServiceOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions) +void EnumValueOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions) _extensions_.Clear(); - deprecated_ = false; uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + deprecated_ = false; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool ServiceOptions::MergePartialFromCodedStream( +bool EnumValueOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.EnumValueOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool deprecated = 33 [default = false]; - case 33: { - if (tag == 264) { + // optional bool deprecated = 1 [default = false]; + case 1: { + if (tag == 8u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -11544,7 +11556,7 @@ bool ServiceOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -11555,20 +11567,20 @@ bool ServiceOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.EnumValueOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.EnumValueOptions) return false; #undef DO_ } -void ServiceOptions::SerializeWithCachedSizes( +void EnumValueOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceOptions) - // optional bool deprecated = 33 [default = false]; + // @@protoc_insertion_point(serialize_start:google.protobuf.EnumValueOptions) + // optional bool deprecated = 1 [default = false]; if (has_deprecated()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->deprecated(), output); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; @@ -11585,52 +11597,40 @@ void ServiceOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.EnumValueOptions) } -::google::protobuf::uint8* ServiceOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceOptions) - // optional bool deprecated = 33 [default = false]; +::google::protobuf::uint8* EnumValueOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueOptions) + // optional bool deprecated = 1 [default = false]; if (has_deprecated()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target); + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->deprecated(), target); } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions) return target; } -int ServiceOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceOptions) - int total_size = 0; - - // optional bool deprecated = 33 [default = false]; - if (has_deprecated()) { - total_size += 2 + 1; - } - - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t EnumValueOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -11639,138 +11639,150 @@ int ServiceOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + // optional bool deprecated = 1 [default = false]; + if (has_deprecated()) { + total_size += 1 + 1; + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void ServiceOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const ServiceOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void EnumValueOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.EnumValueOptions) + GOOGLE_DCHECK_NE(&from, this); + const EnumValueOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.EnumValueOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.ServiceOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.EnumValueOptions) MergeFrom(*source); } } -void ServiceOptions::MergeFrom(const ServiceOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_deprecated()) { - set_deprecated(from.deprecated()); - } - } +void EnumValueOptions::MergeFrom(const EnumValueOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueOptions) + GOOGLE_DCHECK_NE(&from, this); _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); + if (from.has_deprecated()) { + set_deprecated(from.deprecated()); } } -void ServiceOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.ServiceOptions) +void EnumValueOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.EnumValueOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void ServiceOptions::CopyFrom(const ServiceOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceOptions) +void EnumValueOptions::CopyFrom(const EnumValueOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool ServiceOptions::IsInitialized() const { +bool EnumValueOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void ServiceOptions::Swap(ServiceOptions* other) { +void EnumValueOptions::Swap(EnumValueOptions* other) { if (other == this) return; InternalSwap(other); } -void ServiceOptions::InternalSwap(ServiceOptions* other) { - std::swap(deprecated_, other->deprecated_); +void EnumValueOptions::InternalSwap(EnumValueOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(deprecated_, other->deprecated_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata ServiceOptions::GetMetadata() const { +::google::protobuf::Metadata EnumValueOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = ServiceOptions_descriptor_; - metadata.reflection = ServiceOptions_reflection_; - return metadata; + return file_level_metadata[16]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// ServiceOptions +// EnumValueOptions -// optional bool deprecated = 33 [default = false]; -bool ServiceOptions::has_deprecated() const { +// optional bool deprecated = 1 [default = false]; +bool EnumValueOptions::has_deprecated() const { return (_has_bits_[0] & 0x00000001u) != 0; } -void ServiceOptions::set_has_deprecated() { +void EnumValueOptions::set_has_deprecated() { _has_bits_[0] |= 0x00000001u; } -void ServiceOptions::clear_has_deprecated() { +void EnumValueOptions::clear_has_deprecated() { _has_bits_[0] &= ~0x00000001u; } -void ServiceOptions::clear_deprecated() { +void EnumValueOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool ServiceOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated) +bool EnumValueOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated) return deprecated_; } - void ServiceOptions::set_deprecated(bool value) { +void EnumValueOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated) + // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated) } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int ServiceOptions::uninterpreted_option_size() const { +int EnumValueOptions::uninterpreted_option_size() const { return uninterpreted_option_.size(); } -void ServiceOptions::clear_uninterpreted_option() { +void EnumValueOptions::clear_uninterpreted_option() { uninterpreted_option_.Clear(); } -const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option) +const ::google::protobuf::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_.Get(index); } -::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_.Mutable(index); } -::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_.Add(); } ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -ServiceOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option) +EnumValueOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option) return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -ServiceOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option) +EnumValueOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option) return uninterpreted_option_; } @@ -11779,117 +11791,108 @@ ServiceOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int MethodOptions::kDeprecatedFieldNumber; -const int MethodOptions::kUninterpretedOptionFieldNumber; +const int ServiceOptions::kDeprecatedFieldNumber; +const int ServiceOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -MethodOptions::MethodOptions() +ServiceOptions::ServiceOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.MethodOptions) -} - -void MethodOptions::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.ServiceOptions) } - -MethodOptions::MethodOptions(const MethodOptions& from) +ServiceOptions::ServiceOptions(const ServiceOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + deprecated_ = from.deprecated_; + // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions) } -void MethodOptions::SharedCtor() { +void ServiceOptions::SharedCtor() { _cached_size_ = 0; deprecated_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } -MethodOptions::~MethodOptions() { - // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions) +ServiceOptions::~ServiceOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.ServiceOptions) SharedDtor(); } -void MethodOptions::SharedDtor() { - if (this != default_instance_) { - } +void ServiceOptions::SharedDtor() { } -void MethodOptions::SetCachedSize(int size) const { +void ServiceOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* MethodOptions::descriptor() { +const ::google::protobuf::Descriptor* ServiceOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return MethodOptions_descriptor_; + return file_level_metadata[17].descriptor; } -const MethodOptions& MethodOptions::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const ServiceOptions& ServiceOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -MethodOptions* MethodOptions::default_instance_ = NULL; - -MethodOptions* MethodOptions::New(::google::protobuf::Arena* arena) const { - MethodOptions* n = new MethodOptions; +ServiceOptions* ServiceOptions::New(::google::protobuf::Arena* arena) const { + ServiceOptions* n = new ServiceOptions; if (arena != NULL) { arena->Own(n); } return n; } -void MethodOptions::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions) +void ServiceOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions) _extensions_.Clear(); - deprecated_ = false; uninterpreted_option_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + deprecated_ = false; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool MethodOptions::MergePartialFromCodedStream( +bool ServiceOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.MethodOptions) + // @@protoc_insertion_point(parse_start:google.protobuf.ServiceOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // optional bool deprecated = 33 [default = false]; case 33: { - if (tag == 264) { + if (tag == 264u) { + set_has_deprecated(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &deprecated_))); - set_has_deprecated(); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_uninterpreted_option; break; } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; case 999: { - if (tag == 7994) { - parse_uninterpreted_option: + if (tag == 7994u) { DO_(input->IncrementRecursionDepth()); - parse_loop_uninterpreted_option: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectTag(7994)) goto parse_loop_uninterpreted_option; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -11901,7 +11904,7 @@ bool MethodOptions::MergePartialFromCodedStream( goto success; } if ((8000u <= tag)) { - DO_(_extensions_.ParseField(tag, input, default_instance_, + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), mutable_unknown_fields())); continue; } @@ -11912,17 +11915,17 @@ bool MethodOptions::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.MethodOptions) + // @@protoc_insertion_point(parse_success:google.protobuf.ServiceOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.MethodOptions) + // @@protoc_insertion_point(parse_failure:google.protobuf.ServiceOptions) return false; #undef DO_ } -void MethodOptions::SerializeWithCachedSizes( +void ServiceOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.MethodOptions) + // @@protoc_insertion_point(serialize_start:google.protobuf.ServiceOptions) // optional bool deprecated = 33 [default = false]; if (has_deprecated()) { ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output); @@ -11942,12 +11945,13 @@ void MethodOptions::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.MethodOptions) + // @@protoc_insertion_point(serialize_end:google.protobuf.ServiceOptions) } -::google::protobuf::uint8* MethodOptions::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodOptions) +::google::protobuf::uint8* ServiceOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceOptions) // optional bool deprecated = 33 [default = false]; if (has_deprecated()) { target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target); @@ -11956,38 +11960,25 @@ ::google::protobuf::uint8* MethodOptions::SerializeWithCachedSizesToArray( // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 999, this->uninterpreted_option(i), target); + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } // Extension range [1000, 536870912) - target = _extensions_.SerializeWithCachedSizesToArray( - 1000, 536870912, target); + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions) return target; } -int MethodOptions::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodOptions) - int total_size = 0; - - // optional bool deprecated = 33 [default = false]; - if (has_deprecated()) { - total_size += 2 + 1; - } - - // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; - total_size += 2 * this->uninterpreted_option_size(); - for (int i = 0; i < this->uninterpreted_option_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->uninterpreted_option(i)); - } +size_t ServiceOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceOptions) + size_t total_size = 0; total_size += _extensions_.ByteSize(); @@ -11996,138 +11987,150 @@ int MethodOptions::ByteSize() const { ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + total_size += 2 + 1; + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void MethodOptions::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const MethodOptions* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void ServiceOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.ServiceOptions) + GOOGLE_DCHECK_NE(&from, this); + const ServiceOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.MethodOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.ServiceOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.MethodOptions) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.ServiceOptions) MergeFrom(*source); } } -void MethodOptions::MergeFrom(const MethodOptions& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodOptions) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - uninterpreted_option_.MergeFrom(from.uninterpreted_option_); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_deprecated()) { - set_deprecated(from.deprecated()); - } - } +void ServiceOptions::MergeFrom(const ServiceOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceOptions) + GOOGLE_DCHECK_NE(&from, this); _extensions_.MergeFrom(from._extensions_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); + if (from.has_deprecated()) { + set_deprecated(from.deprecated()); } } -void MethodOptions::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.MethodOptions) +void ServiceOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.ServiceOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void MethodOptions::CopyFrom(const MethodOptions& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodOptions) +void ServiceOptions::CopyFrom(const ServiceOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool MethodOptions::IsInitialized() const { +bool ServiceOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; - - if (!_extensions_.IsInitialized()) return false; return true; + return true; } -void MethodOptions::Swap(MethodOptions* other) { +void ServiceOptions::Swap(ServiceOptions* other) { if (other == this) return; InternalSwap(other); } -void MethodOptions::InternalSwap(MethodOptions* other) { - std::swap(deprecated_, other->deprecated_); +void ServiceOptions::InternalSwap(ServiceOptions* other) { uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(deprecated_, other->deprecated_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata MethodOptions::GetMetadata() const { +::google::protobuf::Metadata ServiceOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = MethodOptions_descriptor_; - metadata.reflection = MethodOptions_reflection_; - return metadata; + return file_level_metadata[17]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// MethodOptions +// ServiceOptions // optional bool deprecated = 33 [default = false]; -bool MethodOptions::has_deprecated() const { +bool ServiceOptions::has_deprecated() const { return (_has_bits_[0] & 0x00000001u) != 0; } -void MethodOptions::set_has_deprecated() { +void ServiceOptions::set_has_deprecated() { _has_bits_[0] |= 0x00000001u; } -void MethodOptions::clear_has_deprecated() { +void ServiceOptions::clear_has_deprecated() { _has_bits_[0] &= ~0x00000001u; } -void MethodOptions::clear_deprecated() { +void ServiceOptions::clear_deprecated() { deprecated_ = false; clear_has_deprecated(); } - bool MethodOptions::deprecated() const { - // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated) +bool ServiceOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated) return deprecated_; } - void MethodOptions::set_deprecated(bool value) { +void ServiceOptions::set_deprecated(bool value) { set_has_deprecated(); deprecated_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated) + // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated) } // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; -int MethodOptions::uninterpreted_option_size() const { +int ServiceOptions::uninterpreted_option_size() const { return uninterpreted_option_.size(); } -void MethodOptions::clear_uninterpreted_option() { +void ServiceOptions::clear_uninterpreted_option() { uninterpreted_option_.Clear(); } -const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option) +const ::google::protobuf::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_.Get(index); } -::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_.Mutable(index); } -::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() { - // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option) +::google::protobuf::UninterpretedOption* ServiceOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_.Add(); } ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* -MethodOptions::mutable_uninterpreted_option() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option) +ServiceOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option) return &uninterpreted_option_; } const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& -MethodOptions::uninterpreted_option() const { - // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option) +ServiceOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option) return uninterpreted_option_; } @@ -12136,123 +12139,133 @@ MethodOptions::uninterpreted_option() const { // =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int UninterpretedOption_NamePart::kNamePartFieldNumber; -const int UninterpretedOption_NamePart::kIsExtensionFieldNumber; +const int MethodOptions::kDeprecatedFieldNumber; +const int MethodOptions::kIdempotencyLevelFieldNumber; +const int MethodOptions::kUninterpretedOptionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -UninterpretedOption_NamePart::UninterpretedOption_NamePart() +MethodOptions::MethodOptions() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption.NamePart) -} - -void UninterpretedOption_NamePart::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.MethodOptions) } - -UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from) +MethodOptions::MethodOptions(const MethodOptions& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + uninterpreted_option_(from.uninterpreted_option_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + _extensions_.MergeFrom(from._extensions_); + ::memcpy(&deprecated_, &from.deprecated_, + reinterpret_cast(&idempotency_level_) - + reinterpret_cast(&deprecated_) + sizeof(idempotency_level_)); + // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions) } -void UninterpretedOption_NamePart::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); +void MethodOptions::SharedCtor() { _cached_size_ = 0; - name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - is_extension_ = false; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&deprecated_, 0, reinterpret_cast(&idempotency_level_) - + reinterpret_cast(&deprecated_) + sizeof(idempotency_level_)); } -UninterpretedOption_NamePart::~UninterpretedOption_NamePart() { - // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart) +MethodOptions::~MethodOptions() { + // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions) SharedDtor(); } -void UninterpretedOption_NamePart::SharedDtor() { - name_part_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } +void MethodOptions::SharedDtor() { } -void UninterpretedOption_NamePart::SetCachedSize(int size) const { +void MethodOptions::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* UninterpretedOption_NamePart::descriptor() { +const ::google::protobuf::Descriptor* MethodOptions::descriptor() { protobuf_AssignDescriptorsOnce(); - return UninterpretedOption_NamePart_descriptor_; + return file_level_metadata[18].descriptor; } -const UninterpretedOption_NamePart& UninterpretedOption_NamePart::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const MethodOptions& MethodOptions::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -UninterpretedOption_NamePart* UninterpretedOption_NamePart::default_instance_ = NULL; - -UninterpretedOption_NamePart* UninterpretedOption_NamePart::New(::google::protobuf::Arena* arena) const { - UninterpretedOption_NamePart* n = new UninterpretedOption_NamePart; +MethodOptions* MethodOptions::New(::google::protobuf::Arena* arena) const { + MethodOptions* n = new MethodOptions; if (arena != NULL) { arena->Own(n); } return n; } -void UninterpretedOption_NamePart::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart) +void MethodOptions::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions) + _extensions_.Clear(); + uninterpreted_option_.Clear(); if (_has_bits_[0 / 32] & 3u) { - if (has_name_part()) { - name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - is_extension_ = false; - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + ::memset(&deprecated_, 0, reinterpret_cast(&idempotency_level_) - + reinterpret_cast(&deprecated_) + sizeof(idempotency_level_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool UninterpretedOption_NamePart::MergePartialFromCodedStream( +bool MethodOptions::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(parse_start:google.protobuf.MethodOptions) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(16383u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required string name_part = 1; - case 1: { - if (tag == 10) { - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_name_part())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->name_part().data(), this->name_part().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.UninterpretedOption.NamePart.name_part"); + // optional bool deprecated = 33 [default = false]; + case 33: { + if (tag == 264u) { + set_has_deprecated(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &deprecated_))); } else { goto handle_unusual; } - if (input->ExpectTag(16)) goto parse_is_extension; break; } - // required bool is_extension = 2; - case 2: { - if (tag == 16) { - parse_is_extension: + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + case 34: { + if (tag == 272u) { + int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( - input, &is_extension_))); - set_has_is_extension(); + int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( + input, &value))); + if (::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value)) { + set_idempotency_level(static_cast< ::google::protobuf::MethodOptions_IdempotencyLevel >(value)); + } else { + mutable_unknown_fields()->AddVarint(34, value); + } + } else { + goto handle_unusual; + } + break; + } + + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + case 999: { + if (tag == 7994u) { + DO_(input->IncrementRecursionDepth()); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( + input, add_uninterpreted_option())); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; + input->UnsafeDecrementRecursionDepth(); break; } @@ -12263,6 +12276,11 @@ bool UninterpretedOption_NamePart::MergePartialFromCodedStream( ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { goto success; } + if ((8000u <= tag)) { + DO_(_extensions_.ParseField(tag, input, internal_default_instance(), + mutable_unknown_fields())); + continue; + } DO_(::google::protobuf::internal::WireFormat::SkipField( input, tag, mutable_unknown_fields())); break; @@ -12270,419 +12288,391 @@ bool UninterpretedOption_NamePart::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(parse_success:google.protobuf.MethodOptions) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(parse_failure:google.protobuf.MethodOptions) return false; #undef DO_ } -void UninterpretedOption_NamePart::SerializeWithCachedSizes( +void MethodOptions::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption.NamePart) - // required string name_part = 1; - if (has_name_part()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->name_part().data(), this->name_part().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.NamePart.name_part"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 1, this->name_part(), output); + // @@protoc_insertion_point(serialize_start:google.protobuf.MethodOptions) + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->deprecated(), output); } - // required bool is_extension = 2; - if (has_is_extension()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output); + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + if (has_idempotency_level()) { + ::google::protobuf::internal::WireFormatLite::WriteEnum( + 34, this->idempotency_level(), output); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 999, this->uninterpreted_option(i), output); + } + + // Extension range [1000, 536870912) + _extensions_.SerializeWithCachedSizes( + 1000, 536870912, output); + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(serialize_end:google.protobuf.MethodOptions) } -::google::protobuf::uint8* UninterpretedOption_NamePart::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption.NamePart) - // required string name_part = 1; - if (has_name_part()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->name_part().data(), this->name_part().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.NamePart.name_part"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 1, this->name_part(), target); +::google::protobuf::uint8* MethodOptions::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodOptions) + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->deprecated(), target); } - // required bool is_extension = 2; - if (has_is_extension()) { - target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target); + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + if (has_idempotency_level()) { + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( + 34, this->idempotency_level(), target); + } + + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + for (unsigned int i = 0, n = this->uninterpreted_option_size(); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageNoVirtualToArray( + 999, this->uninterpreted_option(i), false, target); } + // Extension range [1000, 536870912) + target = _extensions_.InternalSerializeWithCachedSizesToArray( + 1000, 536870912, false, target); + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions) return target; } -int UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const { -// @@protoc_insertion_point(required_fields_byte_size_fallback_start:google.protobuf.UninterpretedOption.NamePart) - int total_size = 0; - - if (has_name_part()) { - // required string name_part = 1; - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name_part()); - } - - if (has_is_extension()) { - // required bool is_extension = 2; - total_size += 1 + 1; - } - - return total_size; -} -int UninterpretedOption_NamePart::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption.NamePart) - int total_size = 0; - - if (((_has_bits_[0] & 0x00000003) ^ 0x00000003) == 0) { // All required fields are present. - // required string name_part = 1; - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->name_part()); +size_t MethodOptions::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodOptions) + size_t total_size = 0; - // required bool is_extension = 2; - total_size += 1 + 1; + total_size += _extensions_.ByteSize(); - } else { - total_size += RequiredFieldsByteSizeFallback(); - } if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; + { + unsigned int count = this->uninterpreted_option_size(); + total_size += 2UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->uninterpreted_option(i)); + } + } + + if (_has_bits_[0 / 32] & 3u) { + // optional bool deprecated = 33 [default = false]; + if (has_deprecated()) { + total_size += 2 + 1; + } + + // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; + if (has_idempotency_level()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->idempotency_level()); + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption.NamePart) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const UninterpretedOption_NamePart* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void MethodOptions::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.MethodOptions) + GOOGLE_DCHECK_NE(&from, this); + const MethodOptions* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.MethodOptions) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption.NamePart) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.MethodOptions) MergeFrom(*source); } } -void UninterpretedOption_NamePart::MergeFrom(const UninterpretedOption_NamePart& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption.NamePart) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_name_part()) { - set_has_name_part(); - name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_); +void MethodOptions::MergeFrom(const MethodOptions& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodOptions) + GOOGLE_DCHECK_NE(&from, this); + _extensions_.MergeFrom(from._extensions_); + _internal_metadata_.MergeFrom(from._internal_metadata_); + uninterpreted_option_.MergeFrom(from.uninterpreted_option_); + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_deprecated()) { + set_deprecated(from.deprecated()); } - if (from.has_is_extension()) { - set_is_extension(from.is_extension()); + if (from.has_idempotency_level()) { + set_idempotency_level(from.idempotency_level()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } -void UninterpretedOption_NamePart::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption.NamePart) +void MethodOptions::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.MethodOptions) if (&from == this) return; Clear(); MergeFrom(from); } -void UninterpretedOption_NamePart::CopyFrom(const UninterpretedOption_NamePart& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption.NamePart) +void MethodOptions::CopyFrom(const MethodOptions& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodOptions) if (&from == this) return; Clear(); MergeFrom(from); } -bool UninterpretedOption_NamePart::IsInitialized() const { - if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; +bool MethodOptions::IsInitialized() const { + if (!_extensions_.IsInitialized()) { + return false; + } + if (!::google::protobuf::internal::AllAreInitialized(this->uninterpreted_option())) return false; return true; } -void UninterpretedOption_NamePart::Swap(UninterpretedOption_NamePart* other) { +void MethodOptions::Swap(MethodOptions* other) { if (other == this) return; InternalSwap(other); } -void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* other) { - name_part_.Swap(&other->name_part_); - std::swap(is_extension_, other->is_extension_); +void MethodOptions::InternalSwap(MethodOptions* other) { + uninterpreted_option_.UnsafeArenaSwap(&other->uninterpreted_option_); + std::swap(deprecated_, other->deprecated_); + std::swap(idempotency_level_, other->idempotency_level_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); + _extensions_.Swap(&other->_extensions_); } -::google::protobuf::Metadata UninterpretedOption_NamePart::GetMetadata() const { +::google::protobuf::Metadata MethodOptions::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = UninterpretedOption_NamePart_descriptor_; - metadata.reflection = UninterpretedOption_NamePart_reflection_; - return metadata; + return file_level_metadata[18]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// MethodOptions + +// optional bool deprecated = 33 [default = false]; +bool MethodOptions::has_deprecated() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void MethodOptions::set_has_deprecated() { + _has_bits_[0] |= 0x00000001u; +} +void MethodOptions::clear_has_deprecated() { + _has_bits_[0] &= ~0x00000001u; +} +void MethodOptions::clear_deprecated() { + deprecated_ = false; + clear_has_deprecated(); +} +bool MethodOptions::deprecated() const { + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated) + return deprecated_; +} +void MethodOptions::set_deprecated(bool value) { + set_has_deprecated(); + deprecated_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated) +} + +// optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; +bool MethodOptions::has_idempotency_level() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void MethodOptions::set_has_idempotency_level() { + _has_bits_[0] |= 0x00000002u; +} +void MethodOptions::clear_has_idempotency_level() { + _has_bits_[0] &= ~0x00000002u; +} +void MethodOptions::clear_idempotency_level() { + idempotency_level_ = 0; + clear_has_idempotency_level(); +} +::google::protobuf::MethodOptions_IdempotencyLevel MethodOptions::idempotency_level() const { + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.idempotency_level) + return static_cast< ::google::protobuf::MethodOptions_IdempotencyLevel >(idempotency_level_); +} +void MethodOptions::set_idempotency_level(::google::protobuf::MethodOptions_IdempotencyLevel value) { + assert(::google::protobuf::MethodOptions_IdempotencyLevel_IsValid(value)); + set_has_idempotency_level(); + idempotency_level_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.idempotency_level) +} + +// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999; +int MethodOptions::uninterpreted_option_size() const { + return uninterpreted_option_.size(); +} +void MethodOptions::clear_uninterpreted_option() { + uninterpreted_option_.Clear(); +} +const ::google::protobuf::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_.Get(index); +} +::google::protobuf::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_.Mutable(index); +} +::google::protobuf::UninterpretedOption* MethodOptions::add_uninterpreted_option() { + // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_.Add(); +} +::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >* +MethodOptions::mutable_uninterpreted_option() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option) + return &uninterpreted_option_; +} +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption >& +MethodOptions::uninterpreted_option() const { + // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option) + return uninterpreted_option_; } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int UninterpretedOption::kNameFieldNumber; -const int UninterpretedOption::kIdentifierValueFieldNumber; -const int UninterpretedOption::kPositiveIntValueFieldNumber; -const int UninterpretedOption::kNegativeIntValueFieldNumber; -const int UninterpretedOption::kDoubleValueFieldNumber; -const int UninterpretedOption::kStringValueFieldNumber; -const int UninterpretedOption::kAggregateValueFieldNumber; +const int UninterpretedOption_NamePart::kNamePartFieldNumber; +const int UninterpretedOption_NamePart::kIsExtensionFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -UninterpretedOption::UninterpretedOption() +UninterpretedOption_NamePart::UninterpretedOption_NamePart() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption) -} - -void UninterpretedOption::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption.NamePart) } - -UninterpretedOption::UninterpretedOption(const UninterpretedOption& from) +UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_name_part()) { + name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_); + } + is_extension_ = from.is_extension_; + // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart) } -void UninterpretedOption::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); +void UninterpretedOption_NamePart::SharedCtor() { _cached_size_ = 0; - identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - positive_int_value_ = GOOGLE_ULONGLONG(0); - negative_int_value_ = GOOGLE_LONGLONG(0); - double_value_ = 0; - string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + name_part_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + is_extension_ = false; } -UninterpretedOption::~UninterpretedOption() { - // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption) +UninterpretedOption_NamePart::~UninterpretedOption_NamePart() { + // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart) SharedDtor(); } -void UninterpretedOption::SharedDtor() { - identifier_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - string_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - aggregate_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } +void UninterpretedOption_NamePart::SharedDtor() { + name_part_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -void UninterpretedOption::SetCachedSize(int size) const { +void UninterpretedOption_NamePart::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* UninterpretedOption::descriptor() { +const ::google::protobuf::Descriptor* UninterpretedOption_NamePart::descriptor() { protobuf_AssignDescriptorsOnce(); - return UninterpretedOption_descriptor_; + return file_level_metadata[19].descriptor; } -const UninterpretedOption& UninterpretedOption::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const UninterpretedOption_NamePart& UninterpretedOption_NamePart::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -UninterpretedOption* UninterpretedOption::default_instance_ = NULL; - -UninterpretedOption* UninterpretedOption::New(::google::protobuf::Arena* arena) const { - UninterpretedOption* n = new UninterpretedOption; +UninterpretedOption_NamePart* UninterpretedOption_NamePart::New(::google::protobuf::Arena* arena) const { + UninterpretedOption_NamePart* n = new UninterpretedOption_NamePart; if (arena != NULL) { arena->Own(n); } return n; } -void UninterpretedOption::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(UninterpretedOption, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 126u) { - ZR_(positive_int_value_, double_value_); - if (has_identifier_value()) { - identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_string_value()) { - string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_aggregate_value()) { - aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - } - -#undef ZR_HELPER_ -#undef ZR_ - - name_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); +void UninterpretedOption_NamePart::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart) + if (has_name_part()) { + GOOGLE_DCHECK(!name_part_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*name_part_.UnsafeRawStringPointer())->clear(); } + is_extension_ = false; + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -bool UninterpretedOption::MergePartialFromCodedStream( +bool UninterpretedOption_NamePart::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption.NamePart) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - case 2: { - if (tag == 18) { - DO_(input->IncrementRecursionDepth()); - parse_loop_name: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( - input, add_name())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(18)) goto parse_loop_name; - input->UnsafeDecrementRecursionDepth(); - if (input->ExpectTag(26)) goto parse_identifier_value; - break; - } - - // optional string identifier_value = 3; - case 3: { - if (tag == 26) { - parse_identifier_value: + // required string name_part = 1; + case 1: { + if (tag == 10u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_identifier_value())); + input, this->mutable_name_part())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->identifier_value().data(), this->identifier_value().length(), + this->name_part().data(), this->name_part().length(), ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.UninterpretedOption.identifier_value"); - } else { - goto handle_unusual; - } - if (input->ExpectTag(32)) goto parse_positive_int_value; - break; - } - - // optional uint64 positive_int_value = 4; - case 4: { - if (tag == 32) { - parse_positive_int_value: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( - input, &positive_int_value_))); - set_has_positive_int_value(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(40)) goto parse_negative_int_value; - break; - } - - // optional int64 negative_int_value = 5; - case 5: { - if (tag == 40) { - parse_negative_int_value: - DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( - input, &negative_int_value_))); - set_has_negative_int_value(); + "google.protobuf.UninterpretedOption.NamePart.name_part"); } else { goto handle_unusual; } - if (input->ExpectTag(49)) goto parse_double_value; break; } - // optional double double_value = 6; - case 6: { - if (tag == 49) { - parse_double_value: + // required bool is_extension = 2; + case 2: { + if (tag == 16u) { + set_has_is_extension(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< - double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( - input, &double_value_))); - set_has_double_value(); - } else { - goto handle_unusual; - } - if (input->ExpectTag(58)) goto parse_string_value; - break; - } - - // optional bytes string_value = 7; - case 7: { - if (tag == 58) { - parse_string_value: - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( - input, this->mutable_string_value())); - } else { - goto handle_unusual; - } - if (input->ExpectTag(66)) goto parse_aggregate_value; - break; - } - - // optional string aggregate_value = 8; - case 8: { - if (tag == 66) { - parse_aggregate_value: - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_aggregate_value())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->aggregate_value().data(), this->aggregate_value().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.UninterpretedOption.aggregate_value"); + bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( + input, &is_extension_))); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -12700,288 +12690,177 @@ bool UninterpretedOption::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption.NamePart) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption.NamePart) return false; #undef DO_ } -void UninterpretedOption::SerializeWithCachedSizes( +void UninterpretedOption_NamePart::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption) - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - for (unsigned int i = 0, n = this->name_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 2, this->name(i), output); - } - - // optional string identifier_value = 3; - if (has_identifier_value()) { + // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption.NamePart) + // required string name_part = 1; + if (has_name_part()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->identifier_value().data(), this->identifier_value().length(), + this->name_part().data(), this->name_part().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.identifier_value"); + "google.protobuf.UninterpretedOption.NamePart.name_part"); ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->identifier_value(), output); - } - - // optional uint64 positive_int_value = 4; - if (has_positive_int_value()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->positive_int_value(), output); - } - - // optional int64 negative_int_value = 5; - if (has_negative_int_value()) { - ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->negative_int_value(), output); - } - - // optional double double_value = 6; - if (has_double_value()) { - ::google::protobuf::internal::WireFormatLite::WriteDouble(6, this->double_value(), output); - } - - // optional bytes string_value = 7; - if (has_string_value()) { - ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( - 7, this->string_value(), output); + 1, this->name_part(), output); } - // optional string aggregate_value = 8; - if (has_aggregate_value()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->aggregate_value().data(), this->aggregate_value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.aggregate_value"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 8, this->aggregate_value(), output); + // required bool is_extension = 2; + if (has_is_extension()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->is_extension(), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption.NamePart) } -::google::protobuf::uint8* UninterpretedOption::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption) - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - for (unsigned int i = 0, n = this->name_size(); i < n; i++) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 2, this->name(i), target); - } - - // optional string identifier_value = 3; - if (has_identifier_value()) { +::google::protobuf::uint8* UninterpretedOption_NamePart::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption.NamePart) + // required string name_part = 1; + if (has_name_part()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->identifier_value().data(), this->identifier_value().length(), + this->name_part().data(), this->name_part().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.identifier_value"); + "google.protobuf.UninterpretedOption.NamePart.name_part"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->identifier_value(), target); + 1, this->name_part(), target); } - // optional uint64 positive_int_value = 4; - if (has_positive_int_value()) { - target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->positive_int_value(), target); + // required bool is_extension = 2; + if (has_is_extension()) { + target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->is_extension(), target); } - // optional int64 negative_int_value = 5; - if (has_negative_int_value()) { - target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->negative_int_value(), target); + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); } + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart) + return target; +} - // optional double double_value = 6; - if (has_double_value()) { - target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(6, this->double_value(), target); - } +size_t UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const { +// @@protoc_insertion_point(required_fields_byte_size_fallback_start:google.protobuf.UninterpretedOption.NamePart) + size_t total_size = 0; - // optional bytes string_value = 7; - if (has_string_value()) { - target = - ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( - 7, this->string_value(), target); + if (has_name_part()) { + // required string name_part = 1; + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name_part()); } - // optional string aggregate_value = 8; - if (has_aggregate_value()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->aggregate_value().data(), this->aggregate_value().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.UninterpretedOption.aggregate_value"); - target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 8, this->aggregate_value(), target); + if (has_is_extension()) { + // required bool is_extension = 2; + total_size += 1 + 1; } + return total_size; +} +size_t UninterpretedOption_NamePart::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption.NamePart) + size_t total_size = 0; + if (_internal_metadata_.have_unknown_fields()) { - target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( - unknown_fields(), target); + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption) - return target; -} + if (((_has_bits_[0] & 0x00000003) ^ 0x00000003) == 0) { // All required fields are present. + // required string name_part = 1; + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->name_part()); -int UninterpretedOption::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption) - int total_size = 0; + // required bool is_extension = 2; + total_size += 1 + 1; - if (_has_bits_[1 / 32] & 126u) { - // optional string identifier_value = 3; - if (has_identifier_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->identifier_value()); - } + } else { + total_size += RequiredFieldsByteSizeFallback(); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} - // optional uint64 positive_int_value = 4; - if (has_positive_int_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt64Size( - this->positive_int_value()); - } - - // optional int64 negative_int_value = 5; - if (has_negative_int_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int64Size( - this->negative_int_value()); - } - - // optional double double_value = 6; - if (has_double_value()) { - total_size += 1 + 8; - } - - // optional bytes string_value = 7; - if (has_string_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( - this->string_value()); - } - - // optional string aggregate_value = 8; - if (has_aggregate_value()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::StringSize( - this->aggregate_value()); - } - - } - // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; - total_size += 1 * this->name_size(); - for (int i = 0; i < this->name_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->name(i)); - } - - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const UninterpretedOption* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void UninterpretedOption_NamePart::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption.NamePart) + GOOGLE_DCHECK_NE(&from, this); + const UninterpretedOption_NamePart* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption.NamePart) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption.NamePart) MergeFrom(*source); } } -void UninterpretedOption::MergeFrom(const UninterpretedOption& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - name_.MergeFrom(from.name_); - if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) { - if (from.has_identifier_value()) { - set_has_identifier_value(); - identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_); - } - if (from.has_positive_int_value()) { - set_positive_int_value(from.positive_int_value()); - } - if (from.has_negative_int_value()) { - set_negative_int_value(from.negative_int_value()); - } - if (from.has_double_value()) { - set_double_value(from.double_value()); - } - if (from.has_string_value()) { - set_has_string_value(); - string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_); +void UninterpretedOption_NamePart::MergeFrom(const UninterpretedOption_NamePart& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption.NamePart) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_name_part()) { + set_has_name_part(); + name_part_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.name_part_); } - if (from.has_aggregate_value()) { - set_has_aggregate_value(); - aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_); + if (from.has_is_extension()) { + set_is_extension(from.is_extension()); } } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } -void UninterpretedOption::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption) +void UninterpretedOption_NamePart::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption.NamePart) if (&from == this) return; Clear(); MergeFrom(from); } -void UninterpretedOption::CopyFrom(const UninterpretedOption& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption) +void UninterpretedOption_NamePart::CopyFrom(const UninterpretedOption_NamePart& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption.NamePart) if (&from == this) return; Clear(); MergeFrom(from); } -bool UninterpretedOption::IsInitialized() const { - - if (!::google::protobuf::internal::AllAreInitialized(this->name())) return false; +bool UninterpretedOption_NamePart::IsInitialized() const { + if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; return true; } -void UninterpretedOption::Swap(UninterpretedOption* other) { +void UninterpretedOption_NamePart::Swap(UninterpretedOption_NamePart* other) { if (other == this) return; InternalSwap(other); } -void UninterpretedOption::InternalSwap(UninterpretedOption* other) { - name_.UnsafeArenaSwap(&other->name_); - identifier_value_.Swap(&other->identifier_value_); - std::swap(positive_int_value_, other->positive_int_value_); - std::swap(negative_int_value_, other->negative_int_value_); - std::swap(double_value_, other->double_value_); - string_value_.Swap(&other->string_value_); - aggregate_value_.Swap(&other->aggregate_value_); +void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* other) { + name_part_.Swap(&other->name_part_); + std::swap(is_extension_, other->is_extension_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); } -::google::protobuf::Metadata UninterpretedOption::GetMetadata() const { +::google::protobuf::Metadata UninterpretedOption_NamePart::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = UninterpretedOption_descriptor_; - metadata.reflection = UninterpretedOption_reflection_; - return metadata; + return file_level_metadata[19]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -13001,37 +12880,45 @@ void UninterpretedOption_NamePart::clear_name_part() { name_part_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_name_part(); } - const ::std::string& UninterpretedOption_NamePart::name_part() const { +const ::std::string& UninterpretedOption_NamePart::name_part() const { // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.name_part) - return name_part_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return name_part_.GetNoArena(); } - void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) { +void UninterpretedOption_NamePart::set_name_part(const ::std::string& value) { set_has_name_part(); name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.name_part) } - void UninterpretedOption_NamePart::set_name_part(const char* value) { +#if LANG_CXX11 +void UninterpretedOption_NamePart::set_name_part(::std::string&& value) { + set_has_name_part(); + name_part_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.NamePart.name_part) +} +#endif +void UninterpretedOption_NamePart::set_name_part(const char* value) { set_has_name_part(); name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.NamePart.name_part) } - void UninterpretedOption_NamePart::set_name_part(const char* value, size_t size) { +void UninterpretedOption_NamePart::set_name_part(const char* value, size_t size) { set_has_name_part(); name_part_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.NamePart.name_part) } - ::std::string* UninterpretedOption_NamePart::mutable_name_part() { +::std::string* UninterpretedOption_NamePart::mutable_name_part() { set_has_name_part(); // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.NamePart.name_part) return name_part_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* UninterpretedOption_NamePart::release_name_part() { +::std::string* UninterpretedOption_NamePart::release_name_part() { // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.NamePart.name_part) clear_has_name_part(); return name_part_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void UninterpretedOption_NamePart::set_allocated_name_part(::std::string* name_part) { +void UninterpretedOption_NamePart::set_allocated_name_part(::std::string* name_part) { if (name_part != NULL) { set_has_name_part(); } else { @@ -13055,472 +12942,231 @@ void UninterpretedOption_NamePart::clear_is_extension() { is_extension_ = false; clear_has_is_extension(); } - bool UninterpretedOption_NamePart::is_extension() const { +bool UninterpretedOption_NamePart::is_extension() const { // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.is_extension) return is_extension_; } - void UninterpretedOption_NamePart::set_is_extension(bool value) { +void UninterpretedOption_NamePart::set_is_extension(bool value) { set_has_is_extension(); is_extension_ = value; // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.is_extension) } -// ------------------------------------------------------------------- +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// UninterpretedOption +// =================================================================== -// repeated .google.protobuf.UninterpretedOption.NamePart name = 2; -int UninterpretedOption::name_size() const { - return name_.size(); -} -void UninterpretedOption::clear_name() { - name_.Clear(); -} -const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.name) - return name_.Get(index); -} -::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.name) - return name_.Mutable(index); -} -::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() { - // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name) - return name_.Add(); -} -::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >* -UninterpretedOption::mutable_name() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name) - return &name_; -} -const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >& -UninterpretedOption::name() const { - // @@protoc_insertion_point(field_list:google.protobuf.UninterpretedOption.name) - return name_; -} +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int UninterpretedOption::kNameFieldNumber; +const int UninterpretedOption::kIdentifierValueFieldNumber; +const int UninterpretedOption::kPositiveIntValueFieldNumber; +const int UninterpretedOption::kNegativeIntValueFieldNumber; +const int UninterpretedOption::kDoubleValueFieldNumber; +const int UninterpretedOption::kStringValueFieldNumber; +const int UninterpretedOption::kAggregateValueFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -// optional string identifier_value = 3; -bool UninterpretedOption::has_identifier_value() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void UninterpretedOption::set_has_identifier_value() { - _has_bits_[0] |= 0x00000002u; -} -void UninterpretedOption::clear_has_identifier_value() { - _has_bits_[0] &= ~0x00000002u; +UninterpretedOption::UninterpretedOption() + : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } + SharedCtor(); + // @@protoc_insertion_point(constructor:google.protobuf.UninterpretedOption) } -void UninterpretedOption::clear_identifier_value() { - identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_identifier_value(); +UninterpretedOption::UninterpretedOption(const UninterpretedOption& from) + : ::google::protobuf::Message(), + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + name_(from.name_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_identifier_value()) { + identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_); + } + string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_string_value()) { + string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_); + } + aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_aggregate_value()) { + aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_); + } + ::memcpy(&positive_int_value_, &from.positive_int_value_, + reinterpret_cast(&double_value_) - + reinterpret_cast(&positive_int_value_) + sizeof(double_value_)); + // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption) } - const ::std::string& UninterpretedOption::identifier_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value) - return identifier_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + +void UninterpretedOption::SharedCtor() { + _cached_size_ = 0; + identifier_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + string_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + aggregate_value_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + ::memset(&positive_int_value_, 0, reinterpret_cast(&double_value_) - + reinterpret_cast(&positive_int_value_) + sizeof(double_value_)); } - void UninterpretedOption::set_identifier_value(const ::std::string& value) { - set_has_identifier_value(); - identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value) + +UninterpretedOption::~UninterpretedOption() { + // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption) + SharedDtor(); } - void UninterpretedOption::set_identifier_value(const char* value) { - set_has_identifier_value(); - identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.identifier_value) + +void UninterpretedOption::SharedDtor() { + identifier_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + string_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + aggregate_value_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void UninterpretedOption::set_identifier_value(const char* value, size_t size) { - set_has_identifier_value(); - identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.identifier_value) + +void UninterpretedOption::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); } - ::std::string* UninterpretedOption::mutable_identifier_value() { - set_has_identifier_value(); - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.identifier_value) - return identifier_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +const ::google::protobuf::Descriptor* UninterpretedOption::descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[20].descriptor; } - ::std::string* UninterpretedOption::release_identifier_value() { - // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value) - clear_has_identifier_value(); - return identifier_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + +const UninterpretedOption& UninterpretedOption::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } - void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) { - if (identifier_value != NULL) { - set_has_identifier_value(); - } else { - clear_has_identifier_value(); + +UninterpretedOption* UninterpretedOption::New(::google::protobuf::Arena* arena) const { + UninterpretedOption* n = new UninterpretedOption; + if (arena != NULL) { + arena->Own(n); } - identifier_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), identifier_value); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value) + return n; } -// optional uint64 positive_int_value = 4; -bool UninterpretedOption::has_positive_int_value() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -void UninterpretedOption::set_has_positive_int_value() { - _has_bits_[0] |= 0x00000004u; -} -void UninterpretedOption::clear_has_positive_int_value() { - _has_bits_[0] &= ~0x00000004u; -} -void UninterpretedOption::clear_positive_int_value() { - positive_int_value_ = GOOGLE_ULONGLONG(0); - clear_has_positive_int_value(); -} - ::google::protobuf::uint64 UninterpretedOption::positive_int_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.positive_int_value) - return positive_int_value_; -} - void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 value) { - set_has_positive_int_value(); - positive_int_value_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value) -} - -// optional int64 negative_int_value = 5; -bool UninterpretedOption::has_negative_int_value() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -void UninterpretedOption::set_has_negative_int_value() { - _has_bits_[0] |= 0x00000008u; -} -void UninterpretedOption::clear_has_negative_int_value() { - _has_bits_[0] &= ~0x00000008u; -} -void UninterpretedOption::clear_negative_int_value() { - negative_int_value_ = GOOGLE_LONGLONG(0); - clear_has_negative_int_value(); -} - ::google::protobuf::int64 UninterpretedOption::negative_int_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.negative_int_value) - return negative_int_value_; -} - void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value) { - set_has_negative_int_value(); - negative_int_value_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value) -} - -// optional double double_value = 6; -bool UninterpretedOption::has_double_value() const { - return (_has_bits_[0] & 0x00000010u) != 0; -} -void UninterpretedOption::set_has_double_value() { - _has_bits_[0] |= 0x00000010u; -} -void UninterpretedOption::clear_has_double_value() { - _has_bits_[0] &= ~0x00000010u; -} -void UninterpretedOption::clear_double_value() { - double_value_ = 0; - clear_has_double_value(); -} - double UninterpretedOption::double_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.double_value) - return double_value_; -} - void UninterpretedOption::set_double_value(double value) { - set_has_double_value(); - double_value_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value) -} - -// optional bytes string_value = 7; -bool UninterpretedOption::has_string_value() const { - return (_has_bits_[0] & 0x00000020u) != 0; -} -void UninterpretedOption::set_has_string_value() { - _has_bits_[0] |= 0x00000020u; -} -void UninterpretedOption::clear_has_string_value() { - _has_bits_[0] &= ~0x00000020u; -} -void UninterpretedOption::clear_string_value() { - string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_string_value(); -} - const ::std::string& UninterpretedOption::string_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value) - return string_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_string_value(const ::std::string& value) { - set_has_string_value(); - string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value) -} - void UninterpretedOption::set_string_value(const char* value) { - set_has_string_value(); - string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.string_value) -} - void UninterpretedOption::set_string_value(const void* value, size_t size) { - set_has_string_value(); - string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.string_value) -} - ::std::string* UninterpretedOption::mutable_string_value() { - set_has_string_value(); - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.string_value) - return string_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - ::std::string* UninterpretedOption::release_string_value() { - // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value) - clear_has_string_value(); - return string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_allocated_string_value(::std::string* string_value) { - if (string_value != NULL) { - set_has_string_value(); - } else { - clear_has_string_value(); - } - string_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value) -} - -// optional string aggregate_value = 8; -bool UninterpretedOption::has_aggregate_value() const { - return (_has_bits_[0] & 0x00000040u) != 0; -} -void UninterpretedOption::set_has_aggregate_value() { - _has_bits_[0] |= 0x00000040u; -} -void UninterpretedOption::clear_has_aggregate_value() { - _has_bits_[0] &= ~0x00000040u; -} -void UninterpretedOption::clear_aggregate_value() { - aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_aggregate_value(); -} - const ::std::string& UninterpretedOption::aggregate_value() const { - // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value) - return aggregate_value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_aggregate_value(const ::std::string& value) { - set_has_aggregate_value(); - aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value) -} - void UninterpretedOption::set_aggregate_value(const char* value) { - set_has_aggregate_value(); - aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.aggregate_value) -} - void UninterpretedOption::set_aggregate_value(const char* value, size_t size) { - set_has_aggregate_value(); - aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.aggregate_value) -} - ::std::string* UninterpretedOption::mutable_aggregate_value() { - set_has_aggregate_value(); - // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.aggregate_value) - return aggregate_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - ::std::string* UninterpretedOption::release_aggregate_value() { - // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.aggregate_value) - clear_has_aggregate_value(); - return aggregate_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) { - if (aggregate_value != NULL) { - set_has_aggregate_value(); - } else { - clear_has_aggregate_value(); - } - aggregate_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), aggregate_value); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value) -} - -#endif // PROTOBUF_INLINE_NOT_IN_HEADERS - -// =================================================================== - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int SourceCodeInfo_Location::kPathFieldNumber; -const int SourceCodeInfo_Location::kSpanFieldNumber; -const int SourceCodeInfo_Location::kLeadingCommentsFieldNumber; -const int SourceCodeInfo_Location::kTrailingCommentsFieldNumber; -const int SourceCodeInfo_Location::kLeadingDetachedCommentsFieldNumber; -#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 - -SourceCodeInfo_Location::SourceCodeInfo_Location() - : ::google::protobuf::Message(), _internal_metadata_(NULL) { - SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo.Location) -} - -void SourceCodeInfo_Location::InitAsDefaultInstance() { -} - -SourceCodeInfo_Location::SourceCodeInfo_Location(const SourceCodeInfo_Location& from) - : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo.Location) -} - -void SourceCodeInfo_Location::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); - _cached_size_ = 0; - leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -SourceCodeInfo_Location::~SourceCodeInfo_Location() { - // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo.Location) - SharedDtor(); +void UninterpretedOption::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption) + name_.Clear(); + if (_has_bits_[0 / 32] & 7u) { + if (has_identifier_value()) { + GOOGLE_DCHECK(!identifier_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*identifier_value_.UnsafeRawStringPointer())->clear(); + } + if (has_string_value()) { + GOOGLE_DCHECK(!string_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*string_value_.UnsafeRawStringPointer())->clear(); + } + if (has_aggregate_value()) { + GOOGLE_DCHECK(!aggregate_value_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*aggregate_value_.UnsafeRawStringPointer())->clear(); + } + } + if (_has_bits_[0 / 32] & 56u) { + ::memset(&positive_int_value_, 0, reinterpret_cast(&double_value_) - + reinterpret_cast(&positive_int_value_) + sizeof(double_value_)); + } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } -void SourceCodeInfo_Location::SharedDtor() { - leading_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - trailing_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } -} - -void SourceCodeInfo_Location::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const ::google::protobuf::Descriptor* SourceCodeInfo_Location::descriptor() { - protobuf_AssignDescriptorsOnce(); - return SourceCodeInfo_Location_descriptor_; -} - -const SourceCodeInfo_Location& SourceCodeInfo_Location::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; -} - -SourceCodeInfo_Location* SourceCodeInfo_Location::default_instance_ = NULL; - -SourceCodeInfo_Location* SourceCodeInfo_Location::New(::google::protobuf::Arena* arena) const { - SourceCodeInfo_Location* n = new SourceCodeInfo_Location; - if (arena != NULL) { - arena->Own(n); - } - return n; -} - -void SourceCodeInfo_Location::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location) - if (_has_bits_[0 / 32] & 12u) { - if (has_leading_comments()) { - leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - if (has_trailing_comments()) { - trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - } - path_.Clear(); - span_.Clear(); - leading_detached_comments_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } -} - -bool SourceCodeInfo_Location::MergePartialFromCodedStream( +bool UninterpretedOption::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(parse_start:google.protobuf.UninterpretedOption) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated int32 path = 1 [packed = true]; - case 1: { - if (tag == 10) { - DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, this->mutable_path()))); - } else if (tag == 8) { - DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 10, input, this->mutable_path()))); - } else { - goto handle_unusual; - } - if (input->ExpectTag(18)) goto parse_span; - break; - } - - // repeated int32 span = 2 [packed = true]; + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; case 2: { - if (tag == 18) { - parse_span: - DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - input, this->mutable_span()))); - } else if (tag == 16) { - DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< - ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 18, input, this->mutable_span()))); + if (tag == 18u) { + DO_(input->IncrementRecursionDepth()); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( + input, add_name())); } else { goto handle_unusual; } - if (input->ExpectTag(26)) goto parse_leading_comments; + input->UnsafeDecrementRecursionDepth(); break; } - // optional string leading_comments = 3; + // optional string identifier_value = 3; case 3: { - if (tag == 26) { - parse_leading_comments: + if (tag == 26u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_leading_comments())); + input, this->mutable_identifier_value())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_comments().data(), this->leading_comments().length(), + this->identifier_value().data(), this->identifier_value().length(), ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.SourceCodeInfo.Location.leading_comments"); + "google.protobuf.UninterpretedOption.identifier_value"); } else { goto handle_unusual; } - if (input->ExpectTag(34)) goto parse_trailing_comments; break; } - // optional string trailing_comments = 4; + // optional uint64 positive_int_value = 4; case 4: { - if (tag == 34) { - parse_trailing_comments: - DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->mutable_trailing_comments())); - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->trailing_comments().data(), this->trailing_comments().length(), - ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + if (tag == 32u) { + set_has_positive_int_value(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>( + input, &positive_int_value_))); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_leading_detached_comments; break; } - // repeated string leading_detached_comments = 6; + // optional int64 negative_int_value = 5; + case 5: { + if (tag == 40u) { + set_has_negative_int_value(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( + input, &negative_int_value_))); + } else { + goto handle_unusual; + } + break; + } + + // optional double double_value = 6; case 6: { - if (tag == 50) { - parse_leading_detached_comments: + if (tag == 49u) { + set_has_double_value(); + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>( + input, &double_value_))); + } else { + goto handle_unusual; + } + break; + } + + // optional bytes string_value = 7; + case 7: { + if (tag == 58u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + input, this->mutable_string_value())); + } else { + goto handle_unusual; + } + break; + } + + // optional string aggregate_value = 8; + case 8: { + if (tag == 66u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( - input, this->add_leading_detached_comments())); + input, this->mutable_aggregate_value())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_detached_comments(this->leading_detached_comments_size() - 1).data(), - this->leading_detached_comments(this->leading_detached_comments_size() - 1).length(), + this->aggregate_value().data(), this->aggregate_value().length(), ::google::protobuf::internal::WireFormat::PARSE, - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); + "google.protobuf.UninterpretedOption.aggregate_value"); } else { goto handle_unusual; } - if (input->ExpectTag(50)) goto parse_leading_detached_comments; - if (input->ExpectAtEnd()) goto success; break; } @@ -13538,391 +13184,763 @@ bool SourceCodeInfo_Location::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(parse_success:google.protobuf.UninterpretedOption) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(parse_failure:google.protobuf.UninterpretedOption) return false; #undef DO_ } -void SourceCodeInfo_Location::SerializeWithCachedSizes( +void UninterpretedOption::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo.Location) - // repeated int32 path = 1 [packed = true]; - if (this->path_size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteTag(1, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); - output->WriteVarint32(_path_cached_byte_size_); + // @@protoc_insertion_point(serialize_start:google.protobuf.UninterpretedOption) + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; + for (unsigned int i = 0, n = this->name_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 2, this->name(i), output); } - for (int i = 0; i < this->path_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( - this->path(i), output); + + // optional string identifier_value = 3; + if (has_identifier_value()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->identifier_value().data(), this->identifier_value().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.UninterpretedOption.identifier_value"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->identifier_value(), output); } - // repeated int32 span = 2 [packed = true]; - if (this->span_size() > 0) { - ::google::protobuf::internal::WireFormatLite::WriteTag(2, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); - output->WriteVarint32(_span_cached_byte_size_); + // optional uint64 positive_int_value = 4; + if (has_positive_int_value()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt64(4, this->positive_int_value(), output); } - for (int i = 0; i < this->span_size(); i++) { - ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( - this->span(i), output); + + // optional int64 negative_int_value = 5; + if (has_negative_int_value()) { + ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->negative_int_value(), output); } - // optional string leading_comments = 3; - if (has_leading_comments()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_comments().data(), this->leading_comments().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_comments"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 3, this->leading_comments(), output); + // optional double double_value = 6; + if (has_double_value()) { + ::google::protobuf::internal::WireFormatLite::WriteDouble(6, this->double_value(), output); } - // optional string trailing_comments = 4; - if (has_trailing_comments()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->trailing_comments().data(), this->trailing_comments().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.trailing_comments"); - ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( - 4, this->trailing_comments(), output); + // optional bytes string_value = 7; + if (has_string_value()) { + ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased( + 7, this->string_value(), output); } - // repeated string leading_detached_comments = 6; - for (int i = 0; i < this->leading_detached_comments_size(); i++) { + // optional string aggregate_value = 8; + if (has_aggregate_value()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + this->aggregate_value().data(), this->aggregate_value().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); - ::google::protobuf::internal::WireFormatLite::WriteString( - 6, this->leading_detached_comments(i), output); + "google.protobuf.UninterpretedOption.aggregate_value"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 8, this->aggregate_value(), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(serialize_end:google.protobuf.UninterpretedOption) } -::google::protobuf::uint8* SourceCodeInfo_Location::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo.Location) - // repeated int32 path = 1 [packed = true]; - if (this->path_size() > 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( - 1, - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, - target); - target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( - _path_cached_byte_size_, target); - } - for (int i = 0; i < this->path_size(); i++) { - target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32NoTagToArray(this->path(i), target); - } - - // repeated int32 span = 2 [packed = true]; - if (this->span_size() > 0) { - target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( - 2, - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, - target); - target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( - _span_cached_byte_size_, target); - } - for (int i = 0; i < this->span_size(); i++) { +::google::protobuf::uint8* UninterpretedOption::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption) + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; + for (unsigned int i = 0, n = this->name_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteInt32NoTagToArray(this->span(i), target); + InternalWriteMessageNoVirtualToArray( + 2, this->name(i), false, target); } - // optional string leading_comments = 3; - if (has_leading_comments()) { + // optional string identifier_value = 3; + if (has_identifier_value()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_comments().data(), this->leading_comments().length(), + this->identifier_value().data(), this->identifier_value().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_comments"); + "google.protobuf.UninterpretedOption.identifier_value"); target = ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 3, this->leading_comments(), target); + 3, this->identifier_value(), target); } - // optional string trailing_comments = 4; - if (has_trailing_comments()) { - ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->trailing_comments().data(), this->trailing_comments().length(), - ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + // optional uint64 positive_int_value = 4; + if (has_positive_int_value()) { + target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(4, this->positive_int_value(), target); + } + + // optional int64 negative_int_value = 5; + if (has_negative_int_value()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->negative_int_value(), target); + } + + // optional double double_value = 6; + if (has_double_value()) { + target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(6, this->double_value(), target); + } + + // optional bytes string_value = 7; + if (has_string_value()) { target = - ::google::protobuf::internal::WireFormatLite::WriteStringToArray( - 4, this->trailing_comments(), target); + ::google::protobuf::internal::WireFormatLite::WriteBytesToArray( + 7, this->string_value(), target); } - // repeated string leading_detached_comments = 6; - for (int i = 0; i < this->leading_detached_comments_size(); i++) { + // optional string aggregate_value = 8; + if (has_aggregate_value()) { ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( - this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + this->aggregate_value().data(), this->aggregate_value().length(), ::google::protobuf::internal::WireFormat::SERIALIZE, - "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); - target = ::google::protobuf::internal::WireFormatLite:: - WriteStringToArray(6, this->leading_detached_comments(i), target); + "google.protobuf.UninterpretedOption.aggregate_value"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 8, this->aggregate_value(), target); } if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo.Location) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption) return target; } -int SourceCodeInfo_Location::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo.Location) - int total_size = 0; +size_t UninterpretedOption::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption) + size_t total_size = 0; - if (_has_bits_[2 / 32] & 12u) { - // optional string leading_comments = 3; - if (has_leading_comments()) { + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.UninterpretedOption.NamePart name = 2; + { + unsigned int count = this->name_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->name(i)); + } + } + + if (_has_bits_[0 / 32] & 63u) { + // optional string identifier_value = 3; + if (has_identifier_value()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( - this->leading_comments()); + this->identifier_value()); } - // optional string trailing_comments = 4; - if (has_trailing_comments()) { + // optional bytes string_value = 7; + if (has_string_value()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->string_value()); + } + + // optional string aggregate_value = 8; + if (has_aggregate_value()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( - this->trailing_comments()); + this->aggregate_value()); } - } - // repeated int32 path = 1 [packed = true]; - { - int data_size = 0; - for (int i = 0; i < this->path_size(); i++) { - data_size += ::google::protobuf::internal::WireFormatLite:: - Int32Size(this->path(i)); - } - if (data_size > 0) { + // optional uint64 positive_int_value = 4; + if (has_positive_int_value()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + ::google::protobuf::internal::WireFormatLite::UInt64Size( + this->positive_int_value()); } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _path_cached_byte_size_ = data_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - total_size += data_size; - } - // repeated int32 span = 2 [packed = true]; - { - int data_size = 0; - for (int i = 0; i < this->span_size(); i++) { - data_size += ::google::protobuf::internal::WireFormatLite:: - Int32Size(this->span(i)); - } - if (data_size > 0) { + // optional int64 negative_int_value = 5; + if (has_negative_int_value()) { total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + ::google::protobuf::internal::WireFormatLite::Int64Size( + this->negative_int_value()); } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _span_cached_byte_size_ = data_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - total_size += data_size; - } - // repeated string leading_detached_comments = 6; - total_size += 1 * this->leading_detached_comments_size(); - for (int i = 0; i < this->leading_detached_comments_size(); i++) { - total_size += ::google::protobuf::internal::WireFormatLite::StringSize( - this->leading_detached_comments(i)); - } + // optional double double_value = 6; + if (has_double_value()) { + total_size += 1 + 8; + } - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo.Location) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const SourceCodeInfo_Location* source = - ::google::protobuf::internal::DynamicCastToGenerated( - &from); - if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo.Location) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); +void UninterpretedOption::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.UninterpretedOption) + GOOGLE_DCHECK_NE(&from, this); + const UninterpretedOption* source = + ::google::protobuf::internal::DynamicCastToGenerated( + &from); + if (source == NULL) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.UninterpretedOption) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.UninterpretedOption) + MergeFrom(*source); + } +} + +void UninterpretedOption::MergeFrom(const UninterpretedOption& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + name_.MergeFrom(from.name_); + if (from._has_bits_[0 / 32] & 63u) { + if (from.has_identifier_value()) { + set_has_identifier_value(); + identifier_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.identifier_value_); + } + if (from.has_string_value()) { + set_has_string_value(); + string_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.string_value_); + } + if (from.has_aggregate_value()) { + set_has_aggregate_value(); + aggregate_value_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.aggregate_value_); + } + if (from.has_positive_int_value()) { + set_positive_int_value(from.positive_int_value()); + } + if (from.has_negative_int_value()) { + set_negative_int_value(from.negative_int_value()); + } + if (from.has_double_value()) { + set_double_value(from.double_value()); + } + } +} + +void UninterpretedOption::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.UninterpretedOption) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void UninterpretedOption::CopyFrom(const UninterpretedOption& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool UninterpretedOption::IsInitialized() const { + if (!::google::protobuf::internal::AllAreInitialized(this->name())) return false; + return true; +} + +void UninterpretedOption::Swap(UninterpretedOption* other) { + if (other == this) return; + InternalSwap(other); +} +void UninterpretedOption::InternalSwap(UninterpretedOption* other) { + name_.UnsafeArenaSwap(&other->name_); + identifier_value_.Swap(&other->identifier_value_); + string_value_.Swap(&other->string_value_); + aggregate_value_.Swap(&other->aggregate_value_); + std::swap(positive_int_value_, other->positive_int_value_); + std::swap(negative_int_value_, other->negative_int_value_); + std::swap(double_value_, other->double_value_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _internal_metadata_.Swap(&other->_internal_metadata_); + std::swap(_cached_size_, other->_cached_size_); +} + +::google::protobuf::Metadata UninterpretedOption::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[20]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// UninterpretedOption + +// repeated .google.protobuf.UninterpretedOption.NamePart name = 2; +int UninterpretedOption::name_size() const { + return name_.size(); +} +void UninterpretedOption::clear_name() { + name_.Clear(); +} +const ::google::protobuf::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.name) + return name_.Get(index); +} +::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.name) + return name_.Mutable(index); +} +::google::protobuf::UninterpretedOption_NamePart* UninterpretedOption::add_name() { + // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name) + return name_.Add(); +} +::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >* +UninterpretedOption::mutable_name() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name) + return &name_; +} +const ::google::protobuf::RepeatedPtrField< ::google::protobuf::UninterpretedOption_NamePart >& +UninterpretedOption::name() const { + // @@protoc_insertion_point(field_list:google.protobuf.UninterpretedOption.name) + return name_; +} + +// optional string identifier_value = 3; +bool UninterpretedOption::has_identifier_value() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void UninterpretedOption::set_has_identifier_value() { + _has_bits_[0] |= 0x00000001u; +} +void UninterpretedOption::clear_has_identifier_value() { + _has_bits_[0] &= ~0x00000001u; +} +void UninterpretedOption::clear_identifier_value() { + identifier_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_identifier_value(); +} +const ::std::string& UninterpretedOption::identifier_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value) + return identifier_value_.GetNoArena(); +} +void UninterpretedOption::set_identifier_value(const ::std::string& value) { + set_has_identifier_value(); + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value) +} +#if LANG_CXX11 +void UninterpretedOption::set_identifier_value(::std::string&& value) { + set_has_identifier_value(); + identifier_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.identifier_value) +} +#endif +void UninterpretedOption::set_identifier_value(const char* value) { + set_has_identifier_value(); + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.identifier_value) +} +void UninterpretedOption::set_identifier_value(const char* value, size_t size) { + set_has_identifier_value(); + identifier_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.identifier_value) +} +::std::string* UninterpretedOption::mutable_identifier_value() { + set_has_identifier_value(); + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.identifier_value) + return identifier_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* UninterpretedOption::release_identifier_value() { + // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value) + clear_has_identifier_value(); + return identifier_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void UninterpretedOption::set_allocated_identifier_value(::std::string* identifier_value) { + if (identifier_value != NULL) { + set_has_identifier_value(); + } else { + clear_has_identifier_value(); + } + identifier_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), identifier_value); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value) +} + +// optional uint64 positive_int_value = 4; +bool UninterpretedOption::has_positive_int_value() const { + return (_has_bits_[0] & 0x00000008u) != 0; +} +void UninterpretedOption::set_has_positive_int_value() { + _has_bits_[0] |= 0x00000008u; +} +void UninterpretedOption::clear_has_positive_int_value() { + _has_bits_[0] &= ~0x00000008u; +} +void UninterpretedOption::clear_positive_int_value() { + positive_int_value_ = GOOGLE_ULONGLONG(0); + clear_has_positive_int_value(); +} +::google::protobuf::uint64 UninterpretedOption::positive_int_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.positive_int_value) + return positive_int_value_; +} +void UninterpretedOption::set_positive_int_value(::google::protobuf::uint64 value) { + set_has_positive_int_value(); + positive_int_value_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value) +} + +// optional int64 negative_int_value = 5; +bool UninterpretedOption::has_negative_int_value() const { + return (_has_bits_[0] & 0x00000010u) != 0; +} +void UninterpretedOption::set_has_negative_int_value() { + _has_bits_[0] |= 0x00000010u; +} +void UninterpretedOption::clear_has_negative_int_value() { + _has_bits_[0] &= ~0x00000010u; +} +void UninterpretedOption::clear_negative_int_value() { + negative_int_value_ = GOOGLE_LONGLONG(0); + clear_has_negative_int_value(); +} +::google::protobuf::int64 UninterpretedOption::negative_int_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.negative_int_value) + return negative_int_value_; +} +void UninterpretedOption::set_negative_int_value(::google::protobuf::int64 value) { + set_has_negative_int_value(); + negative_int_value_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value) +} + +// optional double double_value = 6; +bool UninterpretedOption::has_double_value() const { + return (_has_bits_[0] & 0x00000020u) != 0; +} +void UninterpretedOption::set_has_double_value() { + _has_bits_[0] |= 0x00000020u; +} +void UninterpretedOption::clear_has_double_value() { + _has_bits_[0] &= ~0x00000020u; +} +void UninterpretedOption::clear_double_value() { + double_value_ = 0; + clear_has_double_value(); +} +double UninterpretedOption::double_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.double_value) + return double_value_; +} +void UninterpretedOption::set_double_value(double value) { + set_has_double_value(); + double_value_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value) +} + +// optional bytes string_value = 7; +bool UninterpretedOption::has_string_value() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +void UninterpretedOption::set_has_string_value() { + _has_bits_[0] |= 0x00000002u; +} +void UninterpretedOption::clear_has_string_value() { + _has_bits_[0] &= ~0x00000002u; +} +void UninterpretedOption::clear_string_value() { + string_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_string_value(); +} +const ::std::string& UninterpretedOption::string_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value) + return string_value_.GetNoArena(); +} +void UninterpretedOption::set_string_value(const ::std::string& value) { + set_has_string_value(); + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value) +} +#if LANG_CXX11 +void UninterpretedOption::set_string_value(::std::string&& value) { + set_has_string_value(); + string_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.string_value) +} +#endif +void UninterpretedOption::set_string_value(const char* value) { + set_has_string_value(); + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.string_value) +} +void UninterpretedOption::set_string_value(const void* value, size_t size) { + set_has_string_value(); + string_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.string_value) +} +::std::string* UninterpretedOption::mutable_string_value() { + set_has_string_value(); + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.string_value) + return string_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* UninterpretedOption::release_string_value() { + // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value) + clear_has_string_value(); + return string_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void UninterpretedOption::set_allocated_string_value(::std::string* string_value) { + if (string_value != NULL) { + set_has_string_value(); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo.Location) - MergeFrom(*source); + clear_has_string_value(); } + string_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), string_value); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value) } -void SourceCodeInfo_Location::MergeFrom(const SourceCodeInfo_Location& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo.Location) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - path_.MergeFrom(from.path_); - span_.MergeFrom(from.span_); - leading_detached_comments_.MergeFrom(from.leading_detached_comments_); - if (from._has_bits_[2 / 32] & (0xffu << (2 % 32))) { - if (from.has_leading_comments()) { - set_has_leading_comments(); - leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_); - } - if (from.has_trailing_comments()) { - set_has_trailing_comments(); - trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_); - } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } +// optional string aggregate_value = 8; +bool UninterpretedOption::has_aggregate_value() const { + return (_has_bits_[0] & 0x00000004u) != 0; } - -void SourceCodeInfo_Location::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo.Location) - if (&from == this) return; - Clear(); - MergeFrom(from); +void UninterpretedOption::set_has_aggregate_value() { + _has_bits_[0] |= 0x00000004u; } - -void SourceCodeInfo_Location::CopyFrom(const SourceCodeInfo_Location& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo.Location) - if (&from == this) return; - Clear(); - MergeFrom(from); +void UninterpretedOption::clear_has_aggregate_value() { + _has_bits_[0] &= ~0x00000004u; } - -bool SourceCodeInfo_Location::IsInitialized() const { - - return true; +void UninterpretedOption::clear_aggregate_value() { + aggregate_value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_aggregate_value(); } - -void SourceCodeInfo_Location::Swap(SourceCodeInfo_Location* other) { - if (other == this) return; - InternalSwap(other); +const ::std::string& UninterpretedOption::aggregate_value() const { + // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value) + return aggregate_value_.GetNoArena(); } -void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* other) { - path_.UnsafeArenaSwap(&other->path_); - span_.UnsafeArenaSwap(&other->span_); - leading_comments_.Swap(&other->leading_comments_); - trailing_comments_.Swap(&other->trailing_comments_); - leading_detached_comments_.UnsafeArenaSwap(&other->leading_detached_comments_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _internal_metadata_.Swap(&other->_internal_metadata_); - std::swap(_cached_size_, other->_cached_size_); +void UninterpretedOption::set_aggregate_value(const ::std::string& value) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value) } - -::google::protobuf::Metadata SourceCodeInfo_Location::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = SourceCodeInfo_Location_descriptor_; - metadata.reflection = SourceCodeInfo_Location_reflection_; - return metadata; +#if LANG_CXX11 +void UninterpretedOption::set_aggregate_value(::std::string&& value) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.UninterpretedOption.aggregate_value) +} +#endif +void UninterpretedOption::set_aggregate_value(const char* value) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.UninterpretedOption.aggregate_value) +} +void UninterpretedOption::set_aggregate_value(const char* value, size_t size) { + set_has_aggregate_value(); + aggregate_value_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.UninterpretedOption.aggregate_value) +} +::std::string* UninterpretedOption::mutable_aggregate_value() { + set_has_aggregate_value(); + // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.aggregate_value) + return aggregate_value_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* UninterpretedOption::release_aggregate_value() { + // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.aggregate_value) + clear_has_aggregate_value(); + return aggregate_value_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void UninterpretedOption::set_allocated_aggregate_value(::std::string* aggregate_value) { + if (aggregate_value != NULL) { + set_has_aggregate_value(); + } else { + clear_has_aggregate_value(); + } + aggregate_value_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), aggregate_value); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 -const int SourceCodeInfo::kLocationFieldNumber; +const int SourceCodeInfo_Location::kPathFieldNumber; +const int SourceCodeInfo_Location::kSpanFieldNumber; +const int SourceCodeInfo_Location::kLeadingCommentsFieldNumber; +const int SourceCodeInfo_Location::kTrailingCommentsFieldNumber; +const int SourceCodeInfo_Location::kLeadingDetachedCommentsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 -SourceCodeInfo::SourceCodeInfo() +SourceCodeInfo_Location::SourceCodeInfo_Location() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); - // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo) -} - -void SourceCodeInfo::InitAsDefaultInstance() { + // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo.Location) } - -SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from) +SourceCodeInfo_Location::SourceCodeInfo_Location(const SourceCodeInfo_Location& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); - // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo) + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + path_(from.path_), + span_(from.span_), + leading_detached_comments_(from.leading_detached_comments_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_leading_comments()) { + leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_); + } + trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_trailing_comments()) { + trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_); + } + // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo.Location) } -void SourceCodeInfo::SharedCtor() { +void SourceCodeInfo_Location::SharedCtor() { _cached_size_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + leading_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + trailing_comments_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -SourceCodeInfo::~SourceCodeInfo() { - // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo) +SourceCodeInfo_Location::~SourceCodeInfo_Location() { + // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo.Location) SharedDtor(); } -void SourceCodeInfo::SharedDtor() { - if (this != default_instance_) { - } +void SourceCodeInfo_Location::SharedDtor() { + leading_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + trailing_comments_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } -void SourceCodeInfo::SetCachedSize(int size) const { +void SourceCodeInfo_Location::SetCachedSize(int size) const { GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); } -const ::google::protobuf::Descriptor* SourceCodeInfo::descriptor() { +const ::google::protobuf::Descriptor* SourceCodeInfo_Location::descriptor() { protobuf_AssignDescriptorsOnce(); - return SourceCodeInfo_descriptor_; + return file_level_metadata[21].descriptor; } -const SourceCodeInfo& SourceCodeInfo::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; +const SourceCodeInfo_Location& SourceCodeInfo_Location::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -SourceCodeInfo* SourceCodeInfo::default_instance_ = NULL; - -SourceCodeInfo* SourceCodeInfo::New(::google::protobuf::Arena* arena) const { - SourceCodeInfo* n = new SourceCodeInfo; +SourceCodeInfo_Location* SourceCodeInfo_Location::New(::google::protobuf::Arena* arena) const { + SourceCodeInfo_Location* n = new SourceCodeInfo_Location; if (arena != NULL) { arena->Own(n); } return n; } -void SourceCodeInfo::Clear() { -// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo) - location_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } -} +void SourceCodeInfo_Location::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location) + path_.Clear(); + span_.Clear(); + leading_detached_comments_.Clear(); + if (_has_bits_[0 / 32] & 3u) { + if (has_leading_comments()) { + GOOGLE_DCHECK(!leading_comments_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*leading_comments_.UnsafeRawStringPointer())->clear(); + } + if (has_trailing_comments()) { + GOOGLE_DCHECK(!trailing_comments_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*trailing_comments_.UnsafeRawStringPointer())->clear(); + } + } + _has_bits_.Clear(); + _internal_metadata_.Clear(); +} + +bool SourceCodeInfo_Location::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo.Location) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated int32 path = 1 [packed = true]; + case 1: { + if (tag == 10u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, this->mutable_path()))); + } else if (tag == 8u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + 1, 10u, input, this->mutable_path()))); + } else { + goto handle_unusual; + } + break; + } + + // repeated int32 span = 2 [packed = true]; + case 2: { + if (tag == 18u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + input, this->mutable_span()))); + } else if (tag == 16u) { + DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< + ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( + 1, 18u, input, this->mutable_span()))); + } else { + goto handle_unusual; + } + break; + } + + // optional string leading_comments = 3; + case 3: { + if (tag == 26u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_leading_comments())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_comments().data(), this->leading_comments().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.SourceCodeInfo.Location.leading_comments"); + } else { + goto handle_unusual; + } + break; + } -bool SourceCodeInfo::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure - ::google::protobuf::uint32 tag; - // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo) - for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); - tag = p.first; - if (!p.second) goto handle_unusual; - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - case 1: { - if (tag == 10) { - DO_(input->IncrementRecursionDepth()); - parse_loop_location: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( - input, add_location())); + // optional string trailing_comments = 4; + case 4: { + if (tag == 34u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->mutable_trailing_comments())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->trailing_comments().data(), this->trailing_comments().length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + } else { + goto handle_unusual; + } + break; + } + + // repeated string leading_detached_comments = 6; + case 6: { + if (tag == 50u) { + DO_(::google::protobuf::internal::WireFormatLite::ReadString( + input, this->add_leading_detached_comments())); + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_detached_comments(this->leading_detached_comments_size() - 1).data(), + this->leading_detached_comments(this->leading_detached_comments_size() - 1).length(), + ::google::protobuf::internal::WireFormat::PARSE, + "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); } else { goto handle_unusual; } - if (input->ExpectTag(10)) goto parse_loop_location; - input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -13940,131 +13958,294 @@ bool SourceCodeInfo::MergePartialFromCodedStream( } } success: - // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo.Location) return true; failure: - // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo.Location) return false; #undef DO_ } -void SourceCodeInfo::SerializeWithCachedSizes( +void SourceCodeInfo_Location::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo) - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - for (unsigned int i = 0, n = this->location_size(); i < n; i++) { - ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( - 1, this->location(i), output); + // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo.Location) + // repeated int32 path = 1 [packed = true]; + if (this->path_size() > 0) { + ::google::protobuf::internal::WireFormatLite::WriteTag(1, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); + output->WriteVarint32(_path_cached_byte_size_); + } + for (int i = 0; i < this->path_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( + this->path(i), output); + } + + // repeated int32 span = 2 [packed = true]; + if (this->span_size() > 0) { + ::google::protobuf::internal::WireFormatLite::WriteTag(2, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output); + output->WriteVarint32(_span_cached_byte_size_); + } + for (int i = 0; i < this->span_size(); i++) { + ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag( + this->span(i), output); + } + + // optional string leading_comments = 3; + if (has_leading_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_comments().data(), this->leading_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_comments"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 3, this->leading_comments(), output); + } + + // optional string trailing_comments = 4; + if (has_trailing_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->trailing_comments().data(), this->trailing_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased( + 4, this->trailing_comments(), output); + } + + // repeated string leading_detached_comments = 6; + for (int i = 0; i < this->leading_detached_comments_size(); i++) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); + ::google::protobuf::internal::WireFormatLite::WriteString( + 6, this->leading_detached_comments(i), output); } if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); } - // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo.Location) } -::google::protobuf::uint8* SourceCodeInfo::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { - // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo) - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - for (unsigned int i = 0, n = this->location_size(); i < n; i++) { +::google::protobuf::uint8* SourceCodeInfo_Location::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo.Location) + // repeated int32 path = 1 [packed = true]; + if (this->path_size() > 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( + 1, + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, + target); + target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( + _path_cached_byte_size_, target); + } + for (int i = 0; i < this->path_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteInt32NoTagToArray(this->path(i), target); + } + + // repeated int32 span = 2 [packed = true]; + if (this->span_size() > 0) { + target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray( + 2, + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, + target); + target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray( + _span_cached_byte_size_, target); + } + for (int i = 0; i < this->span_size(); i++) { + target = ::google::protobuf::internal::WireFormatLite:: + WriteInt32NoTagToArray(this->span(i), target); + } + + // optional string leading_comments = 3; + if (has_leading_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_comments().data(), this->leading_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_comments"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 3, this->leading_comments(), target); + } + + // optional string trailing_comments = 4; + if (has_trailing_comments()) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->trailing_comments().data(), this->trailing_comments().length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.trailing_comments"); + target = + ::google::protobuf::internal::WireFormatLite::WriteStringToArray( + 4, this->trailing_comments(), target); + } + + // repeated string leading_detached_comments = 6; + for (int i = 0; i < this->leading_detached_comments_size(); i++) { + ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( + this->leading_detached_comments(i).data(), this->leading_detached_comments(i).length(), + ::google::protobuf::internal::WireFormat::SERIALIZE, + "google.protobuf.SourceCodeInfo.Location.leading_detached_comments"); target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->location(i), target); + WriteStringToArray(6, this->leading_detached_comments(i), target); } if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); } - // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo.Location) return target; } -int SourceCodeInfo::ByteSize() const { -// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo) - int total_size = 0; - - // repeated .google.protobuf.SourceCodeInfo.Location location = 1; - total_size += 1 * this->location_size(); - for (int i = 0; i < this->location_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->location(i)); - } +size_t SourceCodeInfo_Location::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo.Location) + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated int32 path = 1 [packed = true]; + { + size_t data_size = 0; + unsigned int count = this->path_size(); + for (unsigned int i = 0; i < count; i++) { + data_size += ::google::protobuf::internal::WireFormatLite:: + Int32Size(this->path(i)); + } + if (data_size > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(data_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _path_cached_byte_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + total_size += data_size; + } + + // repeated int32 span = 2 [packed = true]; + { + size_t data_size = 0; + unsigned int count = this->span_size(); + for (unsigned int i = 0; i < count; i++) { + data_size += ::google::protobuf::internal::WireFormatLite:: + Int32Size(this->span(i)); + } + if (data_size > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(data_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _span_cached_byte_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + total_size += data_size; + } + + // repeated string leading_detached_comments = 6; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->leading_detached_comments_size()); + for (int i = 0; i < this->leading_detached_comments_size(); i++) { + total_size += ::google::protobuf::internal::WireFormatLite::StringSize( + this->leading_detached_comments(i)); + } + + if (_has_bits_[0 / 32] & 3u) { + // optional string leading_comments = 3; + if (has_leading_comments()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->leading_comments()); + } + + // optional string trailing_comments = 4; + if (has_trailing_comments()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::StringSize( + this->trailing_comments()); + } + + } + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } -void SourceCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const SourceCodeInfo* source = - ::google::protobuf::internal::DynamicCastToGenerated( +void SourceCodeInfo_Location::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo.Location) + GOOGLE_DCHECK_NE(&from, this); + const SourceCodeInfo_Location* source = + ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo.Location) ::google::protobuf::internal::ReflectionOps::Merge(from, this); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo) + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo.Location) MergeFrom(*source); } } - -void SourceCodeInfo::MergeFrom(const SourceCodeInfo& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - location_.MergeFrom(from.location_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); + +void SourceCodeInfo_Location::MergeFrom(const SourceCodeInfo_Location& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo.Location) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + path_.MergeFrom(from.path_); + span_.MergeFrom(from.span_); + leading_detached_comments_.MergeFrom(from.leading_detached_comments_); + if (from._has_bits_[0 / 32] & 3u) { + if (from.has_leading_comments()) { + set_has_leading_comments(); + leading_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.leading_comments_); + } + if (from.has_trailing_comments()) { + set_has_trailing_comments(); + trailing_comments_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.trailing_comments_); + } } } -void SourceCodeInfo::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo) +void SourceCodeInfo_Location::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo.Location) if (&from == this) return; Clear(); MergeFrom(from); } -void SourceCodeInfo::CopyFrom(const SourceCodeInfo& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo) +void SourceCodeInfo_Location::CopyFrom(const SourceCodeInfo_Location& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo.Location) if (&from == this) return; Clear(); MergeFrom(from); } -bool SourceCodeInfo::IsInitialized() const { - +bool SourceCodeInfo_Location::IsInitialized() const { return true; } -void SourceCodeInfo::Swap(SourceCodeInfo* other) { +void SourceCodeInfo_Location::Swap(SourceCodeInfo_Location* other) { if (other == this) return; InternalSwap(other); } -void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) { - location_.UnsafeArenaSwap(&other->location_); +void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* other) { + path_.UnsafeArenaSwap(&other->path_); + span_.UnsafeArenaSwap(&other->span_); + leading_detached_comments_.UnsafeArenaSwap(&other->leading_detached_comments_); + leading_comments_.Swap(&other->leading_comments_); + trailing_comments_.Swap(&other->trailing_comments_); std::swap(_has_bits_[0], other->_has_bits_[0]); _internal_metadata_.Swap(&other->_internal_metadata_); std::swap(_cached_size_, other->_cached_size_); } -::google::protobuf::Metadata SourceCodeInfo::GetMetadata() const { +::google::protobuf::Metadata SourceCodeInfo_Location::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = SourceCodeInfo_descriptor_; - metadata.reflection = SourceCodeInfo_reflection_; - return metadata; + return file_level_metadata[21]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS @@ -14077,24 +14258,24 @@ int SourceCodeInfo_Location::path_size() const { void SourceCodeInfo_Location::clear_path() { path_.Clear(); } - ::google::protobuf::int32 SourceCodeInfo_Location::path(int index) const { +::google::protobuf::int32 SourceCodeInfo_Location::path(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.path) return path_.Get(index); } - void SourceCodeInfo_Location::set_path(int index, ::google::protobuf::int32 value) { +void SourceCodeInfo_Location::set_path(int index, ::google::protobuf::int32 value) { path_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.path) } - void SourceCodeInfo_Location::add_path(::google::protobuf::int32 value) { +void SourceCodeInfo_Location::add_path(::google::protobuf::int32 value) { path_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.path) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& SourceCodeInfo_Location::path() const { // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.path) return path_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* SourceCodeInfo_Location::mutable_path() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.path) return &path_; @@ -14107,24 +14288,24 @@ int SourceCodeInfo_Location::span_size() const { void SourceCodeInfo_Location::clear_span() { span_.Clear(); } - ::google::protobuf::int32 SourceCodeInfo_Location::span(int index) const { +::google::protobuf::int32 SourceCodeInfo_Location::span(int index) const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.span) return span_.Get(index); } - void SourceCodeInfo_Location::set_span(int index, ::google::protobuf::int32 value) { +void SourceCodeInfo_Location::set_span(int index, ::google::protobuf::int32 value) { span_.Set(index, value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.span) } - void SourceCodeInfo_Location::add_span(::google::protobuf::int32 value) { +void SourceCodeInfo_Location::add_span(::google::protobuf::int32 value) { span_.Add(value); // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.span) } - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& SourceCodeInfo_Location::span() const { // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.span) return span_; } - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* SourceCodeInfo_Location::mutable_span() { // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.span) return &span_; @@ -14132,49 +14313,57 @@ SourceCodeInfo_Location::mutable_span() { // optional string leading_comments = 3; bool SourceCodeInfo_Location::has_leading_comments() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000001u) != 0; } void SourceCodeInfo_Location::set_has_leading_comments() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000001u; } void SourceCodeInfo_Location::clear_has_leading_comments() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000001u; } void SourceCodeInfo_Location::clear_leading_comments() { leading_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_leading_comments(); } - const ::std::string& SourceCodeInfo_Location::leading_comments() const { +const ::std::string& SourceCodeInfo_Location::leading_comments() const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_comments) - return leading_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return leading_comments_.GetNoArena(); } - void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) { +void SourceCodeInfo_Location::set_leading_comments(const ::std::string& value) { set_has_leading_comments(); leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_comments) } - void SourceCodeInfo_Location::set_leading_comments(const char* value) { +#if LANG_CXX11 +void SourceCodeInfo_Location::set_leading_comments(::std::string&& value) { + set_has_leading_comments(); + leading_comments_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.SourceCodeInfo.Location.leading_comments) +} +#endif +void SourceCodeInfo_Location::set_leading_comments(const char* value) { set_has_leading_comments(); leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_comments) } - void SourceCodeInfo_Location::set_leading_comments(const char* value, size_t size) { +void SourceCodeInfo_Location::set_leading_comments(const char* value, size_t size) { set_has_leading_comments(); leading_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_comments) } - ::std::string* SourceCodeInfo_Location::mutable_leading_comments() { +::std::string* SourceCodeInfo_Location::mutable_leading_comments() { set_has_leading_comments(); // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_comments) return leading_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* SourceCodeInfo_Location::release_leading_comments() { +::std::string* SourceCodeInfo_Location::release_leading_comments() { // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.leading_comments) clear_has_leading_comments(); return leading_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) { +void SourceCodeInfo_Location::set_allocated_leading_comments(::std::string* leading_comments) { if (leading_comments != NULL) { set_has_leading_comments(); } else { @@ -14186,115 +14375,353 @@ void SourceCodeInfo_Location::clear_leading_comments() { // optional string trailing_comments = 4; bool SourceCodeInfo_Location::has_trailing_comments() const { - return (_has_bits_[0] & 0x00000008u) != 0; + return (_has_bits_[0] & 0x00000002u) != 0; } void SourceCodeInfo_Location::set_has_trailing_comments() { - _has_bits_[0] |= 0x00000008u; + _has_bits_[0] |= 0x00000002u; } void SourceCodeInfo_Location::clear_has_trailing_comments() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000002u; } void SourceCodeInfo_Location::clear_trailing_comments() { trailing_comments_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); clear_has_trailing_comments(); } - const ::std::string& SourceCodeInfo_Location::trailing_comments() const { +const ::std::string& SourceCodeInfo_Location::trailing_comments() const { // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.trailing_comments) - return trailing_comments_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return trailing_comments_.GetNoArena(); } - void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) { +void SourceCodeInfo_Location::set_trailing_comments(const ::std::string& value) { set_has_trailing_comments(); trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.trailing_comments) } - void SourceCodeInfo_Location::set_trailing_comments(const char* value) { +#if LANG_CXX11 +void SourceCodeInfo_Location::set_trailing_comments(::std::string&& value) { + set_has_trailing_comments(); + trailing_comments_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.SourceCodeInfo.Location.trailing_comments) +} +#endif +void SourceCodeInfo_Location::set_trailing_comments(const char* value) { set_has_trailing_comments(); trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.trailing_comments) } - void SourceCodeInfo_Location::set_trailing_comments(const char* value, size_t size) { +void SourceCodeInfo_Location::set_trailing_comments(const char* value, size_t size) { set_has_trailing_comments(); trailing_comments_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(reinterpret_cast(value), size)); // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.trailing_comments) } - ::std::string* SourceCodeInfo_Location::mutable_trailing_comments() { +::std::string* SourceCodeInfo_Location::mutable_trailing_comments() { set_has_trailing_comments(); // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.trailing_comments) return trailing_comments_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - ::std::string* SourceCodeInfo_Location::release_trailing_comments() { +::std::string* SourceCodeInfo_Location::release_trailing_comments() { // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.trailing_comments) clear_has_trailing_comments(); return trailing_comments_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); } - void SourceCodeInfo_Location::set_allocated_trailing_comments(::std::string* trailing_comments) { +void SourceCodeInfo_Location::set_allocated_trailing_comments(::std::string* trailing_comments) { if (trailing_comments != NULL) { set_has_trailing_comments(); } else { - clear_has_trailing_comments(); + clear_has_trailing_comments(); + } + trailing_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), trailing_comments); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments) +} + +// repeated string leading_detached_comments = 6; +int SourceCodeInfo_Location::leading_detached_comments_size() const { + return leading_detached_comments_.size(); +} +void SourceCodeInfo_Location::clear_leading_detached_comments() { + leading_detached_comments_.Clear(); +} +const ::std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_.Get(index); +} +::std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) { + // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_.Mutable(index); +} +void SourceCodeInfo_Location::set_leading_detached_comments(int index, const ::std::string& value) { + // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + leading_detached_comments_.Mutable(index)->assign(value); +} +void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) { + leading_detached_comments_.Mutable(index)->assign(value); + // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) { + leading_detached_comments_.Mutable(index)->assign( + reinterpret_cast(value), size); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +::std::string* SourceCodeInfo_Location::add_leading_detached_comments() { + // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_.Add(); +} +void SourceCodeInfo_Location::add_leading_detached_comments(const ::std::string& value) { + leading_detached_comments_.Add()->assign(value); + // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) { + leading_detached_comments_.Add()->assign(value); + // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) { + leading_detached_comments_.Add()->assign(reinterpret_cast(value), size); + // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) +} +const ::google::protobuf::RepeatedPtrField< ::std::string>& +SourceCodeInfo_Location::leading_detached_comments() const { + // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return leading_detached_comments_; +} +::google::protobuf::RepeatedPtrField< ::std::string>* +SourceCodeInfo_Location::mutable_leading_detached_comments() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + return &leading_detached_comments_; +} + +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS + +// =================================================================== + +#if !defined(_MSC_VER) || _MSC_VER >= 1900 +const int SourceCodeInfo::kLocationFieldNumber; +#endif // !defined(_MSC_VER) || _MSC_VER >= 1900 + +SourceCodeInfo::SourceCodeInfo() + : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } + SharedCtor(); + // @@protoc_insertion_point(constructor:google.protobuf.SourceCodeInfo) +} +SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from) + : ::google::protobuf::Message(), + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + location_(from.location_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo) +} + +void SourceCodeInfo::SharedCtor() { + _cached_size_ = 0; +} + +SourceCodeInfo::~SourceCodeInfo() { + // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo) + SharedDtor(); +} + +void SourceCodeInfo::SharedDtor() { +} + +void SourceCodeInfo::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const ::google::protobuf::Descriptor* SourceCodeInfo::descriptor() { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[22].descriptor; +} + +const SourceCodeInfo& SourceCodeInfo::default_instance() { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); +} + +SourceCodeInfo* SourceCodeInfo::New(::google::protobuf::Arena* arena) const { + SourceCodeInfo* n = new SourceCodeInfo; + if (arena != NULL) { + arena->Own(n); + } + return n; +} + +void SourceCodeInfo::Clear() { +// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo) + location_.Clear(); + _has_bits_.Clear(); + _internal_metadata_.Clear(); +} + +bool SourceCodeInfo::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure + ::google::protobuf::uint32 tag; + // @@protoc_insertion_point(parse_start:google.protobuf.SourceCodeInfo) + for (;;) { + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); + tag = p.first; + if (!p.second) goto handle_unusual; + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + case 1: { + if (tag == 10u) { + DO_(input->IncrementRecursionDepth()); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( + input, add_location())); + } else { + goto handle_unusual; + } + input->UnsafeDecrementRecursionDepth(); + break; + } + + default: { + handle_unusual: + if (tag == 0 || + ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + goto success; + } + DO_(::google::protobuf::internal::WireFormat::SkipField( + input, tag, mutable_unknown_fields())); + break; + } + } + } +success: + // @@protoc_insertion_point(parse_success:google.protobuf.SourceCodeInfo) + return true; +failure: + // @@protoc_insertion_point(parse_failure:google.protobuf.SourceCodeInfo) + return false; +#undef DO_ +} + +void SourceCodeInfo::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // @@protoc_insertion_point(serialize_start:google.protobuf.SourceCodeInfo) + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + for (unsigned int i = 0, n = this->location_size(); i < n; i++) { + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray( + 1, this->location(i), output); + } + + if (_internal_metadata_.have_unknown_fields()) { + ::google::protobuf::internal::WireFormat::SerializeUnknownFields( + unknown_fields(), output); + } + // @@protoc_insertion_point(serialize_end:google.protobuf.SourceCodeInfo) +} + +::google::protobuf::uint8* SourceCodeInfo::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused + // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo) + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + for (unsigned int i = 0, n = this->location_size(); i < n; i++) { + target = ::google::protobuf::internal::WireFormatLite:: + InternalWriteMessageNoVirtualToArray( + 1, this->location(i), false, target); + } + + if (_internal_metadata_.have_unknown_fields()) { + target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( + unknown_fields(), target); + } + // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo) + return target; +} + +size_t SourceCodeInfo::ByteSizeLong() const { +// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo) + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated .google.protobuf.SourceCodeInfo.Location location = 1; + { + unsigned int count = this->location_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->location(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void SourceCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.SourceCodeInfo) + GOOGLE_DCHECK_NE(&from, this); + const SourceCodeInfo* source = + ::google::protobuf::internal::DynamicCastToGenerated( + &from); + if (source == NULL) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.SourceCodeInfo) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.SourceCodeInfo) + MergeFrom(*source); } - trailing_comments_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), trailing_comments); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments) } -// repeated string leading_detached_comments = 6; -int SourceCodeInfo_Location::leading_detached_comments_size() const { - return leading_detached_comments_.size(); -} -void SourceCodeInfo_Location::clear_leading_detached_comments() { - leading_detached_comments_.Clear(); -} - const ::std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_.Get(index); -} - ::std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) { - // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_.Mutable(index); -} - void SourceCodeInfo_Location::set_leading_detached_comments(int index, const ::std::string& value) { - // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - leading_detached_comments_.Mutable(index)->assign(value); -} - void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) { - leading_detached_comments_.Mutable(index)->assign(value); - // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) -} - void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) { - leading_detached_comments_.Mutable(index)->assign( - reinterpret_cast(value), size); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) -} - ::std::string* SourceCodeInfo_Location::add_leading_detached_comments() { - // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_.Add(); +void SourceCodeInfo::MergeFrom(const SourceCodeInfo& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + location_.MergeFrom(from.location_); } - void SourceCodeInfo_Location::add_leading_detached_comments(const ::std::string& value) { - leading_detached_comments_.Add()->assign(value); - // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + +void SourceCodeInfo::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.SourceCodeInfo) + if (&from == this) return; + Clear(); + MergeFrom(from); } - void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) { - leading_detached_comments_.Add()->assign(value); - // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + +void SourceCodeInfo::CopyFrom(const SourceCodeInfo& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo) + if (&from == this) return; + Clear(); + MergeFrom(from); } - void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) { - leading_detached_comments_.Add()->assign(reinterpret_cast(value), size); - // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) + +bool SourceCodeInfo::IsInitialized() const { + return true; } - const ::google::protobuf::RepeatedPtrField< ::std::string>& -SourceCodeInfo_Location::leading_detached_comments() const { - // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return leading_detached_comments_; + +void SourceCodeInfo::Swap(SourceCodeInfo* other) { + if (other == this) return; + InternalSwap(other); } - ::google::protobuf::RepeatedPtrField< ::std::string>* -SourceCodeInfo_Location::mutable_leading_detached_comments() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments) - return &leading_detached_comments_; +void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) { + location_.UnsafeArenaSwap(&other->location_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _internal_metadata_.Swap(&other->_internal_metadata_); + std::swap(_cached_size_, other->_cached_size_); } -// ------------------------------------------------------------------- +::google::protobuf::Metadata SourceCodeInfo::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[22]; +} +#if PROTOBUF_INLINE_NOT_IN_HEADERS // SourceCodeInfo // repeated .google.protobuf.SourceCodeInfo.Location location = 1; @@ -14340,28 +14767,34 @@ const int GeneratedCodeInfo_Annotation::kEndFieldNumber; GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.GeneratedCodeInfo.Annotation) } - -void GeneratedCodeInfo_Annotation::InitAsDefaultInstance() { -} - GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(const GeneratedCodeInfo_Annotation& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + path_(from.path_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); + source_file_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + if (from.has_source_file()) { + source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_); + } + ::memcpy(&begin_, &from.begin_, + reinterpret_cast(&end_) - + reinterpret_cast(&begin_) + sizeof(end_)); // @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo.Annotation) } void GeneratedCodeInfo_Annotation::SharedCtor() { - ::google::protobuf::internal::GetEmptyString(); _cached_size_ = 0; source_file_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - begin_ = 0; - end_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); + ::memset(&begin_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&begin_) + sizeof(end_)); } GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() { @@ -14371,8 +14804,6 @@ GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() { void GeneratedCodeInfo_Annotation::SharedDtor() { source_file_.DestroyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - if (this != default_instance_) { - } } void GeneratedCodeInfo_Annotation::SetCachedSize(int size) const { @@ -14382,16 +14813,14 @@ void GeneratedCodeInfo_Annotation::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* GeneratedCodeInfo_Annotation::descriptor() { protobuf_AssignDescriptorsOnce(); - return GeneratedCodeInfo_Annotation_descriptor_; + return file_level_metadata[23].descriptor; } const GeneratedCodeInfo_Annotation& GeneratedCodeInfo_Annotation::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::default_instance_ = NULL; - GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::New(::google::protobuf::Arena* arena) const { GeneratedCodeInfo_Annotation* n = new GeneratedCodeInfo_Annotation; if (arena != NULL) { @@ -14402,37 +14831,17 @@ GeneratedCodeInfo_Annotation* GeneratedCodeInfo_Annotation::New(::google::protob void GeneratedCodeInfo_Annotation::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo.Annotation) -#if defined(__clang__) -#define ZR_HELPER_(f) \ - _Pragma("clang diagnostic push") \ - _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \ - __builtin_offsetof(GeneratedCodeInfo_Annotation, f) \ - _Pragma("clang diagnostic pop") -#else -#define ZR_HELPER_(f) reinterpret_cast(\ - &reinterpret_cast(16)->f) -#endif - -#define ZR_(first, last) do {\ - ::memset(&first, 0,\ - ZR_HELPER_(last) - ZR_HELPER_(first) + sizeof(last));\ -} while (0) - - if (_has_bits_[0 / 32] & 14u) { - ZR_(begin_, end_); - if (has_source_file()) { - source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - } - } - -#undef ZR_HELPER_ -#undef ZR_ - path_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); + if (has_source_file()) { + GOOGLE_DCHECK(!source_file_.IsDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited())); + (*source_file_.UnsafeRawStringPointer())->clear(); + } + if (_has_bits_[0 / 32] & 6u) { + ::memset(&begin_, 0, reinterpret_cast(&end_) - + reinterpret_cast(&begin_) + sizeof(end_)); } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream( @@ -14441,31 +14850,29 @@ bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.GeneratedCodeInfo.Annotation) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // repeated int32 path = 1 [packed = true]; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, this->mutable_path()))); - } else if (tag == 8) { + } else if (tag == 8u) { DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( - 1, 10, input, this->mutable_path()))); + 1, 10u, input, this->mutable_path()))); } else { goto handle_unusual; } - if (input->ExpectTag(18)) goto parse_source_file; break; } // optional string source_file = 2; case 2: { - if (tag == 18) { - parse_source_file: + if (tag == 18u) { DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_source_file())); ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField( @@ -14475,37 +14882,32 @@ bool GeneratedCodeInfo_Annotation::MergePartialFromCodedStream( } else { goto handle_unusual; } - if (input->ExpectTag(24)) goto parse_begin; break; } // optional int32 begin = 3; case 3: { - if (tag == 24) { - parse_begin: + if (tag == 24u) { + set_has_begin(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &begin_))); - set_has_begin(); } else { goto handle_unusual; } - if (input->ExpectTag(32)) goto parse_end; break; } // optional int32 end = 4; case 4: { - if (tag == 32) { - parse_end: + if (tag == 32u) { + set_has_end(); DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>( input, &end_))); - set_has_end(); } else { goto handle_unusual; } - if (input->ExpectAtEnd()) goto success; break; } @@ -14571,8 +14973,9 @@ void GeneratedCodeInfo_Annotation::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.GeneratedCodeInfo.Annotation) } -::google::protobuf::uint8* GeneratedCodeInfo_Annotation::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* GeneratedCodeInfo_Annotation::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo.Annotation) // repeated int32 path = 1 [packed = true]; if (this->path_size() > 0) { @@ -14617,11 +15020,35 @@ ::google::protobuf::uint8* GeneratedCodeInfo_Annotation::SerializeWithCachedSize return target; } -int GeneratedCodeInfo_Annotation::ByteSize() const { +size_t GeneratedCodeInfo_Annotation::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo.Annotation) - int total_size = 0; + size_t total_size = 0; + + if (_internal_metadata_.have_unknown_fields()) { + total_size += + ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( + unknown_fields()); + } + // repeated int32 path = 1 [packed = true]; + { + size_t data_size = 0; + unsigned int count = this->path_size(); + for (unsigned int i = 0; i < count; i++) { + data_size += ::google::protobuf::internal::WireFormatLite:: + Int32Size(this->path(i)); + } + if (data_size > 0) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + } + int cached_size = ::google::protobuf::internal::ToCachedSize(data_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _path_cached_byte_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + total_size += data_size; + } - if (_has_bits_[1 / 32] & 14u) { + if (_has_bits_[0 / 32] & 7u) { // optional string source_file = 2; if (has_source_file()) { total_size += 1 + @@ -14644,113 +15071,230 @@ int GeneratedCodeInfo_Annotation::ByteSize() const { } } - // repeated int32 path = 1 [packed = true]; - { - int data_size = 0; - for (int i = 0; i < this->path_size(); i++) { - data_size += ::google::protobuf::internal::WireFormatLite:: - Int32Size(this->path(i)); + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = cached_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void GeneratedCodeInfo_Annotation::MergeFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + GOOGLE_DCHECK_NE(&from, this); + const GeneratedCodeInfo_Annotation* source = + ::google::protobuf::internal::DynamicCastToGenerated( + &from); + if (source == NULL) { + // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.GeneratedCodeInfo.Annotation) + ::google::protobuf::internal::ReflectionOps::Merge(from, this); + } else { + // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.GeneratedCodeInfo.Annotation) + MergeFrom(*source); + } +} + +void GeneratedCodeInfo_Annotation::MergeFrom(const GeneratedCodeInfo_Annotation& from) { +// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); + path_.MergeFrom(from.path_); + if (from._has_bits_[0 / 32] & 7u) { + if (from.has_source_file()) { + set_has_source_file(); + source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_); } - if (data_size > 0) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::Int32Size(data_size); + if (from.has_begin()) { + set_begin(from.begin()); + } + if (from.has_end()) { + set_end(from.end()); } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _path_cached_byte_size_ = data_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - total_size += data_size; } +} - if (_internal_metadata_.have_unknown_fields()) { - total_size += - ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( - unknown_fields()); - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; +void GeneratedCodeInfo_Annotation::CopyFrom(const ::google::protobuf::Message& from) { +// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +void GeneratedCodeInfo_Annotation::CopyFrom(const GeneratedCodeInfo_Annotation& from) { +// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool GeneratedCodeInfo_Annotation::IsInitialized() const { + return true; +} + +void GeneratedCodeInfo_Annotation::Swap(GeneratedCodeInfo_Annotation* other) { + if (other == this) return; + InternalSwap(other); +} +void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* other) { + path_.UnsafeArenaSwap(&other->path_); + source_file_.Swap(&other->source_file_); + std::swap(begin_, other->begin_); + std::swap(end_, other->end_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + _internal_metadata_.Swap(&other->_internal_metadata_); + std::swap(_cached_size_, other->_cached_size_); +} + +::google::protobuf::Metadata GeneratedCodeInfo_Annotation::GetMetadata() const { + protobuf_AssignDescriptorsOnce(); + return file_level_metadata[23]; +} + +#if PROTOBUF_INLINE_NOT_IN_HEADERS +// GeneratedCodeInfo_Annotation + +// repeated int32 path = 1 [packed = true]; +int GeneratedCodeInfo_Annotation::path_size() const { + return path_.size(); +} +void GeneratedCodeInfo_Annotation::clear_path() { + path_.Clear(); +} +::google::protobuf::int32 GeneratedCodeInfo_Annotation::path(int index) const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path) + return path_.Get(index); +} +void GeneratedCodeInfo_Annotation::set_path(int index, ::google::protobuf::int32 value) { + path_.Set(index, value); + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.path) +} +void GeneratedCodeInfo_Annotation::add_path(::google::protobuf::int32 value) { + path_.Add(value); + // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path) +} +const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& +GeneratedCodeInfo_Annotation::path() const { + // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.Annotation.path) + return path_; +} +::google::protobuf::RepeatedField< ::google::protobuf::int32 >* +GeneratedCodeInfo_Annotation::mutable_path() { + // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path) + return &path_; +} + +// optional string source_file = 2; +bool GeneratedCodeInfo_Annotation::has_source_file() const { + return (_has_bits_[0] & 0x00000001u) != 0; +} +void GeneratedCodeInfo_Annotation::set_has_source_file() { + _has_bits_[0] |= 0x00000001u; +} +void GeneratedCodeInfo_Annotation::clear_has_source_file() { + _has_bits_[0] &= ~0x00000001u; +} +void GeneratedCodeInfo_Annotation::clear_source_file() { + source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clear_has_source_file(); +} +const ::std::string& GeneratedCodeInfo_Annotation::source_file() const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file) + return source_file_.GetNoArena(); +} +void GeneratedCodeInfo_Annotation::set_source_file(const ::std::string& value) { + set_has_source_file(); + source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.source_file) +} +#if LANG_CXX11 +void GeneratedCodeInfo_Annotation::set_source_file(::std::string&& value) { + set_has_source_file(); + source_file_.SetNoArena( + &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value)); + // @@protoc_insertion_point(field_set_rvalue:google.protobuf.GeneratedCodeInfo.Annotation.source_file) } - -void GeneratedCodeInfo_Annotation::MergeFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const GeneratedCodeInfo_Annotation* source = - ::google::protobuf::internal::DynamicCastToGenerated( - &from); - if (source == NULL) { - // @@protoc_insertion_point(generalized_merge_from_cast_fail:google.protobuf.GeneratedCodeInfo.Annotation) - ::google::protobuf::internal::ReflectionOps::Merge(from, this); +#endif +void GeneratedCodeInfo_Annotation::set_source_file(const char* value) { + set_has_source_file(); + source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); + // @@protoc_insertion_point(field_set_char:google.protobuf.GeneratedCodeInfo.Annotation.source_file) +} +void GeneratedCodeInfo_Annotation::set_source_file(const char* value, size_t size) { + set_has_source_file(); + source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), + ::std::string(reinterpret_cast(value), size)); + // @@protoc_insertion_point(field_set_pointer:google.protobuf.GeneratedCodeInfo.Annotation.source_file) +} +::std::string* GeneratedCodeInfo_Annotation::mutable_source_file() { + set_has_source_file(); + // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.Annotation.source_file) + return source_file_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +::std::string* GeneratedCodeInfo_Annotation::release_source_file() { + // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file) + clear_has_source_file(); + return source_file_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); +} +void GeneratedCodeInfo_Annotation::set_allocated_source_file(::std::string* source_file) { + if (source_file != NULL) { + set_has_source_file(); } else { - // @@protoc_insertion_point(generalized_merge_from_cast_success:google.protobuf.GeneratedCodeInfo.Annotation) - MergeFrom(*source); + clear_has_source_file(); } + source_file_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source_file); + // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file) } -void GeneratedCodeInfo_Annotation::MergeFrom(const GeneratedCodeInfo_Annotation& from) { -// @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - path_.MergeFrom(from.path_); - if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) { - if (from.has_source_file()) { - set_has_source_file(); - source_file_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_file_); - } - if (from.has_begin()) { - set_begin(from.begin()); - } - if (from.has_end()) { - set_end(from.end()); - } - } - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } +// optional int32 begin = 3; +bool GeneratedCodeInfo_Annotation::has_begin() const { + return (_has_bits_[0] & 0x00000002u) != 0; } - -void GeneratedCodeInfo_Annotation::CopyFrom(const ::google::protobuf::Message& from) { -// @@protoc_insertion_point(generalized_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (&from == this) return; - Clear(); - MergeFrom(from); +void GeneratedCodeInfo_Annotation::set_has_begin() { + _has_bits_[0] |= 0x00000002u; } - -void GeneratedCodeInfo_Annotation::CopyFrom(const GeneratedCodeInfo_Annotation& from) { -// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation) - if (&from == this) return; - Clear(); - MergeFrom(from); +void GeneratedCodeInfo_Annotation::clear_has_begin() { + _has_bits_[0] &= ~0x00000002u; } - -bool GeneratedCodeInfo_Annotation::IsInitialized() const { - - return true; +void GeneratedCodeInfo_Annotation::clear_begin() { + begin_ = 0; + clear_has_begin(); } - -void GeneratedCodeInfo_Annotation::Swap(GeneratedCodeInfo_Annotation* other) { - if (other == this) return; - InternalSwap(other); +::google::protobuf::int32 GeneratedCodeInfo_Annotation::begin() const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.begin) + return begin_; } -void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* other) { - path_.UnsafeArenaSwap(&other->path_); - source_file_.Swap(&other->source_file_); - std::swap(begin_, other->begin_); - std::swap(end_, other->end_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - _internal_metadata_.Swap(&other->_internal_metadata_); - std::swap(_cached_size_, other->_cached_size_); +void GeneratedCodeInfo_Annotation::set_begin(::google::protobuf::int32 value) { + set_has_begin(); + begin_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.begin) } -::google::protobuf::Metadata GeneratedCodeInfo_Annotation::GetMetadata() const { - protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = GeneratedCodeInfo_Annotation_descriptor_; - metadata.reflection = GeneratedCodeInfo_Annotation_reflection_; - return metadata; +// optional int32 end = 4; +bool GeneratedCodeInfo_Annotation::has_end() const { + return (_has_bits_[0] & 0x00000004u) != 0; +} +void GeneratedCodeInfo_Annotation::set_has_end() { + _has_bits_[0] |= 0x00000004u; +} +void GeneratedCodeInfo_Annotation::clear_has_end() { + _has_bits_[0] &= ~0x00000004u; +} +void GeneratedCodeInfo_Annotation::clear_end() { + end_ = 0; + clear_has_end(); +} +::google::protobuf::int32 GeneratedCodeInfo_Annotation::end() const { + // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.end) + return end_; +} +void GeneratedCodeInfo_Annotation::set_end(::google::protobuf::int32 value) { + set_has_end(); + end_ = value; + // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end) } +#endif // PROTOBUF_INLINE_NOT_IN_HEADERS -// ------------------------------------------------------------------- +// =================================================================== #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int GeneratedCodeInfo::kAnnotationFieldNumber; @@ -14758,24 +15302,24 @@ const int GeneratedCodeInfo::kAnnotationFieldNumber; GeneratedCodeInfo::GeneratedCodeInfo() : ::google::protobuf::Message(), _internal_metadata_(NULL) { + if (GOOGLE_PREDICT_TRUE(this != internal_default_instance())) { + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + } SharedCtor(); // @@protoc_insertion_point(constructor:google.protobuf.GeneratedCodeInfo) } - -void GeneratedCodeInfo::InitAsDefaultInstance() { -} - GeneratedCodeInfo::GeneratedCodeInfo(const GeneratedCodeInfo& from) : ::google::protobuf::Message(), - _internal_metadata_(NULL) { - SharedCtor(); - MergeFrom(from); + _internal_metadata_(NULL), + _has_bits_(from._has_bits_), + _cached_size_(0), + annotation_(from.annotation_) { + _internal_metadata_.MergeFrom(from._internal_metadata_); // @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo) } void GeneratedCodeInfo::SharedCtor() { _cached_size_ = 0; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); } GeneratedCodeInfo::~GeneratedCodeInfo() { @@ -14784,8 +15328,6 @@ GeneratedCodeInfo::~GeneratedCodeInfo() { } void GeneratedCodeInfo::SharedDtor() { - if (this != default_instance_) { - } } void GeneratedCodeInfo::SetCachedSize(int size) const { @@ -14795,16 +15337,14 @@ void GeneratedCodeInfo::SetCachedSize(int size) const { } const ::google::protobuf::Descriptor* GeneratedCodeInfo::descriptor() { protobuf_AssignDescriptorsOnce(); - return GeneratedCodeInfo_descriptor_; + return file_level_metadata[24].descriptor; } const GeneratedCodeInfo& GeneratedCodeInfo::default_instance() { - if (default_instance_ == NULL) protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto(); - return *default_instance_; + protobuf_InitDefaults_google_2fprotobuf_2fdescriptor_2eproto(); + return *internal_default_instance(); } -GeneratedCodeInfo* GeneratedCodeInfo::default_instance_ = NULL; - GeneratedCodeInfo* GeneratedCodeInfo::New(::google::protobuf::Arena* arena) const { GeneratedCodeInfo* n = new GeneratedCodeInfo; if (arena != NULL) { @@ -14816,10 +15356,8 @@ GeneratedCodeInfo* GeneratedCodeInfo::New(::google::protobuf::Arena* arena) cons void GeneratedCodeInfo::Clear() { // @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo) annotation_.Clear(); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); - if (_internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->Clear(); - } + _has_bits_.Clear(); + _internal_metadata_.Clear(); } bool GeneratedCodeInfo::MergePartialFromCodedStream( @@ -14828,23 +15366,20 @@ bool GeneratedCodeInfo::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; // @@protoc_insertion_point(parse_start:google.protobuf.GeneratedCodeInfo) for (;;) { - ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127); + ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u); tag = p.first; if (!p.second) goto handle_unusual; switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; case 1: { - if (tag == 10) { + if (tag == 10u) { DO_(input->IncrementRecursionDepth()); - parse_loop_annotation: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtualNoRecursionDepth( input, add_annotation())); } else { goto handle_unusual; } - if (input->ExpectTag(10)) goto parse_loop_annotation; input->UnsafeDecrementRecursionDepth(); - if (input->ExpectAtEnd()) goto success; break; } @@ -14886,14 +15421,15 @@ void GeneratedCodeInfo::SerializeWithCachedSizes( // @@protoc_insertion_point(serialize_end:google.protobuf.GeneratedCodeInfo) } -::google::protobuf::uint8* GeneratedCodeInfo::SerializeWithCachedSizesToArray( - ::google::protobuf::uint8* target) const { +::google::protobuf::uint8* GeneratedCodeInfo::InternalSerializeWithCachedSizesToArray( + bool deterministic, ::google::protobuf::uint8* target) const { + (void)deterministic; // Unused // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo) // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; for (unsigned int i = 0, n = this->annotation_size(); i < n; i++) { target = ::google::protobuf::internal::WireFormatLite:: - WriteMessageNoVirtualToArray( - 1, this->annotation(i), target); + InternalWriteMessageNoVirtualToArray( + 1, this->annotation(i), false, target); } if (_internal_metadata_.have_unknown_fields()) { @@ -14904,33 +15440,37 @@ ::google::protobuf::uint8* GeneratedCodeInfo::SerializeWithCachedSizesToArray( return target; } -int GeneratedCodeInfo::ByteSize() const { +size_t GeneratedCodeInfo::ByteSizeLong() const { // @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo) - int total_size = 0; - - // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; - total_size += 1 * this->annotation_size(); - for (int i = 0; i < this->annotation_size(); i++) { - total_size += - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->annotation(i)); - } + size_t total_size = 0; if (_internal_metadata_.have_unknown_fields()) { total_size += ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize( unknown_fields()); } + // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; + { + unsigned int count = this->annotation_size(); + total_size += 1UL * count; + for (unsigned int i = 0; i < count; i++) { + total_size += + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->annotation(i)); + } + } + + int cached_size = ::google::protobuf::internal::ToCachedSize(total_size); GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; + _cached_size_ = cached_size; GOOGLE_SAFE_CONCURRENT_WRITES_END(); return total_size; } void GeneratedCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { // @@protoc_insertion_point(generalized_merge_from_start:google.protobuf.GeneratedCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); - const GeneratedCodeInfo* source = + GOOGLE_DCHECK_NE(&from, this); + const GeneratedCodeInfo* source = ::google::protobuf::internal::DynamicCastToGenerated( &from); if (source == NULL) { @@ -14944,11 +15484,9 @@ void GeneratedCodeInfo::MergeFrom(const ::google::protobuf::Message& from) { void GeneratedCodeInfo::MergeFrom(const GeneratedCodeInfo& from) { // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo) - if (GOOGLE_PREDICT_FALSE(&from == this)) MergeFromFail(__LINE__); + GOOGLE_DCHECK_NE(&from, this); + _internal_metadata_.MergeFrom(from._internal_metadata_); annotation_.MergeFrom(from.annotation_); - if (from._internal_metadata_.have_unknown_fields()) { - mutable_unknown_fields()->MergeFrom(from.unknown_fields()); - } } void GeneratedCodeInfo::CopyFrom(const ::google::protobuf::Message& from) { @@ -14966,7 +15504,6 @@ void GeneratedCodeInfo::CopyFrom(const GeneratedCodeInfo& from) { } bool GeneratedCodeInfo::IsInitialized() const { - return true; } @@ -14983,149 +15520,10 @@ void GeneratedCodeInfo::InternalSwap(GeneratedCodeInfo* other) { ::google::protobuf::Metadata GeneratedCodeInfo::GetMetadata() const { protobuf_AssignDescriptorsOnce(); - ::google::protobuf::Metadata metadata; - metadata.descriptor = GeneratedCodeInfo_descriptor_; - metadata.reflection = GeneratedCodeInfo_reflection_; - return metadata; + return file_level_metadata[24]; } #if PROTOBUF_INLINE_NOT_IN_HEADERS -// GeneratedCodeInfo_Annotation - -// repeated int32 path = 1 [packed = true]; -int GeneratedCodeInfo_Annotation::path_size() const { - return path_.size(); -} -void GeneratedCodeInfo_Annotation::clear_path() { - path_.Clear(); -} - ::google::protobuf::int32 GeneratedCodeInfo_Annotation::path(int index) const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path) - return path_.Get(index); -} - void GeneratedCodeInfo_Annotation::set_path(int index, ::google::protobuf::int32 value) { - path_.Set(index, value); - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.path) -} - void GeneratedCodeInfo_Annotation::add_path(::google::protobuf::int32 value) { - path_.Add(value); - // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path) -} - const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& -GeneratedCodeInfo_Annotation::path() const { - // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.Annotation.path) - return path_; -} - ::google::protobuf::RepeatedField< ::google::protobuf::int32 >* -GeneratedCodeInfo_Annotation::mutable_path() { - // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path) - return &path_; -} - -// optional string source_file = 2; -bool GeneratedCodeInfo_Annotation::has_source_file() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -void GeneratedCodeInfo_Annotation::set_has_source_file() { - _has_bits_[0] |= 0x00000002u; -} -void GeneratedCodeInfo_Annotation::clear_has_source_file() { - _has_bits_[0] &= ~0x00000002u; -} -void GeneratedCodeInfo_Annotation::clear_source_file() { - source_file_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); - clear_has_source_file(); -} - const ::std::string& GeneratedCodeInfo_Annotation::source_file() const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file) - return source_file_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void GeneratedCodeInfo_Annotation::set_source_file(const ::std::string& value) { - set_has_source_file(); - source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value); - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - void GeneratedCodeInfo_Annotation::set_source_file(const char* value) { - set_has_source_file(); - source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value)); - // @@protoc_insertion_point(field_set_char:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - void GeneratedCodeInfo_Annotation::set_source_file(const char* value, size_t size) { - set_has_source_file(); - source_file_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), - ::std::string(reinterpret_cast(value), size)); - // @@protoc_insertion_point(field_set_pointer:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - ::std::string* GeneratedCodeInfo_Annotation::mutable_source_file() { - set_has_source_file(); - // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.Annotation.source_file) - return source_file_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - ::std::string* GeneratedCodeInfo_Annotation::release_source_file() { - // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file) - clear_has_source_file(); - return source_file_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); -} - void GeneratedCodeInfo_Annotation::set_allocated_source_file(::std::string* source_file) { - if (source_file != NULL) { - set_has_source_file(); - } else { - clear_has_source_file(); - } - source_file_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source_file); - // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file) -} - -// optional int32 begin = 3; -bool GeneratedCodeInfo_Annotation::has_begin() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -void GeneratedCodeInfo_Annotation::set_has_begin() { - _has_bits_[0] |= 0x00000004u; -} -void GeneratedCodeInfo_Annotation::clear_has_begin() { - _has_bits_[0] &= ~0x00000004u; -} -void GeneratedCodeInfo_Annotation::clear_begin() { - begin_ = 0; - clear_has_begin(); -} - ::google::protobuf::int32 GeneratedCodeInfo_Annotation::begin() const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.begin) - return begin_; -} - void GeneratedCodeInfo_Annotation::set_begin(::google::protobuf::int32 value) { - set_has_begin(); - begin_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.begin) -} - -// optional int32 end = 4; -bool GeneratedCodeInfo_Annotation::has_end() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -void GeneratedCodeInfo_Annotation::set_has_end() { - _has_bits_[0] |= 0x00000008u; -} -void GeneratedCodeInfo_Annotation::clear_has_end() { - _has_bits_[0] &= ~0x00000008u; -} -void GeneratedCodeInfo_Annotation::clear_end() { - end_ = 0; - clear_has_end(); -} - ::google::protobuf::int32 GeneratedCodeInfo_Annotation::end() const { - // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.end) - return end_; -} - void GeneratedCodeInfo_Annotation::set_end(::google::protobuf::int32 value) { - set_has_end(); - end_ = value; - // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end) -} - -// ------------------------------------------------------------------- - // GeneratedCodeInfo // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1; From a74fa9b677fdf3b4b6510c6a3f4b58404989de47 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 7 Apr 2025 21:15:34 -0400 Subject: [PATCH 55/63] refactor 2.0.1 block of changelog (#370) Fixed blatantly incorrect date Including items that e.g. describe changes to the changelog just bloats the changelog. It's supposed to be the point of reference for consumer-facing changes IIRC. Before 2.0, no changelog talked about tooling that didn't affect the code or tests either. --- CHANGELOG.rst | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2555e1c..73b55a8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,23 +9,18 @@ Changelog * The false positive for indented member initializer lists in namespaces were eradicated. (https://github.com/cpplint/cpplint/pull/353) * The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) -2.0.1 (2025-03-09) +2.0.1 (2025-04-02) ================== Yet another overdue... hotfix. Sorry this took so long. -* The false positive for indented function parameters in namespaces was eradicated by @norab0130 in https://github.com/cpplint/cpplint/pull/304 -* IWYU: treat stdio.h the same way as cstdio by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/319 -* README.rst: Add instructions for pre-commit by @cclauss in https://github.com/cpplint/cpplint/pull/320 -* PEP 621: Migrate from setup.{py, cfg} to pyproject.toml by @cclauss in https://github.com/cpplint/cpplint/pull/315 -* Prepare for release 2.0.1 and update changelog by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/322 -* Refactor tests and metadata by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/317 -* misc git cleanup by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/340 -* Mypy: static type checker for Python by @cclauss in https://github.com/cpplint/cpplint/pull/345 -* CONTRIBUTING.rst: Default branch is develop, add pre-commit by @cclauss in https://github.com/cpplint/cpplint/pull/349 -* Fix test refactoring by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/350 -* suppress C++-only categories on C file extensions by @aaronliu0130 in https://github.com/cpplint/cpplint/pull/318 -* Add a GitHub Action to publish to PyPI by @cclauss in https://github.com/cpplint/cpplint/pull/347 +* The false positive for indented function parameters in namespaces was eradicated. (https://github.com/cpplint/cpplint/pull/304) +* Files that end in ".c", ".C", or ".cu" will now also automatically suppress C++-only categories. Previously, `// NO_LINT_C` was required. (https://github.com/cpplint/cpplint/pull/318) +* build/include-what-you-use now recognizes c-style headers such as for symbols from . (https://github.com/cpplint/cpplint/pull/319) +* Ruff, mypy, and codespell were ran on the project to improve performance and reader comprehension thanks to @cclauss. + * Tests were refactored away from unittest to improve display with pytest by @cclauss. (https://github.com/cpplint/cpplint/pull/332) +* @Hs293Go fixed an embarrassing typo; the "latch" and "numbers" headers are now recognized correctly instead of "latchnumbers". (https://github.com/cpplint/cpplint/pull/300) +* CLI tests were refactored through, among other things, making adding new .def's easier by migrating to a parameterized setup. (https://github.com/cpplint/cpplint/pull/317) 2.0.0 (2024-10-06) ================== From 350702a4d39395571bd118c9a3cff0a573488d61 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 8 Apr 2025 03:16:55 +0200 Subject: [PATCH 56/63] chore: Prepare for release v2.0.2 (#369) No other open pull requests. @aaronliu0130 has landed some critical changes. * [x] Merge a new pull request that only updates the version number and updates CHANGELOG.rst. * [x] Go to https://github.com/cpplint/cpplint/releases/new * [x] Put in the NEW version number. * [x] Click the Generate release notes button * [x] Click the Save draft button and ask other maintainers to review. * [ ] Ship it and check https://pypi.org/project/cpplint after a few minutes. Draft release: https://github.com/cpplint/cpplint/releases/edit/untagged-bac3df867046406901f0 --------- Co-authored-by: Aaron Liu --- CHANGELOG.rst | 4 ++-- cpplint.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 73b55a8..4ed9f3e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,10 +2,10 @@ Changelog ********* -2.1.0 (TBA) +2.0.2 (2025-04-08) =========== -* Python versions less than 3.9 are no longer supported. +* Python versions less than 3.9 are no longer supported. (https://github.com/cpplint/cpplint/pull/334) * The false positive for indented member initializer lists in namespaces were eradicated. (https://github.com/cpplint/cpplint/pull/353) * The warning on non-const references (runtime/references) is now disabled by default pursuant to the May 2020 Google style guide update. (https://github.com/cpplint/cpplint/pull/305) diff --git a/cpplint.py b/cpplint.py index 8498ee6..7abd2ba 100755 --- a/cpplint.py +++ b/cpplint.py @@ -61,7 +61,7 @@ # if empty, use defaults _valid_extensions: set[str] = set() -__VERSION__ = "2.0.1" +__VERSION__ = "2.0.2" _USAGE = """ Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit|sed|gsed] From 2d2e1c9bbfd25f0d47e1ee193e7160cda4930b70 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 15:25:32 -0400 Subject: [PATCH 57/63] [pre-commit.ci] pre-commit autoupdate (#374) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7eb37f3..ad76be7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.4 + rev: v0.11.5 hooks: - id: ruff - id: ruff-format From 54f085a6ee825e7adbf244145404f22881617896 Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Fri, 18 Apr 2025 12:02:48 -0400 Subject: [PATCH 58/63] chore: bump dev version (#378) Per release policy --- CHANGELOG.rst | 3 +++ cpplint.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4ed9f3e..7aa9397 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog ********* +TBA +=== + 2.0.2 (2025-04-08) =========== diff --git a/cpplint.py b/cpplint.py index 7abd2ba..4573d89 100755 --- a/cpplint.py +++ b/cpplint.py @@ -61,7 +61,7 @@ # if empty, use defaults _valid_extensions: set[str] = set() -__VERSION__ = "2.0.2" +__VERSION__ = "2.0.3-dev0" _USAGE = """ Syntax: cpplint.py [--verbose=#] [--output=emacs|eclipse|vs7|junit|sed|gsed] From b32e1f309981df5f3eecc3a65c9ea708cb2eb5ba Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 18:50:14 -0400 Subject: [PATCH 59/63] [pre-commit.ci] pre-commit autoupdate (#379) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ad76be7..718e8c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: - tomli - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.5 + rev: v0.11.6 hooks: - id: ruff - id: ruff-format From b6ada002ca39c8b55ed08b278e0135c8a940db89 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 18 May 2025 18:39:30 -0400 Subject: [PATCH 60/63] change shebang to python3 (#383) --- cpplint.py | 2 +- cpplint_clitest.py | 2 +- cpplint_unittest.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpplint.py b/cpplint.py index 4573d89..e400b05 100755 --- a/cpplint.py +++ b/cpplint.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2009 Google Inc. All rights reserved. # diff --git a/cpplint_clitest.py b/cpplint_clitest.py index b20566f..7cb2047 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2009 Google Inc. All rights reserved. # diff --git a/cpplint_unittest.py b/cpplint_unittest.py index 730babd..e36093f 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (c) 2009 Google Inc. All rights reserved. # From 26af9717305c4e631b8cd582c3dbde692565509e Mon Sep 17 00:00:00 2001 From: Geoffrey Viola Date: Wed, 9 Jul 2025 11:13:46 -0400 Subject: [PATCH 61/63] granular build/namespaces categories Enhance the using directives check by adding more granularity to the warnings. The warnings are split into multiple categories 1. block/namespace scope 2. source/header file 3. literal/nonliteral namespace Possible filter combinations would look like the following 1. Google: None 2. CppCoreGuidelines 1. -build/namespaces/header/block 2. -build/namespaces/source 3. Like CppCoreGuidlines, but disallow non-literal namespaces in source files at namespace scope 1. -build/namespaces/header/block 2. -build/namespaces/source/block 3. -build/namespaces/source/namespace/literal Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- cpplint.py | 71 ++++++++++++----- cpplint_unittest.py | 83 ++++++++++++++++---- samples/silly-sample/filters.def | 2 +- samples/silly-sample/includeorder_cfirst.def | 2 +- samples/silly-sample/sed.def | 2 +- samples/silly-sample/simple.def | 2 +- 6 files changed, 124 insertions(+), 38 deletions(-) diff --git a/cpplint.py b/cpplint.py index e400b05..24897da 100755 --- a/cpplint.py +++ b/cpplint.py @@ -308,8 +308,14 @@ "build/include_order", "build/include_what_you_use", "build/namespaces_headers", - "build/namespaces_literals", - "build/namespaces", + "build/namespaces/header/block/literals", + "build/namespaces/header/block/nonliterals", + "build/namespaces/header/namespace/literals", + "build/namespaces/header/namespace/nonliterals", + "build/namespaces/source/block/literals", + "build/namespaces/source/block/nonliterals", + "build/namespaces/source/namespace/literals", + "build/namespaces/source/namespace/nonliterals", "build/printf_format", "build/storage_class", "legal/copyright", @@ -935,6 +941,16 @@ "Missing space after ,": r"s/,\([^ ]\)/, \1/g", } +# Used for backwards compatibility and ease of use +_FILTER_SHORTCUTS = { + "build/namespaces_literals": [ + "build/namespaces/header/block/literals", + "build/namespaces/header/namespace/literals", + "build/namespaces/source/block/literals", + "build/namespaces/source/namespace/literals", + ] +} + # The root directory used for deriving header guard CPP variable. # This is set by --root flag. _root = None @@ -1457,7 +1473,12 @@ def AddFilters(self, filters): for filt in filters.split(","): clean_filt = filt.strip() if clean_filt: - self.filters.append(clean_filt) + if len(clean_filt) > 1 and clean_filt[1:] in _FILTER_SHORTCUTS: + starting_char = clean_filt[0] + new_filters = [starting_char + x for x in _FILTER_SHORTCUTS[clean_filt[1:]]] + self.filters.extend(new_filters) + else: + self.filters.append(clean_filt) for filt in self.filters: if not filt.startswith(("+", "-")): msg = f"Every filter in --filters must start with + or - ({filt} does not)" @@ -3287,6 +3308,14 @@ def InAsmBlock(self): """ return self.stack and self.stack[-1].inline_asm != _NO_ASM + def InBlockScope(self): + """Check if we are currently one level inside a block scope. + + Returns: + True if top of the stack is a block scope, False otherwise. + """ + return len(self.stack) > 0 and not isinstance(self.stack[-1], _NamespaceInfo) + def InTemplateArgumentList(self, clean_lines, linenum, pos): """Check if current position is inside template argument list. @@ -6021,22 +6050,26 @@ def CheckLanguage( ) if re.search(r"\busing namespace\b", line): - if re.search(r"\bliterals\b", line): - error( - filename, - linenum, - "build/namespaces_literals", - 5, - "Do not use namespace using-directives. Use using-declarations instead.", - ) - else: - error( - filename, - linenum, - "build/namespaces", - 5, - "Do not use namespace using-directives. Use using-declarations instead.", - ) + is_literals = re.search(r"\bliterals\b", line) is not None + is_header = not _IsSourceExtension(file_extension) + file_type = "header" if is_header else "source" + + # Check for the block scope for multiline blocks. + # Check if the line starts with the using directive as a heuristic in case it's all one line + is_block_scope = nesting_state.InBlockScope() or not line.startswith("using namespace") + + scope_type = "block" if is_block_scope else "namespace" + literal_type = "literals" if is_literals else "nonliterals" + + specific_category = f"build/namespaces/{file_type}/{scope_type}/{literal_type}" + + error( + filename, + linenum, + specific_category, + 5, + "Do not use namespace using-directives. Use using-declarations instead.", + ) # Detect variable-length arrays. match = re.match(r"\s*(.+::)?(\w+) [a-z]\w*\[(.+)];", line) diff --git a/cpplint_unittest.py b/cpplint_unittest.py index e36093f..574e5fd 100755 --- a/cpplint_unittest.py +++ b/cpplint_unittest.py @@ -3640,7 +3640,7 @@ def DoTest(self, lines): assert ( error_collector.Results().count( "Do not use namespace using-directives. Use using-declarations instead. " - "[build/namespaces] [5]" + "[build/namespaces/source/namespace/nonliterals] [5]" ) == 1 ) @@ -3649,20 +3649,6 @@ def DoTest(self, lines): DoTest(self, ["", "", "", "using namespace foo;"]) DoTest(self, ["// hello", "using namespace foo;"]) - def testUsingLiteralsNamespaces(self): - self.TestLint( - "using namespace std::literals;", - "Do not use namespace" - " using-directives. Use using-declarations instead." - " [build/namespaces_literals] [5]", - ) - self.TestLint( - "using namespace std::literals::chrono_literals;", - "Do" - " not use namespace using-directives. Use using-declarations instead." - " [build/namespaces_literals] [5]", - ) - def testNewlineAtEOF(self): def DoTest(self, data, is_missing_eof): error_collector = ErrorCollector(self.assertTrue) @@ -4203,6 +4189,73 @@ def testEndOfNamespaceComments(self): == 0 ) + def testUsingNamespacesGranular(self): + """Test granular using namespace checks for different contexts.""" + + self.TestLanguageRulesCheck( + "foo.h", + "using namespace std;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/namespace/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.h", + "using namespace std::chrono::literals;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/namespace/literals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "using namespace std;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/namespace/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "using namespace std::chrono::literals;", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/namespace/literals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.h", + "{ using namespace std; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/block/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.h", + "{ using namespace std::chrono::literals; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/header/block/literals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "{ using namespace std; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/block/nonliterals] [5]", + ) + + self.TestLanguageRulesCheck( + "foo.cc", + "{ using namespace std::chrono::literals; }", + "Do not use namespace using-directives. " + "Use using-declarations instead." + " [build/namespaces/source/block/literals] [5]", + ) + def testComma(self): self.TestLint("a = f(1,2);", "Missing space after , [whitespace/comma] [3]") self.TestLint( diff --git a/samples/silly-sample/filters.def b/samples/silly-sample/filters.def index e0fac32..5780b3e 100644 --- a/samples/silly-sample/filters.def +++ b/samples/silly-sample/filters.def @@ -13,7 +13,7 @@ src/sillycode.cpp:1: Include the directory when naming header files [build/inc src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] +src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces/source/namespace/nonliterals] [5] src/sillycode.cpp:40: If/else bodies with multiple statements require braces [readability/braces] [4] src/sillycode.cpp:66: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] src/sillycode.cpp:76: Single-parameter constructors should be marked explicit. [runtime/explicit] [4] diff --git a/samples/silly-sample/includeorder_cfirst.def b/samples/silly-sample/includeorder_cfirst.def index a3b30a4..9be5e44 100644 --- a/samples/silly-sample/includeorder_cfirst.def +++ b/samples/silly-sample/includeorder_cfirst.def @@ -11,7 +11,7 @@ src/sillycode.cpp:2: Should have a space between // and comment [whitespace/co src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found other system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found other system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] +src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces/source/namespace/nonliterals] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] diff --git a/samples/silly-sample/sed.def b/samples/silly-sample/sed.def index b3778ee..850a16d 100644 --- a/samples/silly-sample/sed.def +++ b/samples/silly-sample/sed.def @@ -15,7 +15,7 @@ sed -i '249s/\([^ ]\){/\1 {/' src/sillycode.cpp # Missing space before { [white # src/sillycode.cpp:2: " is an unapproved C++11 header." [build/c++11] [5] # src/sillycode.cpp:3: "Found C system header after other header. Should be: sillycode.h, c system, c++ system, other." [build/include_order] [4] # src/sillycode.cpp:4: "Found C system header after other header. Should be: sillycode.h, c system, c++ system, other." [build/include_order] [4] -# src/sillycode.cpp:5: "Do not use namespace using-directives. Use using-declarations instead." [build/namespaces] [5] +# src/sillycode.cpp:5: "Do not use namespace using-directives. Use using-declarations instead." [build/namespaces/source/namespace/nonliterals] [5] # src/sillycode.cpp:8: "public: should be indented +1 space inside class Date" [whitespace/indent] [3] # src/sillycode.cpp:15: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] # src/sillycode.cpp:39: "{ should almost always be at the end of the previous line" [whitespace/braces] [4] diff --git a/samples/silly-sample/simple.def b/samples/silly-sample/simple.def index 7bc1dc6..b7ce111 100644 --- a/samples/silly-sample/simple.def +++ b/samples/silly-sample/simple.def @@ -12,7 +12,7 @@ src/sillycode.cpp:2: Should have a space between // and comment [whitespace/co src/sillycode.cpp:2: is an unapproved C++11 header. [build/c++11] [5] src/sillycode.cpp:3: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] src/sillycode.cpp:4: Found C system header after other header. Should be: sillycode.h, c system, c++ system, other. [build/include_order] [4] -src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces] [5] +src/sillycode.cpp:5: Do not use namespace using-directives. Use using-declarations instead. [build/namespaces/source/namespace/nonliterals] [5] src/sillycode.cpp:8: public: should be indented +1 space inside class Date [whitespace/indent] [3] src/sillycode.cpp:15: { should almost always be at the end of the previous line [whitespace/braces] [4] src/sillycode.cpp:39: { should almost always be at the end of the previous line [whitespace/braces] [4] From c2b1ce67ba8f2e9cd02eb1edbea24b59eadba640 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jul 2025 02:17:01 +0000 Subject: [PATCH 62/63] Bump sigstore/gh-action-sigstore-python in the github-actions group Bumps the github-actions group with 1 update: [sigstore/gh-action-sigstore-python](https://github.com/sigstore/gh-action-sigstore-python). Updates `sigstore/gh-action-sigstore-python` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/sigstore/gh-action-sigstore-python/releases) - [Changelog](https://github.com/sigstore/gh-action-sigstore-python/blob/main/CHANGELOG.md) - [Commits](https://github.com/sigstore/gh-action-sigstore-python/compare/v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: sigstore/gh-action-sigstore-python dependency-version: 3.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index edf2366..5e79bcd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,7 +70,7 @@ jobs: name: python-package-distributions path: dist/ - name: Sign the dists with Sigstore - uses: sigstore/gh-action-sigstore-python@v3.0.0 + uses: sigstore/gh-action-sigstore-python@v3.0.1 with: inputs: >- ./dist/*.tar.gz From 2eef70dadc16b5e9578931f26e6ad9da23a7b400 Mon Sep 17 00:00:00 2001 From: Geoffrey Viola Date: Fri, 18 Jul 2025 14:45:51 -0400 Subject: [PATCH 63/63] Allow specifying _third_party_headers_pattern (#388) --- cpplint.py | 41 +++++++++++++++++++++++++---------- cpplint_clitest.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/cpplint.py b/cpplint.py index 24897da..ad942ba 100755 --- a/cpplint.py +++ b/cpplint.py @@ -68,7 +68,7 @@ [--filter=-x,+y,...] [--counting=total|toplevel|detailed] [--root=subdir] [--repository=path] - [--linelength=digits] [--headers=x,y,...] + [--linelength=digits] [--headers=x,y,...] [--third_party_headers=pattern] [--recursive] [--exclude=path] [--extensions=hpp,cpp,...] @@ -240,6 +240,8 @@ The header extensions that cpplint will treat as .h in checks. Values are automatically added to --extensions list. (by default, only files with extensions %s will be assumed to be headers) + third_party_headers=pattern + Regex for identifying third-party headers to exclude from include checks. Examples: --headers=%s @@ -256,6 +258,7 @@ linelength=80 root=subdir headers=x,y,... + third_party_headers=pattern "set noparent" option prevents cpplint from traversing directory tree upwards looking for more .cfg files in parent directories. This option @@ -812,14 +815,6 @@ r")$" ) - -# These headers are excluded from [build/include] and [build/include_order] -# checks: -# - Anything not following google file name conventions (containing an -# uppercase character, such as Python.h or nsStringAPI.h, for example). -# - Lua headers. -_THIRD_PARTY_HEADERS_PATTERN = re.compile(r"^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$") - # Pattern for matching FileInfo.BaseName() against test file name _test_suffixes = ["_test", "_regtest", "_unittest"] _TEST_FILE_SUFFIX = "(" + "|".join(_test_suffixes) + r")$" @@ -981,6 +976,16 @@ # This is set by --headers flag. _hpp_headers: set[str] = set() +# These headers are excluded from [build/include_subdir], [build/include_order], and +# [build/include_alpha] +# The default checks are following +# - Anything not following google file name conventions (containing an +# uppercase character, such as Python.h or nsStringAPI.h, for example). +# - Lua headers. +# Default pattern for third-party headers (uppercase .h or Lua headers). +_THIRD_PARTY_HEADERS_DEFAULT = r"^(?:[^/]*[A-Z][^/]*\.h|lua\.h|lauxlib\.h|lualib\.h)$" +_third_party_headers_pattern = re.compile(_THIRD_PARTY_HEADERS_DEFAULT) + class ErrorSuppressions: """Class to track all error suppressions for cpplint""" @@ -1072,6 +1077,15 @@ def ProcessIncludeOrderOption(val): PrintUsage("Invalid includeorder value %s. Expected default|standardcfirst") +def ProcessThirdPartyHeadersOption(val): + """Sets the regex pattern for third-party headers.""" + global _third_party_headers_pattern + try: + _third_party_headers_pattern = re.compile(val) + except re.error: + PrintUsage(f"Invalid third_party_headers pattern: {val}") + + def IsHeaderExtension(file_extension): return file_extension in GetHeaderExtensions() @@ -5744,7 +5758,7 @@ def CheckIncludeLine(filename, clean_lines, linenum, include_state, error): if ( match and IsHeaderExtension(match.group(2)) - and not _THIRD_PARTY_HEADERS_PATTERN.match(match.group(1)) + and not _third_party_headers_pattern.match(match.group(1)) ): error( filename, @@ -5797,7 +5811,7 @@ def CheckIncludeLine(filename, clean_lines, linenum, include_state, error): third_src_header = True break - if third_src_header or not _THIRD_PARTY_HEADERS_PATTERN.match(include): + if third_src_header or not _third_party_headers_pattern.match(include): include_state.include_list[-1].append((include, linenum)) # We want to ensure that headers appear in the right order: @@ -7527,6 +7541,8 @@ def ProcessConfigOverrides(filename): _root = os.path.join(os.path.dirname(cfg_file), val) elif name == "headers": ProcessHppHeadersOption(val) + elif name == "third_party_headers": + ProcessThirdPartyHeadersOption(val) elif name == "includeorder": ProcessIncludeOrderOption(val) else: @@ -7711,6 +7727,7 @@ def ParseArguments(args): "exclude=", "recursive", "headers=", + "third_party_headers=", "includeorder=", "config=", "quiet", @@ -7770,6 +7787,8 @@ def ParseArguments(args): ProcessExtensionsOption(val) elif opt == "--headers": ProcessHppHeadersOption(val) + elif opt == "--third_party_headers": + ProcessThirdPartyHeadersOption(val) elif opt == "--recursive": recursive = True elif opt == "--includeorder": diff --git a/cpplint_clitest.py b/cpplint_clitest.py index 7cb2047..165e192 100755 --- a/cpplint_clitest.py +++ b/cpplint_clitest.py @@ -37,6 +37,7 @@ import subprocess import sys import tempfile +import textwrap import pytest from testfixtures import compare # type: ignore[import-untyped] @@ -224,5 +225,57 @@ def test_codelite_sample(self): self.check_all_in_folder("./samples/codelite-sample", 1) +# Tests for third_party_headers option +def test_third_party_headers_default(tmp_path): + # By default, headers with uppercase letters are treated as third-party and not flagged + cpp = tmp_path / "test.cpp" + cpp.write_text( + textwrap.dedent(""" + // Copyright 2025 cpplint + #include "Foo.h" + int main() { return 0; } + """) + ) + status, out, err = run_shell_command(BASE_CMD, f"{cpp.name}", cwd=str(tmp_path)) + assert status == 0, f"stdout\n{out.decode('utf-8')}\nstderr\n{err.decode('utf-8')}" + # No include_subdir warning + assert b"build/include_subdir" not in err + + +def test_third_party_headers_override(tmp_path): + # Override third_party_headers so Foo.h is not recognized as third-party + cpp = tmp_path / "test.cpp" + cpp.write_text( + textwrap.dedent(""" + // Copyright 2025 cpplint + #include "Foo.h" + """) + ) + # Use a pattern that matches nothing + flag = "--third_party_headers=^Bar.h$" + status, out, err = run_shell_command(BASE_CMD, f"{flag} {cpp.name}", cwd=str(tmp_path)) + # Expect a warning about include_subdir + assert status == 1, f"stdout\n{out.decode('utf-8')}\nstderr\n{err.decode('utf-8')}" + assert b"build/include_subdir" in err + + +def test_third_party_headers_config(tmp_path): + # Override third_party_headers via config file so Foo.h is not recognized as third-party + cpp = tmp_path / "test.cpp" + cpp.write_text( + textwrap.dedent(""" + // Copyright 2025 cpplint + #include "Foo.h" + """) + ) + # Write configuration file to override third_party_headers + config = tmp_path / "CPPLINT.cfg" + config.write_text("third_party_headers=^Bar.h$\n") + status, out, err = run_shell_command(BASE_CMD, f"{cpp.name}", cwd=str(tmp_path)) + # Expect a warning about include_subdir due to override + assert status == 1, f"stdout\n{out.decode('utf-8')}\nstderr\n{err.decode('utf-8')}" + assert b"build/include_subdir" in err + + if __name__ == "__main__": pytest.main([__file__])