<!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>[198790] 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/198790">198790</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-29 13:10:20 -0700 (Tue, 29 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>"Can not" => "cannot" in String.prototype error messages
https://bugs.webkit.org/show_bug.cgi?id=155895
Reviewed by Mark Lam.
Source/JavaScriptCore:
* runtime/StringPrototype.cpp:
(JSC::stringProtoFuncStartsWith):
(JSC::stringProtoFuncEndsWith):
(JSC::stringProtoFuncIncludes):
* tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js:
(test):
(test.get let):
LayoutTests:
* js/string-includes-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsstringincludesexpectedtxt">trunk/LayoutTests/js/string-includes-expected.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressstringprototypemethodsendsWithstartsWithincludescorrectnessjs">trunk/Source/JavaScriptCore/tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198789 => 198790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-29 19:51:17 UTC (rev 198789)
+++ trunk/LayoutTests/ChangeLog 2016-03-29 20:10:20 UTC (rev 198790)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-03-29 Saam barati <sbarati@apple.com>
+
+ "Can not" => "cannot" in String.prototype error messages
+ https://bugs.webkit.org/show_bug.cgi?id=155895
+
+ Reviewed by Mark Lam.
+
+ * js/string-includes-expected.txt:
+
</ins><span class="cx"> 2016-03-29 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Adding Timeout to ios-simulator TestExpectations for perf/adding-radio-buttons.html
</span></span></pre></div>
<a id="trunkLayoutTestsjsstringincludesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/string-includes-expected.txt (198789 => 198790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/string-includes-expected.txt 2016-03-29 19:51:17 UTC (rev 198789)
+++ trunk/LayoutTests/js/string-includes-expected.txt 2016-03-29 20:10:20 UTC (rev 198790)
</span><span class="lines">@@ -118,9 +118,9 @@
</span><span class="cx"> PASS (function() { var f = String.prototype.startsWith; (function() { f('a'); })(); })() threw exception TypeError: Type error.
</span><span class="cx"> PASS (function() { var f = String.prototype.endsWith; (function() { f('a'); })(); })() threw exception TypeError: Type error.
</span><span class="cx"> PASS (function() { var f = String.prototype.includes; (function() { f('a'); })(); })() threw exception TypeError: Type error.
</span><del>-PASS 'foo bar'.startsWith(/w+/) threw exception TypeError: Argument to String.prototype.startsWith can not be a RegExp..
-PASS 'foo bar'.endsWith(/w+/) threw exception TypeError: Argument to String.prototype.endsWith can not be a RegExp..
-PASS 'foo bar'.includes(/w+/) threw exception TypeError: Argument to String.prototype.includes can not be a RegExp..
</del><ins>+PASS 'foo bar'.startsWith(/w+/) threw exception TypeError: Argument to String.prototype.startsWith cannot be a RegExp..
+PASS 'foo bar'.endsWith(/w+/) threw exception TypeError: Argument to String.prototype.endsWith cannot be a RegExp..
+PASS 'foo bar'.includes(/w+/) threw exception TypeError: Argument to String.prototype.includes cannot be a RegExp..
</ins><span class="cx"> PASS stringToSearchIn.startsWith(searchString, startOffset) is true
</span><span class="cx"> PASS sideEffect == 'ABC' is true
</span><span class="cx"> PASS stringToSearchIn.startsWith(searchString, startOffset) threw exception error.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198789 => 198790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-29 19:51:17 UTC (rev 198789)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-29 20:10:20 UTC (rev 198790)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-29 Saam barati <sbarati@apple.com>
+
+ "Can not" => "cannot" in String.prototype error messages
+ https://bugs.webkit.org/show_bug.cgi?id=155895
+
+ Reviewed by Mark Lam.
+
+ * runtime/StringPrototype.cpp:
+ (JSC::stringProtoFuncStartsWith):
+ (JSC::stringProtoFuncEndsWith):
+ (JSC::stringProtoFuncIncludes):
+ * tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js:
+ (test):
+ (test.get let):
+
</ins><span class="cx"> 2016-03-29 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: We should have a way to capture heap snapshots programatically.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (198789 => 198790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-03-29 19:51:17 UTC (rev 198789)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-03-29 20:10:20 UTC (rev 198790)
</span><span class="lines">@@ -1955,7 +1955,7 @@
</span><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (isRegularExpression)
</span><del>- return throwVMTypeError(exec, "Argument to String.prototype.startsWith can not be a RegExp.");
</del><ins>+ return throwVMTypeError(exec, "Argument to String.prototype.startsWith cannot be a RegExp.");
</ins><span class="cx">
</span><span class="cx"> String searchString = a0.toString(exec)->value(exec);
</span><span class="cx"> if (exec->hadException())
</span><span class="lines">@@ -1991,7 +1991,7 @@
</span><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (isRegularExpression)
</span><del>- return throwVMTypeError(exec, "Argument to String.prototype.endsWith can not be a RegExp.");
</del><ins>+ return throwVMTypeError(exec, "Argument to String.prototype.endsWith cannot be a RegExp.");
</ins><span class="cx">
</span><span class="cx"> String searchString = a0.toString(exec)->value(exec);
</span><span class="cx"> if (exec->hadException())
</span><span class="lines">@@ -2028,7 +2028,7 @@
</span><span class="cx"> if (vm.exception())
</span><span class="cx"> return JSValue::encode(JSValue());
</span><span class="cx"> if (isRegularExpression)
</span><del>- return throwVMTypeError(exec, "Argument to String.prototype.includes can not be a RegExp.");
</del><ins>+ return throwVMTypeError(exec, "Argument to String.prototype.includes cannot be a RegExp.");
</ins><span class="cx">
</span><span class="cx"> String searchString = a0.toString(exec)->value(exec);
</span><span class="cx"> if (exec->hadException())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressstringprototypemethodsendsWithstartsWithincludescorrectnessjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js (198789 => 198790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js 2016-03-29 19:51:17 UTC (rev 198789)
+++ trunk/Source/JavaScriptCore/tests/stress/string-prototype-methods-endsWith-startsWith-includes-correctness.js 2016-03-29 20:10:20 UTC (rev 198790)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> try {
</span><span class="cx"> foo.endsWith(/foo/);
</span><span class="cx"> } catch(e) {
</span><del>- assert(e.toString() === "TypeError: Argument to String.prototype.endsWith can not be a RegExp.");
</del><ins>+ assert(e.toString() === "TypeError: Argument to String.prototype.endsWith cannot be a RegExp.");
</ins><span class="cx"> threw = true;
</span><span class="cx"> }
</span><span class="cx"> assert(threw);
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> try {
</span><span class="cx"> foo.startsWith(/foo/);
</span><span class="cx"> } catch(e) {
</span><del>- assert(e.toString() === "TypeError: Argument to String.prototype.startsWith can not be a RegExp.");
</del><ins>+ assert(e.toString() === "TypeError: Argument to String.prototype.startsWith cannot be a RegExp.");
</ins><span class="cx"> threw = true;
</span><span class="cx"> }
</span><span class="cx"> assert(threw);
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> try {
</span><span class="cx"> foo.includes(/foo/);
</span><span class="cx"> } catch(e) {
</span><del>- assert(e.toString() === "TypeError: Argument to String.prototype.includes can not be a RegExp.");
</del><ins>+ assert(e.toString() === "TypeError: Argument to String.prototype.includes cannot be a RegExp.");
</ins><span class="cx"> threw = true;
</span><span class="cx"> }
</span><span class="cx"> assert(threw);
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> try {
</span><span class="cx"> foo.endsWith(proxy);
</span><span class="cx"> } catch(e) {
</span><del>- assert(e.toString() === "TypeError: Argument to String.prototype.endsWith can not be a RegExp.");
</del><ins>+ assert(e.toString() === "TypeError: Argument to String.prototype.endsWith cannot be a RegExp.");
</ins><span class="cx"> threw = true;
</span><span class="cx"> }
</span><span class="cx"> assert(threw);
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> try {
</span><span class="cx"> foo.startsWith(proxy);
</span><span class="cx"> } catch(e) {
</span><del>- assert(e.toString() === "TypeError: Argument to String.prototype.startsWith can not be a RegExp.");
</del><ins>+ assert(e.toString() === "TypeError: Argument to String.prototype.startsWith cannot be a RegExp.");
</ins><span class="cx"> threw = true;
</span><span class="cx"> }
</span><span class="cx"> assert(threw);
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> try {
</span><span class="cx"> foo.includes(proxy);
</span><span class="cx"> } catch(e) {
</span><del>- assert(e.toString() === "TypeError: Argument to String.prototype.includes can not be a RegExp.");
</del><ins>+ assert(e.toString() === "TypeError: Argument to String.prototype.includes cannot be a RegExp.");
</ins><span class="cx"> threw = true;
</span><span class="cx"> }
</span><span class="cx"> assert(threw);
</span></span></pre>
</div>
</div>
</body>
</html>