<!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>[185245] 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/185245">185245</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2015-06-05 04:06:49 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>check-webkit-style should recommend using nullptr instead of recommending using 0 for the null pointer in C++ code.
https://bugs.webkit.org/show_bug.cgi?id=145680
Reviewed by Brent Fulgham.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_for_null):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(WebKitStyleTest.test_null_false_zero):</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 (185244 => 185245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-05 09:11:24 UTC (rev 185244)
+++ trunk/Tools/ChangeLog 2015-06-05 11:06:49 UTC (rev 185245)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-04 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ check-webkit-style should recommend using nullptr instead of recommending using 0 for the null pointer in C++ code.
+ https://bugs.webkit.org/show_bug.cgi?id=145680
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_for_null):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (WebKitStyleTest.test_null_false_zero):
+
</ins><span class="cx"> 2015-06-05 Stephanie Lewis <slewis@apple.com>
</span><span class="cx">
</span><span class="cx"> Make the web server more robust to timing issues..
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (185244 => 185245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-06-05 09:11:24 UTC (rev 185244)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-06-05 11:06:49 UTC (rev 185245)
</span><span class="lines">@@ -2722,7 +2722,7 @@
</span><span class="cx"> if search(r'\bNULL\b', line):
</span><span class="cx"> # FIXME: We should recommend using nullptr instead of NULL in C++ code per
</span><span class="cx"> # <http://www.webkit.org/coding/coding-style.html#zero-null>.
</span><del>- error(line_number, 'readability/null', 5, 'Use 0 instead of NULL.')
</del><ins>+ error(line_number, 'readability/null', 5, 'Use nullptr instead of NULL.')
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> line = clean_lines.raw_lines[line_number]
</span><span class="lines">@@ -2730,9 +2730,7 @@
</span><span class="cx"> # matches, then do the check with strings collapsed to avoid giving errors for
</span><span class="cx"> # NULLs occurring in strings.
</span><span class="cx"> if search(r'\bNULL\b', line) and search(r'\bNULL\b', CleansedLines.collapse_strings(line)):
</span><del>- # FIXME: We should recommend using nullptr instead of 0 or null in C++ code per
- # <http://www.webkit.org/coding/coding-style.html#zero-null>.
- error(line_number, 'readability/null', 4, 'Use 0 or null instead of NULL (even in *comments*).')
</del><ins>+ error(line_number, 'readability/null', 4, 'Use nullptr instead of NULL (even in *comments*).')
</ins><span class="cx">
</span><span class="cx"> def get_line_width(line):
</span><span class="cx"> """Determines the width of the line in column positions.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (185244 => 185245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-06-05 09:11:24 UTC (rev 185244)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-06-05 11:06:49 UTC (rev 185245)
</span><span class="lines">@@ -4599,23 +4599,23 @@
</span><span class="cx"> '')
</span><span class="cx">
</span><span class="cx"> def test_null_false_zero(self):
</span><del>- # 1. In C++, the null pointer value should be written as 0. In C,
</del><ins>+ # 1. In C++, the null pointer value should be written as nullptr. In C,
</ins><span class="cx"> # it should be written as NULL. In Objective-C and Objective-C++,
</span><span class="cx"> # follow the guideline for C or C++, respectively, but use nil to
</span><span class="cx"> # represent a null Objective-C object.
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> 'functionCall(NULL)',
</span><del>- 'Use 0 instead of NULL.'
</del><ins>+ 'Use nullptr instead of NULL.'
</ins><span class="cx"> ' [readability/null] [5]',
</span><span class="cx"> 'foo.cpp')
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> "// Don't use NULL in comments since it isn't in code.",
</span><del>- 'Use 0 or null instead of NULL (even in *comments*).'
</del><ins>+ 'Use nullptr instead of NULL (even in *comments*).'
</ins><span class="cx"> ' [readability/null] [4]',
</span><span class="cx"> 'foo.cpp')
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> '"A string with NULL" // and a comment with NULL is tricky to flag correctly in cpp_style.',
</span><del>- 'Use 0 or null instead of NULL (even in *comments*).'
</del><ins>+ 'Use nullptr instead of NULL (even in *comments*).'
</ins><span class="cx"> ' [readability/null] [4]',
</span><span class="cx"> 'foo.cpp')
</span><span class="cx"> self.assert_lint(
</span><span class="lines">@@ -4726,11 +4726,11 @@
</span><span class="cx"> '')
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> 'gtk_widget_style_get_property(style, NULL, NULL);',
</span><del>- 'Use 0 instead of NULL. [readability/null] [5]',
</del><ins>+ 'Use nullptr instead of NULL. [readability/null] [5]',
</ins><span class="cx"> 'foo.cpp')
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> 'gtk_widget_style_get_valist(style, NULL, NULL);',
</span><del>- 'Use 0 instead of NULL. [readability/null] [5]',
</del><ins>+ 'Use nullptr instead of NULL. [readability/null] [5]',
</ins><span class="cx"> 'foo.cpp')
</span><span class="cx">
</span><span class="cx"> # 2. C++ and C bool values should be written as true and
</span><span class="lines">@@ -4791,10 +4791,10 @@
</span><span class="cx"> '')
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> 'if (LIKELY(foo == NULL))',
</span><del>- 'Use 0 instead of NULL. [readability/null] [5]')
</del><ins>+ 'Use nullptr instead of NULL. [readability/null] [5]')
</ins><span class="cx"> self.assert_lint(
</span><span class="cx"> 'if (UNLIKELY(foo == NULL))',
</span><del>- 'Use 0 instead of NULL. [readability/null] [5]')
</del><ins>+ 'Use nullptr instead of NULL. [readability/null] [5]')
</ins><span class="cx">
</span><span class="cx"> def test_directive_indentation(self):
</span><span class="cx"> self.assert_lint(
</span></span></pre>
</div>
</div>
</body>
</html>