Index: Tools/Scripts/webkitpy/style/checkers/cpp.py |
diff --git a/Tools/Scripts/webkitpy/style/checkers/cpp.py b/Tools/Scripts/webkitpy/style/checkers/cpp.py |
index 52519527f81faf8f6855ed1f6cadf92134611399..ca146aeb74ad400c73e0ae2491ea44606750753a 100644 |
--- a/Tools/Scripts/webkitpy/style/checkers/cpp.py |
+++ b/Tools/Scripts/webkitpy/style/checkers/cpp.py |
@@ -3411,17 +3411,13 @@ def check_identifier_name_in_declaration(filename, line_number, line, file_state |
line = line[matched.end():] |
-def check_for_toFoo_definition(filename, pattern, error): |
- """ Reports for using static_cast instead of toFoo convenience function. |
- |
- This function will output warnings to make sure you are actually using |
- the added toFoo conversion functions rather than directly hard coding |
- the static_cast<Classname*> call. For example, you should toHTMLELement(Node*) |
- to convert Node* to HTMLElement*, instead of static_cast<HTMLElement*>(Node*) |
+def check_for_toFoo_definition(filename, search_func_name, grep_patterns, error): |
aarya
2014/01/27 19:45:56
check_for_toFoo_definition -> check_for_cast_defin
r.kasibhatla
2014/02/03 15:29:15
Done.
|
+ """Checks for a Cpp-style static cast on objects by searching for the pattern. |
Args: |
filename: The name of the header file in which to check for toFoo definition. |
- pattern: The conversion function pattern to grep for. |
+ search_func_name: The toFoo convinience function string. |
Dirk Pranke
2014/01/27 19:38:51
Nit: "convenience".
aarya
2014/01/27 19:45:56
typo: convenience
r.kasibhatla
2014/02/03 15:29:15
Done.
r.kasibhatla
2014/02/03 15:29:15
Done.
|
+ grep_patterns: Array consisting the regex patterns to search for. |
error: The function to call with any errors found. |
""" |
def get_abs_filepath(filename): |
@@ -3433,19 +3429,23 @@ def check_for_toFoo_definition(filename, pattern, error): |
return os.path.join(root, filename) |
return None |
- def grep(lines, pattern, error): |
+ def grep(lines, search_func_name, grep_patterns, error): |
matches = [] |
function_state = None |
for line_number in xrange(lines.num_lines()): |
line = (lines.elided[line_number]).rstrip() |
try: |
- if pattern in line: |
+ # Search for DEFINE_TYPE_CASTS pattern in the file. |
+ if re.search(grep_patterns[0], line): |
aarya
2014/01/27 19:45:56
grep_patterns[0], grep_patterns[1] is not a good w
r.kasibhatla
2014/02/03 15:29:15
Done.
|
+ matches.append([line, line_number + 1, line_number + 1]) |
+ # DEFINE_TYPE_CASTS pattern not found. Search for toFoo pattern instead in the file. |
Dirk Pranke
2014/01/27 19:38:51
Nit: it's a bit odd to me to have a comment immedi
r.kasibhatla
2014/02/03 15:29:15
Done.
|
+ elif re.search(grep_patterns[1], line): |
if not function_state: |
function_state = _FunctionState(1) |
detect_functions(lines, line_number, function_state, error) |
# Exclude the match of dummy conversion function. Dummy function is just to |
# catch invalid conversions and shouldn't be part of possible alternatives. |
- result = re.search(r'%s(\s+)%s' % ("void", pattern), line) |
+ result = re.search(r'%s(\s+)%s' % ("void", search_func_name), line) |
if not result: |
matches.append([line, function_state.body_start_position.row, function_state.end_position.row + 1]) |
function_state = None |
@@ -3491,12 +3491,17 @@ def check_for_toFoo_definition(filename, pattern, error): |
f.close() |
# Make a list of all genuine alternatives to static_cast. |
- matches = grep(clean_lines, pattern, error) |
+ matches = grep(clean_lines, search_func_name, grep_patterns, error) |
return matches |
def check_for_object_static_cast(processing_file, line_number, line, error): |
- """Checks for a Cpp-style static cast on objects by looking for the pattern. |
+ """ Reports for using static_cast instead of toFoo convenience function. |
+ |
+ This function will output warnings to make sure you are actually using |
+ the added toFoo conversion functions rather than directly hard coding |
+ the static_cast<Classname*> call. For example, you should toHTMLELement(Node*) |
+ to convert Node* to HTMLElement*, instead of static_cast<HTMLElement*>(Node*) |
Args: |
processing_file: The name of the processing file. |
@@ -3504,6 +3509,7 @@ def check_for_object_static_cast(processing_file, line_number, line, error): |
line: The line of code to check. |
error: The function to call with any errors found. |
""" |
+ |
matched = search(r'\bstatic_cast<(\s*\w*:?:?\w+\s*\*+\s*)>', line) |
if not matched: |
return |
@@ -3519,9 +3525,14 @@ def check_for_object_static_cast(processing_file, line_number, line, error): |
class_name = class_name[namespace_pos + 2:] |
header_file = ''.join((class_name, '.h')) |
- matches = check_for_toFoo_definition(header_file, ''.join(('to', class_name)), error) |
- # Ignore (for now) if not able to find the header where toFoo might be defined. |
- # TODO: Handle cases where Classname might be defined in some other header or cpp file. |
+ toFoo_name = ''.join(('to', class_name)) |
+ matching_patterns = [] |
+ matching_patterns.append(re.compile(r'\s*DEFINE_(\w*)TYPE_CASTS\(%s,(.+)(\);$)' % class_name)) |
+ matching_patterns.append(re.compile(r'[ \w]*%s\*\s+%s\((.+)\)$' % (class_name, toFoo_name))) |
+ |
+ matches = check_for_toFoo_definition(header_file, toFoo_name, matching_patterns, error) |
+ # FIXME(kphanee): Handle cases where Classname might be defined in some other header or cpp file. |
Dirk Pranke
2014/01/27 19:38:51
Nit: We don't use usernames in FIXMEs.
r.kasibhatla
2014/02/03 15:29:15
Done.
|
+ # It would remove this hack for ignoring not finding Foo.h |
aarya
2014/01/27 19:45:56
This line is not clear, can you rephrase this.
r.kasibhatla
2014/02/03 15:29:15
Done.
|
if matches is None: |
return |
@@ -3537,7 +3548,7 @@ def check_for_object_static_cast(processing_file, line_number, line, error): |
if len(matches): |
# toFoo is defined - enforce using it. |
# TODO: Suggest an appropriate toFoo from the alternatives present in matches. |
- error(line_number, 'runtime/casting', 4, |
+ error(line_number, 'security/casting', 4, |
'static_cast of class objects is not allowed. Use to%s defined in %s.' % |
(class_name, header_file)) |
else: |
@@ -3984,6 +3995,7 @@ class CppChecker(object): |
'runtime/threadsafe_fn', |
'runtime/unsigned', |
'runtime/virtual', |
+ 'security/casting', |
'whitespace/blank_line', |
'whitespace/braces', |
'whitespace/comma', |