RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 17:27:35 +00:00
Code Issues Activity Actions

LibJS: Make Object::to_string() call the "toString" property if present

Browse source
This commit is contained in:
Andreas Kling 2020-04-05 18:18:24 +02:00
parent a7b21ec0f4
commit 8bfee015bc
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibJS/Runtime/Object.cpp
View file

@ -205,6 +205,14 @@ Value Object::to_primitive(PreferredType preferred_type) const
Value Object::to_string() const Value Object::to_string() const
{ {
auto to_string_property = get("toString");
if (to_string_property.has_value()
&& to_string_property.value().is_object()
&& to_string_property.value().as_object().is_function()) {
auto& to_string_function = static_cast<Function&>(to_string_property.value().as_object());
return const_cast<Object*>(this)->interpreter().call(&to_string_function, const_cast<Object*>(this));
}
return js_string(heap(), String::format("[object %s]", class_name())); return js_string(heap(), String::format("[object %s]", class_name()));
} }
} }

2
Libraries/LibJS/Runtime/ObjectPrototype.cpp
View file

@ -61,7 +61,7 @@ Value ObjectPrototype::to_string(Interpreter& interpreter)
auto* this_object = interpreter.this_value().to_object(interpreter.heap()); auto* this_object = interpreter.this_value().to_object(interpreter.heap());
if (!this_object) if (!this_object)
return {}; return {};
return Value(this_object->to_string()); return js_string(interpreter, String::format("[object %s]", this_object->class_name()));
} }
Value ObjectPrototype::value_of(Interpreter& interpreter) Value ObjectPrototype::value_of(Interpreter& interpreter)

3
Libraries/LibJS/Tests/Array.prototype.toString.js
View file

@ -3,6 +3,9 @@ try {
assert(a.toString() === '1,2,3'); assert(a.toString() === '1,2,3');
assert([].toString() === ''); assert([].toString() === '');
assert([5].toString() === '5'); assert([5].toString() === '5');
assert("rgb(" + [10, 11, 12] + ")" === "rgb(10,11,12)");
console.log("PASS"); console.log("PASS");
} catch (e) { } catch (e) {
console.log("FAIL: " + e); console.log("FAIL: " + e);

2
Libraries/LibJS/Tests/function-TypeError.js
View file

@ -41,7 +41,7 @@ try {
new isNaN(); new isNaN();
} catch(e) { } catch(e) {
assert(e.name === "TypeError"); assert(e.name === "TypeError");
assert(e.message === "[object NativeFunction] is not a constructor"); assert(e.message === "function () {\n [NativeFunction]\n} is not a constructor");
} }
console.log("PASS"); console.log("PASS");