Kaynağa Gözat

Assistant+Spreadsheet: Convert usages of Value::TDSWOSE to Value::TSWOSE

Timothy Flynn 2 yıl önce
ebeveyn
işleme
a2f1b80c36

+ 1 - 1
Userland/Applications/Assistant/Providers.cpp

@@ -105,7 +105,7 @@ void CalculatorProvider::query(DeprecatedString const& query, Function<void(Nonn
     if (!result.is_number()) {
     if (!result.is_number()) {
         calculation = "0";
         calculation = "0";
     } else {
     } else {
-        calculation = result.to_deprecated_string_without_side_effects();
+        calculation = result.to_string_without_side_effects().release_value_but_fixme_should_propagate_errors().to_deprecated_string();
     }
     }
 
 
     NonnullRefPtrVector<Result> results;
     NonnullRefPtrVector<Result> results;

+ 1 - 1
Userland/Applications/Spreadsheet/Cell.cpp

@@ -41,7 +41,7 @@ void Cell::set_data(JS::Value new_data)
 
 
     StringBuilder builder;
     StringBuilder builder;
 
 
-    builder.append(new_data.to_deprecated_string_without_side_effects());
+    builder.append(new_data.to_string_without_side_effects().release_value_but_fixme_should_propagate_errors());
     m_data = builder.to_deprecated_string();
     m_data = builder.to_deprecated_string();
 
 
     m_evaluated_data = move(new_data);
     m_evaluated_data = move(new_data);

+ 3 - 3
Userland/Applications/Spreadsheet/Spreadsheet.cpp

@@ -64,7 +64,7 @@ Sheet::Sheet(Workbook& workbook)
             if (result.is_error()) {
             if (result.is_error()) {
                 warnln("Spreadsheet: Failed to run runtime code:");
                 warnln("Spreadsheet: Failed to run runtime code:");
                 auto thrown_value = *result.throw_completion().value();
                 auto thrown_value = *result.throw_completion().value();
-                warn("Threw: {}", thrown_value.to_deprecated_string_without_side_effects());
+                warn("Threw: {}", MUST(thrown_value.to_string_without_side_effects()));
                 if (thrown_value.is_object() && is<JS::Error>(thrown_value.as_object())) {
                 if (thrown_value.is_object() && is<JS::Error>(thrown_value.as_object())) {
                     auto& error = static_cast<JS::Error const&>(thrown_value.as_object());
                     auto& error = static_cast<JS::Error const&>(thrown_value.as_object());
                     warnln(" with message '{}'", error.get_without_side_effects(interpreter().vm().names.message));
                     warnln(" with message '{}'", error.get_without_side_effects(interpreter().vm().names.message));
@@ -562,7 +562,7 @@ JsonObject Sheet::to_json() const
             auto json = interpreter().realm().global_object().get_without_side_effects("JSON");
             auto json = interpreter().realm().global_object().get_without_side_effects("JSON");
             auto stringified_or_error = JS::call(vm, json.as_object().get_without_side_effects("stringify").as_function(), json, it.value->evaluated_data());
             auto stringified_or_error = JS::call(vm, json.as_object().get_without_side_effects("stringify").as_function(), json, it.value->evaluated_data());
             VERIFY(!stringified_or_error.is_error());
             VERIFY(!stringified_or_error.is_error());
-            data.set("value", stringified_or_error.release_value().to_deprecated_string_without_side_effects());
+            data.set("value", stringified_or_error.release_value().to_string_without_side_effects().release_value_but_fixme_should_propagate_errors().to_deprecated_string());
         } else {
         } else {
             data.set("value", it.value->data());
             data.set("value", it.value->data());
         }
         }
@@ -693,7 +693,7 @@ JsonObject Sheet::gather_documentation() const
         if (!doc.is_string())
         if (!doc.is_string())
             return;
             return;
 
 
-        JsonParser parser(doc.to_deprecated_string_without_side_effects());
+        JsonParser parser(doc.to_string_without_side_effects().release_value_but_fixme_should_propagate_errors());
         auto doc_object = parser.parse();
         auto doc_object = parser.parse();
 
 
         if (!doc_object.is_error())
         if (!doc_object.is_error())

+ 2 - 2
Userland/Applications/Spreadsheet/SpreadsheetModel.cpp

@@ -33,7 +33,7 @@ GUI::Variant SheetModel::data(const GUI::ModelIndex& index, GUI::ModelRole role)
                     auto message = object.get_without_side_effects("message");
                     auto message = object.get_without_side_effects("message");
                     auto error = message.to_deprecated_string(vm);
                     auto error = message.to_deprecated_string(vm);
                     if (error.is_throw_completion())
                     if (error.is_throw_completion())
-                        builder.append(message.to_deprecated_string_without_side_effects());
+                        builder.append(message.to_string_without_side_effects().release_value_but_fixme_should_propagate_errors());
                     else
                     else
                         builder.append(error.release_value());
                         builder.append(error.release_value());
                     return builder.to_deprecated_string();
                     return builder.to_deprecated_string();
@@ -120,7 +120,7 @@ GUI::Variant SheetModel::data(const GUI::ModelIndex& index, GUI::ModelRole role)
         auto& error = static_cast<JS::Error&>(object);
         auto& error = static_cast<JS::Error&>(object);
         auto const& trace = error.traceback();
         auto const& trace = error.traceback();
         StringBuilder builder;
         StringBuilder builder;
-        builder.appendff("{}\n", error.get_without_side_effects(object.vm().names.message).to_deprecated_string_without_side_effects());
+        builder.appendff("{}\n", error.get_without_side_effects(object.vm().names.message).to_string_without_side_effects().release_value_but_fixme_should_propagate_errors());
         for (auto const& frame : trace.in_reverse()) {
         for (auto const& frame : trace.in_reverse()) {
             if (frame.source_range.filename().contains("runtime.js"sv)) {
             if (frame.source_range.filename().contains("runtime.js"sv)) {
                 if (frame.function_name == "<unknown>")
                 if (frame.function_name == "<unknown>")