<!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>[185065] 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/185065">185065</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-01 11:05:17 -0700 (Mon, 01 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] check-webkit-style provides bogus explanation for alphabetical sorting error
https://bugs.webkit.org/show_bug.cgi?id=144959
Reviewed by Darin Adler.
* Scripts/webkitpy/style/checkers/cmake.py:
(CMakeChecker.check): Use enumerate instead of xrange.
(CMakeChecker._check_list_order): Use enumerate instead of incrementing line_number manually.
* Scripts/webkitpy/style/checkers/cmake_unittest.py:
(CMakeCheckerTest.test_check): Update the expected results.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscmakepy">trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscmake_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185064 => 185065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-01 18:00:05 UTC (rev 185064)
+++ trunk/Tools/ChangeLog 2015-06-01 18:05:17 UTC (rev 185065)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-06-01 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><ins>+ [CMake] check-webkit-style provides bogus explanation for alphabetical sorting error
+ https://bugs.webkit.org/show_bug.cgi?id=144959
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/style/checkers/cmake.py:
+ (CMakeChecker.check): Use enumerate instead of xrange.
+ (CMakeChecker._check_list_order): Use enumerate instead of incrementing line_number manually.
+ * Scripts/webkitpy/style/checkers/cmake_unittest.py:
+ (CMakeCheckerTest.test_check): Update the expected results.
+
+2015-06-01 Csaba Osztrogonác <ossy@webkit.org>
+
</ins><span class="cx"> Fix the webkitpy scm unittests after r174051
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145511
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscmakepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py (185064 => 185065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2015-06-01 18:00:05 UTC (rev 185064)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cmake.py 2015-06-01 18:05:17 UTC (rev 185065)
</span><span class="lines">@@ -90,9 +90,8 @@
</span><span class="cx">
</span><span class="cx"> def check(self, lines):
</span><span class="cx"> self._tab_checker.check(lines)
</span><del>- self._num_lines = len(lines)
- for l in xrange(self._num_lines):
- self._process_line(l + 1, lines[l])
</del><ins>+ for line_number, line in enumerate(lines, start=1):
+ self._process_line(line_number, line)
</ins><span class="cx"> self._check_list_order(lines)
</span><span class="cx">
</span><span class="cx"> def _process_line(self, line_number, line_content):
</span><span class="lines">@@ -151,12 +150,10 @@
</span><span class="cx"> def _check_list_order(self, lines):
</span><span class="cx"> last_line = None
</span><span class="cx">
</span><del>- line_number = 0
- for line in lines:
</del><ins>+ for line_number, line in enumerate(lines, start=1):
</ins><span class="cx"> matched = search('\$\{.*\}', line)
</span><span class="cx"> if matched:
</span><span class="cx"> continue
</span><del>- line_number += 1
</del><span class="cx"> line = line.strip()
</span><span class="cx">
</span><span class="cx"> if last_line == None:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscmake_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py (185064 => 185065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py 2015-06-01 18:00:05 UTC (rev 185064)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cmake_unittest.py 2015-06-01 18:05:17 UTC (rev 185065)
</span><span class="lines">@@ -131,8 +131,8 @@
</span><span class="cx"> (24, 'list/parentheses', 5, 'The parentheses after the last listitem "b" should be in a new line.'),
</span><span class="cx"> (31, 'list/duplicate', 5, 'The item "a" should be added only once to the list.'),
</span><span class="cx"> (35, 'list/order', 5, 'Alphabetical sorting problem. "a" should be before "b".'),
</span><del>- (41, 'list/order', 5, 'Alphabetical sorting problem. "c/c.c" should be before "c/b/a.a".'),
- (49, 'list/emptyline', 5, 'There should be no empty line between "a" and "b".'),
- (54, 'list/emptyline', 5, 'There should be exactly one empty line instead of 0 between "a/b.b" and "b/a.a".'),
- (57, 'list/emptyline', 5, 'There should be exactly one empty line instead of 2 between "b/a.a" and "c/a.a".'),
</del><ins>+ (42, 'list/order', 5, 'Alphabetical sorting problem. "c/c.c" should be before "c/b/a.a".'),
+ (50, 'list/emptyline', 5, 'There should be no empty line between "a" and "b".'),
+ (55, 'list/emptyline', 5, 'There should be exactly one empty line instead of 0 between "a/b.b" and "b/a.a".'),
+ (58, 'list/emptyline', 5, 'There should be exactly one empty line instead of 2 between "b/a.a" and "c/a.a".'),
</ins><span class="cx"> ])
</span></span></pre>
</div>
</div>
</body>
</html>