fix cpplint#112, identifying of copy constructors should allow combinations of volatile and const

tkruse · tkruse · commit 851ceb00cba6 · 2020-01-13T16:23:39.000+09:00
diff --git a/cpplint.py b/cpplint.py
@@ -3153,7 +3153,8 @@ def CheckForNonStandardConstructs(filename, clean_lines, linenum,
         Search(r'\bstd\s*::\s*initializer_list\b', constructor_args[0]))
     copy_constructor = bool(
         onearg_constructor and
-        Match(r'(const\s+)?%s(\s*<[^>]*>)?(\s+const)?\s*(?:<\w+>\s*)?&'
+        Match(r'((const\s+(volatile\s+)?)?|(volatile\s+(const\s+)?))?'
+              r'%s(\s*<[^>]*>)?(\s+const)?\s*(?:<\w+>\s*)?&'
               % re.escape(base_classname), constructor_args[0].strip()))
 
     if (not is_marked_explicit and
diff --git a/cpplint_unittest.py b/cpplint_unittest.py
@@ -1669,6 +1669,24 @@ class Foo {
             Foo(const Foo&);
           };""",
           '')
+      self.TestMultiLineLint(
+          """
+          class Foo {
+            Foo(volatile Foo&);
+          };""",
+          '')
+      self.TestMultiLineLint(
+          """
+          class Foo {
+            Foo(volatile const Foo&);
+          };""",
+          '')
+      self.TestMultiLineLint(
+          """
+          class Foo {
+            Foo(const volatile Foo&);
+          };""",
+          '')
       self.TestMultiLineLint(
           """
           class Foo {
