RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:57:45 +00:00
Code Issues Activity Actions

LibWeb: Don't generate Optional<String> from IDL for non-null arguments

Browse source 
Previously if the IDL was something like:
```
constructor(optional DOMString data = "");
```

We were generating code that would be passing through to the constructor
an Optional<String> - even though for this situation it is not possible
for it to be null.

Instead, if we know if there is a default value that is non-null and the
type is not nullish, just generate the cpp code as a String.
This commit is contained in:
Shannon Booth 2023-09-04 23:54:32 +12:00 • committed by Tim Flynn
parent f991e40d7f
commit 914fb90bbe
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Meta/Lagom/Tools/CodeGenerators/LibWeb/BindingsGenerator/IDLGenerators.cpp
View file

@ -377,13 +377,23 @@ static void generate_to_new_string(SourceGenerator& scoped_generator, ParameterT
)~~~"); )~~~");
} }
} else { } else {
scoped_generator.append(R"~~~( bool may_be_null = !optional_default_value.has_value() || parameter.type->is_nullable() || optional_default_value.value() == "null";
if (may_be_null) {
scoped_generator.append(R"~~~(
Optional<String> @cpp_name@; Optional<String> @cpp_name@;
)~~~");
} else {
scoped_generator.append(R"~~~(
String @cpp_name@;
)~~~");
}
scoped_generator.append(R"~~~(
if (!@js_name@@js_suffix@.is_undefined()) { if (!@js_name@@js_suffix@.is_undefined()) {
if (!@legacy_null_to_empty_string@ || !@js_name@@js_suffix@.is_null()) if (!@legacy_null_to_empty_string@ || !@js_name@@js_suffix@.is_null())
@cpp_name@ = TRY(@js_name@@js_suffix@.to_string(vm)); @cpp_name@ = TRY(@js_name@@js_suffix@.to_string(vm));
})~~~"); })~~~");
if (optional_default_value.has_value() && (!parameter.type->is_nullable() || optional_default_value.value() != "null")) { if (!may_be_null) {
scoped_generator.append(R"~~~( else { scoped_generator.append(R"~~~( else {
@cpp_name@ = MUST(String::from_utf8(@parameter.optional_default_value@sv)); @cpp_name@ = MUST(String::from_utf8(@parameter.optional_default_value@sv));
} }
@ -810,7 +820,10 @@ static void generate_to_cpp(SourceGenerator& generator, ParameterType& parameter
} }
generate_to_cpp(dictionary_generator, member, member_property_value_name, "", member_value_name, interface, member.extended_attributes.contains("LegacyNullToEmptyString"), !member.required, member.default_value); generate_to_cpp(dictionary_generator, member, member_property_value_name, "", member_value_name, interface, member.extended_attributes.contains("LegacyNullToEmptyString"), !member.required, member.default_value);
if (member.type->is_string() && optional && !interface.extended_attributes.contains("UseDeprecatedAKString")) {
bool may_be_null = !optional_default_value.has_value() || parameter.type->is_nullable() || optional_default_value.value() == "null";
if (member.type->is_string() && optional && !interface.extended_attributes.contains("UseDeprecatedAKString") && may_be_null) {
dictionary_generator.append(R"~~~( dictionary_generator.append(R"~~~(
if (@member_value_name@.has_value()) if (@member_value_name@.has_value())
@cpp_name@.@member_name@ = @member_value_name@.release_value(); @cpp_name@.@member_name@ = @member_value_name@.release_value();