Skip to content

WINRT_LEAN_AND_MEAN should not exclude overridable interfaces #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kennykerr merged 1 commit into from
Nov 11, 2019
Merged

WINRT_LEAN_AND_MEAN should not exclude overridable interfaces #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cppwinrt/code_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,7 +1780,7 @@ namespace cppwinrt
}
}

static void write_produce(writer& w, TypeDef const& type)
static void write_produce(writer& w, TypeDef const& type, cache const& c)
{
auto format = R"( template <typename D%>
struct produce<D, %> : produce_base<D, %>
Expand All @@ -1790,7 +1790,7 @@ namespace cppwinrt

auto generics = type.GenericParam();
auto guard{ w.push_generic_params(generics) };
bool const lean_and_mean = !can_produce(type);
bool const lean_and_mean = !can_produce(type, c);

if (lean_and_mean)
{
Expand Down
2 changes: 1 addition & 1 deletion cppwinrt/file_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ namespace cppwinrt
write_impl_namespace(w);
w.write_each<write_consume_definitions>(members.interfaces);
w.write_each<write_delegate_implementation>(members.delegates);
w.write_each<write_produce>(members.interfaces);
w.write_each<write_produce>(members.interfaces, c);
w.write_each<write_dispatch_overridable>(members.classes);
write_close_namespace(w);

Expand Down
18 changes: 16 additions & 2 deletions cppwinrt/helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ namespace cppwinrt
!members.delegates.empty();
}

static bool can_produce(TypeDef const& type)
static bool can_produce(TypeDef const& type, cache const& c)
{
auto attribute = get_attribute(type, "Windows.Foundation.Metadata", "ExclusiveToAttribute");

Expand All @@ -864,12 +864,26 @@ namespace cppwinrt
return true;
}

auto interface_name = type_name(type);
auto class_name = get_attribute_value<ElemSig::SystemType>(attribute, 0).name;
auto class_type = c.find_required(class_name);

for (auto&& impl : class_type.InterfaceImpl())
{
if (has_attribute(impl, "Windows.Foundation.Metadata", "OverridableAttribute"))
{
if (interface_name == type_name(impl.Interface()))
{
return true;
}
}
}

if (!settings.component)
{
return false;
}

auto class_name = get_attribute_value<ElemSig::SystemType>(attribute, 0).name;
return settings.component_filter.includes(class_name);
}
}
12 changes: 12 additions & 0 deletions cppwinrt/type_writers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,20 @@ namespace cppwinrt
name_space(type.TypeNamespace())
{
}

explicit type_name(coded_index<TypeDefOrRef> const& type)
{
auto const& [type_namespace, type_name] = get_type_namespace_and_name(type);
name_space = type_namespace;
name = type_name;
}
};

bool operator==(type_name const& left, type_name const& right)
{
return left.name == right.name && left.name_space == right.name_space;
}

bool operator==(type_name const& left, std::string_view const& right)
{
if (left.name.size() + 1 + left.name_space.size() != right.size())
Expand Down