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

LibWeb: Escape reserved names of generated wrapper functions

Browse source 
This also adds 'delete' to the list of reserved cpp names.
This commit is contained in:
Idan Horowitz 2021-09-13 00:23:42 +03:00 • committed by Andreas Kling
parent e946316618
commit 47e261c691
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator.cpp
View file

@ -20,7 +20,7 @@
static String make_input_acceptable_cpp(String const& input) static String make_input_acceptable_cpp(String const& input)
{ {
if (input.is_one_of("class", "template", "for", "default", "char", "namespace")) { if (input.is_one_of("class", "template", "for", "default", "char", "namespace", "delete")) {
StringBuilder builder; StringBuilder builder;
builder.append(input); builder.append(input);
builder.append('_'); builder.append('_');
@ -866,13 +866,13 @@ static void generate_function(SourceGenerator& generator, IDL::Function const& f
function_generator.set("class_name", class_name); function_generator.set("class_name", class_name);
function_generator.set("interface_fully_qualified_name", interface_fully_qualified_name); function_generator.set("interface_fully_qualified_name", interface_fully_qualified_name);
function_generator.set("function.name", function.name); function_generator.set("function.name", function.name);
function_generator.set("function.name:snakecase", function.name.to_snakecase()); function_generator.set("function.name:snakecase", make_input_acceptable_cpp(function.name.to_snakecase()));
if (function.extended_attributes.contains("ImplementedAs")) { if (function.extended_attributes.contains("ImplementedAs")) {
auto implemented_as = function.extended_attributes.get("ImplementedAs").value(); auto implemented_as = function.extended_attributes.get("ImplementedAs").value();
function_generator.set("function.cpp_name", implemented_as); function_generator.set("function.cpp_name", implemented_as);
} else { } else {
function_generator.set("function.cpp_name", function.name.to_snakecase()); function_generator.set("function.cpp_name", make_input_acceptable_cpp(function.name.to_snakecase()));
} }
function_generator.append(R"~~~( function_generator.append(R"~~~(
@ -1167,7 +1167,7 @@ private:
for (auto& function : interface.static_functions) { for (auto& function : interface.static_functions) {
auto function_generator = generator.fork(); auto function_generator = generator.fork();
function_generator.set("function.name:snakecase", function.name.to_snakecase()); function_generator.set("function.name:snakecase", make_input_acceptable_cpp(function.name.to_snakecase()));
function_generator.append(R"~~~( function_generator.append(R"~~~(
JS_DECLARE_NATIVE_FUNCTION(@function.name:snakecase@); JS_DECLARE_NATIVE_FUNCTION(@function.name:snakecase@);
)~~~"); )~~~");
@ -1320,7 +1320,7 @@ define_direct_property("@constant.name@", JS::Value((i32)@constant.value@), JS::
for (auto& function : interface.static_functions) { for (auto& function : interface.static_functions) {
auto function_generator = generator.fork(); auto function_generator = generator.fork();
function_generator.set("function.name", function.name); function_generator.set("function.name", function.name);
function_generator.set("function.name:snakecase", function.name.to_snakecase()); function_generator.set("function.name:snakecase", make_input_acceptable_cpp(function.name.to_snakecase()));
function_generator.set("function.length", String::number(function.length())); function_generator.set("function.length", String::number(function.length()));
function_generator.append(R"~~~( function_generator.append(R"~~~(
@ -1372,7 +1372,7 @@ private:
for (auto& function : interface.functions) { for (auto& function : interface.functions) {
auto function_generator = generator.fork(); auto function_generator = generator.fork();
function_generator.set("function.name:snakecase", function.name.to_snakecase()); function_generator.set("function.name:snakecase", make_input_acceptable_cpp(function.name.to_snakecase()));
function_generator.append(R"~~~( function_generator.append(R"~~~(
JS_DECLARE_NATIVE_FUNCTION(@function.name:snakecase@); JS_DECLARE_NATIVE_FUNCTION(@function.name:snakecase@);
)~~~"); )~~~");
@ -1557,7 +1557,7 @@ void @prototype_class@::initialize(JS::GlobalObject& global_object)
for (auto& function : interface.functions) { for (auto& function : interface.functions) {
auto function_generator = generator.fork(); auto function_generator = generator.fork();
function_generator.set("function.name", function.name); function_generator.set("function.name", function.name);
function_generator.set("function.name:snakecase", function.name.to_snakecase()); function_generator.set("function.name:snakecase", make_input_acceptable_cpp(function.name.to_snakecase()));
function_generator.set("function.length", String::number(function.length())); function_generator.set("function.length", String::number(function.length()));
function_generator.append(R"~~~( function_generator.append(R"~~~(