[es6] Implement @@match subclassing.

BUG=v8:4305
LOG=N

Review URL: https://codereview.chromium.org/1434523002

Cr-Commit-Position: refs/heads/master@{#32210}

src/js/regexp.js

@@ -15,8 +15,8 @@ var GlobalRegExp = global.RegExp;
 var InternalArray = utils.InternalArray;
 var InternalPackedArray = utils.InternalPackedArray;
 var MakeTypeError;
+var matchSymbol = utils.ImportNow("match_symbol");
 var splitSymbol = utils.ImportNow("split_symbol");
-var matchSymbol = utils.ImportNow("match_symbol");;
 
 utils.ImportFromExperimental(function(from) {
   FLAG_harmony_tolength = from.FLAG_harmony_tolength;
@@ -355,6 +355,21 @@ function RegExpSplit(string, limit) {
 }
 
 
+// ES6 21.2.5.6.
+function RegExpMatch(string) {
+  if (!IS_REGEXP(this)) {
+    throw MakeTypeError(kIncompatibleMethodReceiver,
+                        "RegExp.prototype.@@match", this);
+  }
+  var subject = TO_STRING(string);
+
+  if (!REGEXP_GLOBAL(this)) return RegExpExecNoTests(this, subject, 0);
+  this.lastIndex = 0;
+  var result = %StringMatch(subject, this, RegExpLastMatchInfo);
+  return result;
+}
+
+
 // Getters for the static properties lastMatch, lastParen, leftContext, and
 // rightContext of the RegExp constructor.  The properties are computed based
 // on the captures array of the last successful match and the subject string
@@ -472,6 +487,7 @@ utils.InstallFunctions(GlobalRegExp.prototype, DONT_ENUM, [
   "test", RegExpTest,
   "toString", RegExpToString,
   "compile", RegExpCompileJS,
+  matchSymbol, RegExpMatch,
   splitSymbol, RegExpSplit,
 ]);
 

src/js/string.js

@@ -19,6 +19,7 @@ var MakeRangeError;
 var MakeTypeError;
 var MathMax;
 var MathMin;
+var matchSymbol = utils.ImportNow("match_symbol");
 var RegExpExec;
 var RegExpExecNoTests;
 var RegExpLastMatchInfo;
@@ -155,18 +156,23 @@ function StringLocaleCompareJS(other) {
 
 
 // ECMA-262 section 15.5.4.10
-function StringMatchJS(regexp) {
+function StringMatchJS(pattern) {
   CHECK_OBJECT_COERCIBLE(this, "String.prototype.match");
 
-  var subject = TO_STRING(this);
-  if (IS_REGEXP(regexp)) {
-    if (!REGEXP_GLOBAL(regexp)) return RegExpExecNoTests(regexp, subject, 0);
-    var result = %StringMatch(subject, regexp, RegExpLastMatchInfo);
-    regexp.lastIndex = 0;
-    return result;
+  if (!IS_NULL_OR_UNDEFINED(pattern)) {
+    var matcher = pattern[matchSymbol];
+    if (!IS_UNDEFINED(matcher)) {
+      if (!IS_CALLABLE(matcher)) {
+        throw MakeTypeError(kCalledNonCallable, matcher);
+      }
+      return %_Call(matcher, pattern, this);
+    }
   }
+
+  var subject = TO_STRING(this);
+
   // Non-regexp argument.
-  regexp = new GlobalRegExp(regexp);
+  var regexp = new GlobalRegExp(pattern);
   return RegExpExecNoTests(regexp, subject, 0);
 }
 

test/mjsunit/harmony/string-match.js

+// Copyright 2015 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-regexp-subclass
+
+var pattern = {};
+pattern[Symbol.match] = function(string) {
+  return string.length;
+};
+// Check object coercible fails.
+assertThrows(() => String.prototype.match.call(null, pattern),
+             TypeError);
+// Override is called.
+assertEquals(5, "abcde".match(pattern));
+// Non-callable override.
+pattern[Symbol.match] = "dumdidum";
+assertThrows(() => "abcde".match(pattern), TypeError);
+
+assertEquals("[Symbol.match]", RegExp.prototype[Symbol.match].name);