mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

BindingsGenerator: Handle nullable enum properties

Browse source 
Add some checks to the statement wrapping code to make sure we properly
handle the expected pattern of returning ``Optional<Enum>`` from
nullable enum properties.
This commit is contained in:
Andrew Kaster 2023-08-23 10:23:06 -06:00 • committed by Andrew Kaster
parent d3a8ee6e4b
commit cf0ffc12cc
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1621,7 +1621,7 @@ static void generate_wrap_statement(SourceGenerator& generator, DeprecatedString
@result_expression@ JS::js_null(); @result_expression@ JS::js_null();
} else { } else {
)~~~"); )~~~");
} else if (type.is_primitive()) { } else if (type.is_primitive() || interface.enumerations.contains(type.name())) {
scoped_generator.append(R"~~~( scoped_generator.append(R"~~~(
if (!@value@.has_value()) { if (!@value@.has_value()) {
@result_expression@ JS::js_null(); @result_expression@ JS::js_null();
@ -1764,6 +1764,9 @@ static void generate_wrap_statement(SourceGenerator& generator, DeprecatedString
); );
)~~~"); )~~~");
} else if (interface.enumerations.contains(type.name())) { } else if (interface.enumerations.contains(type.name())) {
// Handle Enum? values, which were null-checked above
if (type.is_nullable())
scoped_generator.set("value", DeprecatedString::formatted("{}.value()", value));
if (!interface.extended_attributes.contains("UseNewAKString")) { if (!interface.extended_attributes.contains("UseNewAKString")) {
scoped_generator.append(R"~~~( scoped_generator.append(R"~~~(
@result_expression@ JS::PrimitiveString::create(vm, Bindings::idl_enum_to_deprecated_string(@value@)); @result_expression@ JS::PrimitiveString::create(vm, Bindings::idl_enum_to_deprecated_string(@value@));