<!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>[167010] 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/167010">167010</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-09 02:48:26 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stylechecker: False positive on inline asm code.
https://bugs.webkit.org/show_bug.cgi?id=130570
Patch by Gergo Balogh <gbalogh.u-szeged@partner.samsung.com> on 2014-04-09
Reviewed by Csaba Osztrogonác.
Disable stylechecking in asm blocks.
* Scripts/webkitpy/style/checkers/cpp.py:
(process_line):
(_InlineASMState):
(_InlineASMState.__init__):
(_InlineASMState.process_line):
(_InlineASMState.isInside):
(_process_lines):
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
(WebKitStyleTest.test_member_initialization_list):</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 (167009 => 167010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-09 09:39:03 UTC (rev 167009)
+++ trunk/Tools/ChangeLog 2014-04-09 09:48:26 UTC (rev 167010)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-09 Gergo Balogh <gbalogh.u-szeged@partner.samsung.com>
+
+ Stylechecker: False positive on inline asm code.
+ https://bugs.webkit.org/show_bug.cgi?id=130570
+
+ Reviewed by Csaba Osztrogonác.
+
+ Disable stylechecking in asm blocks.
+
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ (process_line):
+ (_InlineASMState):
+ (_InlineASMState.__init__):
+ (_InlineASMState.process_line):
+ (_InlineASMState.isInside):
+ (_process_lines):
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ (WebKitStyleTest.test_member_initialization_list):
+
</ins><span class="cx"> 2014-04-09 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Move WebKit1 unit tests resources used by WebKit2 unit tests to WebKit2 resources dir
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (167009 => 167010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-04-09 09:39:03 UTC (rev 167009)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2014-04-09 09:48:26 UTC (rev 167010)
</span><span class="lines">@@ -3620,7 +3620,7 @@
</span><span class="cx">
</span><span class="cx"> def process_line(filename, file_extension,
</span><span class="cx"> clean_lines, line, include_state, function_state,
</span><del>- class_state, file_state, enum_state, error):
</del><ins>+ class_state, file_state, enum_state, asm_state, error):
</ins><span class="cx"> """Processes a single line in the file.
</span><span class="cx">
</span><span class="cx"> Args:
</span><span class="lines">@@ -3637,6 +3637,7 @@
</span><span class="cx"> the state of things in the file.
</span><span class="cx"> enum_state: A _EnumState instance which maintains an enum declaration
</span><span class="cx"> state.
</span><ins>+ asm_state: The state of inline ASM code.
</ins><span class="cx"> error: A callable to which errors are reported, which takes arguments:
</span><span class="cx"> line number, error level, and message
</span><span class="cx">
</span><span class="lines">@@ -3648,6 +3649,9 @@
</span><span class="cx"> return
</span><span class="cx"> if match(r'\s*\b__asm\b', raw_lines[line]): # Ignore asm lines as they format differently.
</span><span class="cx"> return
</span><ins>+ asm_state.process_line(raw_lines[line])
+ if asm_state.is_in_asm(): # Ignore further checks because asm blocks formatted differently.
+ return
</ins><span class="cx"> check_function_definition(filename, file_extension, clean_lines, line, function_state, error)
</span><span class="cx"> check_pass_ptr_usage(clean_lines, line, function_state, error)
</span><span class="cx"> check_for_leaky_patterns(clean_lines, line, function_state, error)
</span><span class="lines">@@ -3660,6 +3664,21 @@
</span><span class="cx"> check_invalid_increment(clean_lines, line, error)
</span><span class="cx">
</span><span class="cx">
</span><ins>+class _InlineASMState(object):
+ """Stores the state for the inline asm codes."""
+ def __init__(self):
+ self._is_in_asm = False
+
+ def process_line(self, line):
+ if match(r'\s*asm\s+(volatile)?\(', line):
+ self._is_in_asm = True
+ elif search(r'\);$', line) and self._is_in_asm: # Can not do more without a proper parser (or lexer).
+ self._is_in_asm = False
+
+ def is_in_asm(self):
+ return self._is_in_asm
+
+
</ins><span class="cx"> def _process_lines(filename, file_extension, lines, error, min_confidence):
</span><span class="cx"> """Performs lint checks and reports any errors to the given error function.
</span><span class="cx">
</span><span class="lines">@@ -3686,10 +3705,11 @@
</span><span class="cx"> clean_lines = CleansedLines(lines)
</span><span class="cx"> file_state = _FileState(clean_lines, file_extension)
</span><span class="cx"> enum_state = _EnumState()
</span><ins>+ asm_state = _InlineASMState()
</ins><span class="cx"> for line in xrange(clean_lines.num_lines()):
</span><span class="cx"> process_line(filename, file_extension, clean_lines, line,
</span><span class="cx"> include_state, function_state, class_state, file_state,
</span><del>- enum_state, error)
</del><ins>+ enum_state, asm_state, error)
</ins><span class="cx"> class_state.check_finished(error)
</span><span class="cx">
</span><span class="cx"> check_for_include_what_you_use(filename, clean_lines, include_state, error)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (167009 => 167010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2014-04-09 09:39:03 UTC (rev 167009)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2014-04-09 09:48:26 UTC (rev 167010)
</span><span class="lines">@@ -5025,7 +5025,7 @@
</span><span class="cx"> ' [whitespace/indent] [4]',
</span><span class="cx"> 'Missing space after , [whitespace/comma] [3]'])
</span><span class="cx">
</span><del>- fine_example = (
</del><ins>+ self.assert_multi_line_lint((
</ins><span class="cx"> 'MyClass::MyClass(Document* doc)\n'
</span><span class="cx"> ' : MySuperClass()\n'
</span><span class="cx"> '#if !BLA(FOO)\n'
</span><span class="lines">@@ -5033,9 +5033,17 @@
</span><span class="cx"> ' , m_doc(0)\n'
</span><span class="cx"> '#endif\n'
</span><span class="cx"> ' , m_myMember(0)\n'
</span><del>- '{ }')
- self.assert_multi_line_lint(fine_example, '')
</del><ins>+ '{ }'), '')
</ins><span class="cx">
</span><ins>+ self.assert_multi_line_lint((
+ 'asm volatile('
+ ' "lock; cmpxchgl %3, %2"\n'
+ ' "sete %1"\n'
+ ' : "+a"(expected), "=q"(result), "+m"(*location)\n'
+ ' : "r"(newValue)\n'
+ ' : "memory"\n'
+ ');'), '')
+
</ins><span class="cx"> self.assert_multi_line_lint('''\
</span><span class="cx"> MyClass::MyClass(Document* doc)
</span><span class="cx"> :MySuperClass()
</span></span></pre>
</div>
</div>
</body>
</html>