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

LibWeb: Make WrapperGenerator consider "unsigned" part of a type

Browse source
This commit is contained in:
Andreas Kling 2021-01-23 17:56:55 +01:00
parent adb2fae69c
commit cf836e6bff
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Userland/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp
View file

@ -144,7 +144,6 @@ struct Constant {
struct Attribute { struct Attribute {
bool readonly { false }; bool readonly { false };
bool unsigned_ { false };
Type type; Type type;
String name; String name;
HashMap<String, String> extended_attributes; HashMap<String, String> extended_attributes;
@ -211,9 +210,16 @@ static OwnPtr<Interface> parse_interface(StringView filename, const StringView&
assert_specific('{'); assert_specific('{');
auto parse_type = [&] { auto parse_type = [&] {
bool unsigned_ = lexer.consume_specific("unsigned");
if (unsigned_)
consume_whitespace();
auto name = lexer.consume_until([](auto ch) { return isspace(ch) || ch == '?'; }); auto name = lexer.consume_until([](auto ch) { return isspace(ch) || ch == '?'; });
auto nullable = lexer.consume_specific('?'); auto nullable = lexer.consume_specific('?');
return Type { name, nullable }; StringBuilder builder;
if (unsigned_)
builder.append("unsigned ");
builder.append(name);
return Type { builder.to_string(), nullable };
}; };
auto parse_attribute = [&](HashMap<String, String>& extended_attributes) { auto parse_attribute = [&](HashMap<String, String>& extended_attributes) {
@ -224,10 +230,6 @@ static OwnPtr<Interface> parse_interface(StringView filename, const StringView&
if (lexer.consume_specific("attribute")) if (lexer.consume_specific("attribute"))
consume_whitespace(); consume_whitespace();
bool unsigned_ = lexer.consume_specific("unsigned");
if (unsigned_)
consume_whitespace();
auto type = parse_type(); auto type = parse_type();
consume_whitespace(); consume_whitespace();
auto name = lexer.consume_until([](auto ch) { return isspace(ch) || ch == ';'; }); auto name = lexer.consume_until([](auto ch) { return isspace(ch) || ch == ';'; });
@ -236,7 +238,6 @@ static OwnPtr<Interface> parse_interface(StringView filename, const StringView&
assert_specific(';'); assert_specific(';');
Attribute attribute; Attribute attribute;
attribute.readonly = readonly; attribute.readonly = readonly;
attribute.unsigned_ = unsigned_;
attribute.type = type; attribute.type = type;
attribute.name = name; attribute.name = name;
attribute.getter_callback_name = String::formatted("{}_getter", snake_name(attribute.name)); attribute.getter_callback_name = String::formatted("{}_getter", snake_name(attribute.name));
@ -250,9 +251,6 @@ static OwnPtr<Interface> parse_interface(StringView filename, const StringView&
consume_whitespace(); consume_whitespace();
Constant constant; Constant constant;
bool unsigned_ = lexer.consume_specific("unsigned");
if (unsigned_)
consume_whitespace();
constant.type = parse_type(); constant.type = parse_type();
consume_whitespace(); consume_whitespace();
constant.name = lexer.consume_until([](auto ch) { return isspace(ch) || ch == '='; }); constant.name = lexer.consume_until([](auto ch) { return isspace(ch) || ch == '='; });
@ -1092,6 +1090,12 @@ static @fully_qualified_name@* impl_from(JS::VM& vm, JS::GlobalObject& global_ob
} else if (parameter.type.name == "boolean") { } else if (parameter.type.name == "boolean") {
scoped_generator.append(R"~~~( scoped_generator.append(R"~~~(
auto @cpp_name@ = @js_name@@js_suffix@.to_boolean(); auto @cpp_name@ = @js_name@@js_suffix@.to_boolean();
)~~~");
} else if (parameter.type.name == "unsigned long") {
scoped_generator.append(R"~~~(
auto @cpp_name@ = @js_name@@js_suffix@.to_u32(global_object);
if (vm.exception())
@return_statement@
)~~~"); )~~~");
} else { } else {
dbgln("Unimplemented JS-to-C++ conversion: {}", parameter.type.name); dbgln("Unimplemented JS-to-C++ conversion: {}", parameter.type.name);
@ -1158,11 +1162,11 @@ static @fully_qualified_name@* impl_from(JS::VM& vm, JS::GlobalObject& global_ob
return new_array; return new_array;
)~~~"); )~~~");
} else if (return_type.name == "boolean" || return_type.name == "double" || return_type.name == "long") { } else if (return_type.name == "boolean" || return_type.name == "double" || return_type.name == "long" || return_type.name == "unsigned long") {
scoped_generator.append(R"~~~( scoped_generator.append(R"~~~(
return JS::Value(retval); return JS::Value(retval);
)~~~"); )~~~");
} else if (return_type.name == "short") { } else if (return_type.name == "short" || return_type.name == "unsigned short") {
scoped_generator.append(R"~~~( scoped_generator.append(R"~~~(
return JS::Value((i32)retval); return JS::Value((i32)retval);
)~~~"); )~~~");