<!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>[178599] trunk/Source/JavaScriptCore</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/178599">178599</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2015-01-16 13:40:23 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: code generator should fail on duplicate parameter and member names
https://bugs.webkit.org/show_bug.cgi?id=140555
Reviewed by Timothy Hatcher.
* inspector/scripts/codegen/models.py:
(find_duplicates): Add a helper function to find duplicates in a list.
(Protocol.parse_type_declaration):
(Protocol.parse_command):
(Protocol.parse_event):
* inspector/scripts/tests/expected/fail-on-duplicate-command-call-parameter-names.json-error: Added.
* inspector/scripts/tests/expected/fail-on-duplicate-command-return-parameter-names.json-error: Added.
* inspector/scripts/tests/expected/fail-on-duplicate-event-parameter-names.json-error: Added.
* inspector/scripts/tests/expected/fail-on-duplicate-type-member-names.json-error: Added.
* inspector/scripts/tests/fail-on-duplicate-command-call-parameter-names.json: Added.
* inspector/scripts/tests/fail-on-duplicate-command-return-parameter-names.json: Added.
* inspector/scripts/tests/fail-on-duplicate-event-parameter-names.json: Added.
* inspector/scripts/tests/fail-on-duplicate-type-member-names.json: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicatecommandcallparameternamesjsonerror">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-call-parameter-names.json-error</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicatecommandreturnparameternamesjsonerror">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-return-parameter-names.json-error</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicateeventparameternamesjsonerror">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-event-parameter-names.json-error</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicatetypemembernamesjsonerror">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-type-member-names.json-error</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicatecommandcallparameternamesjson">trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-call-parameter-names.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicatecommandreturnparameternamesjson">trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-return-parameter-names.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicateeventparameternamesjson">trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-event-parameter-names.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicatetypemembernamesjson">trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-type-member-names.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178598 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-16 21:37:42 UTC (rev 178598)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-16 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: code generator should fail on duplicate parameter and member names
+ https://bugs.webkit.org/show_bug.cgi?id=140555
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/scripts/codegen/models.py:
+ (find_duplicates): Add a helper function to find duplicates in a list.
+ (Protocol.parse_type_declaration):
+ (Protocol.parse_command):
+ (Protocol.parse_event):
+ * inspector/scripts/tests/expected/fail-on-duplicate-command-call-parameter-names.json-error: Added.
+ * inspector/scripts/tests/expected/fail-on-duplicate-command-return-parameter-names.json-error: Added.
+ * inspector/scripts/tests/expected/fail-on-duplicate-event-parameter-names.json-error: Added.
+ * inspector/scripts/tests/expected/fail-on-duplicate-type-member-names.json-error: Added.
+ * inspector/scripts/tests/fail-on-duplicate-command-call-parameter-names.json: Added.
+ * inspector/scripts/tests/fail-on-duplicate-command-return-parameter-names.json: Added.
+ * inspector/scripts/tests/fail-on-duplicate-event-parameter-names.json: Added.
+ * inspector/scripts/tests/fail-on-duplicate-type-member-names.json: Added.
+
</ins><span class="cx"> 2015-01-16 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r174226): Header on huffingtonpost.com is too large
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (178598 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2015-01-16 21:37:42 UTC (rev 178598)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> # THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> import logging
</span><ins>+import collections
</ins><span class="cx">
</span><span class="cx"> log = logging.getLogger('global')
</span><span class="cx">
</span><span class="lines">@@ -33,6 +34,10 @@
</span><span class="cx"> return str[:1].upper() + str[1:]
</span><span class="cx">
</span><span class="cx">
</span><ins>+def find_duplicates(l):
+ return [key for key, count in collections.Counter(l).items() if count > 1]
+
+
</ins><span class="cx"> _FRAMEWORK_CONFIG_MAP = {
</span><span class="cx"> "Global": {
</span><span class="cx"> },
</span><span class="lines">@@ -326,6 +331,10 @@
</span><span class="cx"> raise ParseException("Malformed type specification: properties is not an array")
</span><span class="cx"> type_members.extend([self.parse_type_member(member) for member in json['properties']])
</span><span class="cx">
</span><ins>+ duplicate_names = find_duplicates([member.member_name for member in type_members])
+ if len(duplicate_names) > 0:
+ raise ParseException("Malformed domain specification: type declaration for %s has duplicate member names" % json['id'])
+
</ins><span class="cx"> type_ref = TypeReference(json['type'], json.get('$ref'), json.get('enum'), json.get('items'))
</span><span class="cx"> return TypeDeclaration(json['id'], type_ref, json.get("description", ""), type_members)
</span><span class="cx">
</span><span class="lines">@@ -348,11 +357,19 @@
</span><span class="cx"> raise ParseException("Malformed command specification: parameters is not an array")
</span><span class="cx"> call_parameters.extend([self.parse_call_or_return_parameter(parameter) for parameter in json['parameters']])
</span><span class="cx">
</span><ins>+ duplicate_names = find_duplicates([param.parameter_name for param in call_parameters])
+ if len(duplicate_names) > 0:
+ raise ParseException("Malformed domain specification: call parameter list for command %s has duplicate parameter names" % json['name'])
+
</ins><span class="cx"> if 'returns' in json:
</span><span class="cx"> if not isinstance(json['returns'], list):
</span><span class="cx"> raise ParseException("Malformed command specification: returns is not an array")
</span><span class="cx"> return_parameters.extend([self.parse_call_or_return_parameter(parameter) for parameter in json['returns']])
</span><span class="cx">
</span><ins>+ duplicate_names = find_duplicates([param.parameter_name for param in return_parameters])
+ if len(duplicate_names) > 0:
+ raise ParseException("Malformed domain specification: return parameter list for command %s has duplicate parameter names" % json['name'])
+
</ins><span class="cx"> return Command(json['name'], call_parameters, return_parameters, json.get('description', ""), json.get('async', False))
</span><span class="cx">
</span><span class="cx"> def parse_event(self, json):
</span><span class="lines">@@ -366,6 +383,10 @@
</span><span class="cx"> raise ParseException("Malformed event specification: parameters is not an array")
</span><span class="cx"> event_parameters.extend([self.parse_call_or_return_parameter(parameter) for parameter in json['parameters']])
</span><span class="cx">
</span><ins>+ duplicate_names = find_duplicates([param.parameter_name for param in event_parameters])
+ if len(duplicate_names) > 0:
+ raise ParseException("Malformed domain specification: parameter list for event %s has duplicate parameter names" % json['name'])
+
</ins><span class="cx"> return Event(json['name'], event_parameters, json.get('description', ""))
</span><span class="cx">
</span><span class="cx"> def parse_call_or_return_parameter(self, json):
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicatecommandcallparameternamesjsonerror"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-call-parameter-names.json-error (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-call-parameter-names.json-error (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-call-parameter-names.json-error 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+ERROR: Malformed domain specification: call parameter list for command processPoints has duplicate parameter names
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicatecommandreturnparameternamesjsonerror"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-return-parameter-names.json-error (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-return-parameter-names.json-error (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-command-return-parameter-names.json-error 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+ERROR: Malformed domain specification: return parameter list for command processPoints has duplicate parameter names
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicateeventparameternamesjsonerror"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-event-parameter-names.json-error (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-event-parameter-names.json-error (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-event-parameter-names.json-error 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+ERROR: Malformed domain specification: parameter list for event processedPoints has duplicate parameter names
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedfailonduplicatetypemembernamesjsonerror"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-type-member-names.json-error (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-type-member-names.json-error (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-duplicate-type-member-names.json-error 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+ERROR: Malformed domain specification: type declaration for Point has duplicate member names
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicatecommandcallparameternamesjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-call-parameter-names.json (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-call-parameter-names.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-call-parameter-names.json 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+{
+ "domain": "Overlay",
+ "commands": [
+ {
+ "name": "processPoints",
+ "parameters": [
+ { "name": "point", "type": "number" },
+ { "name": "point", "type": "number" }
+ ],
+ "returns": [
+ { "name": "result1", "type": "string" },
+ { "name": "result2", "type": "string" }
+ ]
+ }
+ ]
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicatecommandreturnparameternamesjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-return-parameter-names.json (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-return-parameter-names.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-command-return-parameter-names.json 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+{
+ "domain": "Overlay",
+ "commands": [
+ {
+ "name": "processPoints",
+ "parameters": [
+ { "name": "point1", "type": "number" },
+ { "name": "point2", "type": "number" }
+ ],
+ "returns": [
+ { "name": "result", "type": "string" },
+ { "name": "result", "type": "string" }
+ ]
+ }
+ ]
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicateeventparameternamesjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-event-parameter-names.json (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-event-parameter-names.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-event-parameter-names.json 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+{
+ "domain": "Overlay",
+ "events": [
+ {
+ "name": "processedPoints",
+ "parameters": [
+ { "name": "point", "type": "number" },
+ { "name": "point", "type": "number" }
+ ]
+ }
+ ]
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsfailonduplicatetypemembernamesjson"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-type-member-names.json (0 => 178599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-type-member-names.json (rev 0)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/fail-on-duplicate-type-member-names.json 2015-01-16 21:40:23 UTC (rev 178599)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+[
+{
+ "domain": "OverlayTypes",
+ "types": [
+ {
+ "id": "Point",
+ "type": "object",
+ "properties": [
+ { "name": "x", "type": "integer" },
+ { "name": "x", "type": "integer" }
+ ]
+ }
+ ]
+}
+]
</ins></span></pre>
</div>
</div>
</body>
</html>