ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Tools/Scripts/webkitpy/style/checkers/cpp.py

 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009, 2010, 2012 Google Inc. All rights reserved.
 # Copyright (C) 2009 Torch Mobile Inc.
 # Copyright (C) 2009 Apple Inc. All rights reserved.
 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org)
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
@@ skipping 2952 matching lines @@
         character_after_identifier = matched.group('character_after_identifier')
 
         # If we removed a non-for-control statement, the character after
         # the identifier should be '='. With this rule, we can avoid
         # warning for cases like "if (val & INT_MAX) {".
         if control_statement and character_after_identifier != '=':
             return
 
         is_function_arguments = is_function_arguments or character_after_identifier == '('
 
-        # Remove "m_" and "s_" to allow them.
-        modified_identifier = sub(r'(^|(?<=::))[ms]_', '', identifier)
-        if not file_state.is_objective_c() and modified_identifier.find('_') >= 0:
-            # Various exceptions to the rule: JavaScript op codes functions, const_iterator.
-            if (not (filename.find('JavaScriptCore') >= 0 and modified_identifier.find('op_') >= 0)
-                    and not (filename.find('gtk') >= 0 and modified_identifier.startswith('webkit_') >= 0)
-                    and not (filename.find('StructTraits.h') >= 0)
-                    and not modified_identifier.startswith('tst_')
-                    and not modified_identifier.startswith('webkit_dom_object_')
-                    and not modified_identifier.startswith('webkit_soup')
-                    and not modified_identifier.startswith('NPN_')
-                    and not modified_identifier.startswith('NPP_')
-                    and not modified_identifier.startswith('NP_')
-                    and not modified_identifier.startswith('qt_')
-                    and not modified_identifier.startswith('_q_')
-                    and not modified_identifier.startswith('cairo_')
-                    and not modified_identifier.startswith('Ecore_')
-                    and not modified_identifier.startswith('Eina_')
-                    and not modified_identifier.startswith('Evas_')
-                    and not modified_identifier.startswith('Ewk_')
-                    and not modified_identifier.startswith('cti_')
-                    and not modified_identifier.find('::qt_') >= 0
-                    and not modified_identifier.find('::_q_') >= 0
-                    and not modified_identifier == "const_iterator"
-                    and not modified_identifier == "vm_throw"
-                    and not modified_identifier == "DFG_OPERATION"):
-                error(line_number, 'readability/naming/underscores', 4, identifier +
-                      " is incorrectly named. Don't use underscores in your identifier names.")
-
         # Check for variables named 'l', these are too easy to confuse with '1' in some fonts
-        if modified_identifier == 'l':
+        if identifier == 'l':
             error(line_number, 'readability/naming', 4, identifier +
                   " is incorrectly named. Don't use the single letter 'l' as an identifier name.")
 
         # There can be only one declaration in non-for-control statements.
         if control_statement:
             return
         # We should continue checking if this is a function
         # declaration because we need to check its arguments.
         # Also, we need to check multiple declarations.
         if character_after_identifier != '(' and character_after_identifier != ',':
@@ skipping 623 matching lines @@
 
     def check(self, lines):
         _process_lines(self.file_path, self.file_extension, lines,
                        self.handle_style_error, self.min_confidence)
 
 
 # FIXME: Remove this function (requires refactoring unit tests).
 def process_file_data(filename, file_extension, lines, error, min_confidence, fs=None):
     checker = CppChecker(filename, file_extension, error, min_confidence, fs)
     checker.check(lines)