<!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>[200429] trunk</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/200429">200429</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-04 14:05:16 -0700 (Wed, 04 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the grammar of some error messages 'a argument list' => 'an argument list'
https://bugs.webkit.org/show_bug.cgi?id=157350
<rdar://problem/26082108>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-04
Reviewed by Mark Lam.
LayoutTests/imported/w3c:
* web-platform-tests/html/dom/interfaces-expected.txt:
Source/JavaScriptCore:
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseIfStatement):
(JSC::Parser<LexerType>::parseImportDeclaration):
(JSC::Parser<LexerType>::parseExportDeclaration):
(JSC::Parser<LexerType>::parseObjectLiteral):
(JSC::Parser<LexerType>::parseStrictObjectLiteral):
(JSC::Parser<LexerType>::parseArguments):
Use the alternate error message formatter macro which outputs 'an'
instead of 'a' preceding the last argument.
LayoutTests:
* fast/css/css-selector-text-expected.txt:
* inspector/runtime/parse-expected.txt:
* js/object-literal-computed-methods-expected.txt:
* js/object-literal-methods-expected.txt:
* sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.2_Keywords/S7.5.2_A1.12-expected.txt:
* sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T1-expected.txt:
* sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T2-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcsscssselectortextexpectedtxt">trunk/LayoutTests/fast/css/css-selector-text-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorruntimeparseexpectedtxt">trunk/LayoutTests/inspector/runtime/parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsobjectliteralcomputedmethodsexpectedtxt">trunk/LayoutTests/js/object-literal-computed-methods-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsobjectliteralmethodsexpectedtxt">trunk/LayoutTests/js/object-literal-methods-expected.txt</a></li>
<li><a href="#trunkLayoutTestssputnikConformance07_Lexical_Conventions75_Tokens752_KeywordsS752_A112expectedtxt">trunk/LayoutTests/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.2_Keywords/S7.5.2_A1.12-expected.txt</a></li>
<li><a href="#trunkLayoutTestssputnikConformance12_Statement125_The_if_StatementS125_A6_T1expectedtxt">trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T1-expected.txt</a></li>
<li><a href="#trunkLayoutTestssputnikConformance12_Statement125_The_if_StatementS125_A6_T2expectedtxt">trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T2-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/ChangeLog 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Improve the grammar of some error messages 'a argument list' => 'an argument list'
+ https://bugs.webkit.org/show_bug.cgi?id=157350
+ <rdar://problem/26082108>
+
+ Reviewed by Mark Lam.
+
+ * fast/css/css-selector-text-expected.txt:
+ * inspector/runtime/parse-expected.txt:
+ * js/object-literal-computed-methods-expected.txt:
+ * js/object-literal-methods-expected.txt:
+ * sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.2_Keywords/S7.5.2_A1.12-expected.txt:
+ * sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T1-expected.txt:
+ * sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T2-expected.txt:
+
</ins><span class="cx"> 2016-05-04 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Corrections to r200422
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsscssselectortextexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/css-selector-text-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/css-selector-text-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/fast/css/css-selector-text-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> PASS parseThenSerializeRule(':lang(*--) { }') threw exception TypeError: undefined is not an object (evaluating 'styleElement.sheet.cssRules[0].cssText').
</span><span class="cx"> PASS parseThenSerializeRule(':lang(*---) { }') threw exception TypeError: undefined is not an object (evaluating 'styleElement.sheet.cssRules[0].cssText').
</span><span class="cx"> PASS parseThenSerializeRule(':lang(*----) { }') threw exception TypeError: undefined is not an object (evaluating 'styleElement.sheet.cssRules[0].cssText').
</span><del>-PASS parseThenSerializeRule(':lang(*)' { }) threw exception SyntaxError: Unexpected token '{'. Expected ')' to end a argument list..
</del><ins>+PASS parseThenSerializeRule(':lang(*)' { }) threw exception SyntaxError: Unexpected token '{'. Expected ')' to end an argument list..
</ins><span class="cx"> PASS parseThenSerializeRule(':lang(**) { }') threw exception TypeError: undefined is not an object (evaluating 'styleElement.sheet.cssRules[0].cssText').
</span><span class="cx"> PASS parseThenSerializeRule(':lang(-*-) { }') threw exception TypeError: undefined is not an object (evaluating 'styleElement.sheet.cssRules[0].cssText').
</span><span class="cx"> PASS parseThenSerializeRule(':lang(*-*) { }') threw exception TypeError: undefined is not an object (evaluating 'styleElement.sheet.cssRules[0].cssText').
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Improve the grammar of some error messages 'a argument list' => 'an argument list'
+ https://bugs.webkit.org/show_bug.cgi?id=157350
+ <rdar://problem/26082108>
+
+ Reviewed by Mark Lam.
+
+ * web-platform-tests/html/dom/interfaces-expected.txt:
+
</ins><span class="cx"> 2016-05-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Sync web-platform-tests up to revision 4af8373
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmldominterfacesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/interfaces-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -2722,27 +2722,27 @@
</span><span class="cx"> PASS TrackEvent interface: existence and properties of interface prototype object
</span><span class="cx"> PASS TrackEvent interface: existence and properties of interface prototype object's "constructor" property
</span><span class="cx"> PASS TrackEvent interface: attribute track
</span><del>-FAIL TrackEvent must be primary interface of new TrackEvent("addtrack"; {track:document.createElement("track").track}) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Stringification of new TrackEvent("addtrack"; {track:document.createElement("track").track}) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL TrackEvent interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "track" with the proper type (0) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "type" with the proper type (0) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "target" with the proper type (1) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "currentTarget" with the proper type (2) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "NONE" with the proper type (3) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "CAPTURING_PHASE" with the proper type (4) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "AT_TARGET" with the proper type (5) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "BUBBLING_PHASE" with the proper type (6) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "eventPhase" with the proper type (7) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "stopPropagation" with the proper type (8) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "stopImmediatePropagation" with the proper type (9) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "bubbles" with the proper type (10) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "cancelable" with the proper type (11) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "preventDefault" with the proper type (12) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "defaultPrevented" with the proper type (13) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must have own property "isTrusted" assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "timeStamp" with the proper type (15) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "initEvent" with the proper type (16) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
-FAIL Event interface: calling initEvent(DOMString,boolean,boolean) on new TrackEvent("addtrack"; {track:document.createElement("track").track}) with too few arguments must throw TypeError assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end a ..."
</del><ins>+FAIL TrackEvent must be primary interface of new TrackEvent("addtrack"; {track:document.createElement("track").track}) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Stringification of new TrackEvent("addtrack"; {track:document.createElement("track").track}) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL TrackEvent interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "track" with the proper type (0) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "type" with the proper type (0) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "target" with the proper type (1) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "currentTarget" with the proper type (2) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "NONE" with the proper type (3) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "CAPTURING_PHASE" with the proper type (4) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "AT_TARGET" with the proper type (5) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "BUBBLING_PHASE" with the proper type (6) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "eventPhase" with the proper type (7) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "stopPropagation" with the proper type (8) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "stopImmediatePropagation" with the proper type (9) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "bubbles" with the proper type (10) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "cancelable" with the proper type (11) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "preventDefault" with the proper type (12) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "defaultPrevented" with the proper type (13) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must have own property "isTrusted" assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "timeStamp" with the proper type (15) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: new TrackEvent("addtrack"; {track:document.createElement("track").track}) must inherit property "initEvent" with the proper type (16) assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
+FAIL Event interface: calling initEvent(DOMString,boolean,boolean) on new TrackEvent("addtrack"; {track:document.createElement("track").track}) with too few arguments must throw TypeError assert_equals: Unexpected exception when evaluating object expected null but got object "SyntaxError: Unexpected token ';'. Expected ')' to end an..."
</ins><span class="cx"> PASS HTMLMapElement interface: existence and properties of interface object
</span><span class="cx"> PASS HTMLMapElement interface object length
</span><span class="cx"> PASS HTMLMapElement interface object name
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorruntimeparseexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/runtime/parse-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/runtime/parse-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/inspector/runtime/parse-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> PASS: Should be SyntaxErrorType Irrecoverable.
</span><span class="cx"> Source: if x(1)
</span><span class="cx"> ^
</span><del>-Error Message: Unexpected identifier 'x'. Expected '(' to start a 'if' condition.
</del><ins>+Error Message: Unexpected identifier 'x'. Expected '(' to start an 'if' condition.
</ins><span class="cx"> Error Range: {"startOffset":3,"endOffset":4}
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsobjectliteralcomputedmethodsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/object-literal-computed-methods-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/object-literal-computed-methods-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/js/object-literal-computed-methods-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> PASS ({ [foo](,,,){} }) threw exception SyntaxError: Unexpected token ','. Expected a parameter pattern or a ')' in parameter list..
</span><span class="cx"> PASS ({ [foo](a{}, bar(){} }) threw exception SyntaxError: Unexpected token '{'. Expected a ')' or a ',' after a parameter declaration..
</span><span class="cx"> PASS ({ [foo](a, b), bar(){} }) threw exception SyntaxError: Unexpected token ','. Expected an opening '{' at the start of a method body..
</span><del>-PASS ({ [foo](a, b) { if }, bar(){} }) threw exception SyntaxError: Unexpected token '}'. Expected '(' to start a 'if' condition..
</del><ins>+PASS ({ [foo](a, b) { if }, bar(){} }) threw exception SyntaxError: Unexpected token '}'. Expected '(' to start an 'if' condition..
</ins><span class="cx"> PASS ({__proto__: function(){}}) instanceof Function is true
</span><span class="cx"> PASS ({['__proto__'](){}}) instanceof Function is false
</span><span class="cx"> PASS ({['__proto__'](){}}).__proto__ instanceof Function is true
</span></span></pre></div>
<a id="trunkLayoutTestsjsobjectliteralmethodsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/object-literal-methods-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/object-literal-methods-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/js/object-literal-methods-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> PASS ({ foo(,,,){} }) threw exception SyntaxError: Unexpected token ','. Expected a parameter pattern or a ')' in parameter list..
</span><span class="cx"> PASS ({ foo(a{}, bar(){} }) threw exception SyntaxError: Unexpected token '{'. Expected a ')' or a ',' after a parameter declaration..
</span><span class="cx"> PASS ({ foo(a, b), bar(){} }) threw exception SyntaxError: Unexpected token ','. Expected an opening '{' at the start of a method body..
</span><del>-PASS ({ foo(a, b) { if }, bar(){} }) threw exception SyntaxError: Unexpected token '}'. Expected '(' to start a 'if' condition..
</del><ins>+PASS ({ foo(a, b) { if }, bar(){} }) threw exception SyntaxError: Unexpected token '}'. Expected '(' to start an 'if' condition..
</ins><span class="cx"> PASS ({__proto__: function(){}}) instanceof Function is true
</span><span class="cx"> PASS ({__proto__(){}}) instanceof Function is false
</span><span class="cx"> PASS ({__proto__(){}}).__proto__ instanceof Function is true
</span></span></pre></div>
<a id="trunkLayoutTestssputnikConformance07_Lexical_Conventions75_Tokens752_KeywordsS752_A112expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.2_Keywords/S7.5.2_A1.12-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.2_Keywords/S7.5.2_A1.12-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.2_Keywords/S7.5.2_A1.12-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-CONSOLE MESSAGE: line 76: SyntaxError: Unexpected token '='. Expected '(' to start a 'if' condition.
</del><ins>+CONSOLE MESSAGE: line 76: SyntaxError: Unexpected token '='. Expected '(' to start an 'if' condition.
</ins><span class="cx"> S7.5.2_A1.12
</span><span class="cx">
</span><span class="cx"> PASS Expected parsing failure
</span></span></pre></div>
<a id="trunkLayoutTestssputnikConformance12_Statement125_The_if_StatementS125_A6_T1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T1-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T1-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T1-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-CONSOLE MESSAGE: line 78: SyntaxError: Unexpected keyword 'true'. Expected '(' to start a 'if' condition.
</del><ins>+CONSOLE MESSAGE: line 78: SyntaxError: Unexpected keyword 'true'. Expected '(' to start an 'if' condition.
</ins><span class="cx"> S12.5_A6_T1
</span><span class="cx">
</span><span class="cx"> PASS Expected parsing failure
</span></span></pre></div>
<a id="trunkLayoutTestssputnikConformance12_Statement125_The_if_StatementS125_A6_T2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T2-expected.txt (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T2-expected.txt 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/LayoutTests/sputnik/Conformance/12_Statement/12.5_The_if_Statement/S12.5_A6_T2-expected.txt 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-CONSOLE MESSAGE: line 78: SyntaxError: Unexpected keyword 'false'. Expected '(' to start a 'if' condition.
</del><ins>+CONSOLE MESSAGE: line 78: SyntaxError: Unexpected keyword 'false'. Expected '(' to start an 'if' condition.
</ins><span class="cx"> S12.5_A6_T2
</span><span class="cx">
</span><span class="cx"> PASS Expected parsing failure
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-04 Joseph Pecoraro <pecoraro@apple.com>
+
+ Improve the grammar of some error messages 'a argument list' => 'an argument list'
+ https://bugs.webkit.org/show_bug.cgi?id=157350
+ <rdar://problem/26082108>
+
+ Reviewed by Mark Lam.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseIfStatement):
+ (JSC::Parser<LexerType>::parseImportDeclaration):
+ (JSC::Parser<LexerType>::parseExportDeclaration):
+ (JSC::Parser<LexerType>::parseObjectLiteral):
+ (JSC::Parser<LexerType>::parseStrictObjectLiteral):
+ (JSC::Parser<LexerType>::parseArguments):
+ Use the alternate error message formatter macro which outputs 'an'
+ instead of 'a' preceding the last argument.
+
</ins><span class="cx"> 2016-05-04 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Corrections to r200422
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (200428 => 200429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-05-04 20:49:26 UTC (rev 200428)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-05-04 21:05:16 UTC (rev 200429)
</span><span class="lines">@@ -69,6 +69,10 @@
</span><span class="cx"> consumeOrFail(token, "Expected '", tokenString, "' to ", operation, " a ", production);\
</span><span class="cx"> } while (0)
</span><span class="cx">
</span><ins>+#define handleProductionOrFail2(token, tokenString, operation, production) do {\
+ consumeOrFail(token, "Expected '", tokenString, "' to ", operation, " an ", production);\
+} while (0)
+
</ins><span class="cx"> #define semanticFailureDueToKeyword(...) do { \
</span><span class="cx"> if (strictMode() && m_token.m_type == RESERVED_IF_STRICT) \
</span><span class="cx"> semanticFail("Cannot use the reserved word '", getToken(), "' as a ", __VA_ARGS__, " in strict mode"); \
</span><span class="lines">@@ -2528,12 +2532,12 @@
</span><span class="cx"> JSTokenLocation ifLocation(tokenLocation());
</span><span class="cx"> int start = tokenLine();
</span><span class="cx"> next();
</span><del>- handleProductionOrFail(OPENPAREN, "(", "start", "'if' condition");
</del><ins>+ handleProductionOrFail2(OPENPAREN, "(", "start", "'if' condition");
</ins><span class="cx">
</span><span class="cx"> TreeExpression condition = parseExpression(context);
</span><span class="cx"> failIfFalse(condition, "Expected a expression as the condition for an if statement");
</span><span class="cx"> int end = tokenLine();
</span><del>- handleProductionOrFail(CLOSEPAREN, ")", "end", "'if' condition");
</del><ins>+ handleProductionOrFail2(CLOSEPAREN, ")", "end", "'if' condition");
</ins><span class="cx">
</span><span class="cx"> const Identifier* unused = 0;
</span><span class="cx"> m_immediateParentAllowsFunctionDeclarationInStatement = true;
</span><span class="lines">@@ -2563,12 +2567,12 @@
</span><span class="cx"> int innerStart = tokenLine();
</span><span class="cx"> next();
</span><span class="cx">
</span><del>- handleProductionOrFail(OPENPAREN, "(", "start", "'if' condition");
</del><ins>+ handleProductionOrFail2(OPENPAREN, "(", "start", "'if' condition");
</ins><span class="cx">
</span><span class="cx"> TreeExpression innerCondition = parseExpression(context);
</span><span class="cx"> failIfFalse(innerCondition, "Expected a expression as the condition for an if statement");
</span><span class="cx"> int innerEnd = tokenLine();
</span><del>- handleProductionOrFail(CLOSEPAREN, ")", "end", "'if' condition");
</del><ins>+ handleProductionOrFail2(CLOSEPAREN, ")", "end", "'if' condition");
</ins><span class="cx"> const Identifier* unused = 0;
</span><span class="cx"> m_immediateParentAllowsFunctionDeclarationInStatement = true;
</span><span class="cx"> TreeStatement innerTrueBlock = parseStatement(context, unused);
</span><span class="lines">@@ -2754,7 +2758,7 @@
</span><span class="cx"> if (!consume(COMMA))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- handleProductionOrFail(CLOSEBRACE, "}", "end", "import list");
</del><ins>+ handleProductionOrFail2(CLOSEBRACE, "}", "end", "import list");
</ins><span class="cx"> } else
</span><span class="cx"> failWithMessage("Expected namespace import or import list");
</span><span class="cx"> }
</span><span class="lines">@@ -2916,7 +2920,7 @@
</span><span class="cx"> if (!consume(COMMA))
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- handleProductionOrFail(CLOSEBRACE, "}", "end", "export list");
</del><ins>+ handleProductionOrFail2(CLOSEBRACE, "}", "end", "export list");
</ins><span class="cx">
</span><span class="cx"> typename TreeBuilder::ModuleName moduleName = 0;
</span><span class="cx"> if (matchContextualKeyword(m_vm->propertyNames->from)) {
</span><span class="lines">@@ -3498,7 +3502,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> location = tokenLocation();
</span><del>- handleProductionOrFail(CLOSEBRACE, "}", "end", "object literal");
</del><ins>+ handleProductionOrFail2(CLOSEBRACE, "}", "end", "object literal");
</ins><span class="cx">
</span><span class="cx"> m_parserState.nonLHSCount = oldNonLHSCount;
</span><span class="cx">
</span><span class="lines">@@ -3544,7 +3548,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> location = tokenLocation();
</span><del>- handleProductionOrFail(CLOSEBRACE, "}", "end", "object literal");
</del><ins>+ handleProductionOrFail2(CLOSEBRACE, "}", "end", "object literal");
</ins><span class="cx">
</span><span class="cx"> m_parserState.nonLHSCount = oldNonLHSCount;
</span><span class="cx">
</span><span class="lines">@@ -3850,7 +3854,7 @@
</span><span class="cx"> tail = context.createArgumentsList(argumentLocation, tail, arg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- handleProductionOrFail(CLOSEPAREN, ")", "end", "argument list");
</del><ins>+ handleProductionOrFail2(CLOSEPAREN, ")", "end", "argument list");
</ins><span class="cx"> if (hasSpread) {
</span><span class="cx"> TreeExpression spreadArray = context.createSpreadExpression(location, context.createArray(location, context.createElementList(argList)), argumentsStart, argumentsDivot, m_lastTokenEndPosition);
</span><span class="cx"> return context.createArguments(context.createArgumentsList(location, spreadArray));
</span></span></pre>
</div>
</div>
</body>
</html>