<!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>[181831] 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/181831">181831</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-21 21:08:23 -0700 (Sat, 21 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix a typo in Parser error message
https://bugs.webkit.org/show_bug.cgi?id=142942
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-03-21
Reviewed by Alexey Proskuryakov.
Source/JavaScriptCore:
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitSlow_op_resolve_scope):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::emitSlow_op_resolve_scope):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseClass):
Fix a common identifier typo.
LayoutTests:
* js/class-syntax-declaration-expected.txt:
* js/class-syntax-expression-expected.txt:
* js/class-syntax-super-expected.txt:
* js/script-tests/class-syntax-declaration.js:
* js/script-tests/class-syntax-expression.js:
* js/script-tests/class-syntax-super.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsclasssyntaxdeclarationexpectedtxt">trunk/LayoutTests/js/class-syntax-declaration-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsclasssyntaxexpressionexpectedtxt">trunk/LayoutTests/js/class-syntax-expression-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsclasssyntaxsuperexpectedtxt">trunk/LayoutTests/js/class-syntax-super-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsclasssyntaxdeclarationjs">trunk/LayoutTests/js/script-tests/class-syntax-declaration.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsclasssyntaxexpressionjs">trunk/LayoutTests/js/script-tests/class-syntax-expression.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsclasssyntaxsuperjs">trunk/LayoutTests/js/script-tests/class-syntax-super.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp</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 (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/LayoutTests/ChangeLog 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Fix a typo in Parser error message
+ https://bugs.webkit.org/show_bug.cgi?id=142942
+
+ Reviewed by Alexey Proskuryakov.
+
+ * js/class-syntax-declaration-expected.txt:
+ * js/class-syntax-expression-expected.txt:
+ * js/class-syntax-super-expected.txt:
+ * js/script-tests/class-syntax-declaration.js:
+ * js/script-tests/class-syntax-expression.js:
+ * js/script-tests/class-syntax-super.js:
+
</ins><span class="cx"> 2015-03-21 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Try to get debug bots green.
</span></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxdeclarationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/class-syntax-declaration-expected.txt (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-declaration-expected.txt 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/LayoutTests/js/class-syntax-declaration-expected.txt 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> PASS A.prototype.constructor is A
</span><span class="cx"> PASS class threw exception SyntaxError: Unexpected end of script.
</span><span class="cx"> PASS class X { threw exception SyntaxError: Unexpected end of script.
</span><del>-PASS class X { ( } threw exception SyntaxError: Unexpected token '('. Expected an indentifier..
</del><ins>+PASS class X { ( } threw exception SyntaxError: Unexpected token '('. Expected an identifier..
</ins><span class="cx"> PASS class X {} did not throw exception.
</span><span class="cx"> PASS class X { constructor() {} constructor() {} } threw exception SyntaxError: Cannot declare multiple constructors in a single class..
</span><span class="cx"> PASS class X { constructor() {} static constructor() { return staticMethodValue; } } did not throw exception.
</span></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxexpressionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/class-syntax-expression-expected.txt (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-expression-expected.txt 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/LayoutTests/js/class-syntax-expression-expected.txt 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> PASS A.prototype.constructor is A
</span><span class="cx"> PASS x = class threw exception SyntaxError: Unexpected end of script.
</span><span class="cx"> PASS x = class { threw exception SyntaxError: Unexpected end of script.
</span><del>-PASS x = class { ( } threw exception SyntaxError: Unexpected token '('. Expected an indentifier..
</del><ins>+PASS x = class { ( } threw exception SyntaxError: Unexpected token '('. Expected an identifier..
</ins><span class="cx"> PASS x = class {} did not throw exception.
</span><span class="cx"> PASS x = class { constructor() {} constructor() {} } threw exception SyntaxError: Cannot declare multiple constructors in a single class..
</span><span class="cx"> PASS x = class { constructor() {} static constructor() { return staticMethodValue; } } did not throw exception.
</span></span></pre></div>
<a id="trunkLayoutTestsjsclasssyntaxsuperexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/class-syntax-super-expected.txt (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/class-syntax-super-expected.txt 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/LayoutTests/js/class-syntax-super-expected.txt 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> PASS (new Derived).baseMethodInGetterSetter = 1; valueInSetter is (new Base).baseMethod
</span><span class="cx"> PASS Derived.staticMethod() is "base3"
</span><span class="cx"> PASS (new SecondDerived).chainMethod() is ["base", "derived", "secondDerived"]
</span><del>-PASS x = class extends Base { constructor() { super(); } super() {} } threw exception SyntaxError: Unexpected keyword 'super'. Expected an indentifier..
</del><ins>+PASS x = class extends Base { constructor() { super(); } super() {} } threw exception SyntaxError: Unexpected keyword 'super'. Expected an identifier..
</ins><span class="cx"> PASS x = class extends Base { constructor() { super(); } method() { super() } } threw exception SyntaxError: Cannot call super() outside of a class constructor..
</span><span class="cx"> PASS x = class extends Base { constructor() { super(); } method() { super } } threw exception SyntaxError: Cannot reference super..
</span><span class="cx"> PASS x = class extends Base { constructor() { super(); } method() { return new super } } did not throw exception.
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsclasssyntaxdeclarationjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/class-syntax-declaration.js (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/class-syntax-declaration.js 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/LayoutTests/js/script-tests/class-syntax-declaration.js 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> shouldThrow("class", "'SyntaxError: Unexpected end of script'");
</span><span class="cx"> shouldThrow("class X {", "'SyntaxError: Unexpected end of script'");
</span><del>-shouldThrow("class X { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an indentifier.'");
</del><ins>+shouldThrow("class X { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an identifier.'");
</ins><span class="cx"> shouldNotThrow("class X {}");
</span><span class="cx"> shouldThrow("class X { constructor() {} constructor() {} }", "'SyntaxError: Cannot declare multiple constructors in a single class.'");
</span><span class="cx"> shouldNotThrow("class X { constructor() {} static constructor() { return staticMethodValue; } }");
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsclasssyntaxexpressionjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/class-syntax-expression.js (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/class-syntax-expression.js 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/LayoutTests/js/script-tests/class-syntax-expression.js 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> shouldThrow("x = class", "'SyntaxError: Unexpected end of script'");
</span><span class="cx"> shouldThrow("x = class {", "'SyntaxError: Unexpected end of script'");
</span><del>-shouldThrow("x = class { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an indentifier.'");
</del><ins>+shouldThrow("x = class { ( }", "'SyntaxError: Unexpected token \\'(\\'. Expected an identifier.'");
</ins><span class="cx"> shouldNotThrow("x = class {}");
</span><span class="cx"> shouldThrow("x = class { constructor() {} constructor() {} }", "'SyntaxError: Cannot declare multiple constructors in a single class.'");
</span><span class="cx"> shouldNotThrow("x = class { constructor() {} static constructor() { return staticMethodValue; } }");
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsclasssyntaxsuperjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/class-syntax-super.js (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/class-syntax-super.js 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/LayoutTests/js/script-tests/class-syntax-super.js 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> shouldBe('(new Derived).baseMethodInGetterSetter = 1; valueInSetter', '(new Base).baseMethod');
</span><span class="cx"> shouldBe('Derived.staticMethod()', '"base3"');
</span><span class="cx"> shouldBe('(new SecondDerived).chainMethod()', '["base", "derived", "secondDerived"]');
</span><del>-shouldThrow('x = class extends Base { constructor() { super(); } super() {} }', '"SyntaxError: Unexpected keyword \'super\'. Expected an indentifier."');
</del><ins>+shouldThrow('x = class extends Base { constructor() { super(); } super() {} }', '"SyntaxError: Unexpected keyword \'super\'. Expected an identifier."');
</ins><span class="cx"> shouldThrow('x = class extends Base { constructor() { super(); } method() { super() } }',
</span><span class="cx"> '"SyntaxError: Cannot call super() outside of a class constructor."');
</span><span class="cx"> shouldThrow('x = class extends Base { constructor() { super(); } method() { super } }', '"SyntaxError: Cannot reference super."');
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-03-21 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Fix a typo in Parser error message
+ https://bugs.webkit.org/show_bug.cgi?id=142942
+
+ Reviewed by Alexey Proskuryakov.
+
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitSlow_op_resolve_scope):
+ * jit/JITPropertyAccess32_64.cpp:
+ (JSC::JIT::emitSlow_op_resolve_scope):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseClass):
+ Fix a common identifier typo.
+
+2015-03-21 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Computed Property names should allow only AssignmentExpressions not any Expression
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142902
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -637,8 +637,8 @@
</span><span class="cx">
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> int32_t scope = currentInstruction[2].u.operand;
</span><del>- int32_t indentifierIndex = currentInstruction[3].u.operand;
- callOperation(operationResolveScope, dst, scope, indentifierIndex);
</del><ins>+ int32_t identifierIndex = currentInstruction[3].u.operand;
+ callOperation(operationResolveScope, dst, scope, identifierIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitLoadWithStructureCheck(int scope, Structure** structureSlot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -661,8 +661,8 @@
</span><span class="cx">
</span><span class="cx"> linkSlowCase(iter);
</span><span class="cx"> int32_t scope = currentInstruction[2].u.operand;
</span><del>- int32_t indentifierIndex = currentInstruction[3].u.operand;
- callOperation(operationResolveScope, dst, scope, indentifierIndex);
</del><ins>+ int32_t identifierIndex = currentInstruction[3].u.operand;
+ callOperation(operationResolveScope, dst, scope, identifierIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitLoadWithStructureCheck(int scope, Structure** structureSlot)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (181830 => 181831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-03-22 03:47:04 UTC (rev 181830)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-03-22 04:08:23 UTC (rev 181831)
</span><span class="lines">@@ -1513,7 +1513,7 @@
</span><span class="cx"> if (isStaticMethod)
</span><span class="cx"> next();
</span><span class="cx">
</span><del>- matchOrFail(IDENT, "Expected an indentifier");
</del><ins>+ matchOrFail(IDENT, "Expected an identifier");
</ins><span class="cx">
</span><span class="cx"> const CommonIdentifiers& propertyNames = *m_vm->propertyNames;
</span><span class="cx"> const Identifier& ident = *m_token.m_data.ident;
</span></span></pre>
</div>
</div>
</body>
</html>