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

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

Issue 2315343002: [builtins] Move StringNormalize to a cpp builtin. (Closed)
Patch Set: Fix crash caused by ToString on unassigned var Created 4 years, 3 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
« no previous file with comments | « src/builtins/builtins.h ('k') | src/js/string.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/builtins/builtins-string.cc
diff --git a/src/builtins/builtins-string.cc b/src/builtins/builtins-string.cc
index d38f6b069d50f5e751d7dfb3147f602a25b2d4f6..2c9aca76f78accc95977f5cd8b13893f87a7fe23 100644
--- a/src/builtins/builtins-string.cc
+++ b/src/builtins/builtins-string.cc
@@ -477,6 +477,40 @@ void Builtins::Generate_StringPrototypeCharCodeAt(
assembler->Return(result);
}
+// ES6 section 21.1.3.12 String.prototype.normalize ( [form] )
+//
+// Simply checks the argument is valid and returns the string itself.
+// If internationalization is enabled, then i18n.js will override this function
+// and provide the proper functionality, so this is just a fallback.
+BUILTIN(StringPrototypeNormalize) {
+ HandleScope handle_scope(isolate);
+ TO_THIS_STRING(string, "String.prototype.normalize");
+
+ Handle<Object> form_input = args.atOrUndefined(isolate, 1);
+ if (form_input->IsUndefined(isolate)) return *string;
+
+ Handle<String> form;
+ ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, form,
+ Object::ToString(isolate, form_input));
+
+ if (!(String::Equals(form,
+ isolate->factory()->NewStringFromStaticChars("NFC")) ||
+ String::Equals(form,
+ isolate->factory()->NewStringFromStaticChars("NFD")) ||
+ String::Equals(form,
+ isolate->factory()->NewStringFromStaticChars("NFKC")) ||
+ String::Equals(form,
+ isolate->factory()->NewStringFromStaticChars("NFKD")))) {
+ Handle<String> valid_forms =
+ isolate->factory()->NewStringFromStaticChars("NFC, NFD, NFKC, NFKD");
+ THROW_NEW_ERROR_RETURN_FAILURE(
+ isolate,
+ NewRangeError(MessageTemplate::kNormalizationForm, valid_forms));
+ }
+
+ return *string;
+}
+
// ES6 section 21.1.3.25 String.prototype.toString ()
void Builtins::Generate_StringPrototypeToString(CodeStubAssembler* assembler) {
typedef compiler::Node Node;
« no previous file with comments | « src/builtins/builtins.h ('k') | src/js/string.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698