eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-26 01:35:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb/BindingsGenerator: Simplify weird dictionary member assignment

Browse Source 
Remove the special case assignment path for string dictionary members.
The old logic was using the outer dictionary conversion’s optional and
optional_default_value state to decide how to assign an individual
member, which was very confusing and not correct.

This was probably needed on earlier buggier versions of the IDL
generator working around the wrong problem.
This commit is contained in:
Shannon Booth
2026-04-17 20:32:38 +02:00
committed by Sam Atkins
parent e9f8b6b035
commit f8288a14cc
Notes: github-actions[bot] 2026-04-17 19:49:34 +00:00 
Author: https://github.com/shannonbooth
Commit: https://github.com/LadybirdBrowser/ladybird/commit/f8288a14cc8
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp
View File

@@ -680,7 +680,7 @@ static void generate_to_integral(SourceGenerator& scoped_generator, ParameterTyp
}
// https://webidl.spec.whatwg.org/#es-dictionary
static void generate_dictionary_to_cpp(SourceGenerator& generator, IDL::Interface const& interface, IDL::Dictionary const& dictionary, ByteString dictionary_name, bool optional = false, Optional<ByteString> optional_default_value = {})
static void generate_dictionary_to_cpp(SourceGenerator& generator, IDL::Interface const& interface, IDL::Dictionary const& dictionary, ByteString dictionary_name)
{
auto const* current_dictionary = &dictionary;
auto current_dictionary_name = move(dictionary_name);
@@ -735,21 +735,9 @@ static void generate_dictionary_to_cpp(SourceGenerator& generator, IDL::Interfac
generate_to_cpp(generator, member, member_property_value_name, "", member_value_name, interface, !member.required, member.default_value);
bool may_be_null = !optional_default_value.has_value() || optional_default_value.value() == "null";
// Required dictionary members cannot be null.
may_be_null &= !member.required && !member.default_value.has_value();
if (member.type->is_string() && optional && may_be_null) {
generator.append(R"~~~(
if (@member_value_name@.has_value())
@cpp_name@.@member_name@ = @member_value_name@.release_value();
)~~~");
} else {
generator.append(R"~~~(
generator.append(R"~~~(
@cpp_name@.@member_name@ = @member_value_name@;
)~~~");
}
if (!member.required && !member.default_value.has_value()) {
generator.append(R"~~~(
}
@@ -1887,7 +1875,7 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
auto dictionary_generator = scoped_generator.fork();
auto dictionary_name = parameter.type->name();
auto& dictionary = interface.dictionaries.find(dictionary_name)->value;
generate_dictionary_to_cpp(dictionary_generator, interface, dictionary, dictionary_name, optional, optional_default_value);
generate_dictionary_to_cpp(dictionary_generator, interface, dictionary, dictionary_name);
} else if (interface.callback_functions.contains(parameter.type->name())) {
auto& callback_function = interface.callback_functions.find(parameter.type->name())->value;
generate_callback_function_to_cpp(scoped_generator, *parameter.type, callback_function, optional);