<!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>[198625] 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/198625">198625</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2016-03-24 09:13:46 -0700 (Thu, 24 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Add Proxy based tests for RegExp.prototype[@@match]
https://bugs.webkit.org/show_bug.cgi?id=155807
Reviewed by Saam Barati.
Added new test that uses Proxy to verify RegExp.prototype[@@match] processing
conforms to the ES6 standard
Modified builtin RegExp.prototype[@@match] to be ES6 spec conformant.
Updated es6.yaml as Proxy_internal_get_calls_RegExp.prototype[Symbol.match].js now passes.
* builtins/RegExpPrototype.js:
(match):
* tests/es6.yaml: Updated.
* tests/stress/regexp-match-proxy.js: Added.
(assert):
(let.getProxyNullExec.new.Proxy):
(let.getSetProxyNullExec.new.Proxy):
(get resetTracking):
(let.getSetProxyMatches_s.new.Proxy):
(set get getSetProxyNullExec):
(let.getSetProxyMatches_tx_Greedy.new.Proxy):
(set get getSetProxyMatches_s):
(let.getSetProxyMatchesUnicode_digit_nonGreedy.new.Proxy):
(set get getSetProxyMatches_tx_Greedy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsRegExpPrototypejs">trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressregexpmatchproxyjs">trunk/Source/JavaScriptCore/tests/stress/regexp-match-proxy.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198624 => 198625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-24 14:19:37 UTC (rev 198624)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-24 16:13:46 UTC (rev 198625)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-03-24 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ [ES6] Add Proxy based tests for RegExp.prototype[@@match]
+ https://bugs.webkit.org/show_bug.cgi?id=155807
+
+ Reviewed by Saam Barati.
+
+ Added new test that uses Proxy to verify RegExp.prototype[@@match] processing
+ conforms to the ES6 standard
+
+ Modified builtin RegExp.prototype[@@match] to be ES6 spec conformant.
+
+ Updated es6.yaml as Proxy_internal_get_calls_RegExp.prototype[Symbol.match].js now passes.
+
+ * builtins/RegExpPrototype.js:
+ (match):
+ * tests/es6.yaml: Updated.
+ * tests/stress/regexp-match-proxy.js: Added.
+ (assert):
+ (let.getProxyNullExec.new.Proxy):
+ (let.getSetProxyNullExec.new.Proxy):
+ (get resetTracking):
+ (let.getSetProxyMatches_s.new.Proxy):
+ (set get getSetProxyNullExec):
+ (let.getSetProxyMatches_tx_Greedy.new.Proxy):
+ (set get getSetProxyMatches_s):
+ (let.getSetProxyMatchesUnicode_digit_nonGreedy.new.Proxy):
+ (set get getSetProxyMatches_tx_Greedy):
+
+2016-03-24 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> [ES6] Greedy unicode RegExp's don't properly backtrack past non BMP characters
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155829
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsRegExpPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js (198624 => 198625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js 2016-03-24 14:19:37 UTC (rev 198624)
+++ trunk/Source/JavaScriptCore/builtins/RegExpPrototype.js 2016-03-24 16:13:46 UTC (rev 198625)
</span><span class="lines">@@ -52,17 +52,17 @@
</span><span class="cx"> if (!regexp.global)
</span><span class="cx"> return regexp.exec(stringArg);
</span><span class="cx">
</span><ins>+ let unicode = regexp.unicode;
</ins><span class="cx"> regexp.lastIndex = 0;
</span><del>-
</del><span class="cx"> let resultList = [];
</span><ins>+ let execFunc = regexp.exec;
</ins><span class="cx">
</span><del>- if (regexp.exec !== @RegExp.prototype.@exec && typeof(regexp.exec) === "function") {
</del><ins>+ if (execFunc !== @RegExp.prototype.@exec && typeof execFunc === "function") {
</ins><span class="cx"> // Match using the overridden exec.
</span><del>- let unicode = regexp.unicode;
- let stringLength = str.length;
</del><ins>+ let stringLength = stringArg.length;
</ins><span class="cx">
</span><span class="cx"> while (true) {
</span><del>- let result = regexp.exec(stringArg);
</del><ins>+ let result = execFunc(stringArg);
</ins><span class="cx">
</span><span class="cx"> if (result === null) {
</span><span class="cx"> if (resultList.length === 0)
</span><span class="lines">@@ -81,6 +81,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> resultList.@push(resultString);
</span><ins>+
+ execFunc = regexp.exec;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (198624 => 198625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-24 14:19:37 UTC (rev 198624)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-24 16:13:46 UTC (rev 198625)
</span><span class="lines">@@ -997,7 +997,7 @@
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_RegExp.prototype.toString.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_RegExp.prototype[Symbol.match].js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_get_calls_RegExp.prototype[Symbol.replace].js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_RegExp.prototype[Symbol.search].js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressregexpmatchproxyjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/regexp-match-proxy.js (0 => 198625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/regexp-match-proxy.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/regexp-match-proxy.js 2016-03-24 16:13:46 UTC (rev 198625)
</span><span class="lines">@@ -0,0 +1,166 @@
</span><ins>+function assert(assertion) {
+ if (typeof assertion != "string")
+ throw new Error("Invalid assertion.");
+
+ let result = eval(assertion);
+
+ if (!result)
+ throw new Error("Bad assertion: " + assertion);
+}
+
+let get = [];
+let set = [];
+let getSet = [];
+
+function resetTracking()
+{
+ get = [];
+ set = [];
+ getSet = [];
+}
+
+let getProxyNullExec = new Proxy({
+ exec: function()
+ {
+ return null;
+ }
+ }, {
+ get: function(o, k)
+ {
+ get.push(k); return o[k];
+ }
+ });
+
+resetTracking();
+RegExp.prototype[Symbol.match].call(getProxyNullExec);
+assert('get == "global,exec"');
+
+let getSetProxyNullExec = new Proxy(
+ {
+ exec: function()
+ {
+ return null;
+ }
+ }, {
+ get: function(o, k)
+ {
+ get.push(k);
+ getSet.push(k);
+ return o[k];
+ },
+ set: function(o, k, v)
+ {
+ set.push(k);
+ getSet.push(k);
+ o[k] = v;
+ }
+ });
+
+getSetProxyNullExec.global = true;
+
+resetTracking();
+RegExp.prototype[Symbol.match].call(getSetProxyNullExec);
+assert('get == "global,unicode,exec"');
+assert('set == "lastIndex"');
+assert('getSet == "global,unicode,lastIndex,exec"');
+
+let regExpGlobal_s = new RegExp("s", "g");
+let getSetProxyMatches_s = new Proxy(
+ {
+ exec: function(string)
+ {
+ return regExpGlobal_s.exec(string);
+ }
+ }, {
+ get: function(o, k)
+ {
+ get.push(k);
+ getSet.push(k);
+ return o[k];
+ },
+ set: function(o, k, v)
+ {
+ set.push(k);
+ getSet.push(k);
+ o[k] = v;
+ }
+ });
+
+getSetProxyMatches_s.global = true;
+resetTracking();
+let matchResult = RegExp.prototype[Symbol.match].call(getSetProxyMatches_s, "This is a test");
+assert('matchResult == "s,s,s"');
+assert('get == "global,unicode,exec,exec,exec,exec"');
+assert('set == "lastIndex"');
+assert('getSet == "global,unicode,lastIndex,exec,exec,exec,exec"');
+
+let regExpGlobal_tx_Greedy = new RegExp("[tx]*", "g");
+let getSetProxyMatches_tx_Greedy = new Proxy(
+ {
+ exec: function(string)
+ {
+ return regExpGlobal_tx_Greedy.exec(string);
+ }
+ }, {
+ get: function(o, k)
+ {
+ get.push(k);
+ getSet.push(k);
+ if (k.toString() == "lastIndex")
+ return regExpGlobal_tx_Greedy.lastIndex;
+ return o[k];
+ },
+ set: function(o, k, v)
+ {
+ set.push(k);
+ getSet.push(k);
+ if (k.toString() == "lastIndex")
+ regExpGlobal_tx_Greedy.lastIndex = v;
+ o[k] = v;
+ }
+ });
+
+getSetProxyMatches_tx_Greedy.global = true;
+
+resetTracking();
+matchResult = RegExp.prototype[Symbol.match].call(getSetProxyMatches_tx_Greedy, "testing");
+assert('matchResult == "t,,,t,,,,"');
+assert('get == "global,unicode,exec,exec,lastIndex,exec,lastIndex,exec,exec,lastIndex,exec,lastIndex,exec,lastIndex,exec,lastIndex,exec"');
+assert('set == "lastIndex,lastIndex,lastIndex,lastIndex,lastIndex,lastIndex,lastIndex"');
+assert('getSet == "global,unicode,lastIndex,exec,exec,lastIndex,lastIndex,exec,lastIndex,lastIndex,exec,exec,lastIndex,lastIndex,exec,lastIndex,lastIndex,exec,lastIndex,lastIndex,exec,lastIndex,lastIndex,exec"');
+
+let regExpGlobalUnicode_digit_nonGreedy = new RegExp("\\d{0,1}", "gu");
+let getSetProxyMatchesUnicode_digit_nonGreedy = new Proxy(
+ {
+ exec: function(string)
+ {
+ return regExpGlobalUnicode_digit_nonGreedy.exec(string);
+ }
+ }, {
+ get: function(o, k)
+ {
+ get.push(k);
+ getSet.push(k);
+ if (k.toString() == "lastIndex")
+ return regExpGlobalUnicode_digit_nonGreedy.lastIndex;
+ return o[k];
+ },
+ set: function(o, k, v)
+ {
+ set.push(k);
+ getSet.push(k);
+ if (k.toString() == "lastIndex")
+ regExpGlobalUnicode_digit_nonGreedy.lastIndex = v;
+ o[k] = v;
+ }
+ });
+
+getSetProxyMatchesUnicode_digit_nonGreedy.global = true;
+getSetProxyMatchesUnicode_digit_nonGreedy.unicode = true;
+
+resetTracking();
+matchResult = RegExp.prototype[Symbol.match].call(getSetProxyMatchesUnicode_digit_nonGreedy, "12X3\u{10400}4");
+assert('matchResult == "1,2,,3,,4,"');
+assert('get == "global,unicode,exec,exec,exec,lastIndex,exec,exec,lastIndex,exec,exec,lastIndex,exec"');
+assert('set == "lastIndex,lastIndex,lastIndex,lastIndex"');
+assert('getSet == "global,unicode,lastIndex,exec,exec,exec,lastIndex,lastIndex,exec,exec,lastIndex,lastIndex,exec,exec,lastIndex,lastIndex,exec"');
</ins></span></pre>
</div>
</div>
</body>
</html>