<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205122] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205122">205122</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-29 09:18:59 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check-webkit-style does not work with Objective-C blocks
https://bugs.webkit.org/show_bug.cgi?id=161247
Patch by Jonathan Bedard <jbedard@apple.com> on 2016-08-29
Reviewed by Darin Adler.
* Scripts/webkitpy/style/checkers/cpp.py:
(regex_for_lambda_functions): Changed to regex_for_lambdas_and_blocks.
(regex_for_lambdas_and_blocks): Added check for Objective-C blocks.
(check_spacing_for_function_call): Pass file state for lambda check.
(check_spacing): Pass file state for lambda check.
(check_braces): Pass file state for lambda check.
(check_style): Pass file state for lambda check.
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(CppStyleTest.test_cpp_lambda_functions): Changed from ‘test_lambda_functions’.
(CppStyleTest.test_objective_c_block): Tests Objective-C blocks.
(CppStyleTest.test_lambda_functions): Changed to ‘test_cpp_lambda_functions’.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpppy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpp_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205121 => 205122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-29 16:18:37 UTC (rev 205121)
+++ trunk/Tools/ChangeLog 2016-08-29 16:18:59 UTC (rev 205122)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-08-29 Jonathan Bedard <jbedard@apple.com>
+
+ Check-webkit-style does not work with Objective-C blocks
+ https://bugs.webkit.org/show_bug.cgi?id=161247
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (regex_for_lambda_functions): Changed to regex_for_lambdas_and_blocks.
+ (regex_for_lambdas_and_blocks): Added check for Objective-C blocks.
+ (check_spacing_for_function_call): Pass file state for lambda check.
+ (check_spacing): Pass file state for lambda check.
+ (check_braces): Pass file state for lambda check.
+ (check_style): Pass file state for lambda check.
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (CppStyleTest.test_cpp_lambda_functions): Changed from ‘test_lambda_functions’.
+ (CppStyleTest.test_objective_c_block): Tests Objective-C blocks.
+ (CppStyleTest.test_lambda_functions): Changed to ‘test_cpp_lambda_functions’.
+
</ins><span class="cx"> 2016-08-29 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> EWS patch status page should indicate bot corresponding to each status message
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (205121 => 205122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2016-08-29 16:18:37 UTC (rev 205121)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2016-08-29 16:18:59 UTC (rev 205122)
</span><span class="lines">@@ -1281,11 +1281,11 @@
</span><span class="cx"> return True
</span><span class="cx">
</span><span class="cx">
</span><del>-def regex_for_lambda_functions(line, line_number, error):
- result = search(r'\s\[.*?\]\s', line)
- if result:
- group = result.group()
-
</del><ins>+def regex_for_lambdas_and_blocks(line, line_number, file_state, error):
+ cpp_result = search(r'\s\[.*?\]\s', line)
+ objc_result = search(r'(\s\^\s?\(.*?\)\s|\^\s?\{)', line)
+ if cpp_result:
+ group = cpp_result.group()
</ins><span class="cx"> targ_error = None
</span><span class="cx">
</span><span class="cx"> if search(r'(\[\s|\s\]|\s,)', group):
</span><span class="lines">@@ -1292,13 +1292,33 @@
</span><span class="cx"> targ_error = [line_number, 'whitespace/brackets', 4,
</span><span class="cx"> 'Extra space in capture list.']
</span><span class="cx">
</span><del>- if targ_error and regex_for_lambda_functions.__last_error != targ_error:
</del><ins>+ if targ_error and regex_for_lambdas_and_blocks.__last_error != targ_error:
</ins><span class="cx"> error(targ_error[0], targ_error[1], targ_error[2], targ_error[3])
</span><del>- regex_for_lambda_functions.__last_error = targ_error
</del><ins>+ regex_for_lambdas_and_blocks.__last_error = targ_error
</ins><span class="cx"> return True
</span><ins>+
+ if objc_result and file_state.is_objective_c_or_objective_cpp():
+ group = objc_result.group()
+ targ_error = None
+
+ if search(r'(\(\s|\s\)|\s,)', group):
+ targ_error = [line_number, 'whitespace/brackets', 4,
+ 'Extra space in block arguments.']
+ if search(r'\^\{', group):
+ targ_error = [line_number, 'whitespace/brackets', 4,
+ 'No space between ^ and block definition.']
+ if search(r'\^\s\(', group):
+ targ_error = [line_number, 'whitespace/brackets', 4,
+ 'Extra space between ^ and block arguments.']
+
+ if targ_error and regex_for_lambdas_and_blocks.__last_error != targ_error:
+ error(targ_error[0], targ_error[1], targ_error[2], targ_error[3])
+ regex_for_lambdas_and_blocks.__last_error = targ_error
+ return True
+
</ins><span class="cx"> return False
</span><span class="cx">
</span><del>-regex_for_lambda_functions.__last_error = None
</del><ins>+regex_for_lambdas_and_blocks.__last_error = None
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def check_for_non_standard_constructs(clean_lines, line_number,
</span><span class="lines">@@ -1451,7 +1471,7 @@
</span><span class="cx"> classinfo.brace_depth = brace_depth
</span><span class="cx">
</span><span class="cx">
</span><del>-def check_spacing_for_function_call(line, line_number, error):
</del><ins>+def check_spacing_for_function_call(line, line_number, file_state, error):
</ins><span class="cx"> """Checks for the correctness of various spacing around function calls.
</span><span class="cx">
</span><span class="cx"> Args:
</span><span class="lines">@@ -1490,7 +1510,7 @@
</span><span class="cx"> if ( # Ignore control structures.
</span><span class="cx"> not search(r'\b(if|for|while|switch|return|new|delete)\b', function_call)
</span><span class="cx"> # Ignore lambda functions
</span><del>- and not regex_for_lambda_functions(function_call, line_number, error)
</del><ins>+ and not regex_for_lambdas_and_blocks(function_call, line_number, file_state, error)
</ins><span class="cx"> # Ignore pointers/references to functions.
</span><span class="cx"> and not search(r' \([^)]+\)\([^)]*(\)|,$)', function_call)
</span><span class="cx"> # Ignore pointers/references to arrays.
</span><span class="lines">@@ -1749,7 +1769,7 @@
</span><span class="cx"> 'memory leaks.' % matched_create_dc.group('function_name'))
</span><span class="cx">
</span><span class="cx">
</span><del>-def check_spacing(file_extension, clean_lines, line_number, error):
</del><ins>+def check_spacing(file_extension, clean_lines, line_number, file_state, error):
</ins><span class="cx"> """Checks for the correctness of various spacing issues in the code.
</span><span class="cx">
</span><span class="cx"> Things we check for: spaces around operators, spaces after
</span><span class="lines">@@ -1989,7 +2009,7 @@
</span><span class="cx"> 'Declaration has space between * and variable name in %s' % matched.group(0).strip())
</span><span class="cx">
</span><span class="cx"> # Next we will look for issues with function calls.
</span><del>- check_spacing_for_function_call(line, line_number, error)
</del><ins>+ check_spacing_for_function_call(line, line_number, file_state, error)
</ins><span class="cx">
</span><span class="cx"> # Except after an opening paren, ^ for blocks, or @ for Objective-C
</span><span class="cx"> # literal NSDictionary, you should have spaces before your braces.
</span><span class="lines">@@ -2430,7 +2450,7 @@
</span><span class="cx"> break
</span><span class="cx">
</span><span class="cx">
</span><del>-def check_braces(clean_lines, line_number, error):
</del><ins>+def check_braces(clean_lines, line_number, file_state, error):
</ins><span class="cx"> """Looks for misplaced braces (e.g. at the end of line).
</span><span class="cx">
</span><span class="cx"> Args:
</span><span class="lines">@@ -2454,7 +2474,7 @@
</span><span class="cx"> previous_line = get_previous_non_blank_line(clean_lines, line_number)[0]
</span><span class="cx"> if ((not search(r'[;:}{)=]\s*$|\)\s*((const|override|const override)\s*)?(->\s*\S+)?\s*$', previous_line)
</span><span class="cx"> or search(r'\b(if|for|while|switch|else|NS_ENUM)\b', previous_line)
</span><del>- or regex_for_lambda_functions(previous_line, line_number, error))
</del><ins>+ or regex_for_lambdas_and_blocks(previous_line, line_number, file_state, error))
</ins><span class="cx"> and previous_line.find('#') < 0
</span><span class="cx"> and previous_line.find('- (') != 0
</span><span class="cx"> and previous_line.find('+ (') != 0):
</span><span class="lines">@@ -2463,7 +2483,7 @@
</span><span class="cx"> elif (search(r'\)\s*(((const|override)\s*)*\s*)?{\s*$', line)
</span><span class="cx"> and line.count('(') == line.count(')')
</span><span class="cx"> and not search(r'(\s*(if|for|while|switch|NS_ENUM|@synchronized)|} @catch)\b', line)
</span><del>- and not regex_for_lambda_functions(line, line_number, error)
</del><ins>+ and not regex_for_lambdas_and_blocks(line, line_number, file_state, error)
</ins><span class="cx"> and line.find("](") < 0
</span><span class="cx"> and not match(r'\s+[A-Z_][A-Z_0-9]+\b', line)):
</span><span class="cx"> error(line_number, 'whitespace/braces', 4,
</span><span class="lines">@@ -2835,9 +2855,9 @@
</span><span class="cx"> check_wtf_move(clean_lines, line_number, file_state, error)
</span><span class="cx"> check_ctype_functions(clean_lines, line_number, file_state, error)
</span><span class="cx"> check_switch_indentation(clean_lines, line_number, error)
</span><del>- check_braces(clean_lines, line_number, error)
</del><ins>+ check_braces(clean_lines, line_number, file_state, error)
</ins><span class="cx"> check_exit_statement_simplifications(clean_lines, line_number, error)
</span><del>- check_spacing(file_extension, clean_lines, line_number, error)
</del><ins>+ check_spacing(file_extension, clean_lines, line_number, file_state, error)
</ins><span class="cx"> check_member_initialization_list(clean_lines, line_number, error)
</span><span class="cx"> check_check(clean_lines, line_number, error)
</span><span class="cx"> check_for_comparisons_to_zero(clean_lines, line_number, error)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (205121 => 205122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2016-08-29 16:18:37 UTC (rev 205121)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2016-08-29 16:18:59 UTC (rev 205122)
</span><span class="lines">@@ -1882,7 +1882,7 @@
</span><span class="cx"> self.assert_lint('int main(int argc, char* agrv [])', 'Extra space before [. [whitespace/brackets] [5]')
</span><span class="cx"> self.assert_lint(' str [strLength] = \'\\0\';', 'Extra space before [. [whitespace/brackets] [5]')
</span><span class="cx">
</span><del>- def test_lambda_functions(self):
</del><ins>+ def test_cpp_lambda_functions(self):
</ins><span class="cx"> self.assert_lint(' [&] (Type argument) {', '')
</span><span class="cx"> self.assert_lint(' [] {', '')
</span><span class="cx"> self.assert_lint(' [ =] (Type argument) {', 'Extra space in capture list. [whitespace/brackets] [4]')
</span><span class="lines">@@ -1890,6 +1890,16 @@
</span><span class="cx"> self.assert_lint(' [var , var_ref&] {', 'Extra space in capture list. [whitespace/brackets] [4]')
</span><span class="cx"> self.assert_lint(' [var,var_ref&] {', 'Missing space after , [whitespace/comma] [3]')
</span><span class="cx">
</span><ins>+ def test_objective_c_block(self):
+ self.assert_lint(' ^(var, var_ref) {', '', 'foo.mm')
+ self.assert_lint(' ^(var, var_ref) {', '', 'foo.m')
+ self.assert_lint(' ^(var , var_ref) {', 'Extra space in block arguments. [whitespace/brackets] [4]', 'foo.m')
+ self.assert_lint(' ^(var,var_ref) {', 'Missing space after , [whitespace/comma] [3]', 'foo.m')
+ self.assert_lint(' ^(var, var_ref) {', 'Place brace on its own line for function definitions. [whitespace/braces] [4]', 'foo.cpp')
+ self.assert_lint(' ^ {', '', 'foo.m')
+ self.assert_lint(' ^{', 'No space between ^ and block definition. [whitespace/brackets] [4]', 'foo.m')
+ self.assert_lint(' ^ (arg1, arg2) {', 'Extra space between ^ and block arguments. [whitespace/brackets] [4]', 'foo.m')
+
</ins><span class="cx"> def test_spacing_around_else(self):
</span><span class="cx"> self.assert_lint('}else {', 'Missing space before else'
</span><span class="cx"> ' [whitespace/braces] [5]')
</span></span></pre>
</div>
</div>
</body>
</html>