mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-09-02 07:37:03 +00:00
AK+Everywhere: Remove now-unecessary use of ByteString with JSON types
This removes JsonObject::get_byte_string and JsonObject::to_byte_string.
This commit is contained in:
Timothy Flynn
Tim Flynn
parent
4791ec35bf
commit
2c03de60da
Notes:
github-actions[bot]
2025-02-21 00:28:59 +00:00
Author: https://github.com/trflynn89
Commit: 2c03de60da
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3631
Reviewed-by: https://github.com/awesomekling ✅
17 changed files with 67 additions and 86 deletions
|
|
@ -29,8 +29,8 @@ namespace Web::ARIA {
|
|||
JsonObject const& value_object = value.as_object();
|
||||
|
||||
auto class_definition_generator = generator.fork();
|
||||
class_definition_generator.set("spec_link"sv, value_object.get_byte_string("specLink"sv).value());
|
||||
class_definition_generator.set("description"sv, value_object.get_byte_string("description"sv).value());
|
||||
class_definition_generator.set("spec_link"sv, value_object.get_string("specLink"sv).release_value());
|
||||
class_definition_generator.set("description"sv, value_object.get_string("description"sv).release_value());
|
||||
class_definition_generator.set("name"sv, name);
|
||||
class_definition_generator.append(R"~~~(
|
||||
// @spec_link@
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ RefPtr<CalculationNode> Parser::parse_math_function(Function const& function, Ca
|
|||
functions_data.for_each_member([&](auto& name, JsonValue const& value) -> void {
|
||||
auto& function_data = value.as_object();
|
||||
auto& parameters = function_data.get_array("parameters"sv).value();
|
||||
auto parameter_validation_rule = function_data.get_byte_string("parameter-validation"sv);
|
||||
auto parameter_validation_rule = function_data.get_string("parameter-validation"sv);
|
||||
bool requires_same_parameters = parameter_validation_rule.has_value() ? (parameter_validation_rule == "same"sv) : true;
|
||||
|
||||
auto function_generator = generator.fork();
|
||||
|
|
@ -158,7 +158,7 @@ RefPtr<CalculationNode> Parser::parse_math_function(Function const& function, Ca
|
|||
// Generate some type checks
|
||||
VERIFY(parameters.size() == 1);
|
||||
auto& parameter_data = parameters[0].as_object();
|
||||
auto parameter_type_string = parameter_data.get_byte_string("type"sv).value();
|
||||
auto parameter_type_string = parameter_data.get_string("type"sv).value();
|
||||
function_generator.set("type_check", generate_calculation_type_check("argument_type"sv, parameter_type_string));
|
||||
function_generator.append(R"~~~(
|
||||
if (!(@type_check@)) {
|
||||
|
|
@ -221,11 +221,11 @@ RefPtr<CalculationNode> Parser::parse_math_function(Function const& function, Ca
|
|||
size_t parameter_index = 0;
|
||||
parameters.for_each([&](JsonValue const& parameter_value) {
|
||||
auto& parameter = parameter_value.as_object();
|
||||
auto parameter_type_string = parameter.get_byte_string("type"sv).value();
|
||||
auto parameter_type_string = parameter.get_string("type"sv).value();
|
||||
auto parameter_required = parameter.get_bool("required"sv).value();
|
||||
|
||||
auto parameter_generator = function_generator.fork();
|
||||
parameter_generator.set("parameter_name", parameter.get_byte_string("name"sv).value());
|
||||
parameter_generator.set("parameter_name", parameter.get_string("name"sv).value());
|
||||
parameter_generator.set("parameter_index", String::number(parameter_index));
|
||||
|
||||
bool parameter_is_calculation;
|
||||
|
|
@ -235,7 +235,7 @@ RefPtr<CalculationNode> Parser::parse_math_function(Function const& function, Ca
|
|||
parameter_generator.set("parse_function", "parse_rounding_strategy(arguments[argument_index])"_string);
|
||||
parameter_generator.set("check_function", ".has_value()"_string);
|
||||
parameter_generator.set("release_function", ".release_value()"_string);
|
||||
if (auto default_value = parameter.get_byte_string("default"sv); default_value.has_value()) {
|
||||
if (auto default_value = parameter.get_string("default"sv); default_value.has_value()) {
|
||||
parameter_generator.set("parameter_default", MUST(String::formatted(" = RoundingStrategy::{}", title_casify(default_value.value()))));
|
||||
} else {
|
||||
parameter_generator.set("parameter_default", ""_string);
|
||||
|
|
@ -250,7 +250,7 @@ RefPtr<CalculationNode> Parser::parse_math_function(Function const& function, Ca
|
|||
|
||||
// NOTE: We have exactly one default value in the data right now, and it's a `<calc-constant>`,
|
||||
// so that's all we handle.
|
||||
if (auto default_value = parameter.get_byte_string("default"sv); default_value.has_value()) {
|
||||
if (auto default_value = parameter.get_string("default"sv); default_value.has_value()) {
|
||||
parameter_generator.set("parameter_default", MUST(String::formatted(" = ConstantCalculationNode::create(CalculationNode::constant_type_from_string(\"{}\"sv).value())", default_value.value())));
|
||||
} else {
|
||||
parameter_generator.set("parameter_default", ""_string);
|
||||
|
|
@ -343,7 +343,7 @@ RefPtr<CalculationNode> Parser::parse_math_function(Function const& function, Ca
|
|||
parameter_index = 0;
|
||||
parameters.for_each([&](JsonValue const& parameter_value) {
|
||||
auto& parameter = parameter_value.as_object();
|
||||
auto parameter_type_string = parameter.get_byte_string("type"sv).value();
|
||||
auto parameter_type_string = parameter.get_string("type"sv).value();
|
||||
|
||||
auto parameter_generator = function_generator.fork();
|
||||
parameter_generator.set("parameter_index"sv, String::number(parameter_index));
|
||||
|
|
|
|||
|
|
@ -140,9 +140,9 @@ bool media_feature_type_is_range(MediaFeatureID media_feature_id)
|
|||
auto member_generator = generator.fork();
|
||||
member_generator.set("name:titlecase", title_casify(name));
|
||||
VERIFY(feature.has("type"sv));
|
||||
auto feature_type = feature.get_byte_string("type"sv);
|
||||
auto feature_type = feature.get_string("type"sv);
|
||||
VERIFY(feature_type.has_value());
|
||||
member_generator.set("is_range", feature_type.value() == "range" ? "true"_string : "false"_string);
|
||||
member_generator.set("is_range", feature_type.value() == "range"sv ? "true"_string : "false"_string);
|
||||
member_generator.append(R"~~~(
|
||||
case MediaFeatureID::@name:titlecase@:
|
||||
return @is_range@;)~~~");
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@ Optional<PropertyID> property_id_from_camel_case_string(StringView string)
|
|||
auto member_generator = generator.fork();
|
||||
member_generator.set("name", name);
|
||||
member_generator.set("name:camelcase", camel_casify(name));
|
||||
if (auto legacy_alias_for = value.as_object().get_byte_string("legacy-alias-for"sv); legacy_alias_for.has_value()) {
|
||||
if (auto legacy_alias_for = value.as_object().get_string("legacy-alias-for"sv); legacy_alias_for.has_value()) {
|
||||
member_generator.set("name:titlecase", title_casify(legacy_alias_for.value()));
|
||||
} else {
|
||||
member_generator.set("name:titlecase", title_casify(name));
|
||||
|
|
@ -449,7 +449,7 @@ Optional<PropertyID> property_id_from_string(StringView string)
|
|||
|
||||
auto member_generator = generator.fork();
|
||||
member_generator.set("name", name);
|
||||
if (auto legacy_alias_for = value.as_object().get_byte_string("legacy-alias-for"sv); legacy_alias_for.has_value()) {
|
||||
if (auto legacy_alias_for = value.as_object().get_string("legacy-alias-for"sv); legacy_alias_for.has_value()) {
|
||||
member_generator.set("name:titlecase", title_casify(legacy_alias_for.value()));
|
||||
} else {
|
||||
member_generator.set("name:titlecase", title_casify(name));
|
||||
|
|
@ -552,7 +552,7 @@ AnimationType animation_type_from_longhand_property(PropertyID property_id)
|
|||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
||||
auto animation_type = value.as_object().get_byte_string("animation-type"sv).value();
|
||||
auto animation_type = value.as_object().get_string("animation-type"sv).value();
|
||||
member_generator.set("value", title_casify(animation_type));
|
||||
member_generator.append(R"~~~(
|
||||
case PropertyID::@name:titlecase@:
|
||||
|
|
@ -681,7 +681,7 @@ NonnullRefPtr<CSSStyleValue> property_initial_value(PropertyID property_id)
|
|||
dbgln("No initial value specified for property '{}'", name);
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
auto initial_value = object.get_byte_string("initial"sv);
|
||||
auto initial_value = object.get_string("initial"sv);
|
||||
VERIFY(initial_value.has_value());
|
||||
auto& initial_value_string = initial_value.value();
|
||||
|
||||
|
|
@ -921,7 +921,7 @@ Optional<ValueType> property_resolves_percentages_relative_to(PropertyID propert
|
|||
if (is_legacy_alias(value.as_object()))
|
||||
return;
|
||||
|
||||
if (auto resolved_type = value.as_object().get_byte_string("percentages-resolve-to"sv); resolved_type.has_value()) {
|
||||
if (auto resolved_type = value.as_object().get_string("percentages-resolve-to"sv); resolved_type.has_value()) {
|
||||
auto property_generator = generator.fork();
|
||||
property_generator.set("name:titlecase", title_casify(name));
|
||||
property_generator.set("resolved_type:titlecase", title_casify(resolved_type.value()));
|
||||
|
|
@ -1057,7 +1057,7 @@ bool is_animatable_property(JsonObject& properties, StringView property_name)
|
|||
auto property = properties.get_object(property_name);
|
||||
VERIFY(property.has_value());
|
||||
|
||||
if (auto animation_type = property.value().get_byte_string("animation-type"sv); animation_type.has_value()) {
|
||||
if (auto animation_type = property.value().get_string("animation-type"sv); animation_type.has_value()) {
|
||||
return animation_type != "none";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -149,14 +149,14 @@ PseudoClassMetadata pseudo_class_metadata(PseudoClass pseudo_class)
|
|||
pseudo_classes_data.for_each_member([&](auto& name, JsonValue const& value) {
|
||||
auto member_generator = generator.fork();
|
||||
auto& pseudo_class = value.as_object();
|
||||
auto argument_string = pseudo_class.get_byte_string("argument"sv).value();
|
||||
auto argument_string = pseudo_class.get_string("argument"sv).value();
|
||||
|
||||
bool is_valid_as_identifier = argument_string.is_empty();
|
||||
bool is_valid_as_function = !argument_string.is_empty();
|
||||
|
||||
if (argument_string.ends_with('?')) {
|
||||
is_valid_as_identifier = true;
|
||||
argument_string = argument_string.substring(0, argument_string.length() - 1);
|
||||
argument_string = MUST(argument_string.substring_from_byte_offset(0, argument_string.byte_count() - 1));
|
||||
}
|
||||
|
||||
String parameter_type = "None"_string;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue