[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [74255] trunk/WebKitTools
From: levin () chromium ! org
Date: 2010-12-17 13:15:38
Message-ID: 20101217131539.79038600B7DF () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[74255] trunk/WebKitTools</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/74255">74255</a></dd> \
<dt>Author</dt> <dd>levin@chromium.org</dd> <dt>Date</dt> <dd>2010-12-17 05:15:23 \
-0800 (Fri, 17 Dec 2010)</dd> </dl>
<h3>Log Message</h3>
<pre>2010-12-17 David Levin <levin@chromium.org>
Reviewed by Eric Seidel.
check-webkit-style should understand WTF #include guards
https://bugs.webkit.org/show_bug.cgi?id=44911
* Scripts/webkitpy/style/checkers/cpp.py:
(get_header_guard_cpp_variable): modify to suggest the WTF style
of header guard when appropriate.
(check_for_header_guard): handle multiple return values from
get_header_guard_cpp_variable
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(CppStyleTest.test_build_header_guard): Added tests for the WTF
header style.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpystylecheckerscpppy">trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py</a></li>
<li><a href="#trunkWebKitToolsScriptswebkitpystylecheckerscpp_unittestpy">trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (74254 => 74255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog 2010-12-17 13:07:20 UTC (rev \
74254)
+++ trunk/WebKitTools/ChangeLog 2010-12-17 13:15:23 UTC (rev 74255)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2010-12-17 David Levin <levin@chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ check-webkit-style should understand WTF #include guards
+ https://bugs.webkit.org/show_bug.cgi?id=44911
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (get_header_guard_cpp_variable): modify to suggest the WTF style
+ of header guard when appropriate.
+ (check_for_header_guard): handle multiple return values from
+ get_header_guard_cpp_variable
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (CppStyleTest.test_build_header_guard): Added tests for the WTF
+ header style.
+
</ins><span class="cx"> 2010-12-16 David Levin <levin@chromium.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Eric Seidel.
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: \
trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py (74254 => 74255)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py 2010-12-17 13:07:20 UTC (rev \
74254)
+++ trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py 2010-12-17 13:15:23 UTC \
(rev 74255) </span><span class="lines">@@ -695,9 +695,16 @@
</span><span class="cx"> # flymake.
</span><span class="cx"> filename = re.sub(r'_flymake\.h$', '.h', filename)
</span><span class="cx">
</span><del>- return sub(r'[-.\s]', '_', os.path.basename(filename))
</del><ins>+ standard_name = sub(r'[-.\s]', '_', os.path.basename(filename))
</ins><span class="cx">
</span><ins>+ # Files under WTF typically have header guards that start with WTF_.
+ if filename.find('/wtf/'):
+ special_name = "WTF_" + standard_name
+ else:
+ special_name = standard_name
+ return (special_name, standard_name)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_for_header_guard(filename, lines, error):
</span><span class="cx"> """Checks that the file contains a header \
guard. </span><span class="cx">
</span><span class="lines">@@ -731,13 +738,13 @@
</span><span class="cx"> if not ifndef or not define or ifndef != define:
</span><span class="cx"> error(0, 'build/header_guard', 5,
</span><span class="cx"> 'No #ifndef header guard found, suggested CPP \
variable is: %s' % </span><del>- cppvar)
</del><ins>+ cppvar[0])
</ins><span class="cx"> return
</span><span class="cx">
</span><span class="cx"> # The guard should be File_h.
</span><del>- if ifndef != cppvar:
</del><ins>+ if ifndef not in cppvar:
</ins><span class="cx"> error(ifndef_line_number, 'build/header_guard', 5,
</span><del>- '#ifndef header guard has wrong style, please use: %s' % \
cppvar) </del><ins>+ '#ifndef header guard has wrong style, please use: \
%s' % cppvar[0]) </ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def check_for_unicode_replacement_characters(lines, error):
</span></span></pre></div>
<a id="trunkWebKitToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: \
trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py (74254 => \
74255)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2010-12-17 13:07:20 \
UTC (rev 74254)
+++ trunk/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2010-12-17 \
13:15:23 UTC (rev 74255) </span><span class="lines">@@ -1741,6 +1741,35 @@
</span><span class="cx"> ' [build/header_guard] [5]' % \
expected_guard), </span><span class="cx"> error_collector.result_list())
</span><span class="cx">
</span><ins>+ # Allow the WTF_ prefix for files in that directory.
+ header_guard_filter = FilterConfiguration(('-', '+build/header_guard'))
+ error_collector = ErrorCollector(self.assert_, header_guard_filter)
+ self.process_file_data('JavaScriptCore/wtf/TestName.h', 'h',
+ ['#ifndef WTF_TestName_h', '#define WTF_TestName_h'],
+ error_collector)
+ self.assertEquals(0, len(error_collector.result_list()),
+ error_collector.result_list())
+
+ # Also allow the non WTF_ prefix for files in that directory.
+ error_collector = ErrorCollector(self.assert_, header_guard_filter)
+ self.process_file_data('JavaScriptCore/wtf/TestName.h', 'h',
+ ['#ifndef TestName_h', '#define TestName_h'],
+ error_collector)
+ self.assertEquals(0, len(error_collector.result_list()),
+ error_collector.result_list())
+
+ # Verify that we suggest the WTF prefix version.
+ error_collector = ErrorCollector(self.assert_, header_guard_filter)
+ self.process_file_data('JavaScriptCore/wtf/TestName.h', 'h',
+ ['#ifndef BAD_TestName_h', '#define BAD_TestName_h'],
+ error_collector)
+ self.assertEquals(
+ 1,
+ error_collector.result_list().count(
+ '#ifndef header guard has wrong style, please use: WTF_TestName_h'
+ ' [build/header_guard] [5]'),
+ error_collector.result_list())
+
</ins><span class="cx"> def test_build_printf_format(self):
</span><span class="cx"> self.assert_lint(
</span><span class="cx"> r'printf("\%%d", value);',
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic