<!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>[161535] 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/161535">161535</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-08 18:13:07 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Missleading style error when mixing system and non-system header include lines.
https://bugs.webkit.org/show_bug.cgi?id=126564
Patch by Gergo Balogh <geryxyz@inf.u-szeged.hu> on 2014-01-08
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/style/checkers/cpp.py:
(check_include_line):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(OrderOfIncludesTest.test_check_alphabetical_include_order):
(OrderOfIncludesTest.test_public_primary_header):</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 (161534 => 161535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-09 02:12:41 UTC (rev 161534)
+++ trunk/Tools/ChangeLog 2014-01-09 02:13:07 UTC (rev 161535)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-08 Gergo Balogh <geryxyz@inf.u-szeged.hu>
+
+ Missleading style error when mixing system and non-system header include lines.
+ https://bugs.webkit.org/show_bug.cgi?id=126564
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (check_include_line):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (OrderOfIncludesTest.test_check_alphabetical_include_order):
+ (OrderOfIncludesTest.test_public_primary_header):
+
</ins><span class="cx"> 2014-01-08 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Unreviewed build fix after r161522.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (161534 => 161535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-01-09 02:12:41 UTC (rev 161534)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-01-09 02:13:07 UTC (rev 161535)
</span><span class="lines">@@ -2916,12 +2916,15 @@
</span><span class="cx"> previous_match = _RE_PATTERN_INCLUDE.search(previous_line)
</span><span class="cx"> if previous_match:
</span><span class="cx"> previous_header_type = include_state.header_types[previous_line_number]
</span><del>- if previous_header_type == _OTHER_HEADER and previous_line.strip() > line.strip():
- # This type of error is potentially a problem with this line or the previous one,
- # so if the error is filtered for one line, report it for the next. This is so that
- # we properly handle patches, for which only modified lines produce errors.
- if not error(line_number - 1, 'build/include_order', 4, 'Alphabetical sorting problem.'):
- error(line_number, 'build/include_order', 4, 'Alphabetical sorting problem.')
</del><ins>+ if previous_header_type == _OTHER_HEADER:
+ if '<' in previous_line and '"' in line:
+ error(line_number, 'build/include_order', 4, 'Bad include order. Mixing system and custom headers.')
+ elif previous_line.strip() > line.strip():
+ # This type of error is potentially a problem with this line or the previous one,
+ # so if the error is filtered for one line, report it for the next. This is so that
+ # we properly handle patches, for which only modified lines produce errors.
+ if not error(line_number - 1, 'build/include_order', 4, 'Alphabetical sorting problem.'):
+ error(line_number, 'build/include_order', 4, 'Alphabetical sorting problem.')
</ins><span class="cx">
</span><span class="cx"> if error_message:
</span><span class="cx"> if file_extension == 'h':
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (161534 => 161535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2014-01-09 02:12:41 UTC (rev 161534)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2014-01-09 02:13:07 UTC (rev 161535)
</span><span class="lines">@@ -2623,7 +2623,7 @@
</span><span class="cx"> self.assert_language_rules_check('foo.h',
</span><span class="cx"> '#include <assert.h>\n'
</span><span class="cx"> '#include "bar.h"\n',
</span><del>- 'Alphabetical sorting problem. [build/include_order] [4]')
</del><ins>+ 'Bad include order. Mixing system and custom headers. [build/include_order] [4]')
</ins><span class="cx">
</span><span class="cx"> self.assert_language_rules_check('foo.h',
</span><span class="cx"> '#include "bar.h"\n'
</span><span class="lines">@@ -2775,7 +2775,7 @@
</span><span class="cx"> '#include <other/foo.h>\n'
</span><span class="cx"> '\n'
</span><span class="cx"> '#include "a.h"\n',
</span><del>- 'Alphabetical sorting problem. [build/include_order] [4]')
</del><ins>+ 'Bad include order. Mixing system and custom headers. [build/include_order] [4]')
</ins><span class="cx">
</span><span class="cx"> # ...except that it starts with public/.
</span><span class="cx"> self.assert_language_rules_check('foo.cpp',
</span><span class="lines">@@ -2791,7 +2791,7 @@
</span><span class="cx"> '#include <public/foop.h>\n'
</span><span class="cx"> '\n'
</span><span class="cx"> '#include "a.h"\n',
</span><del>- 'Alphabetical sorting problem. [build/include_order] [4]')
</del><ins>+ 'Bad include order. Mixing system and custom headers. [build/include_order] [4]')
</ins><span class="cx">
</span><span class="cx"> def test_check_wtf_includes(self):
</span><span class="cx"> self.assert_language_rules_check('foo.cpp',
</span></span></pre>
</div>
</div>
</body>
</html>