diff options
Diffstat (limited to 'Userland/Libraries/LibJS/Runtime/StringConstructor.cpp')
| -rw-r--r-- | Userland/Libraries/LibJS/Runtime/StringConstructor.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/Userland/Libraries/LibJS/Runtime/StringConstructor.cpp b/Userland/Libraries/LibJS/Runtime/StringConstructor.cpp index 420ac933b5..687220553d 100644 --- a/Userland/Libraries/LibJS/Runtime/StringConstructor.cpp +++ b/Userland/Libraries/LibJS/Runtime/StringConstructor.cpp @@ -41,11 +41,12 @@ void StringConstructor::initialize(Realm& realm) // 22.1.1.1 String ( value ), https://tc39.es/ecma262/#sec-string-constructor-string-value ThrowCompletionOr<Value> StringConstructor::call() { - if (!vm().argument_count()) + auto& vm = this->vm(); + if (!vm.argument_count()) return js_string(heap(), ""); - if (vm().argument(0).is_symbol()) - return js_string(heap(), vm().argument(0).as_symbol().to_string()); - return TRY(vm().argument(0).to_primitive_string(global_object())); + if (vm.argument(0).is_symbol()) + return js_string(vm, vm.argument(0).as_symbol().to_string()); + return TRY(vm.argument(0).to_primitive_string(vm)); } // 22.1.1.1 String ( value ), https://tc39.es/ecma262/#sec-string-constructor-string-value @@ -59,7 +60,7 @@ ThrowCompletionOr<Object*> StringConstructor::construct(FunctionObject& new_targ if (!vm.argument_count()) primitive_string = js_string(vm, ""); else - primitive_string = TRY(vm.argument(0).to_primitive_string(global_object)); + primitive_string = TRY(vm.argument(0).to_primitive_string(vm)); auto* prototype = TRY(get_prototype_from_constructor(global_object, new_target, &GlobalObject::string_prototype)); return StringObject::create(realm, *primitive_string, *prototype); } @@ -67,9 +68,9 @@ ThrowCompletionOr<Object*> StringConstructor::construct(FunctionObject& new_targ // 22.1.2.4 String.raw ( template, ...substitutions ), https://tc39.es/ecma262/#sec-string.raw JS_DEFINE_NATIVE_FUNCTION(StringConstructor::raw) { - auto* cooked = TRY(vm.argument(0).to_object(global_object)); + auto* cooked = TRY(vm.argument(0).to_object(vm)); auto raw_value = TRY(cooked->get(vm.names.raw)); - auto* raw = TRY(raw_value.to_object(global_object)); + auto* raw = TRY(raw_value.to_object(vm)); auto literal_segments = TRY(length_of_array_like(global_object, *raw)); if (literal_segments == 0) @@ -81,7 +82,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringConstructor::raw) for (size_t i = 0; i < literal_segments; ++i) { auto next_key = String::number(i); auto next_segment_value = TRY(raw->get(next_key)); - auto next_segment = TRY(next_segment_value.to_string(global_object)); + auto next_segment = TRY(next_segment_value.to_string(vm)); builder.append(next_segment); @@ -90,7 +91,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringConstructor::raw) if (i < number_of_substituions) { auto next = vm.argument(i + 1); - auto next_sub = TRY(next.to_string(global_object)); + auto next_sub = TRY(next.to_string(vm)); builder.append(next_sub); } } @@ -104,7 +105,7 @@ JS_DEFINE_NATIVE_FUNCTION(StringConstructor::from_char_code) string.ensure_capacity(vm.argument_count()); for (size_t i = 0; i < vm.argument_count(); ++i) - string.append(TRY(vm.argument(i).to_u16(global_object))); + string.append(TRY(vm.argument(i).to_u16(vm))); return js_string(vm, Utf16String(move(string))); } @@ -116,10 +117,10 @@ JS_DEFINE_NATIVE_FUNCTION(StringConstructor::from_code_point) string.ensure_capacity(vm.argument_count()); // This will be an under-estimate if any code point is > 0xffff. for (size_t i = 0; i < vm.argument_count(); ++i) { - auto next_code_point = TRY(vm.argument(i).to_number(global_object)); + auto next_code_point = TRY(vm.argument(i).to_number(vm)); if (!next_code_point.is_integral_number()) return vm.throw_completion<RangeError>(ErrorType::InvalidCodePoint, next_code_point.to_string_without_side_effects()); - auto code_point = TRY(next_code_point.to_i32(global_object)); + auto code_point = TRY(next_code_point.to_i32(vm)); if (code_point < 0 || code_point > 0x10FFFF) return vm.throw_completion<RangeError>(ErrorType::InvalidCodePoint, next_code_point.to_string_without_side_effects()); |