Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Unified Diff: src/builtins/builtins-string.cc

Issue 2399423003: [builtins] Move StringIncludes to a builtin. (Closed)
Patch Set: Rename incorrectly named var Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/builtins/builtins-string.cc
diff --git a/src/builtins/builtins-string.cc b/src/builtins/builtins-string.cc
index 238c760b5fbb43ffdcb0ab7d2fc971ddc3bbee23..dca5a3d06dc13871ea0964c0dbc531cc4f932a18 100644
--- a/src/builtins/builtins-string.cc
+++ b/src/builtins/builtins-string.cc
@@ -781,6 +781,42 @@ void Builtins::Generate_StringPrototypeCharCodeAt(
assembler->Return(result);
}
+// ES6 section 21.1.3.7
+// String.prototype.includes ( searchString [ , position ] )
+BUILTIN(StringPrototypeIncludes) {
+ HandleScope handle_scope(isolate);
+ TO_THIS_STRING(str, "String.prototype.includes");
+
+ Handle<Object> search = args.atOrUndefined(isolate, 1);
+ if (search->IsJSReceiver()) {
+ Handle<Symbol> match_symbol = isolate->factory()->match_symbol();
+ Handle<Object> match_property;
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
+ isolate, match_property, Object::GetProperty(search, match_symbol));
+ if (!match_property->IsUndefined(isolate) &&
+ match_property->BooleanValue()) {
+ THROW_NEW_ERROR_RETURN_FAILURE(
+ isolate, NewTypeError(MessageTemplate::kFirstArgumentNotRegExp,
+ isolate->factory()->NewStringFromStaticChars(
+ "String.prototype.includes")));
+ }
+ }
+ Handle<String> search_string;
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, search_string,
+ Object::ToString(isolate, search));
+ Handle<Object> position;
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION(
+ isolate, position,
+ Object::ToInteger(isolate, args.atOrUndefined(isolate, 2)));
+
+ double index = std::max(position->Number(), 0.0);
+ index = std::min(index, static_cast<double>(str->length()));
+
+ int index_in_str = String::IndexOf(isolate, str, search_string,
+ static_cast<uint32_t>(index));
+ return *isolate->factory()->ToBoolean(index_in_str != -1);
+}
+
// ES6 section 21.1.3.8 String.prototype.indexOf ( searchString [ , position ] )
BUILTIN(StringPrototypeIndexOf) {
HandleScope handle_scope(isolate);
« no previous file with comments | « src/builtins/builtins.h ('k') | src/js/string.js » ('j') | test/mjsunit/es6/string-includes.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698