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

LibJS: Make Value::as_string() return a PrimitiveString reference

Browse source
This commit is contained in:
Andreas Kling 2020-04-29 12:35:39 +02:00
parent 75f246dde8
commit 698652a548
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibJS/Runtime/StringPrototype.cpp
View file

@ -194,7 +194,7 @@ enum class PadPlacement {
static Value pad_string(Interpreter& interpreter, Object* object, PadPlacement placement)
{
auto string = object->to_string().as_string()->string();
auto string = object->to_string().as_string().string();
if (interpreter.argument(0).to_number().is_nan()
|| interpreter.argument(0).to_number().is_undefined()
|| interpreter.argument(0).to_number().to_i32() < 0) {
@ -246,7 +246,7 @@ enum class TrimMode {
static Value trim_string(Interpreter& interpreter, const Object& object, TrimMode mode)
{
auto& string = object.to_string().as_string()->string();
auto& string = object.to_string().as_string().string();
size_t substring_start = 0;
size_t substring_length = string.length();
@ -311,7 +311,7 @@ Value StringPrototype::concat(Interpreter& interpreter)
auto* this_object = interpreter.this_value().to_object(interpreter.heap());
if (!this_object)
return {};
auto& string = this_object->to_string().as_string()->string();
auto& string = this_object->to_string().as_string().string();
StringBuilder builder;
builder.append(string);
@ -330,7 +330,7 @@ Value StringPrototype::substring(Interpreter& interpreter)
if (!this_object)
return {};
auto& string = this_object->to_string().as_string()->string();
auto& string = this_object->to_string().as_string().string();
if (interpreter.argument_count() == 0)
return js_string(interpreter, string);
@ -377,7 +377,7 @@ Value StringPrototype::includes(Interpreter& interpreter)
if (!this_object)
return {};
auto& string = this_object->to_string().as_string()->string();
auto& string = this_object->to_string().as_string().string();
auto search_string = interpreter.argument(0).to_string();
i32 position = 0;

6
Libraries/LibJS/Runtime/Value.cpp
View file

@ -92,7 +92,7 @@ bool Value::to_boolean() const
case Type::Undefined:
return false;
case Type::String:
return !as_string()->string().is_empty();
return !as_string().string().is_empty();
case Type::Object:
return true;
default:
@ -144,7 +144,7 @@ Value Value::to_number() const
return Value(0);
case Type::String: {
// FIXME: Trim whitespace beforehand
auto& string = as_string()->string();
auto& string = as_string().string();
if (string.is_empty())
return Value(0);
if (string == "Infinity" || string == "+Infinity")
@ -334,7 +334,7 @@ Value typed_eq(Interpreter&, Value lhs, Value rhs)
case Value::Type::Number:
return Value(lhs.as_double() == rhs.as_double());
case Value::Type::String:
return Value(lhs.as_string()->string() == rhs.as_string()->string());
return Value(lhs.as_string().string() == rhs.as_string().string());
case Value::Type::Boolean:
return Value(lhs.as_bool() == rhs.as_bool());
case Value::Type::Object:

8
Libraries/LibJS/Runtime/Value.h
View file

@ -139,16 +139,16 @@ public:
return *m_value.as_object;
}
PrimitiveString* as_string()
PrimitiveString& as_string()
{
ASSERT(is_string());
return m_value.as_string;
return *m_value.as_string;
}
const PrimitiveString* as_string() const
const PrimitiveString& as_string() const
{
ASSERT(is_string());
return m_value.as_string;
return *m_value.as_string;
}
Cell* as_cell()