1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 23:17:46 +00:00

Everywhere: Rename to_{string => deprecated_string}() where applicable

This will make it easier to support both string types at the same time
while we convert code, and tracking down remaining uses.

One big exception is Value::to_string() in LibJS, where the name is
dictated by the ToString AO.
This commit is contained in:
Linus Groh 2022-12-06 01:12:49 +00:00 committed by Andreas Kling
parent 6e19ab2bbc
commit 57dc179b1f
597 changed files with 1973 additions and 1972 deletions

View file

@ -36,7 +36,7 @@ static DeprecatedString pascal_case(DeprecatedString const& identifier)
} else
builder.append(ch);
}
return builder.to_string();
return builder.to_deprecated_string();
}
struct Message {
@ -50,7 +50,7 @@ struct Message {
StringBuilder builder;
builder.append(pascal_case(name));
builder.append("Response"sv);
return builder.to_string();
return builder.to_deprecated_string();
}
};
@ -75,7 +75,7 @@ static DeprecatedString message_name(DeprecatedString const& endpoint, Deprecate
builder.append(pascal_case(message));
if (is_response)
builder.append("Response"sv);
return builder.to_string();
return builder.to_deprecated_string();
}
Vector<Endpoint> parse(ByteBuffer const& file_contents)
@ -262,7 +262,7 @@ DeprecatedString constructor_for_message(DeprecatedString const& name, Vector<Pa
if (parameters.is_empty()) {
builder.append("() {}"sv);
return builder.to_string();
return builder.to_deprecated_string();
}
builder.append('(');
for (size_t i = 0; i < parameters.size(); ++i) {
@ -279,7 +279,7 @@ DeprecatedString constructor_for_message(DeprecatedString const& name, Vector<Pa
builder.append(", "sv);
}
builder.append(" {}"sv);
return builder.to_string();
return builder.to_deprecated_string();
}
void do_message(SourceGenerator message_generator, DeprecatedString const& name, Vector<Parameter> const& parameters, DeprecatedString const& response_type = {})
@ -683,7 +683,7 @@ public:
message_generator.set("message.pascal_name", pascal_case(name));
message_generator.set("message.response_type", pascal_case(message.response_name()));
message_generator.set("handler_name", name);
message_generator.set("arguments", argument_generator.to_string());
message_generator.set("arguments", argument_generator.to_deprecated_string());
message_generator.appendln(R"~~~(
case (int)Messages::@endpoint.name@::MessageID::@message.pascal_name@: {)~~~");
if (returns_something) {
@ -740,7 +740,7 @@ public:
if (const_ref)
builder.append(" const&"sv);
return builder.to_string();
return builder.to_deprecated_string();
};
for (size_t i = 0; i < parameters.size(); ++i) {

View file

@ -174,7 +174,7 @@ static DeprecatedString sanitize_entry(DeprecatedString const& entry)
next_is_upper = ch == '_';
}
return builder.to_string();
return builder.to_deprecated_string();
}
static Vector<u32> parse_code_point_list(StringView list)
@ -451,7 +451,7 @@ static ErrorOr<void> parse_normalization_props(Core::Stream::BufferedFile& file,
VERIFY((segments.size() == 2) || (segments.size() == 3));
auto code_point_range = parse_code_point_range(segments[0].trim_whitespace());
auto property = segments[1].trim_whitespace().to_string();
auto property = segments[1].trim_whitespace().to_deprecated_string();
Vector<u32> value;
QuickCheck quick_check = QuickCheck::Yes;

View file

@ -89,7 +89,7 @@ static DeprecatedString union_type_to_variant(UnionType const& union_type, Inter
builder.append(", Empty"sv);
builder.append('>');
return builder.to_string();
return builder.to_deprecated_string();
}
CppType idl_type_name_to_cpp_type(Type const& type, Interface const& interface)
@ -174,7 +174,7 @@ static DeprecatedString make_input_acceptable_cpp(DeprecatedString const& input)
StringBuilder builder;
builder.append(input);
builder.append('_');
return builder.to_string();
return builder.to_deprecated_string();
}
return input.replace("-"sv, "_"sv, ReplaceMode::All);
@ -893,7 +893,7 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
if (dictionary_type)
to_variant_captures.append(DeprecatedString::formatted(", &{}{}_to_dictionary", js_name, js_suffix));
union_generator.set("to_variant_captures", to_variant_captures.to_string());
union_generator.set("to_variant_captures", to_variant_captures.to_deprecated_string());
union_generator.append(R"~~~(
auto @js_name@@js_suffix@_to_variant = [@to_variant_captures@](JS::Value @js_name@@js_suffix@) -> JS::ThrowCompletionOr<@union_type@> {
@ -1527,7 +1527,7 @@ static void generate_wrap_statement(SourceGenerator& generator, DeprecatedString
)~~~");
} else if (interface.enumerations.contains(type.name())) {
scoped_generator.append(R"~~~(
@result_expression@ JS::js_string(vm, Bindings::idl_enum_to_string(@value@));
@result_expression@ JS::js_string(vm, Bindings::idl_enum_to_deprecated_string(@value@));
)~~~");
} else if (interface.callback_functions.contains(type.name())) {
// https://webidl.spec.whatwg.org/#es-callback-function
@ -1837,7 +1837,7 @@ static DeprecatedString generate_constructor_for_idl_type(Type const& type)
builder.appendff("make_ref_counted<IDL::ParameterizedTypeType>(\"{}\", {}, NonnullRefPtrVector<IDL::Type> {{", type.name(), type.is_nullable());
append_type_list(builder, parameterized_type.parameters());
builder.append("})"sv);
return builder.to_string();
return builder.to_deprecated_string();
}
case Type::Kind::Union: {
auto const& union_type = type.as_union();
@ -1845,7 +1845,7 @@ static DeprecatedString generate_constructor_for_idl_type(Type const& type)
builder.appendff("make_ref_counted<IDL::UnionType>(\"{}\", {}, NonnullRefPtrVector<IDL::Type> {{", type.name(), type.is_nullable());
append_type_list(builder, union_type.member_types());
builder.append("})"sv);
return builder.to_string();
return builder.to_deprecated_string();
}
}
@ -1931,8 +1931,8 @@ JS_DEFINE_NATIVE_FUNCTION(@class_name@::@function.name:snakecase@)
optionality_builder.append("}"sv);
function_generator.set("overload.callable_id", DeprecatedString::number(overload.callable_id));
function_generator.set("overload.types", types_builder.to_string());
function_generator.set("overload.optionality_values", optionality_builder.to_string());
function_generator.set("overload.types", types_builder.to_deprecated_string());
function_generator.set("overload.optionality_values", optionality_builder.to_deprecated_string());
function_generator.appendln(" overloads.empend(@overload.callable_id@, @overload.types@, @overload.optionality_values@);");
}
@ -2326,7 +2326,7 @@ enum class @enum.type.name@ {
enum_generator.append(R"~~~(
};
inline DeprecatedString idl_enum_to_string(@enum.type.name@ value) {
inline DeprecatedString idl_enum_to_deprecated_string(@enum.type.name@ value) {
switch(value) {
)~~~");
for (auto& entry : it.value.translated_cpp_names) {
@ -2730,7 +2730,7 @@ JS_DEFINE_NATIVE_FUNCTION(@class_name@::to_string)
)~~~");
} else {
stringifier_generator.append(R"~~~(
auto retval = TRY(throw_dom_exception_if_needed(vm, [&] { return impl->to_string(); }));
auto retval = TRY(throw_dom_exception_if_needed(vm, [&] { return impl->to_deprecated_string(); }));
)~~~");
}
stringifier_generator.append(R"~~~(

View file

@ -104,7 +104,7 @@ int main(int argc, char** argv)
builder.append(namespace_);
builder.append("::"sv);
builder.append(interface.name);
interface.fully_qualified_name = builder.to_string();
interface.fully_qualified_name = builder.to_deprecated_string();
} else {
interface.fully_qualified_name = interface.name;
}

View file

@ -77,7 +77,7 @@ enum class ValueID;
enum_generator.appendln("enum class @name:titlecase@ : @enum_type@ {");
for (auto& member : members.values()) {
auto member_name = member.to_string();
auto member_name = member.to_deprecated_string();
// Don't include aliases in the enum.
if (member_name.contains('='))
continue;
@ -126,7 +126,7 @@ Optional<@name:titlecase@> value_id_to_@name:snakecase@(ValueID value_id)
for (auto& member : members.values()) {
auto member_generator = enum_generator.fork();
auto member_name = member.to_string();
auto member_name = member.to_deprecated_string();
if (member_name.contains('=')) {
auto parts = member_name.split_view('=');
member_generator.set("valueid:titlecase", title_casify(parts[0]));
@ -154,7 +154,7 @@ ValueID to_value_id(@name:titlecase@ @name:snakecase@_value)
for (auto& member : members.values()) {
auto member_generator = enum_generator.fork();
auto member_name = member.to_string();
auto member_name = member.to_deprecated_string();
if (member_name.contains('='))
continue;
member_generator.set("member:titlecase", title_casify(member_name));
@ -178,7 +178,7 @@ StringView to_string(@name:titlecase@ value)
for (auto& member : members.values()) {
auto member_generator = enum_generator.fork();
auto member_name = member.to_string();
auto member_name = member.to_deprecated_string();
if (member_name.contains('='))
continue;
member_generator.set("member:css", member_name);

View file

@ -585,7 +585,7 @@ size_t property_maximum_value_count(PropertyID property_id)
VERIFY(max_values.is_number() && !max_values.is_double());
auto property_generator = generator.fork();
property_generator.set("name:titlecase", title_casify(name));
property_generator.set("max_values", max_values.to_string());
property_generator.set("max_values", max_values.to_deprecated_string());
property_generator.append(R"~~~(
case PropertyID::@name:titlecase@:
return @max_values@;

View file

@ -45,7 +45,7 @@ static DeprecatedString title_casify_transform_function(StringView input)
StringBuilder builder;
builder.append(toupper(input[0]));
builder.append(input.substring_view(1));
return builder.to_string();
return builder.to_deprecated_string();
}
ErrorOr<void> generate_header_file(JsonObject& transforms_data, Core::Stream::File& file)
@ -189,7 +189,7 @@ TransformFunctionMetadata transform_function_metadata(TransformFunction transfor
member_generator.append(first ? " "sv : ", "sv);
first = false;
member_generator.append(DeprecatedString::formatted("{{ TransformFunctionParameterType::{}, {}}}", parameter_type, value.as_object().get("required"sv).to_string()));
member_generator.append(DeprecatedString::formatted("{{ TransformFunctionParameterType::{}, {}}}", parameter_type, value.as_object().get("required"sv).to_deprecated_string()));
});
member_generator.append(R"~~~( }

View file

@ -57,7 +57,7 @@ enum class ValueID {
identifier_data.for_each([&](auto& name) {
auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name.to_string()));
member_generator.set("name:titlecase", title_casify(name.to_deprecated_string()));
member_generator.append(R"~~~(
@name:titlecase@,
@ -95,8 +95,8 @@ ValueID value_id_from_string(StringView string)
identifier_data.for_each([&](auto& name) {
auto member_generator = generator.fork();
member_generator.set("name", name.to_string());
member_generator.set("name:titlecase", title_casify(name.to_string()));
member_generator.set("name", name.to_deprecated_string());
member_generator.set("name:titlecase", title_casify(name.to_deprecated_string()));
member_generator.append(R"~~~(
if (string.equals_ignoring_case("@name@"sv))
return ValueID::@name:titlecase@;
@ -113,8 +113,8 @@ const char* string_from_value_id(ValueID value_id) {
identifier_data.for_each([&](auto& name) {
auto member_generator = generator.fork();
member_generator.set("name", name.to_string());
member_generator.set("name:titlecase", title_casify(name.to_string()));
member_generator.set("name", name.to_deprecated_string());
member_generator.set("name:titlecase", title_casify(name.to_deprecated_string()));
member_generator.append(R"~~~(
case ValueID::@name:titlecase@:
return "@name@";

View file

@ -25,7 +25,7 @@ DeprecatedString title_casify(DeprecatedString const& dashy_name)
continue;
builder.append(part.substring_view(1, part.length() - 1));
}
return builder.to_string();
return builder.to_deprecated_string();
}
DeprecatedString camel_casify(StringView dashy_name)
@ -46,7 +46,7 @@ DeprecatedString camel_casify(StringView dashy_name)
continue;
builder.append(part.substring_view(1, part.length() - 1));
}
return builder.to_string();
return builder.to_deprecated_string();
}
DeprecatedString snake_casify(DeprecatedString const& dashy_name)

View file

@ -159,7 +159,7 @@ parse_state_machine(StringView input)
consume_whitespace();
state.exit_action = consume_identifier();
} else if (lexer.next_is('@')) {
auto directive = consume_identifier().to_string();
auto directive = consume_identifier().to_deprecated_string();
fprintf(stderr, "Unimplemented @ directive %s\n", directive.characters());
exit(1);
} else {
@ -189,7 +189,7 @@ parse_state_machine(StringView input)
lexer.consume_specific('@');
state_machine->anywhere = consume_state_description();
} else if (lexer.consume_specific('@')) {
auto directive = consume_identifier().to_string();
auto directive = consume_identifier().to_deprecated_string();
fprintf(stderr, "Unimplemented @ directive %s\n", directive.characters());
exit(1);
} else {