RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 15:32:46 +00:00
Code Issues Activity Actions

CodeGenerators: Convert GeneratorUtil to String

Browse source 
I may have got a little carried away propagating some of the errors. :^)
This commit is contained in:
Sam Atkins 2023-06-17 12:40:43 +01:00 • committed by Sam Atkins
parent f902d4d5e7
commit 540cc42618
5 changed files with 157 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp
View file

@ -54,13 +54,13 @@ enum class ValueID;
)~~~"); )~~~");
enums_data.for_each_member([&](auto& name, auto& value) { TRY(enums_data.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_array()); VERIFY(value.is_array());
auto& members = value.as_array(); auto& members = value.as_array();
auto enum_generator = generator.fork(); auto enum_generator = generator.fork();
enum_generator.set("name:titlecase", title_casify(name)); TRY(enum_generator.set("name:titlecase", TRY(title_casify(name))));
enum_generator.set("name:snakecase", snake_casify(name)); TRY(enum_generator.set("name:snakecase", TRY(snake_casify(name))));
// Find the smallest possible type to use. // Find the smallest possible type to use.
auto member_max_value = members.size() - 1; auto member_max_value = members.size() - 1;
@ -82,7 +82,7 @@ enum class ValueID;
if (member_name.contains('=')) if (member_name.contains('='))
continue; continue;
auto member_generator = enum_generator.fork(); auto member_generator = enum_generator.fork();
member_generator.set("member:titlecase", title_casify(member_name)); TRY(member_generator.set("member:titlecase", TRY(title_casify(member_name))));
member_generator.appendln(" @member:titlecase@,"); member_generator.appendln(" @member:titlecase@,");
} }
@ -91,7 +91,9 @@ enum class ValueID;
enum_generator.appendln("ValueID to_value_id(@name:titlecase@);"); enum_generator.appendln("ValueID to_value_id(@name:titlecase@);");
enum_generator.appendln("StringView to_string(@name:titlecase@);"); enum_generator.appendln("StringView to_string(@name:titlecase@);");
enum_generator.append("\n"); enum_generator.append("\n");
});
return {};
}));
generator.appendln("}"); generator.appendln("}");
@ -111,13 +113,13 @@ ErrorOr<void> generate_implementation_file(JsonObject& enums_data, Core::File& f
namespace Web::CSS { namespace Web::CSS {
)~~~"); )~~~");
enums_data.for_each_member([&](auto& name, auto& value) { TRY(enums_data.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_array()); VERIFY(value.is_array());
auto& members = value.as_array(); auto& members = value.as_array();
auto enum_generator = generator.fork(); auto enum_generator = generator.fork();
enum_generator.set("name:titlecase", title_casify(name)); TRY(enum_generator.set("name:titlecase", TRY(title_casify(name))));
enum_generator.set("name:snakecase", snake_casify(name)); TRY(enum_generator.set("name:snakecase", TRY(snake_casify(name))));
enum_generator.append(R"~~~( enum_generator.append(R"~~~(
Optional<@name:titlecase@> value_id_to_@name:snakecase@(ValueID value_id) Optional<@name:titlecase@> value_id_to_@name:snakecase@(ValueID value_id)
@ -129,11 +131,11 @@ Optional<@name:titlecase@> value_id_to_@name:snakecase@(ValueID value_id)
auto member_name = member.to_deprecated_string(); auto member_name = member.to_deprecated_string();
if (member_name.contains('=')) { if (member_name.contains('=')) {
auto parts = member_name.split_view('='); auto parts = member_name.split_view('=');
member_generator.set("valueid:titlecase", title_casify(parts[0])); TRY(member_generator.set("valueid:titlecase", TRY(title_casify(parts[0]))));
member_generator.set("member:titlecase", title_casify(parts[1])); TRY(member_generator.set("member:titlecase", TRY(title_casify(parts[1]))));
} else { } else {
member_generator.set("valueid:titlecase", title_casify(member_name)); TRY(member_generator.set("valueid:titlecase", TRY(title_casify(member_name))));
member_generator.set("member:titlecase", title_casify(member_name)); TRY(member_generator.set("member:titlecase", TRY(title_casify(member_name))));
} }
member_generator.append(R"~~~( member_generator.append(R"~~~(
case ValueID::@valueid:titlecase@: case ValueID::@valueid:titlecase@:
@ -157,7 +159,7 @@ ValueID to_value_id(@name:titlecase@ @name:snakecase@_value)
auto member_name = member.to_deprecated_string(); auto member_name = member.to_deprecated_string();
if (member_name.contains('=')) if (member_name.contains('='))
continue; continue;
member_generator.set("member:titlecase", title_casify(member_name)); TRY(member_generator.set("member:titlecase", TRY(title_casify(member_name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case @name:titlecase@::@member:titlecase@: case @name:titlecase@::@member:titlecase@:
@ -182,7 +184,7 @@ StringView to_string(@name:titlecase@ value)
if (member_name.contains('=')) if (member_name.contains('='))
continue; continue;
member_generator.set("member:css", member_name); member_generator.set("member:css", member_name);
member_generator.set("member:titlecase", title_casify(member_name)); TRY(member_generator.set("member:titlecase", TRY(title_casify(member_name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case @name:titlecase@::@member:titlecase@: case @name:titlecase@::@member:titlecase@:
@ -195,7 +197,8 @@ StringView to_string(@name:titlecase@ value)
} }
} }
)~~~"); )~~~");
}); return {};
}));
generator.appendln("}"); generator.appendln("}");

44
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp
View file

@ -60,12 +60,13 @@ enum class MediaFeatureValueType {
enum class MediaFeatureID {)~~~"); enum class MediaFeatureID {)~~~");
media_feature_data.for_each_member([&](auto& name, auto&) { TRY(media_feature_data.try_for_each_member([&](auto& name, auto&) -> ErrorOr<void> {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
@name:titlecase@,)~~~"); @name:titlecase@,)~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
}; };
@ -97,15 +98,16 @@ namespace Web::CSS {
Optional<MediaFeatureID> media_feature_id_from_string(StringView string) Optional<MediaFeatureID> media_feature_id_from_string(StringView string)
{)~~~"); {)~~~");
media_feature_data.for_each_member([&](auto& name, auto&) { TRY(media_feature_data.try_for_each_member([&](auto& name, auto&) -> ErrorOr<void> {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name", name); member_generator.set("name", name);
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
if (Infra::is_ascii_case_insensitive_match(string, "@name@"sv)) if (Infra::is_ascii_case_insensitive_match(string, "@name@"sv))
return MediaFeatureID::@name:titlecase@; return MediaFeatureID::@name:titlecase@;
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
return {}; return {};
@ -115,14 +117,15 @@ StringView string_from_media_feature_id(MediaFeatureID media_feature_id)
{ {
switch (media_feature_id) {)~~~"); switch (media_feature_id) {)~~~");
media_feature_data.for_each_member([&](auto& name, auto&) { TRY(media_feature_data.try_for_each_member([&](auto& name, auto&) -> ErrorOr<void> {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name", name); member_generator.set("name", name);
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case MediaFeatureID::@name:titlecase@: case MediaFeatureID::@name:titlecase@:
return "@name@"sv;)~~~"); return "@name@"sv;)~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
} }
@ -133,12 +136,12 @@ bool media_feature_type_is_range(MediaFeatureID media_feature_id)
{ {
switch (media_feature_id) {)~~~"); switch (media_feature_id) {)~~~");
media_feature_data.for_each_member([&](auto& name, auto& value) { TRY(media_feature_data.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
auto& feature = value.as_object(); auto& feature = value.as_object();
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
VERIFY(feature.has("type"sv)); VERIFY(feature.has("type"sv));
auto feature_type = feature.get_deprecated_string("type"sv); auto feature_type = feature.get_deprecated_string("type"sv);
VERIFY(feature_type.has_value()); VERIFY(feature_type.has_value());
@ -146,7 +149,8 @@ bool media_feature_type_is_range(MediaFeatureID media_feature_id)
member_generator.append(R"~~~( member_generator.append(R"~~~(
case MediaFeatureID::@name:titlecase@: case MediaFeatureID::@name:titlecase@:
return @is_range@;)~~~"); return @is_range@;)~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
} }
@ -157,12 +161,12 @@ bool media_feature_accepts_type(MediaFeatureID media_feature_id, MediaFeatureVal
{ {
switch (media_feature_id) {)~~~"); switch (media_feature_id) {)~~~");
media_feature_data.for_each_member([&](auto& name, auto& member) { TRY(media_feature_data.try_for_each_member([&](auto& name, auto& member) -> ErrorOr<void> {
VERIFY(member.is_object()); VERIFY(member.is_object());
auto& feature = member.as_object(); auto& feature = member.as_object();
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case MediaFeatureID::@name:titlecase@:)~~~"); case MediaFeatureID::@name:titlecase@:)~~~");
@ -224,7 +228,8 @@ bool media_feature_accepts_type(MediaFeatureID media_feature_id, MediaFeatureVal
member_generator.append(R"~~~( member_generator.append(R"~~~(
return false;)~~~"); return false;)~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
} }
@ -235,12 +240,12 @@ bool media_feature_accepts_identifier(MediaFeatureID media_feature_id, ValueID i
{ {
switch (media_feature_id) {)~~~"); switch (media_feature_id) {)~~~");
media_feature_data.for_each_member([&](auto& name, auto& member) { TRY(media_feature_data.try_for_each_member([&](auto& name, auto& member) -> ErrorOr<void> {
VERIFY(member.is_object()); VERIFY(member.is_object());
auto& feature = member.as_object(); auto& feature = member.as_object();
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case MediaFeatureID::@name:titlecase@:)~~~"); case MediaFeatureID::@name:titlecase@:)~~~");
@ -265,7 +270,7 @@ bool media_feature_accepts_identifier(MediaFeatureID media_feature_id, ValueID i
append_identifier_switch_if_needed(); append_identifier_switch_if_needed();
auto ident_generator = member_generator.fork(); auto ident_generator = member_generator.fork();
ident_generator.set("identifier:titlecase", title_casify(identifier_name)); TRY(ident_generator.set("identifier:titlecase", TRY(title_casify(identifier_name))));
ident_generator.append(R"~~~( ident_generator.append(R"~~~(
case ValueID::@identifier:titlecase@: case ValueID::@identifier:titlecase@:
return true;)~~~"); return true;)~~~");
@ -280,7 +285,8 @@ bool media_feature_accepts_identifier(MediaFeatureID media_feature_id, ValueID i
member_generator.append(R"~~~( member_generator.append(R"~~~(
return false;)~~~"); return false;)~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
} }

158
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSPropertyID.cpp
View file

@ -16,7 +16,7 @@
ErrorOr<void> replace_logical_aliases(JsonObject& properties); ErrorOr<void> replace_logical_aliases(JsonObject& properties);
ErrorOr<void> generate_header_file(JsonObject& properties, Core::File& file); ErrorOr<void> generate_header_file(JsonObject& properties, Core::File& file);
ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::File& file); ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::File& file);
void generate_bounds_checking_function(JsonObject& properties, SourceGenerator& parent_generator, StringView css_type_name, StringView type_name, Optional<StringView> default_unit_name = {}, Optional<StringView> value_getter = {}); ErrorOr<void> generate_bounds_checking_function(JsonObject& properties, SourceGenerator& parent_generator, StringView css_type_name, StringView type_name, Optional<StringView> default_unit_name = {}, Optional<StringView> value_getter = {});
static bool type_name_is_enum(StringView type_name) static bool type_name_is_enum(StringView type_name)
{ {
@ -120,7 +120,7 @@ enum class PropertyID {
for (auto& name : shorthand_property_ids) { for (auto& name : shorthand_property_ids) {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
@name:titlecase@, @name:titlecase@,
@ -129,21 +129,21 @@ enum class PropertyID {
for (auto& name : longhand_property_ids) { for (auto& name : longhand_property_ids) {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
@name:titlecase@, @name:titlecase@,
)~~~"); )~~~");
} }
generator.set("first_property_id", title_casify(first_property_id)); TRY(generator.set("first_property_id", TRY(title_casify(first_property_id))));
generator.set("last_property_id", title_casify(last_property_id)); TRY(generator.set("last_property_id", TRY(title_casify(last_property_id))));
generator.set("first_shorthand_property_id", title_casify(shorthand_property_ids.first())); TRY(generator.set("first_shorthand_property_id", TRY(title_casify(shorthand_property_ids.first()))));
generator.set("last_shorthand_property_id", title_casify(shorthand_property_ids.last())); TRY(generator.set("last_shorthand_property_id", TRY(title_casify(shorthand_property_ids.last()))));
generator.set("first_longhand_property_id", title_casify(longhand_property_ids.first())); TRY(generator.set("first_longhand_property_id", TRY(title_casify(longhand_property_ids.first()))));
generator.set("last_longhand_property_id", title_casify(longhand_property_ids.last())); TRY(generator.set("last_longhand_property_id", TRY(title_casify(longhand_property_ids.last()))));
generator.append(R"~~~( generator.append(R"~~~(
}; };
@ -223,7 +223,7 @@ struct Traits<Web::CSS::PropertyID> : public GenericTraits<Web::CSS::PropertyID>
return {}; return {};
} }
void generate_bounds_checking_function(JsonObject& properties, SourceGenerator& parent_generator, StringView css_type_name, StringView type_name, Optional<StringView> default_unit_name, Optional<StringView> value_getter) ErrorOr<void> generate_bounds_checking_function(JsonObject& properties, SourceGenerator& parent_generator, StringView css_type_name, StringView type_name, Optional<StringView> default_unit_name, Optional<StringView> value_getter)
{ {
auto generator = parent_generator.fork(); auto generator = parent_generator.fork();
generator.set("css_type_name", css_type_name); generator.set("css_type_name", css_type_name);
@ -235,7 +235,7 @@ bool property_accepts_@css_type_name@(PropertyID property_id, [[maybe_unused]] @
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, JsonValue const& value) { TRY(properties.try_for_each_member([&](auto& name, JsonValue const& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
if (auto maybe_valid_types = value.as_object().get_array("valid-types"sv); maybe_valid_types.has_value() && !maybe_valid_types->is_empty()) { if (auto maybe_valid_types = value.as_object().get_array("valid-types"sv); maybe_valid_types.has_value() && !maybe_valid_types->is_empty()) {
for (auto valid_type : maybe_valid_types->values()) { for (auto valid_type : maybe_valid_types->values()) {
@ -244,7 +244,7 @@ bool property_accepts_@css_type_name@(PropertyID property_id, [[maybe_unused]] @
continue; continue;
auto property_generator = generator.fork(); auto property_generator = generator.fork();
property_generator.set("property_name:titlecase", title_casify(name)); TRY(property_generator.set("property_name:titlecase", TRY(title_casify(name))));
property_generator.append(R"~~~( property_generator.append(R"~~~(
case PropertyID::@property_name:titlecase@: case PropertyID::@property_name:titlecase@:
@ -268,13 +268,13 @@ bool property_accepts_@css_type_name@(PropertyID property_id, [[maybe_unused]] @
break; break;
} }
auto output_check = [&](auto& value_string, StringView comparator) { auto output_check = [&](auto& value_string, StringView comparator) -> ErrorOr<void> {
if (value_getter.has_value()) { if (value_getter.has_value()) {
property_generator.set("value_number", value_string); property_generator.set("value_number", value_string);
property_generator.set("value_getter", value_getter.value()); property_generator.set("value_getter", value_getter.value());
property_generator.set("comparator", comparator); property_generator.set("comparator", comparator);
property_generator.append("@value_getter@ @comparator@ @value_number@"); property_generator.append("@value_getter@ @comparator@ @value_number@");
return; return {};
} }
GenericLexer lexer { value_string }; GenericLexer lexer { value_string };
@ -284,17 +284,18 @@ bool property_accepts_@css_type_name@(PropertyID property_id, [[maybe_unused]] @
value_unit = default_unit_name.value(); value_unit = default_unit_name.value();
VERIFY(lexer.is_eof()); VERIFY(lexer.is_eof());
property_generator.set("value_number", value_number); property_generator.set("value_number", value_number);
property_generator.set("value_unit", title_casify(value_unit)); TRY(property_generator.set("value_unit", TRY(title_casify(value_unit))));
property_generator.set("comparator", comparator); property_generator.set("comparator", comparator);
property_generator.append("value @comparator@ @type_name@(@value_number@, @type_name@::Type::@value_unit@)"); property_generator.append("value @comparator@ @type_name@(@value_number@, @type_name@::Type::@value_unit@)");
return {};
}; };
if (!min_value_string.is_empty()) if (!min_value_string.is_empty())
output_check(min_value_string, ">="sv); TRY(output_check(min_value_string, ">="sv));
if (!min_value_string.is_empty() && !max_value_string.is_empty()) if (!min_value_string.is_empty() && !max_value_string.is_empty())
property_generator.append(" && "); property_generator.append(" && ");
if (!max_value_string.is_empty()) if (!max_value_string.is_empty())
output_check(max_value_string, "<="sv); TRY(output_check(max_value_string, "<="sv));
property_generator.appendln(";"); property_generator.appendln(";");
} else { } else {
property_generator.appendln("true;"); property_generator.appendln("true;");
@ -302,7 +303,8 @@ bool property_accepts_@css_type_name@(PropertyID property_id, [[maybe_unused]] @
break; break;
} }
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:
@ -310,6 +312,7 @@ bool property_accepts_@css_type_name@(PropertyID property_id, [[maybe_unused]] @
} }
} }
)~~~"); )~~~");
return {};
} }
ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::File& file) ErrorOr<void> generate_implementation_file(JsonObject& properties, Core::File& file)
@ -333,18 +336,19 @@ Optional<PropertyID> property_id_from_camel_case_string(StringView string)
{ {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name", name); member_generator.set("name", name);
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.set("name:camelcase", camel_casify(name)); TRY(member_generator.set("name:camelcase", TRY(camel_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
if (string.equals_ignoring_ascii_case("@name:camelcase@"sv)) if (string.equals_ignoring_ascii_case("@name:camelcase@"sv))
return PropertyID::@name:titlecase@; return PropertyID::@name:titlecase@;
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
return {}; return {};
@ -354,17 +358,18 @@ Optional<PropertyID> property_id_from_string(StringView string)
{ {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name", name); member_generator.set("name", name);
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
if (Infra::is_ascii_case_insensitive_match(string, "@name@"sv)) if (Infra::is_ascii_case_insensitive_match(string, "@name@"sv))
return PropertyID::@name:titlecase@; return PropertyID::@name:titlecase@;
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
return {}; return {};
@ -374,17 +379,18 @@ StringView string_from_property_id(PropertyID property_id) {
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name", name); member_generator.set("name", name);
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case PropertyID::@name:titlecase@: case PropertyID::@name:titlecase@:
return "@name@"sv; return "@name@"sv;
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:
@ -397,7 +403,7 @@ bool is_inherited_property(PropertyID property_id)
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
bool inherited = false; bool inherited = false;
@ -409,13 +415,14 @@ bool is_inherited_property(PropertyID property_id)
if (inherited) { if (inherited) {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case PropertyID::@name:titlecase@: case PropertyID::@name:titlecase@:
return true; return true;
)~~~"); )~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:
@ -428,7 +435,7 @@ bool property_affects_layout(PropertyID property_id)
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
bool affects_layout = true; bool affects_layout = true;
@ -437,12 +444,13 @@ bool property_affects_layout(PropertyID property_id)
if (affects_layout) { if (affects_layout) {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case PropertyID::@name:titlecase@: case PropertyID::@name:titlecase@:
)~~~"); )~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
return true; return true;
@ -456,7 +464,7 @@ bool property_affects_stacking_context(PropertyID property_id)
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
bool affects_stacking_context = false; bool affects_stacking_context = false;
@ -465,12 +473,13 @@ bool property_affects_stacking_context(PropertyID property_id)
if (affects_stacking_context) { if (affects_stacking_context) {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case PropertyID::@name:titlecase@: case PropertyID::@name:titlecase@:
)~~~"); )~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
return true; return true;
@ -493,7 +502,7 @@ ErrorOr<NonnullRefPtr<StyleValue>> property_initial_value(JS::Realm& context_rea
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
auto output_initial_value_code = [&](auto& name, auto& object) { auto output_initial_value_code = [&](auto& name, auto& object) -> ErrorOr<void> {
if (!object.has("initial"sv)) { if (!object.has("initial"sv)) {
dbgln("No initial value specified for property '{}'", name); dbgln("No initial value specified for property '{}'", name);
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
@ -503,7 +512,7 @@ ErrorOr<NonnullRefPtr<StyleValue>> property_initial_value(JS::Realm& context_rea
auto& initial_value_string = initial_value.value(); auto& initial_value_string = initial_value.value();
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name)); TRY(member_generator.set("name:titlecase", TRY(title_casify(name))));
member_generator.set("initial_value_string", initial_value_string); member_generator.set("initial_value_string", initial_value_string);
member_generator.append( member_generator.append(
R"~~~( case PropertyID::@name:titlecase@: R"~~~( case PropertyID::@name:titlecase@:
@ -515,12 +524,14 @@ ErrorOr<NonnullRefPtr<StyleValue>> property_initial_value(JS::Realm& context_rea
return initial_value; return initial_value;
} }
)~~~"); )~~~");
return {};
}; };
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
output_initial_value_code(name, value.as_object()); TRY(output_initial_value_code(name, value.as_object()));
}); return {};
}));
generator.append( generator.append(
R"~~~( default: VERIFY_NOT_REACHED(); R"~~~( default: VERIFY_NOT_REACHED();
@ -533,7 +544,7 @@ bool property_has_quirk(PropertyID property_id, Quirk quirk)
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
if (value.as_object().has("quirks"sv)) { if (value.as_object().has("quirks"sv)) {
auto quirks_value = value.as_object().get_array("quirks"sv); auto quirks_value = value.as_object().get_array("quirks"sv);
@ -542,7 +553,7 @@ bool property_has_quirk(PropertyID property_id, Quirk quirk)
if (!quirks.is_empty()) { if (!quirks.is_empty()) {
auto property_generator = generator.fork(); auto property_generator = generator.fork();
property_generator.set("name:titlecase", title_casify(name)); TRY(property_generator.set("name:titlecase", TRY(title_casify(name))));
property_generator.append(R"~~~( property_generator.append(R"~~~(
case PropertyID::@name:titlecase@: { case PropertyID::@name:titlecase@: {
switch (quirk) { switch (quirk) {
@ -550,7 +561,7 @@ bool property_has_quirk(PropertyID property_id, Quirk quirk)
for (auto& quirk : quirks.values()) { for (auto& quirk : quirks.values()) {
VERIFY(quirk.is_string()); VERIFY(quirk.is_string());
auto quirk_generator = property_generator.fork(); auto quirk_generator = property_generator.fork();
quirk_generator.set("quirk:titlecase", title_casify(quirk.as_string())); TRY(quirk_generator.set("quirk:titlecase", TRY(title_casify(quirk.as_string()))));
quirk_generator.append(R"~~~( quirk_generator.append(R"~~~(
case Quirk::@quirk:titlecase@: case Quirk::@quirk:titlecase@:
return true; return true;
@ -564,7 +575,8 @@ bool property_has_quirk(PropertyID property_id, Quirk quirk)
)~~~"); )~~~");
} }
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:
@ -576,13 +588,13 @@ bool property_accepts_type(PropertyID property_id, ValueType value_type)
{ {
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
auto& object = value.as_object(); auto& object = value.as_object();
if (auto maybe_valid_types = object.get_array("valid-types"sv); maybe_valid_types.has_value() && !maybe_valid_types->is_empty()) { if (auto maybe_valid_types = object.get_array("valid-types"sv); maybe_valid_types.has_value() && !maybe_valid_types->is_empty()) {
auto& valid_types = maybe_valid_types.value(); auto& valid_types = maybe_valid_types.value();
auto property_generator = generator.fork(); auto property_generator = generator.fork();
property_generator.set("name:titlecase", title_casify(name)); TRY(property_generator.set("name:titlecase", TRY(title_casify(name))));
property_generator.append(R"~~~( property_generator.append(R"~~~(
case PropertyID::@name:titlecase@: { case PropertyID::@name:titlecase@: {
switch (value_type) { switch (value_type) {
@ -643,7 +655,8 @@ bool property_accepts_type(PropertyID property_id, ValueType value_type)
} }
)~~~"); )~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:
return false; return false;
@ -654,12 +667,12 @@ bool property_accepts_identifier(PropertyID property_id, ValueID identifier)
{ {
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
auto& object = value.as_object(); auto& object = value.as_object();
auto property_generator = generator.fork(); auto property_generator = generator.fork();
property_generator.set("name:titlecase", title_casify(name)); TRY(property_generator.set("name:titlecase", TRY(title_casify(name))));
property_generator.appendln(" case PropertyID::@name:titlecase@: {"); property_generator.appendln(" case PropertyID::@name:titlecase@: {");
if (auto maybe_valid_identifiers = object.get_array("valid-identifiers"sv); maybe_valid_identifiers.has_value() && !maybe_valid_identifiers->is_empty()) { if (auto maybe_valid_identifiers = object.get_array("valid-identifiers"sv); maybe_valid_identifiers.has_value() && !maybe_valid_identifiers->is_empty()) {
@ -667,7 +680,7 @@ bool property_accepts_identifier(PropertyID property_id, ValueID identifier)
auto& valid_identifiers = maybe_valid_identifiers.value(); auto& valid_identifiers = maybe_valid_identifiers.value();
for (auto& identifier : valid_identifiers.values()) { for (auto& identifier : valid_identifiers.values()) {
auto identifier_generator = generator.fork(); auto identifier_generator = generator.fork();
identifier_generator.set("identifier:titlecase", title_casify(identifier.as_string())); TRY(identifier_generator.set("identifier:titlecase", TRY(title_casify(identifier.as_string()))));
identifier_generator.appendln(" case ValueID::@identifier:titlecase@:"); identifier_generator.appendln(" case ValueID::@identifier:titlecase@:");
} }
property_generator.append(R"~~~( property_generator.append(R"~~~(
@ -686,7 +699,7 @@ bool property_accepts_identifier(PropertyID property_id, ValueID identifier)
continue; continue;
auto type_generator = generator.fork(); auto type_generator = generator.fork();
type_generator.set("type_name:snakecase", snake_casify(type_name)); TRY(type_generator.set("type_name:snakecase", TRY(snake_casify(type_name))));
type_generator.append(R"~~~( type_generator.append(R"~~~(
if (value_id_to_@type_name:snakecase@(identifier).has_value()) if (value_id_to_@type_name:snakecase@(identifier).has_value())
return true; return true;
@ -697,7 +710,8 @@ bool property_accepts_identifier(PropertyID property_id, ValueID identifier)
return false; return false;
} }
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:
return false; return false;
@ -709,20 +723,21 @@ size_t property_maximum_value_count(PropertyID property_id)
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
VERIFY(value.is_object()); VERIFY(value.is_object());
if (value.as_object().has("max-values"sv)) { if (value.as_object().has("max-values"sv)) {
auto max_values = value.as_object().get("max-values"sv); auto max_values = value.as_object().get("max-values"sv);
VERIFY(max_values.has_value() && max_values->is_number() && !max_values->is_double()); VERIFY(max_values.has_value() && max_values->is_number() && !max_values->is_double());
auto property_generator = generator.fork(); auto property_generator = generator.fork();
property_generator.set("name:titlecase", title_casify(name)); TRY(property_generator.set("name:titlecase", TRY(title_casify(name))));
property_generator.set("max_values", max_values->to_deprecated_string()); property_generator.set("max_values", max_values->to_deprecated_string());
property_generator.append(R"~~~( property_generator.append(R"~~~(
case PropertyID::@name:titlecase@: case PropertyID::@name:titlecase@:
return @max_values@; return @max_values@;
)~~~"); )~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:
@ -730,44 +745,45 @@ size_t property_maximum_value_count(PropertyID property_id)
} }
})~~~"); })~~~");
generate_bounds_checking_function(properties, generator, "angle"sv, "Angle"sv, "Deg"sv); TRY(generate_bounds_checking_function(properties, generator, "angle"sv, "Angle"sv, "Deg"sv));
generate_bounds_checking_function(properties, generator, "frequency"sv, "Frequency"sv, "Hertz"sv); TRY(generate_bounds_checking_function(properties, generator, "frequency"sv, "Frequency"sv, "Hertz"sv));
generate_bounds_checking_function(properties, generator, "integer"sv, "i64"sv, {}, "value"sv); TRY(generate_bounds_checking_function(properties, generator, "integer"sv, "i64"sv, {}, "value"sv));
generate_bounds_checking_function(properties, generator, "length"sv, "Length"sv, {}, "value.raw_value()"sv); TRY(generate_bounds_checking_function(properties, generator, "length"sv, "Length"sv, {}, "value.raw_value()"sv));
generate_bounds_checking_function(properties, generator, "number"sv, "double"sv, {}, "value"sv); TRY(generate_bounds_checking_function(properties, generator, "number"sv, "double"sv, {}, "value"sv));
generate_bounds_checking_function(properties, generator, "percentage"sv, "Percentage"sv, {}, "value.value()"sv); TRY(generate_bounds_checking_function(properties, generator, "percentage"sv, "Percentage"sv, {}, "value.value()"sv));
generate_bounds_checking_function(properties, generator, "resolution"sv, "Resolution"sv, "Dpi"sv); TRY(generate_bounds_checking_function(properties, generator, "resolution"sv, "Resolution"sv, "Dpi"sv));
generate_bounds_checking_function(properties, generator, "time"sv, "Time"sv, "S"sv); TRY(generate_bounds_checking_function(properties, generator, "time"sv, "Time"sv, "S"sv));
generator.append(R"~~~( generator.append(R"~~~(
Vector<PropertyID> longhands_for_shorthand(PropertyID property_id) Vector<PropertyID> longhands_for_shorthand(PropertyID property_id)
{ {
switch (property_id) { switch (property_id) {
)~~~"); )~~~");
properties.for_each_member([&](auto& name, auto& value) { TRY(properties.try_for_each_member([&](auto& name, auto& value) -> ErrorOr<void> {
if (value.as_object().has("longhands"sv)) { if (value.as_object().has("longhands"sv)) {
auto longhands = value.as_object().get("longhands"sv); auto longhands = value.as_object().get("longhands"sv);
VERIFY(longhands.has_value() && longhands->is_array()); VERIFY(longhands.has_value() && longhands->is_array());
auto longhand_values = longhands->as_array(); auto longhand_values = longhands->as_array();
auto property_generator = generator.fork(); auto property_generator = generator.fork();
property_generator.set("name:titlecase", title_casify(name)); TRY(property_generator.set("name:titlecase", TRY(title_casify(name))));
StringBuilder builder; StringBuilder builder;
bool first = true; bool first = true;
longhand_values.for_each([&](auto& longhand) { TRY(longhand_values.try_for_each([&](auto& longhand) -> ErrorOr<IterationDecision> {
if (first) if (first)
first = false; first = false;
else else
builder.append(", "sv); builder.append(", "sv);
builder.appendff("PropertyID::{}", title_casify(longhand.to_deprecated_string())); builder.appendff("PropertyID::{}", TRY(title_casify(longhand.to_deprecated_string())));
return IterationDecision::Continue; return IterationDecision::Continue;
}); }));
property_generator.set("longhands", builder.to_deprecated_string()); property_generator.set("longhands", builder.to_deprecated_string());
property_generator.append(R"~~~( property_generator.append(R"~~~(
case PropertyID::@name:titlecase@: case PropertyID::@name:titlecase@:
return { @longhands@ }; return { @longhands@ };
)~~~"); )~~~");
} }
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:

21
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSValueID.cpp
View file

@ -55,14 +55,15 @@ enum class ValueID {
Invalid, Invalid,
)~~~"); )~~~");
identifier_data.for_each([&](auto& name) { TRY(identifier_data.try_for_each([&](auto& name) -> ErrorOr<void> {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name:titlecase", title_casify(name.to_deprecated_string())); TRY(member_generator.set("name:titlecase", TRY(title_casify(name.to_deprecated_string()))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
@name:titlecase@, @name:titlecase@,
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
}; };
@ -93,14 +94,15 @@ namespace Web::CSS {
HashMap<StringView, ValueID, AK::CaseInsensitiveASCIIStringViewTraits> g_stringview_to_value_id_map { HashMap<StringView, ValueID, AK::CaseInsensitiveASCIIStringViewTraits> g_stringview_to_value_id_map {
)~~~"); )~~~");
identifier_data.for_each([&](auto& name) { TRY(identifier_data.try_for_each([&](auto& name) -> ErrorOr<void> {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name", name.to_deprecated_string()); member_generator.set("name", name.to_deprecated_string());
member_generator.set("name:titlecase", title_casify(name.to_deprecated_string())); TRY(member_generator.set("name:titlecase", TRY(title_casify(name.to_deprecated_string()))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
{"@name@"sv, ValueID::@name:titlecase@}, {"@name@"sv, ValueID::@name:titlecase@},
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
}; };
@ -114,15 +116,16 @@ StringView string_from_value_id(ValueID value_id) {
switch (value_id) { switch (value_id) {
)~~~"); )~~~");
identifier_data.for_each([&](auto& name) { TRY(identifier_data.try_for_each([&](auto& name) -> ErrorOr<void> {
auto member_generator = generator.fork(); auto member_generator = generator.fork();
member_generator.set("name", name.to_deprecated_string()); member_generator.set("name", name.to_deprecated_string());
member_generator.set("name:titlecase", title_casify(name.to_deprecated_string())); TRY(member_generator.set("name:titlecase", TRY(title_casify(name.to_deprecated_string()))));
member_generator.append(R"~~~( member_generator.append(R"~~~(
case ValueID::@name:titlecase@: case ValueID::@name:titlecase@:
return "@name@"sv; return "@name@"sv;
)~~~"); )~~~");
}); return {};
}));
generator.append(R"~~~( generator.append(R"~~~(
default: default:

28
Meta/Lagom/Tools/CodeGenerators/LibWeb/GeneratorUtil.h
View file

@ -1,34 +1,34 @@
/* /*
* Copyright (c) 2019-2021, Andreas Kling <kling@serenityos.org> * Copyright (c) 2019-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, Samuel Atkins <atkinssj@serenityos.org> * Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#pragma once #pragma once
#include <AK/DeprecatedString.h>
#include <AK/JsonObject.h> #include <AK/JsonObject.h>
#include <AK/String.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <ctype.h> #include <ctype.h>
DeprecatedString title_casify(DeprecatedString const& dashy_name) ErrorOr<String> title_casify(StringView dashy_name)
{ {
auto parts = dashy_name.split('-'); auto parts = dashy_name.split_view('-');
StringBuilder builder; StringBuilder builder;
for (auto& part : parts) { for (auto& part : parts) {
if (part.is_empty()) if (part.is_empty())
continue; continue;
builder.append(toupper(part[0])); TRY(builder.try_append(toupper(part[0])));
if (part.length() == 1) if (part.length() == 1)
continue; continue;
builder.append(part.substring_view(1, part.length() - 1)); TRY(builder.try_append(part.substring_view(1, part.length() - 1)));
} }
return builder.to_deprecated_string(); return builder.to_string();
} }
DeprecatedString camel_casify(StringView dashy_name) ErrorOr<String> camel_casify(StringView dashy_name)
{ {
auto parts = dashy_name.split_view('-'); auto parts = dashy_name.split_view('-');
StringBuilder builder; StringBuilder builder;
@ -41,17 +41,19 @@ DeprecatedString camel_casify(StringView dashy_name)
ch = toupper(ch); ch = toupper(ch);
else else
first = false; first = false;
builder.append(ch); TRY(builder.try_append(ch));
if (part.length() == 1) if (part.length() == 1)
continue; continue;
builder.append(part.substring_view(1, part.length() - 1)); TRY(builder.try_append(part.substring_view(1, part.length() - 1)));
} }
return builder.to_deprecated_string(); return builder.to_string();
} }
DeprecatedString snake_casify(DeprecatedString const& dashy_name) ErrorOr<String> snake_casify(StringView dashy_name)
{ {
return dashy_name.replace("-"sv, "_"sv, ReplaceMode::All); // FIXME: We don't really need to convert dashy_name to a String first, but currently
// all the `replace` functions that take a StringView return DeprecatedString.
return TRY(String::from_utf8(dashy_name)).replace("-"sv, "_"sv, ReplaceMode::All);
} }
ErrorOr<JsonValue> read_entire_file_as_json(StringView filename) ErrorOr<JsonValue> read_entire_file_as_json(StringView filename)