<!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>[200059] 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/200059">200059</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-25 16:41:51 -0700 (Mon, 25 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Tools] whitelist all-uppercase JSTokenType enum in JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=156976
Patch by Caitlin Potter <caitp@igalia.com> on 2016-04-25
Reviewed by Darin Adler.
Mitigate style-checker spam on bugs which introduce new JavaScript
token types.
* Scripts/webkitpy/style/checkers/cpp.py:
(_EnumState.__init__):
(_EnumState.process_clean_line):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(NoNonVirtualDestructorsTest.test_enum_casing):</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 (200058 => 200059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-25 23:39:01 UTC (rev 200058)
+++ trunk/Tools/ChangeLog 2016-04-25 23:41:51 UTC (rev 200059)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-25 Caitlin Potter <caitp@igalia.com>
+
+ [Tools] whitelist all-uppercase JSTokenType enum in JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=156976
+
+ Reviewed by Darin Adler.
+
+ Mitigate style-checker spam on bugs which introduce new JavaScript
+ token types.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (_EnumState.__init__):
+ (_EnumState.process_clean_line):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (NoNonVirtualDestructorsTest.test_enum_casing):
+
</ins><span class="cx"> 2016-04-25 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix issues with content-animation performance tests
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (200058 => 200059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2016-04-25 23:39:01 UTC (rev 200058)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2016-04-25 23:41:51 UTC (rev 200059)
</span><span class="lines">@@ -1240,6 +1240,7 @@
</span><span class="cx"> def __init__(self):
</span><span class="cx"> self.in_enum_decl = False
</span><span class="cx"> self.is_webidl_enum = False
</span><ins>+ self.enum_decl_name = None
</ins><span class="cx">
</span><span class="cx"> def process_clean_line(self, line):
</span><span class="cx"> # FIXME: The regular expressions for expr_all_uppercase and expr_enum_end only accept integers
</span><span class="lines">@@ -1248,27 +1249,29 @@
</span><span class="cx"> expr_all_uppercase = r'\s*[A-Z0-9_]+\s*(?:=\s*[a-zA-Z0-9]+\s*)?,?\s*$'
</span><span class="cx"> expr_starts_lowercase = r'\s*[a-jl-z]'
</span><span class="cx"> expr_enum_end = r'}\s*(?:[a-zA-Z0-9]+\s*(?:=\s*[a-zA-Z0-9]+)?)?\s*;\s*'
</span><del>- expr_enum_start = r'\s*(?:enum(?:\s+class)?(?:\s+[a-zA-Z0-9]+)?)\s*\{?\s*'
</del><ins>+ expr_enum_start = r'\s*(?:enum(?:\s+class)?(?:\s+(?P<identifier>[a-zA-Z0-9]+))?)\s*\{?\s*'
</ins><span class="cx"> if self.in_enum_decl:
</span><span class="cx"> if match(r'\s*' + expr_enum_end + r'$', line):
</span><span class="cx"> self.in_enum_decl = False
</span><span class="cx"> self.is_webidl_enum = False
</span><span class="cx"> return True
</span><span class="cx"> elif match(expr_all_uppercase, line):
</span><del>- return self.is_webidl_enum
</del><ins>+ return self.is_webidl_enum or self.enum_decl_name in _ALLOW_ALL_UPPERCASE_ENUM
</ins><span class="cx"> elif match(expr_starts_lowercase, line):
</span><span class="cx"> return False
</span><span class="cx"> matched = match(expr_enum_start + r'$', line)
</span><span class="cx"> if matched:
</span><span class="cx"> self.in_enum_decl = True
</span><ins>+ self.enum_decl_name = matched.group('identifier')
</ins><span class="cx"> else:
</span><span class="cx"> matched = match(expr_enum_start + r'(?P<members>.*)' + expr_enum_end + r'$', line)
</span><span class="cx"> if matched:
</span><span class="cx"> members = matched.group('members').split(',')
</span><ins>+ allow_all_uppercase = matched.group('identifier') in _ALLOW_ALL_UPPERCASE_ENUM
</ins><span class="cx"> found_invalid_member = False
</span><span class="cx"> for member in members:
</span><span class="cx"> if match(expr_all_uppercase, member):
</span><del>- found_invalid_member = not self.is_webidl_enum
</del><ins>+ found_invalid_member = not self.is_webidl_enum and not allow_all_uppercase
</ins><span class="cx"> if match(expr_starts_lowercase, member):
</span><span class="cx"> found_invalid_member = True
</span><span class="cx"> if found_invalid_member:
</span><span class="lines">@@ -2139,6 +2142,9 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx">
</span><ins>+# Enum declaration whitelist
+_ALLOW_ALL_UPPERCASE_ENUM = ['JSTokenType']
+
</ins><span class="cx"> def check_enum_casing(clean_lines, line_number, enum_state, error):
</span><span class="cx"> """Looks for incorrectly named enum values.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (200058 => 200059)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2016-04-25 23:39:01 UTC (rev 200058)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2016-04-25 23:41:51 UTC (rev 200059)
</span><span class="lines">@@ -3585,8 +3585,24 @@
</span><span class="cx"> };''',
</span><span class="cx"> ['enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums. [readability/enum_casing] [4]'] * 5)
</span><span class="cx">
</span><ins>+ # Allow all-caps enum for JSTokenType
</ins><span class="cx"> self.assert_multi_line_lint(
</span><span class="cx"> '''\
</span><ins>+ enum JSTokenType {
+ NULLTOKEN = KeywordTokenFlag,
+ TRUETOKEN,
+ FALSETOKEN,
+ // ...
+ };''',
+ '')
+
+ self.assert_multi_line_lint(
+ '''\
+ enum JSTokenType { NULLTOKEN = KeywordTokenFlag, TRUETOKEN, FALSETOKEN };''',
+ '')
+
+ self.assert_multi_line_lint(
+ '''\
</ins><span class="cx"> enum Foo {
</span><span class="cx"> fooOne = 1,
</span><span class="cx"> FooTwo = 2
</span></span></pre>
</div>
</div>
</body>
</html>