mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-08 09:09:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

BindingsGenerator: Factor out code to generate JS::Value from an integer

Browse source 
Mirroring the pre-existing `generate_from_integral` function. This will
allow us to fix a bug that all of these if statements have in common -
no handling of nullable types.

This also adjusts the type casted for each integral to fully match that
stated by the spec.
This commit is contained in:
Shannon Booth 2024-07-28 13:15:13 +12:00 • committed by Andreas Kling
commit d6243abec3
Notes: github-actions[bot] 2024-08-01 10:18:14 +00:00
1 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -388,6 +388,35 @@ static void generate_to_string(SourceGenerator& scoped_generator, ParameterType
} }
} }
static void generate_from_integral(SourceGenerator& scoped_generator, IDL::Type const& type)
{
struct TypeMap {
StringView idl_type;
StringView cpp_type;
};
static constexpr auto idl_type_map = to_array<TypeMap>({
{ "byte"sv, "WebIDL::Byte"sv },
{ "octet"sv, "WebIDL::Octet"sv },
{ "short"sv, "WebIDL::Short"sv },
{ "unsigned short"sv, "WebIDL::UnsignedShort"sv },
{ "long"sv, "WebIDL::Long"sv },
{ "unsigned long"sv, "WebIDL::UnsignedLong"sv },
{ "long long"sv, "double"sv },
{ "unsigned long long"sv, "double"sv },
});
auto it = find_if(idl_type_map.begin(), idl_type_map.end(), [&](auto const& entry) {
return entry.idl_type == type.name();
});
VERIFY(it != idl_type_map.end());
scoped_generator.set("cpp_type"sv, it->cpp_type);
scoped_generator.append(R"~~~(
@result_expression@ JS::Value(static_cast<@cpp_type@>(@value@));
)~~~");
}
template<typename ParameterType> template<typename ParameterType>
static void generate_to_integral(SourceGenerator& scoped_generator, ParameterType const& parameter, bool optional, Optional<ByteString> const& optional_default_value) static void generate_to_integral(SourceGenerator& scoped_generator, ParameterType const& parameter, bool optional, Optional<ByteString> const& optional_default_value)
{ {
@ -1741,22 +1770,8 @@ static void generate_wrap_statement(SourceGenerator& generator, ByteString const
@result_expression@ JS::Value(@value@); @result_expression@ JS::Value(@value@);
)~~~"); )~~~");
} }
} else if (type.name() == "short" || type.name() == "long" || type.name() == "unsigned short") { } else if (type.is_integer()) {
scoped_generator.append(R"~~~( generate_from_integral(scoped_generator, type);
@result_expression@ JS::Value((i32)@value@);
)~~~");
} else if (type.name() == "unsigned long") {
scoped_generator.append(R"~~~(
@result_expression@ JS::Value((u32)@value@);
)~~~");
} else if (type.name() == "long long") {
scoped_generator.append(R"~~~(
@result_expression@ JS::Value((double)@value@);
)~~~");
} else if (type.name() == "unsigned long long") {
scoped_generator.append(R"~~~(
@result_expression@ JS::Value((double)@value@);
)~~~");
} else if (type.name() == "Location" || type.name() == "Promise" || type.name() == "Uint8Array" || type.name() == "Uint8ClampedArray" || type.name() == "any") { } else if (type.name() == "Location" || type.name() == "Promise" || type.name() == "Uint8Array" || type.name() == "Uint8ClampedArray" || type.name() == "any") {
scoped_generator.append(R"~~~( scoped_generator.append(R"~~~(
@result_expression@ @value@; @result_expression@ @value@;