<!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>[192274] 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/192274">192274</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-11-10 15:03:19 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[check-webkit-style] False positive (readability/enum_casing) on CF-styled enum members
<http://webkit.org/b/104417>
Reviewed by Brent Fulgham.
* Scripts/webkitpy/style/checkers/cpp.py:
(_EnumState.process_clean_line): Allow 'k' to start enums.
(check_enum_casing): Update error message to discuss 'k'.
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(NoNonVirtualDestructorsTest.test_enum_casing): Update error
messages, and add new tests for enums that start with lowercase
letters.</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 (192273 => 192274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-10 22:50:55 UTC (rev 192273)
+++ trunk/Tools/ChangeLog 2015-11-10 23:03:19 UTC (rev 192274)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-11-10 David Kilzer <ddkilzer@apple.com>
+
+ [check-webkit-style] False positive (readability/enum_casing) on CF-styled enum members
+ <http://webkit.org/b/104417>
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (_EnumState.process_clean_line): Allow 'k' to start enums.
+ (check_enum_casing): Update error message to discuss 'k'.
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (NoNonVirtualDestructorsTest.test_enum_casing): Update error
+ messages, and add new tests for enums that start with lowercase
+ letters.
+
</ins><span class="cx"> 2015-11-10 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> run-jsc-benchmarks doesn't work with internal benchmarks
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (192273 => 192274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-11-10 22:50:55 UTC (rev 192273)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2015-11-10 23:03:19 UTC (rev 192274)
</span><span class="lines">@@ -1240,7 +1240,7 @@
</span><span class="cx"> # and identifiers for the value of the enumerator, but do not accept any other constant
</span><span class="cx"> # expressions. However, this is sufficient for now (11/27/2012).
</span><span class="cx"> expr_all_uppercase = r'\s*[A-Z0-9_]+\s*(?:=\s*[a-zA-Z0-9]+\s*)?,?\s*$'
</span><del>- expr_starts_lowercase = r'\s*[a-z]'
</del><ins>+ expr_starts_lowercase = r'\s*[a-jl-z]'
</ins><span class="cx"> expr_enum_end = r'}\s*(?:[a-zA-Z0-9]+\s*(?:=\s*[a-zA-Z0-9]+)?)?\s*;\s*'
</span><span class="cx"> expr_enum_start = r'\s*(?:enum(?:\s+class)?(?:\s+[a-zA-Z0-9]+)?)\s*\{?\s*'
</span><span class="cx"> if self.in_enum_decl:
</span><span class="lines">@@ -2131,7 +2131,7 @@
</span><span class="cx"> line = clean_lines.elided[line_number] # Get rid of comments and strings.
</span><span class="cx"> if not enum_state.process_clean_line(line):
</span><span class="cx"> error(line_number, 'readability/enum_casing', 4,
</span><del>- 'enum members should use InterCaps with an initial capital letter.')
</del><ins>+ 'enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums.')
</ins><span class="cx">
</span><span class="cx"> def check_directive_indentation(clean_lines, line_number, file_state, error):
</span><span class="cx"> """Looks for indentation of preprocessor directives.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (192273 => 192274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-11-10 22:50:55 UTC (rev 192273)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2015-11-10 23:03:19 UTC (rev 192274)
</span><span class="lines">@@ -3446,7 +3446,7 @@
</span><span class="cx"> enum {
</span><span class="cx"> FOO_ONE
</span><span class="cx"> };''',
</span><del>- ['enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4]'] * 5)
</del><ins>+ ['enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums. [readability/enum_casing] [4]'] * 5)
</ins><span class="cx">
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><span class="lines">@@ -3454,7 +3454,7 @@
</span><span class="cx"> fooOne = 1,
</span><span class="cx"> FooTwo = 2
</span><span class="cx"> };''',
</span><del>- 'enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4]')
</del><ins>+ 'enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums. [readability/enum_casing] [4]')
</ins><span class="cx">
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><span class="lines">@@ -3482,7 +3482,7 @@
</span><span class="cx"> enum class Foo {
</span><span class="cx"> FOO_ONE
</span><span class="cx"> };''',
</span><del>- ['enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4]'] * 5)
</del><ins>+ ['enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums. [readability/enum_casing] [4]'] * 5)
</ins><span class="cx">
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><span class="lines">@@ -3490,7 +3490,7 @@
</span><span class="cx"> fooOne = 1,
</span><span class="cx"> FooTwo = 2
</span><span class="cx"> };''',
</span><del>- 'enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4]')
</del><ins>+ 'enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums. [readability/enum_casing] [4]')
</ins><span class="cx">
</span><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><span class="lines">@@ -3504,8 +3504,32 @@
</span><span class="cx"> };''',
</span><span class="cx"> '')
</span><span class="cx">
</span><ins>+ self.assert_lint(
+ '''enum { aOne = 1, zTwo = 2 };''',
+ 'enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums. [readability/enum_casing] [4]')
+
</ins><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><ins>+ enum {
+ aOne = 1,
+ zTwo = 2
+ };''',
+ ['enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums. [readability/enum_casing] [4]'] * 2)
+
+ self.assert_lint(
+ '''enum { kOne = 1, kTwo = 2 };''',
+ '')
+
+ self.assert_multi_line_lint(
+ '''\
+ enum {
+ kOne = 1,
+ kTwo = 2
+ };''',
+ '')
+
+ self.assert_multi_line_lint(
+ '''\
</ins><span class="cx"> // WebIDL enum
</span><span class="cx"> enum Foo {
</span><span class="cx"> FOO_ONE = 1,
</span></span></pre>
</div>
</div>
</body>
</html>