From 698652a5484795c88b1f64dcc59765ca34f884a9 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 29 Apr 2020 12:35:39 +0200 Subject: [PATCH] LibJS: Make Value::as_string() return a PrimitiveString reference --- Libraries/LibJS/AST.cpp | 4 ++-- Libraries/LibJS/Runtime/StringPrototype.cpp | 10 +++++----- Libraries/LibJS/Runtime/Value.cpp | 6 +++--- Libraries/LibJS/Runtime/Value.h | 8 ++++---- Userland/js.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Libraries/LibJS/AST.cpp b/Libraries/LibJS/AST.cpp index e2b84979d1..7046bbf7c6 100644 --- a/Libraries/LibJS/AST.cpp +++ b/Libraries/LibJS/AST.cpp @@ -1051,7 +1051,7 @@ Value ObjectExpression::execute(Interpreter& interpreter) const object->put(it.key, obj_to_spread.get(it.key)); } } else if (key_result.is_string()) { - auto& str_to_spread = key_result.as_string()->string(); + auto& str_to_spread = key_result.as_string().string(); for (size_t i = 0; i < str_to_spread.length(); i++) { object->put_by_index(i, js_string(interpreter, str_to_spread.substring(i, 1))); @@ -1176,7 +1176,7 @@ Value ArrayExpression::execute(Interpreter& interpreter) const if (value.is_string() || (value.is_object() && value.as_object().is_string_object())) { String string_to_spread; if (value.is_string()) - string_to_spread = value.as_string()->string(); + string_to_spread = value.as_string().string(); else string_to_spread = static_cast(value.as_object()).primitive_string().string(); for (size_t i = 0; i < string_to_spread.length(); ++i) diff --git a/Libraries/LibJS/Runtime/StringPrototype.cpp b/Libraries/LibJS/Runtime/StringPrototype.cpp index 2901770770..91787a9fac 100644 --- a/Libraries/LibJS/Runtime/StringPrototype.cpp +++ b/Libraries/LibJS/Runtime/StringPrototype.cpp @@ -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; diff --git a/Libraries/LibJS/Runtime/Value.cpp b/Libraries/LibJS/Runtime/Value.cpp index d0998e4ec1..7a66ecdcd9 100644 --- a/Libraries/LibJS/Runtime/Value.cpp +++ b/Libraries/LibJS/Runtime/Value.cpp @@ -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: diff --git a/Libraries/LibJS/Runtime/Value.h b/Libraries/LibJS/Runtime/Value.h index 701cad1de3..86a513806e 100644 --- a/Libraries/LibJS/Runtime/Value.h +++ b/Libraries/LibJS/Runtime/Value.h @@ -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() diff --git a/Userland/js.cpp b/Userland/js.cpp index e2a4ed489c..93fa1fd18c 100644 --- a/Userland/js.cpp +++ b/Userland/js.cpp @@ -322,7 +322,7 @@ JS::Value ReplObject::load_file(JS::Interpreter& interpreter) return JS::Value(false); for (auto& file : interpreter.call_frame().arguments) { - String file_name = file.as_string()->string(); + String file_name = file.as_string().string(); auto js_file = Core::File::construct(file_name); if (!js_file->open(Core::IODevice::ReadOnly)) { fprintf(stderr, "Failed to open %s: %s\n", file_name.characters(), js_file->error_string());