Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 21 additions & 2 deletions examples/parametric.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ struct TemplateType
}
};

template<typename T>
struct PartialTemplate : public TemplateType<P2,T>
{
};

// Template containing a non-type parameter
template<typename T, T I>
struct NonTypeParam
Expand Down Expand Up @@ -82,6 +87,14 @@ struct WrapTemplateType
}
};

struct WrapPartialTemplateType
{
template<typename TypeWrapperT>
void operator()(TypeWrapperT&&)
{
}
};

struct WrapTemplateDefaultType
{
template<typename TypeWrapperT>
Expand Down Expand Up @@ -239,6 +252,9 @@ namespace jlcxx
template<typename T1> struct IsMirroredType<CppVector<T1>> : std::false_type { };
template<typename T1, typename T2> struct IsMirroredType<CppVector2<T1,T2>> : std::false_type { };

template<typename T> struct IsMirroredType<PartialTemplate<T>> : std::false_type { };
template<typename T> struct SuperType<PartialTemplate<T>> { typedef TemplateType<P2,T> type; };

} // namespace jlcxx

JLCXX_MODULE define_julia_module(jlcxx::Module& types)
Expand All @@ -249,8 +265,11 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& types)
types.add_type<P1>("P1");
types.add_type<P2>("P2");

types.add_type<Parametric<TypeVar<1>, TypeVar<2>>>("TemplateType")
.apply<TemplateType<P1,P2>, TemplateType<P2,P1>>(WrapTemplateType());
auto template_type = types.add_type<Parametric<TypeVar<1>, TypeVar<2>>>("TemplateType");
template_type.apply<TemplateType<P1,P2>, TemplateType<P2,P1>>(WrapTemplateType());

types.add_type<Parametric<TypeVar<2>>, ParameterList<P2, TypeVar<2>>>("PartialTemplate", template_type.dt())
.apply<PartialTemplate<P1>>(WrapPartialTemplateType());

types.add_type<Parametric<TypeVar<1>>>("TemplateDefaultType")
.apply<TemplateDefaultType<P1>, TemplateDefaultType<P2>>(WrapTemplateDefaultType());
Expand Down
2 changes: 1 addition & 1 deletion include/jlcxx/module.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ TypeWrapper<T> Module::add_type_internal(const std::string& name, JLSuperT* supe
fnames = jl_svec1(jl_symbol("cpp_object"));
ftypes = jl_svec1(jl_voidpointer_type);

if(jl_is_datatype(super_generic) && !jl_is_unionall(super_generic))
if(jl_is_datatype(super_generic) && !jl_is_unionall(super_generic) && !(is_parametric && SuperParametersT::nb_parameters != 0))
{
super = (jl_datatype_t*)super_generic;
}
Expand Down
Loading