RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:08:13 +00:00
Code Issues Activity Actions

LibJS: Add side-effect-free version of Value::to_string()

Browse source 
There are now two API's on Value:

- Value::to_string(Interpreter&) -- may throw.
- Value::to_string_without_side_effects() -- will never throw.

These are some pretty big sweeping changes, so it's possible that I did
some part the wrong way. We'll work it out as we go. :^)

Fixes #2123.
This commit is contained in:
Andreas Kling 2020-05-15 13:39:24 +02:00
parent d8aa2a6997
commit c6ddbd1f3e
25 changed files with 285 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Libraries/LibJS/Runtime/StringConstructor.cpp
View file

@ -51,7 +51,10 @@ Value StringConstructor::call(Interpreter& interpreter)
{
if (!interpreter.argument_count())
return js_string(interpreter, "");
return js_string(interpreter, interpreter.argument(0).to_string());
auto* string = interpreter.argument(0).to_primitive_string(interpreter);
if (interpreter.exception())
return {};
return string;
}
Value StringConstructor::construct(Interpreter& interpreter)
@ -60,7 +63,7 @@ Value StringConstructor::construct(Interpreter& interpreter)
if (!interpreter.argument_count())
primitive_string = js_string(interpreter, "");
else
primitive_string = js_string(interpreter, interpreter.argument(0).to_string());
primitive_string = interpreter.argument(0).to_primitive_string(interpreter);
if (!primitive_string)
return {};
return StringObject::create(interpreter.global_object(), *primitive_string);
@ -84,9 +87,14 @@ Value StringConstructor::raw(Interpreter& interpreter)
StringBuilder builder;
for (size_t i = 0; i < raw_array_elements.size(); ++i) {
builder.append(raw_array_elements.at(i).to_string());
if (i + 1 < interpreter.argument_count() && i < raw_array_elements.size() - 1)
builder.append(interpreter.argument(i + 1).to_string());
builder.append(raw_array_elements.at(i).to_string(interpreter));
if (interpreter.exception())
return {};
if (i + 1 < interpreter.argument_count() && i < raw_array_elements.size() - 1) {
builder.append(interpreter.argument(i + 1).to_string(interpreter));
if (interpreter.exception())
return {};
}
}
return js_string(interpreter, builder.build());